Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-05-16 17:15:17 +06:30
parent fa4c5d075e 29434f2df9
commit dc23df673f
11 changed files with 94 additions and 52 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -335,10 +335,13 @@ class Origami::PaymentsController < BaseOrigamiController
      end

        @sale_data.sale_payments.each do |spay|
-         if spay.payment_method == "cash"
+         if spay.payment_method == "cash" 
           @cash = spay.payment_amount
         end
-          @other_payment += spay.payment_amount
+         if spay.payment_method !="creditnote" 
+            @other_payment += spay.payment_amount
+          end
+          
          if spay.payment_method == "mpu"
            @other += spay.payment_amount
          elsif spay.payment_method == "paypar"