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/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -346,7 +346,7 @@ class Transactions::SalesController < ApplicationController
        customer= Customer.find(sale.customer_id)

         #shop detail
-        shop_details = Shop.find_by_id(1)
+        shop_details = Shop.current_shop
         # get member information
        rebate = MembershipSetting.find_by_rebate(1)
        if customer.membership_id != nil && rebate