fixed conflict

2019-12-02 17:43:02 +06:30
parent bf337495c1 cac6994ccb
commit de73bf9f7d
118 changed files with 14390 additions and 190 deletions
--- a/app/controllers/settings/cashier_terminals_controller.rb
+++ b/app/controllers/settings/cashier_terminals_controller.rb
@@ -5,7 +5,7 @@ class Settings::CashierTerminalsController < ApplicationController
  # GET /settings/cashier_terminals
  # GET /settings/cashier_terminals.json
  def index
-    @settings_cashier_terminals = CashierTerminal.all
+    @settings_cashier_terminals = CashierTerminal.where("shop_code=?",@shop.shop_code)
  end

  # GET /settings/cashier_terminals/1