shop upate for 20 files

2018-04-10 18:10:40 +06:30
parent 4c047550ce
commit 0ff340cac2
20 changed files with 38 additions and 38 deletions
--- a/app/controllers/origami/junction_pay_controller.rb
+++ b/app/controllers/origami/junction_pay_controller.rb
@@ -11,7 +11,7 @@ class Origami::JunctionPayController < BaseOrigamiController
    @cashier_id = current_user.emp_id

    @payment_method_setting_nav = PaymentMethodSetting.all
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
    if @shop.is_rounding_adj
         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
    else
@@ -52,7 +52,7 @@ class Origami::JunctionPayController < BaseOrigamiController

    if(Sale.exists?(sale_id))
      saleObj = Sale.find(sale_id)
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
      
      # rounding adjustment
      # if shop_details.is_rounding_adj