git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

Browse Source
This commit is contained in:
NyanLinHtut
2019-11-13 13:35:34 +06:30
parent 92dd2aeb5a 8046b7210b
commit 891995f531
13 changed files with 116 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/api/void_controller.rb
View File

@@ -8,7 +8,7 @@ class Api::VoidController < Api::ApiController
if sale.discount_type == "member_discount"
sale.update_attributes(total_discount: 0)
sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
sale.compute_by_sale_items(0, nil, order_source)
end
# update count for shift sale
@@ -39,4 +39,3 @@ class Api::VoidController < Api::ApiController
end
end
end

2
app/controllers/origami/customers_controller.rb
View File

@@ -154,7 +154,7 @@ class Origami::CustomersController < BaseOrigamiController
if status == true
render json: JSON.generate({:status => true})
if(id == "SAL")
sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount, nil, order_source)
sale.compute_by_sale_items(sale.total_discount, nil, order_source)
end
else
render json: JSON.generate({:status => false, :error_message => "Record not found"})

9
app/controllers/origami/discounts_controller.rb
View File

@@ -33,7 +33,6 @@ class Origami::DiscountsController < BaseOrigamiController
overall_discount = params[:overall_discount]
sub_total = params[:sub_total]
if Sale.exists?(sale_id)
sale = Sale.find(sale_id)
if sale.bookings[0].dining_facility_id.to_i > 0
@@ -103,7 +102,7 @@ class Origami::DiscountsController < BaseOrigamiController
sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_name, action_by,remark,"OVERALLDISCOUNT" )
end
sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f, nil,order_source)
sale.compute_by_sale_items(overall_discount.to_f, nil,order_source)
if !table.nil?
result = {:status=> "Success", :table_id => table_id, :table_type => table.type }
else
@@ -158,7 +157,7 @@ class Origami::DiscountsController < BaseOrigamiController
# sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;
# sale.save
# Re-calc All Amount in Sale
sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount, nil, order_source)
sale.compute_by_sale_items(sale.total_discount, nil, order_source)
if table.nil?
result = {:status=> "Success"}
else
@@ -220,7 +219,7 @@ class Origami::DiscountsController < BaseOrigamiController
sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_name, action_by,remark,"REMOVEALLDISCOUNT" )
# Re-calc All Amount in Sale
sale.compute_by_sale_items(sale_id, sale.sale_items, 0, nil, order_source)
sale.compute_by_sale_items(0, nil, order_source)
if table.nil?
result = {:status=> "Success"}
else
@@ -321,7 +320,7 @@ class Origami::DiscountsController < BaseOrigamiController
if response["discount_bonus_earned"]
discount_amount = discount_amount + response["discount_bonus_earned"]
end
sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount', order_source, tax_type)
sale.compute_by_sale_items(discount_amount, 'member_discount', order_source, tax_type)
result = {:status=> "Success",:title=>"Member Discount", :table_id => table_id,:table_type => table_type }
elsif response["status"] == "500"
result = {:status=> response["error"],:title=>"Alert", :table_id => table_id,:table_type => table_type }

2
app/controllers/origami/other_charges_controller.rb
View File

@@ -75,7 +75,7 @@ class Origami::OtherChargesController < BaseOrigamiController
end
# Re-calc All Amount in Sale
sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount, nil, cashier_type)
sale.compute_by_sale_items(sale.total_discount, nil, cashier_type)
end
if !table.nil?
dining = {:table_id => table_id, :table_type => table.type }

4
app/controllers/origami/payments_controller.rb
View File

@@ -643,7 +643,7 @@ class Origami::PaymentsController < BaseOrigamiController
if saleObj.discount_type == "member_discount"
saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0,order_source)
saleObj.compute_by_sale_items(0, nil, order_source)
end
saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0)
@@ -818,7 +818,7 @@ class Origami::PaymentsController < BaseOrigamiController
order_source = params[:cashier_type]
tax_type = params[:tax_type]
sale = Sale.find(sale_id)
sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount,nil,order_source,tax_type)
sale.compute_by_sale_items(sale.total_discount, nil, order_source, tax_type)
render json: JSON.generate({:status => true})
end

18
app/controllers/origami/sale_edit_controller.rb
View File

