SQA feedback

2018-03-19 19:34:34 +06:30
parent 25b6458450
commit bf84392ef8
13 changed files with 289 additions and 129 deletions
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -5,33 +5,43 @@ class Origami::JcbController < BaseOrigamiController
    @cashier_type   = params[:type]
    # limit jcb_amount
    sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total = 0
    @jcbcount = 0
-    others = 0
+    @shop        = Shop::ShopDetail
+    @rounding_adj = 0
+    @can_jcb = 0
+    @member_discount= 0
+    @sub_total = 0
+    @membership_id = nil
+    @receipt_no = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total
+      
+      others = 0
+       
+      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  
+      
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "jcb"
+            @jcbcount = @jcbcount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_jcb = total - @jcbcount - others

-    @payment_method_setting_nav = PaymentMethodSetting.all
-    @shop        = Shop::ShopDetail 
-    if @shop.is_rounding_adj
-         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-    else
-        new_total    = sale_data.grand_total
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
    end
-    @rounding_adj = new_total-sale_data.grand_total  
-    
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "jcb"
-          @jcbcount = @jcbcount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
-    end
-    @can_jcb = total - @jcbcount - others

-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
    bank_integration = Lookup.collection_of('bank_integration')
    @bank_integration = 0
    if !bank_integration[0].nil?
@@ -59,4 +69,9 @@ class Origami::JcbController < BaseOrigamiController
    end
  end

+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -5,32 +5,41 @@ class Origami::MasterController < BaseOrigamiController
    @cashier_type   = params[:type]
    # limit master_amount
    sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total = 0
    @mastercount = 0
-    others = 0
-    
-    @payment_method_setting_nav = PaymentMethodSetting.all
-    @shop        = Shop::ShopDetail 
-    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  
+    @shop        = Shop::ShopDetail
+    @rounding_adj = 0
+    @can_master = 0
+    @member_discount = 0
+    @sub_total       = 0
+    @membership_id   = nil
+    @receipt_no      = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total
+      
+      others = 0
+       
+      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  

-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "master"
-          @mastercount = @mastercount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "master"
+            @mastercount = @mastercount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_master = total - @mastercount - others
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
    end
-    @can_master = total - @mastercount - others
-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
    bank_integration = Lookup.collection_of('bank_integration')
    @bank_integration = 0
    if !bank_integration[0].nil?
@@ -58,4 +67,9 @@ class Origami::MasterController < BaseOrigamiController
    end
  end

+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -4,33 +4,43 @@ class Origami::MpuController < BaseOrigamiController
    @cashier_type   = params[:type]
    # limit mpu_amount
    sale_data = Sale.find_by_sale_id(@sale_id)
-    total     = sale_data.grand_total
+    total = 0
    @mpucount = 0
-    others    = 0
-    
-    @payment_method_setting_nav = PaymentMethodSetting.all
    @shop        = Shop::ShopDetail 
-    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  
-    
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "mpu"
-          @mpucount = @mpucount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
-    end
-    @can_mpu = total - @mpucount - others
+    @rounding_adj = 0
+    @can_mpu = 0
+    @member_discount = 0
+    @sub_total = 0
+    @membership_id = nil
+    @receipt_no = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total
+      
+      others    = 0
+      
+      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  
+      
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "mpu"
+            @mpucount = @mpucount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_mpu = total - @mpucount - others
+
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
+    end

-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
    bank_integration = Lookup.collection_of('bank_integration')
    @bank_integration = 0
    if !bank_integration[0].nil?
@@ -58,4 +68,9 @@ class Origami::MpuController < BaseOrigamiController
    end
  end

+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -177,8 +177,11 @@ class Origami::PaymentsController < BaseOrigamiController
          end
          
          booking.booking_orders.each do |order|
-            Order.pay_process_order_queue(order.order_id,table_id)
+            # Order.pay_process_order_queue(order.order_id, table_id)
+            oqs = OrderQueueStation.new
+            oqs.pay_process_order_queue(order.order_id, table_id)
          end
+          
        end

        #for card sale data
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -4,32 +4,40 @@ class Origami::UnionpayController < BaseOrigamiController
    @cashier_type   = params[:type]
    # limit unionpay_amount
    sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total = 0
    @unionpaycount = 0
-    others = 0
-
-    @payment_method_setting_nav = PaymentMethodSetting.all
    @shop        = Shop::ShopDetail 
-    if @shop.is_rounding_adj
-         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-    else
-        new_total    = sale_data.grand_total
+    @rounding_adj = 0
+    @can_unionpay = 0
+    @member_discount = 0
+    @sub_total       = 0
+    @membership_id   = nil
+    @receipt_no      = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total
+      others = 0
+      
+      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  
+      
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "unionpay"
+            @unionpaycount = @unionpaycount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_unionpay = total - @unionpaycount - others
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
    end
-    @rounding_adj = new_total-sale_data.grand_total  
-    
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "unionpay"
-          @unionpaycount = @unionpaycount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
-    end
-    @can_unionpay = total - @unionpaycount - others
-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
    bank_integration = Lookup.collection_of('bank_integration')
    @bank_integration = 0
    if !bank_integration[0].nil?
@@ -58,4 +66,9 @@ class Origami::UnionpayController < BaseOrigamiController
    end
  end

+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -4,32 +4,40 @@ class Origami::VisaController < BaseOrigamiController
    @cashier_type   = params[:type]
    # limit visa_amount
    sale_data = Sale.find_by_sale_id(@sale_id)
-    total = sale_data.grand_total
+    total = 0
    @visacount = 0
-    others = 0
-
-    @payment_method_setting_nav = PaymentMethodSetting.all
    @shop        = Shop::ShopDetail 
-    if @shop.is_rounding_adj
-         new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
-    else
-        new_total    = sale_data.grand_total
+    @rounding_adj = 0
+    @can_visa = 0
+    @member_discount = 0
+    @sub_total = 0
+    @membership_id = nil
+    @receipt_no = nil
+    if !sale_data.nil?
+      total = sale_data.grand_total  
+      others = 0
+
+      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  
+      
+      sale_data.sale_payments.each do |sale_payment|
+          if sale_payment.payment_method == "visa"
+            @visacount = @visacount + sale_payment.payment_amount
+          else
+            others = others + sale_payment.payment_amount
+          end
+      end
+      @can_visa = total - @visacount - others
+      @member_discount = MembershipSetting.find_by_discount(1)
+      @sub_total       = sale_data.total_amount
+      @membership_id   = sale_data.customer.membership_id
+      #for bank integration
+      @receipt_no      = sale_data.receipt_no
    end
-    @rounding_adj = new_total-sale_data.grand_total  
-    
-    sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "visa"
-          @visacount = @visacount + sale_payment.payment_amount
-        else
-          others = others + sale_payment.payment_amount
-        end
-    end
-    @can_visa = total - @visacount - others
-    @member_discount = MembershipSetting.find_by_discount(1)
-    @sub_total       = sale_data.total_amount
-    @membership_id   = sale_data.customer.membership_id
-    #for bank integration
-    @receipt_no      = sale_data.receipt_no
    bank_integration = Lookup.collection_of('bank_integration')
    @bank_integration = 0
    if !bank_integration[0].nil?
@@ -58,4 +66,9 @@ class Origami::VisaController < BaseOrigamiController
    end
  end

+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end
 end