fixed conflict file

2017-06-13 10:40:49 +06:30
parent c05a64bae7 3e691ca3f7
commit f8df5147a4
19 changed files with 196 additions and 120 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -49,8 +49,8 @@ class Origami::PaymentsController < BaseOrigamiController
         if spay.payment_method == "cash"
           @cash = spay.payment_amount
         end
-         if spay.payment_method == "mpu"
-           @other = spay.payment_amount
+         if spay.payment_method == "mpu" || spay.payment_method == "paypar"
+           @other += spay.payment_amount
         end
      end
    end