diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index a9437736..97d08547 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -19,6 +19,7 @@ class Origami::PaymentsController < BaseOrigamiController if Sale.exists?(sale_id) @cash = 0.0 @other = 0.0 + @ppamount = 0.0 @sale_data = Sale.find_by_sale_id(sale_id) #get customer amount @@ -55,8 +56,10 @@ class Origami::PaymentsController < BaseOrigamiController if spay.payment_method == "cash" @cash = spay.payment_amount end - if spay.payment_method == "mpu" || spay.payment_method == "paypar" + if spay.payment_method == "mpu" @other += spay.payment_amount + elsif spay.payment_method == "paypar" + @ppamount += spay.payment_amount end end end diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 490ec341..b9c2fdbf 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -102,8 +102,24 @@
-
Others Payment
-
<%= @other %>
+
+ <% if @other != 0.0 %> +
+
MPU
+
<%= @other %>
+
+ <% elsif @ppamount != 0.0 %> +
+
Paypar
+
<%= @ppamount %>
+
+ <% else %> +
+
Others Payment
+
<%= @ppamount %>
+
+ <% end %> +