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

print cashier by zone

Browse Source
This commit is contained in:
Yan
2017-10-23 19:23:43 +06:30
parent bb96cf6db5
commit 2f254a34ca
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,12 +10,12 @@ class Origami::PaymentsController < BaseOrigamiController
member_info = nil
# For Cashier by Zone
bookings = Booking.find_by_sale_id(sale_id)
bookings = Booking.where("sale_id='#{sale_id}'")
if bookings.count > 1
# for Multiple Cashier by Zone
# for Multiple Booking
table = DiningFacility.find(bookings[0].dining_facility_id)
else
table = DiningFacility.find(bookings.dining_facility_id)
table = DiningFacility.find(bookings[0].dining_facility_id)
end
cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
@@ -61,12 +61,12 @@ class Origami::PaymentsController < BaseOrigamiController
rebate_amount = nil
# For Cashier by Zone
bookings = Booking.find_by_sale_id(sale_id)
bookings = Booking.where("sale_id='#{sale_id}'")
if bookings.count > 1
# for Multiple Cashier by Zone
# for Multiple Booking
table = DiningFacility.find(bookings[0].dining_facility_id)
else
table = DiningFacility.find(bookings.dining_facility_id)
table = DiningFacility.find(bookings[0].dining_facility_id)
end
cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)

9
app/controllers/origami/shifts_controller.rb
View File

@@ -37,12 +37,13 @@ class Origami::ShiftsController < BaseOrigamiController
@shift = ShiftSale.find_by_id(shift_id)
if @shift
@shift.shift_closed_at = DateTime.now.utc
@shift.closing_balance = closing_balance.to_f
@shift.cashier_terminal.is_currently_login = 0
@shift.closing_balance = closing_balance.to_f
@shift.save
# Multiple Cashier
#cashier_terminal = @shift.cashier_terminal
cashier_terminal = @shift.cashier_terminal
cashier_terminal.is_currently_login = 0
cashier_terminal.save
unique_code = "CloseCashierPdf"
@@ -62,7 +63,7 @@ class Origami::ShiftsController < BaseOrigamiController
printer = Printer::CashierStationPrinter.new(print_settings)
printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
end