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

fixed conflict after merch dev for current shop

Browse Source
This commit is contained in:
Nweni
2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ class Origami::PaymentsController < BaseOrigamiController
end
#shop detail
## shop_detail = Shop.first
## shop_detail = Shop.current_shop
# customer= Customer.where('customer_id=' +.customer_id)
customer = Customer.find(sale_data.customer_id)
# rounding adjustment
@@ -141,7 +141,7 @@ class Origami::PaymentsController < BaseOrigamiController
if(Sale.exists?(sale_id))
saleObj = Sale.find(sale_id)
sale_items = SaleItem.get_all_sale_items(sale_id)
#shop_detail = Shop.first
#shop_detail = Shop.current_shop
# rounding adjustment
if !path.include? ("credit_payment")
if @shop.is_rounding_adj
@@ -577,7 +577,7 @@ class Origami::PaymentsController < BaseOrigamiController
customer= Customer.find(saleObj.customer_id)
#shop detail
#shop_detail = Shop.first
#shop_detail = Shop.current_shop
# get member information
rebate = MembershipSetting.find_by_rebate(1)
if customer.membership_id != nil && rebate
@@ -686,8 +686,9 @@ class Origami::PaymentsController < BaseOrigamiController
customer= Customer.find(saleObj.customer_id)
#shop detail
#shop_detail = Shop.first
printer = PrintSetting.where("shop_code='#{@shop.shop_code}'")
#shop_detail = Shop.current_shop
printer = PrintSetting.all
unique_code="ReceiptBillPdf"
if !printer.empty?