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

shop upate for 20 files

Browse Source
This commit is contained in:
Yan
2018-04-10 18:10:40 +06:30
parent 4c047550ce
commit 0ff340cac2
20 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ class Origami::PaymentsController < BaseOrigamiController
end
#shop detail
shop_details = Shop::ShopDetail
shop_details = Shop.first
# customer= Customer.where('customer_id=' +.customer_id)
customer = Customer.find(sale_data.customer_id)
# rounding adjustment
@@ -99,7 +99,7 @@ class Origami::PaymentsController < BaseOrigamiController
if(Sale.exists?(sale_id))
saleObj = Sale.find(sale_id)
shop_details = Shop::ShopDetail
shop_details = Shop.first
# rounding adjustment
if shop_details.is_rounding_adj
a = saleObj.grand_total % 25 # Modulus
@@ -238,7 +238,7 @@ class Origami::PaymentsController < BaseOrigamiController
@dining = ''
@other_payment = 0.0
@shop = Shop::ShopDetail #show shop info
@shop = Shop.first #show shop info
@customer_lists = Customer.where("customer_id = 'CUS-000000000001' or customer_id = 'CUS-000000000002'")
@@ -391,7 +391,7 @@ class Origami::PaymentsController < BaseOrigamiController
customer= Customer.find(saleObj.customer_id)
#shop detail
shop_details = Shop::ShopDetail
shop_details = Shop.first
# get member information
rebate = MembershipSetting.find_by_rebate(1)
if customer.membership_id != nil && rebate
@@ -475,7 +475,7 @@ class Origami::PaymentsController < BaseOrigamiController
customer= Customer.find(saleObj.customer_id)
#shop detail
shop_details = Shop::ShopDetail
shop_details = Shop.first
# get printer info
print_settings=PrintSetting.find_by_unique_code(unique_code)