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

2017-06-26 18:46:16 +06:30
parent 034c9932a6 9d76e1313a
commit ef8f280d0e
20 changed files with 1339 additions and 17 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -41,6 +41,7 @@ class Origami::PaymentsController < BaseOrigamiController
      @visacount= 0.0
      @jcbcount= 0.0
      @mastercount = 0.0
+      @credit = 0.0
      @sale_data = Sale.find_by_sale_id(sale_id)

      #get customer amount
@@ -77,6 +78,8 @@ class Origami::PaymentsController < BaseOrigamiController
           @jcbcount += spay.payment_amount
         elsif spay.payment_method == "master"
           @mastercount += spay.payment_amount
+         elsif spay.payment_method == "creditnote"
+           @credit += spay.payment_amount
         end
      end
    end