@@ -59,7 +59,7 @@ class Origami::SaleEditController < BaseOrigamiController
remark = "Void Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}"
sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, action_by,remark,"SALEITEMVOID" )
saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source)
saleObj.compute_by_sale_items(saleObj.total_discount, nil, order_source)
ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
end
@@ -95,7 +95,7 @@ class Origami::SaleEditController < BaseOrigamiController
remark = "FOC Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}Receipt No #{saleObj.receipt_no}"
sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, action_by,remark,"SALEITEMFOC" )
saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source)
saleObj.compute_by_sale_items(saleObj.total_discount, nil, order_source)
ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
end
@@ -150,10 +150,10 @@ class Origami::SaleEditController < BaseOrigamiController
saleitemObj.save
# re-calc tax
saleObj = Sale.find(saleitemObj.sale_id)
# saleObj = Sale.find(saleitemObj.sale_id)
order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
order = Order.find(order_id)
# order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
# order = Order.find(order_id)
# order.order_items.each do |o|
# if saleitemObj.product_code == o.item_code
@@ -163,7 +163,7 @@ class Origami::SaleEditController < BaseOrigamiController
# end
# end
saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source)
sale.compute_by_sale_items(saleObj.total_discount, nil, order_source)
ProductCommission.edit_product_commission(saleitemObj)
end
@@ -196,7 +196,7 @@ class Origami::SaleEditController < BaseOrigamiController
remark = "Cancle Void Sale Item ID #{saleitemObj.sale_item_id} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}|Receipt No #{saleObj.receipt_no}"
sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, action_by,remark,"ITEMCANCELVOID" )
saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount, order_source)
saleObj.compute_by_sale_items(saleObj.total_discount, nil, order_source)
ProductCommission.remove_product_commission(saleitemObj)
end
@@ -214,9 +214,9 @@ class Origami::SaleEditController < BaseOrigamiController
item.save
ProductCommission.remove_product_commission(item)
end
saleObj.sale_items.reset
# re-calc tax
saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source)
saleObj.compute_by_sale_items(saleObj.total_discount,nil, order_source)
end
def apply_void

2
app/controllers/origami/void_controller.rb
View File

@@ -10,7 +10,7 @@ class Origami::VoidController < BaseOrigamiController
sale = Sale.find_by_sale_id(sale_id)
if sale.discount_type == "member_discount"
sale.update_attributes(total_discount: 0)
sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
sale.compute_by_sale_items(0, nil, order_source)
end
# update count for shift sale

1
app/controllers/origami/waste_spoile_controller.rb
View File

@@ -15,7 +15,6 @@ class Origami::WasteSpoileController < BaseOrigamiController
sale.sale_status = remark
sale.save
# sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
# add to sale item with foc
# sale_items = SaleItem.where("sale_id='#{ sale_id }' and status is null")

2
app/controllers/transactions/sales_controller.rb
View File

@@ -248,7 +248,7 @@ class Transactions::SalesController < ApplicationController
if sale.discount_type == "member_discount"
sale.update_attributes(total_discount: 0)
sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
sale.compute_by_sale_items(0, nil, order_source)
end
# update count for shift sale

9
app/models/promotion.rb
View File

@@ -109,7 +109,7 @@ class Promotion < ApplicationRecord
item = saleObj.order_items.where(item_instance_code: promo_product).first
if !item.nil?
update_existing_item(foc_qty, item, sale_id, "promotion", item[:price], source)
update_existing_item(foc_qty, item, saleObj, "promotion", item[:price], source)
end
end
# AA - 10 # 3 # BB # orderList, #S34345
@@ -128,7 +128,7 @@ class Promotion < ApplicationRecord
item = saleObj.order_items.where(item_instance_code: promo_product).first
if !item.nil?
update_existing_item(promotion_qty, item, sale_id, "promotion", item[:price],source)
update_existing_item(promotion_qty, item, saleObj, "promotion", item[:price],source)
end
end
@@ -158,7 +158,8 @@ class Promotion < ApplicationRecord
sale_item.sale = saleObj
sale_item.save
saleObj.compute_by_sale_items(saleObj.id, saleObj.sale_items, saleObj.total_discount,nil,source)
saleObj.sale_items << sale_item
saleObj.compute_by_sale_items(saleObj.total_discount, nil, source)
end
end
@@ -180,7 +181,7 @@ class Promotion < ApplicationRecord
item = saleObj.order_items.where(item_instance_code: promo_product.item_code).first
if !item.nil?
update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off,source)
update_existing_item(foc_qty, item, saleObj, "promotion nett off", promo_product.net_off,source)
end
end

50
app/models/sale.rb
View File

