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/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -8,7 +8,8 @@ class Origami::VoucherController < BaseOrigamiController
    @vouchercount = 0
    others = 0

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