Merge branch 'r-1902001-01' into foodcourt

2020-07-19 19:44:59 +06:30
parent 530d49bb64 ced6a09095
commit 53f4320371
17 changed files with 240 additions and 146 deletions
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -54,6 +54,7 @@ class Origami::VoidController < BaseOrigamiController
      rebate_amount = nil
      current_balance = nil

+      # For Cashier by Zone
      if sale.booking.dining_facility_id.to_i > 0
        cashier_zone     = CashierTerminalByZone.find_by_zone_id(table.zone_id)
        cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)