shop code

2019-12-10 15:18:48 +06:30
parent c606ca73db
commit 79598c0126
115 changed files with 247 additions and 396 deletions
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -5,8 +5,6 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
    @cashier_type   = params[:type]
 		@membership_rebate_balance=0
 		sale_data = Sale.find_by_sale_id(@sale_id)
-
-        @shop        = Shop.current_shop 
        if @shop.is_rounding_adj
             new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
        else