@@ -361,8 +361,8 @@ class Sale < ApplicationRecord
sale_item.save
# Re-calc
sale = Sale.find(self.id)
self.compute_by_sale_items(self.id, sale.sale_items, self.total_discount, nil, order_source)
self.sale_items << sale_item
self.compute_by_sale_items(self.total_discount, nil, order_source)
end
def create_saleitem_indutycharges(chargeObj, current_checkin_induties_count, induties_pay_amount, dining_name, dining_time, order_source = nil, basic_pay_amount)
sale_item = SaleItem.new
@@ -380,8 +380,8 @@ class Sale < ApplicationRecord
sale_item.price = induties_pay_amount
sale_item.save
# Re-calc
sale = Sale.find(self.id)
self.compute_by_sale_items(self.id, sale.sale_items, self.total_discount, nil, order_source)
self.sale_items << sale_item
self.compute_by_sale_items(self.total_discount, nil, order_source)
end
def update_item (item)
#save sale_audit
@@ -403,14 +403,12 @@ class Sale < ApplicationRecord
#compute - invoice total
def compute(order_source = nil, tax_type = nil)
sales_items = self.sale_items
#Computation Fields
subtotal_price = 0
total_taxable = 0
rounding_adjustment = 0
sales_items.each do |item|
self.sale_items.each do |item|
#compute each item and added to total
subtotal_price = subtotal_price + item.price
@@ -429,23 +427,19 @@ class Sale < ApplicationRecord
# self.grand_total_round
#compute rounding adjustment
# adjust_rounding
self.save!
end
#compute - invoice total
def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil,order_source=nil,tax_type=nil,type=nil)
def compute_by_sale_items(total_discount, discount_type=nil, order_source=nil, tax_type=nil, type=nil)
shop = Shop.first
sale = Sale.find(sale_id)
sales_items = sale_itemss
#Computation Fields
subtotal_price = 0
total_taxable = 0
rounding_adjustment = 0
sales_items.each do |item|
self.sale_items.each do |item|
#compute each item and added to total
subtotal_price = subtotal_price + item.price
@@ -454,35 +448,33 @@ class Sale < ApplicationRecord
total_taxable = total_taxable + item.taxable_price
end
end
compute_tax(sale, total_taxable, total_discount, order_source, tax_type)
sale.total_amount = subtotal_price
sale.total_discount = total_discount
compute_tax(total_taxable, total_discount, order_source, tax_type)
self.total_amount = subtotal_price
self.total_discount = total_discount
if type =="foc"
sale.grand_total = 0
self.grand_total = 0
else
sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax
self.grand_total = (self.total_amount - self.total_discount) + self.total_tax
# sale.grand_total_round
end
if discount_type == "member_discount"
sale.discount_type = discount_type
self.discount_type = discount_type
end
#compute rounding adjustment
# adjust_rounding
sale.save!
self.save!
end
# No Use too many wrong
def compute_without_void(order_source = nil)
sales_items = self.sale_items
#Computation Fields
subtotal_price = 0
total_taxable = 0
rounding_adjustment = 0
sales_items.each do |item|
self.sale_items.each do |item|
if item.status != 'void' && item.status != 'foc'
#compute each item and added to total
subtotal_price = subtotal_price + item.price
@@ -506,7 +498,7 @@ class Sale < ApplicationRecord
end
# Tax Re-Calculte
def compute_tax(sale, total_taxable, total_discount = 0, order_source = nil, tax_type=nil)
def compute_tax(total_taxable, total_discount = 0, order_source = nil, tax_type=nil)
shop = Shop.first
#if tax is not apply create new record
@@ -529,9 +521,9 @@ class Sale < ApplicationRecord
tax_profiles = unique_tax_profiles(order_source, self.customer_id)
# #Creat new tax records
if sale.payment_status != 'foc'
if self.payment_status != 'foc'
tax_profiles.each do |tax|
sale_tax = SaleTax.new(:sale => sale)
sale_tax = SaleTax.new(:sale => self)
sale_tax.tax_name = tax.name
sale_tax.tax_rate = tax.rate
@@ -555,8 +547,8 @@ class Sale < ApplicationRecord
sale_tax.save
end
end
sale.tax_type = tax_incl_exec
sale.total_tax = total_tax_amount
self.tax_type = tax_incl_exec
self.total_tax = total_tax_amount
end
# Tax Calculate

2
app/models/sale_item.rb
View File

@@ -89,7 +89,7 @@ class SaleItem < ApplicationRecord
# sale_item.save
if type != "foc"
sale = Sale.find(sale_id)
sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount)
sale.compute_by_sale_items(sale.total_discount)
end
end

2
app/models/sale_payment.rb
View File

@@ -419,7 +419,7 @@ class SalePayment < ApplicationRecord
SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price)
end
sale = Sale.find(self.sale.sale_id)
sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount,'','','',"foc")
sale.compute_by_sale_items(sale.total_discount,'','','',"foc")
self.payment_method = "foc"
self.payment_amount = self.received_amount