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/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -6,7 +6,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
 		@membership_rebate_balance=0
 		sale_data = Sale.find_by_sale_id(@sale_id)

-        # @shop        = Shop.first
+        @shop        = Shop.current_shop 
        if @shop.is_rounding_adj
             new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
        else