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

fix dis and payment foc and sale item report

Browse Source
This commit is contained in:
Yan
2017-11-22 20:47:53 +06:30
parent 06582d755e
commit 3261fef3cf
5 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ class Origami::DiscountsController < BaseOrigamiController
sale_item.remark = "Discount"
sale_item.qty = -1
sale_item.unit_price = di["price"] * -1
sale_item.unit_price = di["price"].to_f * (-1)
sale_item.taxable_price = di["price"]
sale_item.is_taxable = 1
sale_item.account_id = origin_sale_item.account_id

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

@@ -209,7 +209,7 @@ class Origami::PaymentsController < BaseOrigamiController
printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print")
end
def foc
def foc
cash = params[:cash]
sale_id = params[:sale_id]
sub_total = params[:sub_total]
@@ -233,6 +233,9 @@ class Origami::PaymentsController < BaseOrigamiController
cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
# Re-call Sale Data
saleObj = Sale.find(sale_id)
unique_code = "ReceiptBillPdf"
customer= Customer.find(saleObj.customer_id)