From 0ff340cac29fbd17304c2cc4f5e0afc350744d50 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 10 Apr 2018 18:10:40 +0630
Subject: [PATCH] shop upate for 20 files

---
 app/controllers/api/call_waiters_controller.rb        |  2 +-
 app/controllers/origami/alipay_controller.rb          |  4 ++--
 app/controllers/origami/credit_payments_controller.rb |  4 ++--
 app/controllers/origami/dinga_controller.rb           |  4 ++--
 app/controllers/origami/home_controller.rb            |  4 ++--
 app/controllers/origami/jcb_controller.rb             |  4 ++--
 app/controllers/origami/junction_pay_controller.rb    |  4 ++--
 app/controllers/origami/master_controller.rb          |  4 ++--
 app/controllers/origami/movetable_controller.rb       |  2 +-
 app/controllers/origami/mpu_controller.rb             |  4 ++--
 app/controllers/origami/paymal_controller.rb          |  4 ++--
 app/controllers/origami/payments_controller.rb        | 10 +++++-----
 app/controllers/origami/paypar_payments_controller.rb |  2 +-
 app/controllers/origami/redeem_payments_controller.rb |  2 +-
 app/controllers/origami/rooms_controller.rb           |  2 +-
 app/controllers/origami/table_invoices_controller.rb  |  4 ++--
 app/controllers/origami/unionpay_controller.rb        |  4 ++--
 app/controllers/origami/visa_controller.rb            |  4 ++--
 app/controllers/origami/voucher_controller.rb         |  2 +-
 app/models/sale.rb                                    |  6 +++---
 20 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index 7cf80a5d..b695dc33 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -9,7 +9,7 @@ class Api::CallWaitersController < ActionController::API
     ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
 
     # get printer info
-    @shop          = Shop::ShopDetail 
+    @shop          = Shop.first 
     unique_code    = "CallWaiterPdf" 
     print_settings = PrintSetting.find_by_unique_code(unique_code)
     printer        = Printer::ReceiptPrinter.new(print_settings)   
diff --git a/app/controllers/origami/alipay_controller.rb b/app/controllers/origami/alipay_controller.rb
index 3f449856..d3b7c488 100644
--- a/app/controllers/origami/alipay_controller.rb
+++ b/app/controllers/origami/alipay_controller.rb
@@ -6,7 +6,7 @@ class Origami::AlipayController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @alipaycount = 0
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     @rounding_adj = 0
     @can_alipay = 0
     @member_discount = 0
@@ -54,7 +54,7 @@ class Origami::AlipayController < 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
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index d70ef870..1aab35a5 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -9,7 +9,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     @creditcount = 0
     others = 0
 
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
     else
@@ -32,7 +32,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     sale_id = params[:sale_id]
     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
diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb
index b98b3408..1b3c9ca2 100644
--- a/app/controllers/origami/dinga_controller.rb
+++ b/app/controllers/origami/dinga_controller.rb
@@ -6,7 +6,7 @@ class Origami::DingaController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
-        @shop        = Shop::ShopDetail 
+        @shop        = Shop.first 
         # if @shop.is_rounding_adj
         #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
         # else
@@ -77,7 +77,7 @@ class Origami::DingaController < BaseOrigamiController
 		payment_method = "dinga"
 		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
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 8e00ef80..493e4680 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -8,7 +8,7 @@ class Origami::HomeController < BaseOrigamiController
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders   = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
-    @shop     = Shop::ShopDetail
+    @shop     = Shop.first
     
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
@@ -26,7 +26,7 @@ class Origami::HomeController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
-    @shop =  Shop::ShopDetail
+    @shop =  Shop.first
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index fd79f6d8..dece303a 100644
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -7,7 +7,7 @@ class Origami::JcbController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @jcbcount = 0
-    @shop        = Shop::ShopDetail
+    @shop        = Shop.first
     @rounding_adj = 0
     @can_jcb = 0
     @member_discount= 0
@@ -56,7 +56,7 @@ class Origami::JcbController < 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
diff --git a/app/controllers/origami/junction_pay_controller.rb b/app/controllers/origami/junction_pay_controller.rb
index 1c52a271..aa0f0615 100644
--- 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
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index cca8a2c4..1e4c972d 100644
--- 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
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 3844293e..d6d1fc61 100755
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -86,7 +86,7 @@ class Origami::MovetableController < BaseOrigamiController
     @type          = (DiningFacility.find(change_to)).type
     @moved_by      = @current_user.name
     @date          = DateTime.now
-    @shop          = Shop::ShopDetail
+    @shop          = Shop.first
     unique_code    = "MoveTablePdf" 
     pdf_no        = PrintSetting.where(:unique_code => unique_code).count
     #print_settings = PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 6bd06b5a..234cebaa 100644
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -6,7 +6,7 @@ class Origami::MpuController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @mpucount = 0
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     @rounding_adj = 0
     @can_mpu = 0
     @member_discount = 0
