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/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -7,7 +7,7 @@ class Origami::MasterController < BaseOrigamiController
    sale_data = Sale.find_by_sale_id(@sale_id)
    total = 0
    @mastercount = 0
-    @shop        = Shop::ShopDetail
+    @shop        = Shop.first
    @rounding_adj = 0
    @can_master = 0
    @member_discount = 0
@@ -53,7 +53,7 @@ class Origami::MasterController < BaseOrigamiController
    ref_no = params[:ref_no]
    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