SQA feedback

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