merged master

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

@@ -223,11 +223,3 @@
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
   </div>
 </div>
-
-<!-- <script type="text/template" id="order-items-rows">
-  <tr>
-    <td class="item-name"></td>
-    <td class="item-qty"></td>
-    <td class="item-price"></td>
-  </tr>
-</script> -->

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

@@ -4,12 +4,10 @@
     <div class="card"  >
       <div class="card-header">
         <div id="order-title">
-
-
         	<span><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></span>
-          <span style="margin-left: 40%"><strong>Receipt Date : <%=@sale_data.receipt_date rescue '-'%></strong></span>
+          <span style="margin-left: 24%"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></span>
         	<span><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span>
-          <span><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
+          <span style="margin-left: 27%"><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
         </div>
       </div>
       <div class="card-block">
@@ -89,7 +87,7 @@
     </div>
       <hr>
     <div class="row" id="card_payment">
-      <div class="col-md-8">CARD</div>
+      <div class="col-md-8">OTHERS PAYMENT</div>
       <div class="col-md-4">0.0</div>
     </div>
       <hr>
@@ -152,8 +150,8 @@
              <div class="col-md-7">
                <div class="row">
                  <div class="col-md-3 cashier_number"></div>
-                 <div class="col-md-3 cashier_number">DEL</div>
-                 <div class="col-md-3 cashier_number">CLR</div>
+                 <div class="col-md-3 cashier_number red" data-type="del">DEL</div>
+                 <div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
                </div>
              </div>
              <div class="col-md-5">
@@ -174,6 +172,7 @@ $(document).on('click', '.cashier_number', function(event){
             original_value = $('#cash').text();
 
             var input_type = $(this).attr("data-type");
+            
             switch (input_type) {
               case 'num':
               var input_value = $(this).attr("data-value");
@@ -193,6 +192,10 @@ $(document).on('click', '.cashier_number', function(event){
                 update_balance();
               break;
 
+              case 'clr':
+                 $('#cash').text("0.0");
+                 update_balance();
+              break;
           }
           event.handled = true;
         } else {
@@ -209,16 +212,28 @@ $( document ).ready(function() {
 
  $('#card_payment').click(function() {
    var sale_id = $('#sale_id').text();
-    window.location.href = '/origami/sale/'+ sale_id  + "/payment/card_payment"
+    window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
     return false;
  });
 
  $('#pay').click(function() {
-   console.log("pay")
-   if($('#amount_due').text() > 0){
-     console.log("greater")
+
+   if($('#balance').text() > 0){
+      alert(" Insufficient Amount!")
    }else{
-     console.log("less")
+    //  payment
+    var cash = $('#cash').text();
+    var credit = $('#credit').text();
+    var card = $('#card').text();
+    var sale_id = $('#sale_id').text();
+    $.ajax({type: "POST",
+      url: "<%= origami_payment_process_path %>",
+      data: "cash="+ cash + "&sale_id=" + sale_id,
+      success:function(result){
+        alert("THANK YOU")
+      }
+    });
+
    }
  });
 

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

@@ -2,8 +2,7 @@
 <div class="page-header">
  <ul class="breadcrumb">
   <li><a href="<%=  %>">Home</a></li>
-  <li>Settings</li>
-  <li>Menu Item Option</li>
+  <li><a href="<%= settings_menu_item_options_path %>">Menu Item Options</a></li>
   <span style="float: right">
   </span>
  </ul>

app/views/settings/payment_method_settings/index.html.erb

@@ -34,7 +34,7 @@
           <td><%= settings_payment_method_setting.auth_token %></td>
           <td><%= settings_payment_method_setting.merchant_account_id %></td>
           <td><%= link_to 'Edit', edit_settings_payment_method_setting_path(settings_payment_method_setting) %>
-          | <%= link_to 'Destroy', settings_payment_method_settings_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+          | <%= link_to 'Destroy', settings_payment_method_setting_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
         </tr>
       <% end %>
     </tbody>

app/views/settings/processing_items/_form.html.erb

@@ -20,9 +20,18 @@
           </div>
         <ul class="opi_ul" id="menu_items_category_<%= category.id %>">
           <% category.menu_items.each do |item| %>
-
-            <li><div class="processitems opi_default" data-id="<%= item.item_code %>"><%= item.name %></div></li>
-
+            <% flag =  false %>
+            <% itemsary = JSON.parse(@settings_order_queue_station.processing_items) %>
+            <% itemsary.each do |item_code| %>
+              <% if item_code ==  item.item_code %>
+                <% flag = true %>
+              <% end %>
+            <% end %>
+            <% if flag == true %>
+              <li><div class="processitems opi_default opi_selected" data-id="<%= item.item_code %>"><%= item.name %></div></li>
+            <% else %>
+              <li><div class="processitems opi_default" data-id="<%= item.item_code %>"><%= item.name %></div></li>
+            <% end %>
           <% end %>
         </ul>
         </div>

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

@@ -6,6 +6,7 @@
     <%= f.input :name %>
     <%= f.input :alt_name %>
     <%= f.input :type %>
+    <%= f.input :account_id, :label => "Account type", :collection => Account.collection %>
     <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %>
 
     <%= f.input :min_qty %>

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

@@ -19,6 +19,7 @@
           <th>Name</th>
           <th>Alt name</th>
           <th>Type</th>
+          <th>Account Type</th>
           <th>Menu category</th>
           <th>Menu item</th>
           <th>Min qty</th>
@@ -35,6 +36,7 @@
           <td><%= @settings_menu_item.name  rescue "-" %></td>
           <td><%= @settings_menu_item.alt_name %></td>
           <td><%= @settings_menu_item.type %></td>
+          <td><%= @settings_menu_item.account.title %></td>
           <td><%= @settings_menu_item.menu_category_id %></td>
           <td><%= @settings_menu_item.menu_item_id %></td>
           <td><%= @settings_menu_item.min_qty %></td>

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

@@ -6,6 +6,7 @@
     <%= f.input :name %>
     <%= f.input :alt_name %>
     <%= f.input :type %>
+    <%= f.input :account_id, :label => "Account type", :collection => Account.collection %>
     <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %>
     <%= f.input :min_qty %>
     <%= f.input :min_selectable_item %>

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

@@ -21,6 +21,7 @@
           <th>Name</th>
           <th>Alt name</th>
           <th>Type</th>
+          <th>Accout</th>
           <th>Menu category</th>
           <th>Menu item</th>
           <th>Min qty</th>
@@ -37,6 +38,7 @@
           <td><%= @settings_menu_item.name  rescue "-" %></td>
           <td><%= @settings_menu_item.alt_name %></td>
           <td><%= @settings_menu_item.type %></td>
+          <td><%= @settings_menu_item.account.title %></td>
           <td><%= @settings_menu_item.menu_category_id %></td>
           <td><%= @settings_menu_item.menu_item_id %></td>
           <td><%= @settings_menu_item.min_qty %></td>