shop code

2019-11-22 18:24:02 +06:30
parent 5a3f328789
commit d1ab2c194d
106 changed files with 834 additions and 895 deletions
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -8,14 +8,14 @@ class Origami::VoucherController < BaseOrigamiController
    @vouchercount = 0
    others = 0

-    @shop        = Shop.first 
+    # @shop        = Shop.first 
    if @shop.is_rounding_adj
         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
    else
        new_total    = sale_data.grand_total
    end
-    @rounding_adj = new_total-sale_data.grand_total  
-    
+    @rounding_adj = new_total-sale_data.grand_total
+
    sale_data.sale_payments.each do |sale_payment|
        if sale_payment.payment_method == "voucher"
          @vouchercount = @vouchercount + sale_payment.payment_amount