remove conflict data

2018-05-29 14:32:37 +06:30
parent 3527ef17d9 930e8d29d5
commit 776479a74e
16 changed files with 397 additions and 44 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -235,6 +235,7 @@ class Origami::PaymentsController < BaseOrigamiController
      @credit = 0.0
      @paymalcount = 0.0
      @dingacount = 0.0
+      @giftvouchercount = 0.0
      @sale_data = Sale.find_by_sale_id(sale_id)
      @balance = 0
      @accountable_type = ''
@@ -374,6 +375,8 @@ class Origami::PaymentsController < BaseOrigamiController
            @alipaycount += spay.payment_amount
          elsif spay.payment_method == "dinga"
            @dingacount += spay.payment_amount
+          elsif spay.payment_method == "giftvoucher"
+            @giftvouchercount += spay.payment_amount
         end
      end
    end