fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -23,8 +23,9 @@ class Api::CallWaitersController < ActionController::API
    end
    ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time,from: from, shift_ids: shift_ids
    # get printer info
-    # @shop          = Shop.first 
-    unique_code    = "CallWaiterPdf"
+
+    @shop          = Shop.current_shop 
+    unique_code    = "CallWaiterPdf" 
    print_settings = PrintSetting.find_by_unique_code(unique_code)
    printer        = Printer::ReceiptPrinter.new(print_settings)
    printer.print_call_waiter(print_settings,@table,@time,@shop)