@@ -54,7 +54,7 @@ class Origami::MpuController < 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
diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb
index 3db34a1c..a72a28ec 100644
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -6,7 +6,7 @@ class Origami::PaymalController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
-        @shop        = Shop::ShopDetail 
+        @shop        = Shop.first 
         # if @shop.is_rounding_adj
         #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
         # else
@@ -73,7 +73,7 @@ class Origami::PaymalController < BaseOrigamiController
 	    sale_id = params[:sale_id]
 	    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
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index baa5d2ec..dbd1cbb1 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -44,7 +44,7 @@ class Origami::PaymentsController < BaseOrigamiController
       end
 
        #shop detail
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       # customer= Customer.where('customer_id=' +.customer_id)
       customer = Customer.find(sale_data.customer_id)
       # rounding adjustment
@@ -99,7 +99,7 @@ class Origami::PaymentsController < 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
         a = saleObj.grand_total % 25 # Modulus
@@ -238,7 +238,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @dining  = ''
       @other_payment = 0.0
 
-      @shop        =  Shop::ShopDetail  #show shop info 
+      @shop        =  Shop.first  #show shop info 
 
       @customer_lists = Customer.where("customer_id = 'CUS-000000000001' or customer_id = 'CUS-000000000002'")
 
@@ -391,7 +391,7 @@ class Origami::PaymentsController < BaseOrigamiController
       customer= Customer.find(saleObj.customer_id)
 
       #shop detail
-      shop_details =  Shop::ShopDetail 
+      shop_details =  Shop.first 
       # get member information
       rebate = MembershipSetting.find_by_rebate(1)
       if customer.membership_id != nil && rebate
@@ -475,7 +475,7 @@ class Origami::PaymentsController < BaseOrigamiController
         customer= Customer.find(saleObj.customer_id)
         
          #shop detail
-        shop_details =  Shop::ShopDetail 
+        shop_details =  Shop.first 
 
         # get printer info
         print_settings=PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index faaeca8e..e6e8d14a 100755
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -7,7 +7,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 		payment_method = "paypar"
 		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
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 347fd3ea..708f9f8f 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -6,7 +6,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
-        @shop        = Shop::ShopDetail 
+        @shop        = Shop.first 
         # if @shop.is_rounding_adj
         #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
         # else
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 505d747c..af59cd98 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -28,7 +28,7 @@ class Origami::RoomsController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
-    @shop =  Shop::ShopDetail
+    @shop =  Shop.first
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
     
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index 5cd22054..1e8b1fbd 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -1,7 +1,7 @@
 class Origami::TableInvoicesController < BaseOrigamiController
  	def index
     @table = DiningFacility.find(params[:table_id])
-    shop        =  Shop::ShopDetail  
+    shop        =  Shop.first  
     puts "table bookig lenght"
     @sale_array = Array.new
     @table.bookings.each do |booking|
@@ -33,7 +33,7 @@ class Origami::TableInvoicesController < BaseOrigamiController
     @table = DiningFacility.find(params[:table_id])
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-    shop        =  Shop::ShopDetail  
+    shop        =  Shop.first  
     @sale_array = Array.new
     @table.bookings.each do |booking|
          if booking.sale_id.nil?
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index ec941a20..2bb5b0cf 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -6,7 +6,7 @@ class Origami::UnionpayController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @unionpaycount = 0
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     @rounding_adj = 0
     @can_unionpay = 0
     @member_discount = 0
@@ -51,7 +51,7 @@ class Origami::UnionpayController < 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
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 17b70010..4dc0912a 100644
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -6,7 +6,7 @@ class Origami::VisaController < BaseOrigamiController
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = 0
     @visacount = 0
-    @shop      = Shop::ShopDetail 
+    @shop      = Shop.first 
     @rounding_adj = 0
     @can_visa = 0
     @member_discount = 0
@@ -51,7 +51,7 @@ class Origami::VisaController < 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
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index 25352597..079e045d 100755
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -8,7 +8,7 @@ class Origami::VoucherController < BaseOrigamiController
     @vouchercount = 0
     others = 0
 
-    @shop        = Shop::ShopDetail 
+    @shop        = Shop.first 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
     else
diff --git a/app/models/sale.rb b/app/models/sale.rb
index b9c0717e..f0ad6c7e 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -535,7 +535,7 @@ class Sale < ApplicationRecord
   end
 
   def adjust_rounding
-    shop_details =  Shop::ShopDetail 
+    shop_details =  Shop.first 
       # rounding adjustment
     if shop_details.is_rounding_adj
       a = self.grand_total % 25 # Modulus
@@ -555,7 +555,7 @@ class Sale < ApplicationRecord
   end
 
   def compute_adjust_rounding(grand_total)
-    shop_details =  Shop::ShopDetail 
+    shop_details =  Shop.first 
       # rounding adjustment
     if shop_details.is_rounding_adj
       a = grand_total % 25 # Modulus
@@ -577,7 +577,7 @@ class Sale < ApplicationRecord
   #Generate new Receipt No when it is not assigned
   def generate_receipt_no
     #shop_code and client_code
-    shop_details =  Shop::ShopDetail
+    shop_details =  Shop.first
 
     #Date-Shift-
     if self.receipt_no.nil?