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

Gemfile

@@ -42,7 +42,7 @@ gem 'to_xls-rails'
 
 #Reporting gem
 #gem 'compendium'
-
+#gem "cancan"
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 gem 'jquery-ui-rails'

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

app/views/origami/payments/show.html.erb

@@ -102,8 +102,24 @@
     </div>
       <hr>
     <div class="row" id="card_payment">
-      <div class="col-md-8">Others Payment</div>
-      <div class="col-md-4" id="others"><%= @other %></div>
+      <div class="container">
+        <% if @other != 0.0 %>
+        <div class="row">
+          <div class="col-md-8">MPU</div>
+          <div class="col-md-4" id="others"><%= @other %></div>
+        </div>
+        <% elsif @ppamount != 0.0 %>
+        <div class="row">
+          <div class="col-md-8">Paypar</div>
+          <div class="col-md-4" id="others"><%= @ppamount %></div>
+        </div>
+        <% else %>
+        <div class="row">
+          <div class="col-md-8">Others Payment</div>
+          <div class="col-md-4" id="others"><%= @ppamount %></div>
+        </div>
+        <% end %>
+      </div>
     </div>
       <hr>
     <div class="row">