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

app/views/origami/jcb/index.html.erb

@@ -123,7 +123,7 @@ $(document).on('click', '.cashier_number', function(event){
 
 
   $('#jcb_pay').on('click',function(){
-    var amount = $('#amount').val();
+    var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
 
     $.ajax({type: "POST",

app/views/origami/master/index.html.erb

@@ -120,7 +120,7 @@ $(document).on('click', '.cashier_number', function(event){
         }
 });
   $('#master_pay').on('click',function(){
-    var amount = $('#amount').val();
+    var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
 
     $.ajax({type: "POST",

app/views/origami/mpu/index.html.erb

@@ -120,7 +120,7 @@ $(document).on('click', '.cashier_number', function(event){
         }
 });
   $('#mpu_pay').on('click',function(){
-    var amount = $('#amount').val();
+    var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
 
     $.ajax({type: "POST",

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">

app/views/origami/visa/index.html.erb

@@ -120,7 +120,7 @@ $(document).on('click', '.cashier_number', function(event){
         }
 });
   $('#visa_pay').on('click',function(){
-    var amount = $('#amount').val();
+    var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
 
     $.ajax({type: "POST",

app/views/settings/set_menu_items/show.html.erb

@@ -116,6 +116,7 @@
         <tr>
           <!-- <th>Menu Item Id</th> -->
           <th>item_instance_code</th>
+          <th>item_instance_name</th>
           <th>item_attributes</th>
           <th>price</th>
           <th>is_on_promotion</th>
@@ -131,6 +132,7 @@
           <tr>
             <!-- <td><%= settings_menu_item.menu_item_id %></td> -->
             <td><%= settings_menu_item.item_instance_code %></td>
+            <td><%= settings_menu_item.item_instance_name %></td>
             <td><%= settings_menu_item.item_attributes %></td>
             <td><%= settings_menu_item.price %></td>
             <td><%= settings_menu_item.is_on_promotion %></td>

app/views/settings/simple_menu_items/show.html.erb

@@ -122,6 +122,7 @@
         <tr>
           <!-- <th>Menu Item Id</th> -->
           <th>item_instance_code</th>
+          <th>Instances Name</th>
           <th>item_attributes</th>
           <th>price</th>
           <th>is_on_promotion</th>
@@ -138,6 +139,7 @@
           <tr>
 
             <td><%= settings_menu_item.item_instance_code %></td>
+            <td><%= settings_menu_item.item_instance_name %></td>
             <td><%= settings_menu_item.item_attributes %></td>
             <td><%= settings_menu_item.price %></td>
             <td><%= settings_menu_item.is_on_promotion %></td>