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

check add to existing invoice

Browse Source
This commit is contained in:
phyusin
2018-01-28 16:29:59 +06:30
parent aa129ad469
commit 2a09945d36
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,7 +164,25 @@ class Origami::PaymentsController < BaseOrigamiController
@table_no = '' @table_no = ''
@shop = Shop::ShopDetail @shop = Shop::ShopDetail
@rounding_adj = @sale_data.rounding_adjustment
saleObj = Sale.find(sale_id)
# rounding adjustment
if @shop.is_rounding_adj
a = saleObj.grand_total % 25 # Modulus
b = saleObj.grand_total / 25 # Division
#not calculate rounding if modulus is 0 and division is even
#calculate rounding if modulus is zero or not zero and division are not even
if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
new_total = Sale.get_rounding_adjustment(saleObj.grand_total)
@rounding_adj = new_total-saleObj.grand_total
else
@rounding_adj = @sale_data.rounding_adjustment
end
else
@rounding_adj = @sale_data.rounding_adjustment
end
#end rounding adjustment
#get customer amount #get customer amount
@customer = Customer.find(@sale_data.customer_id) @customer = Customer.find(@sale_data.customer_id)

9
app/models/sale.rb
View File

@@ -470,17 +470,16 @@ class Sale < ApplicationRecord
end end
def adjust_rounding def adjust_rounding
saleObj = Sale.find(self.sale_id)
shop_details = Shop::ShopDetail shop_details = Shop::ShopDetail
# rounding adjustment # rounding adjustment
if shop_details.is_rounding_adj if shop_details.is_rounding_adj
a = saleObj.grand_total % 25 # Modulus a = self.grand_total % 25 # Modulus
b = saleObj.grand_total / 25 # Division b = self.grand_total / 25 # Division
#not calculate rounding if modulus is 0 and division is even #not calculate rounding if modulus is 0 and division is even
#calculate rounding if modulus is zero or not zero and division are not even #calculate rounding if modulus is zero or not zero and division are not even
if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
new_total = Sale.get_rounding_adjustment(saleObj.grand_total) new_total = Sale.get_rounding_adjustment(self.grand_total)
self.rounding_adjustment = new_total-saleObj.grand_total self.rounding_adjustment = new_total - self.grand_total
else else
self.rounding_adjustment = 0.00 self.rounding_adjustment = 0.00
end end