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/models/menu.rb
+++ b/app/models/menu.rb
@@ -141,7 +141,14 @@ class Menu < ApplicationRecord
      end
    else
      # Menu by Menu Import
-      shop_code= shop.shop_code + "_"
+
+      @shop = Shop.current_shop
+      shop_code = ""
+      if !@shop.nil?
+        if @shop.shop_code
+          shop_code = @shop.shop_code + "_"
+        end
+      end

      sheet = spreadsheet.sheet(0)
      menu = sheet.row(1)[1]