add qr loading animation
This commit is contained in:
@@ -57,19 +57,6 @@ class Foodcourt::QrpayController < BaseFoodcourtController
|
|||||||
amount = SalePayment.get_kbz_pay_amount(sale_id, current_user)
|
amount = SalePayment.get_kbz_pay_amount(sale_id, current_user)
|
||||||
@kbz_pay_amount += amount.to_f
|
@kbz_pay_amount += amount.to_f
|
||||||
|
|
||||||
#for changable on/off
|
|
||||||
@changable_tax = true
|
|
||||||
lookup_changable_tax = Lookup.collection_of('changable_tax')
|
|
||||||
if !lookup_changable_tax.empty?
|
|
||||||
lookup_changable_tax.each do |changable_tax|
|
|
||||||
if changable_tax[0].downcase == "change"
|
|
||||||
if changable_tax[1] == '0'
|
|
||||||
@changable_tax = false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# @shop = shop_detail #show shop info
|
# @shop = shop_detail #show shop info
|
||||||
|
|
||||||
@customer_lists = Customer.where(name: ["WALK-IN", "TAKEAWAY"])
|
@customer_lists = Customer.where(name: ["WALK-IN", "TAKEAWAY"])
|
||||||
@@ -82,24 +69,6 @@ class Foodcourt::QrpayController < BaseFoodcourtController
|
|||||||
@individual_total.push({'total_customer' => saleObj.equal_persons.to_i, 'per_person_amount' => per_person_amount.to_f })
|
@individual_total.push({'total_customer' => saleObj.equal_persons.to_i, 'per_person_amount' => per_person_amount.to_f })
|
||||||
end
|
end
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# rounding adjustment
|
|
||||||
if current_shop.is_rounding_adj
|
if current_shop.is_rounding_adj
|
||||||
a = saleObj.grand_total % 25 # Modulus
|
a = saleObj.grand_total % 25 # Modulus
|
||||||
b = saleObj.grand_total / 25 # Division
|
b = saleObj.grand_total / 25 # Division
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user