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

app/views/api/restaurant/menu/_menu_item.json.jbuilder

@@ -90,26 +90,28 @@ json.options opt_format
 #   json.item_attributes = item_instance.item_attributes
 
 json.instances item.menu_item_instances do |is|
-  # Convert id to name for attributes
-  instance_attr = []
+  if is.is_available
+    # Convert id to name for attributes
+    instance_attr = []
 
-  is.item_attributes.each do |ia|
-    # mItemAttr = MenuItemAttribute.find(is)
-    # instance_attr.push(ia)
-    mItemAttr = MenuItemAttribute.find(ia).name
-    instance_attr.push(mItemAttr)
+    is.item_attributes.each do |ia|
+      # mItemAttr = MenuItemAttribute.find(is)
+      # instance_attr.push(ia)
+      mItemAttr = MenuItemAttribute.find(ia).name
+      instance_attr.push(mItemAttr)
+    end
+    
+      json.id is.id
+      json.code is.item_instance_code
+      json.name is.item_instance_name
+      json.price is.price
+      json.is_available is.is_available
+      json.is_default is.is_default
+      json.is_on_promotion is.is_on_promotion
+      json.promotion_price is.promotion_price
+      json.values instance_attr
+      # json.item_sets is.item_sets
   end
-  
-    json.id is.id
-    json.code is.item_instance_code
-    json.name is.item_instance_name
-    json.price is.price
-    json.is_available is.is_available
-    json.is_default is.is_default
-    json.is_on_promotion is.is_on_promotion
-    json.promotion_price is.promotion_price
-    json.values instance_attr
-    # json.item_sets is.item_sets
 end
 
 #Child Menu items

app/views/crm/customers/index.html.erb

@@ -13,8 +13,6 @@
   <div class="row clearfix">
     <div class="col-lg-9 col-md-9 col-sm-9">
       <div class="card">
-        <div class="body">
-          <!-- <div class="main-box-body clearfix"> -->
           <div class="body table-responsive">
             <table class="table table-hover table-striped">
           <!-- <div class="table-responsive">
@@ -55,36 +53,34 @@
             </thead>
 
             <tbody>
-              <% @i = 0 %>
-              <% @crm_customers.each do |crm_customer| %>
-
-              <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
-               <td>
-                 <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
-                 <td>
-                  <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %>
-                  <%= @i += 1 %>
-                  <%else%>
-                  -
-                  <% end %>
-                </td>
-                <td><%= crm_customer.name %></td>
-                <td><%= crm_customer.card_no rescue '-' %></td>
-                <td><%= crm_customer.contact_no %></td>
-                <td><%= crm_customer.email %></td>
-                <td><%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %></td>
-
-              </tr>
-
+              <% if @crm_customers.count > 0 %>
+                <% @i = 0 %>
+                <% @crm_customers.each do |crm_customer| %>
+                  <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
+                   <td>
+                     <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
+                     <td>
+                      <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %>
+                      <%= @i += 1 %>
+                      <%else%>
+                      -
+                      <% end %>
+                    </td>
+                    <td><%= crm_customer.name %></td>
+                    <td><%= crm_customer.card_no rescue '-' %></td>
+                    <td><%= crm_customer.contact_no %></td>
+                    <td><%= crm_customer.email %></td>
+                    <td><%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %></td>
+                  </tr>
+                <% end %>
+              <% else %>
+                    <tr><td colspan="7"><strong><p style="text-align: center;margin-bottom: -1px">There is no data for search <%=@filter%>....</p></strong></td></tr>
               <% end %>
-
             </tbody>
             </table>
             <br>
             <%= paginate @crm_customers %>
           </div>
-        <!-- </div> -->
-        </div>
       </div>
     </div>
     <div class="col-lg-3 col-md-3 col-sm-3">

app/views/origami/addorders/_menu_item.json.jbuilder

@@ -90,23 +90,25 @@ json.options opt_format
 #   json.item_attributes = item_instance.item_attributes
 
 json.instances item.menu_item_instances do |is|
-  # Convert id to name for attributes
-  instance_attr = []
-  is.item_attributes.each do |ia|
-     mItemAttr = MenuItemAttribute.find(ia).name
-    instance_attr.push(mItemAttr)
+  if is.is_available
+    # Convert id to name for attributes
+    instance_attr = []
+    is.item_attributes.each do |ia|
+       mItemAttr = MenuItemAttribute.find(ia).name
+      instance_attr.push(mItemAttr)
+    end
+    
+      json.id is.id
+      json.code is.item_instance_code
+      json.name is.item_instance_name
+      json.price is.price
+      json.is_available is.is_available
+      json.is_default is.is_default
+      json.is_on_promotion is.is_on_promotion
+      json.promotion_price is.promotion_price
+      json.values instance_attr
+      # json.item_sets is.item_sets
   end
-  
-    json.id is.id
-    json.code is.item_instance_code
-    json.name is.item_instance_name
-    json.price is.price
-    json.is_available is.is_available
-    json.is_default is.is_default
-    json.is_on_promotion is.is_on_promotion
-    json.promotion_price is.promotion_price
-    json.values instance_attr
-    # json.item_sets is.item_sets
 end
 
 #Child Menu items

app/views/origami/addorders/detail.html.erb

@@ -140,7 +140,7 @@
                                 
                               </button>
                           </span>
-                          <input type="number" value="1" id="count" class="change_qty keypress_qty form-control col-md-12 ">
+                          <input type="text" value="1" id="count" class="change_qty keypress_qty form-control col-md-12 ">
                           <span class="input-group-btn">
                               <button type="button" class="btn btn-success btn-number" value="+" id="plus">
                                  <i class="material-icons">add</i>
@@ -214,7 +214,7 @@
                                 <i class="material-icons">remove</i>
                               </button>
                           </span>
-                          <input type="number" value="1" id="set_count" class="set_change_qty keypress_qty form-control col-md-12 ">
+                          <input type="text" value="1" id="set_count" class="set_change_qty keypress_qty form-control col-md-12 ">
                           <span class="input-group-btn">
                               <button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
                                   <i class="material-icons">add</i>

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

@@ -11,7 +11,6 @@
       <%= f.input :gateway_url %>
       <%= f.input :auth_token %>
       <%= f.input :merchant_account_id %>
-      <%= f.input :additional_parameter, as: :text %>
       <%= f.input :created_by %>
     </div>
 

app/views/transactions/orders/index.html.erb

@@ -48,6 +48,9 @@
               
               <tr>
                 <th><%= t("views.right_panel.detail.order_id") %></th>
+                
+                <th><%= t :table %>/<%= t :room %></th>
+                <th><%= t("views.right_panel.detail.order_by") %></th>
                 <th><%= t("views.right_panel.detail.type") %></th>
                 <th><%= t :customer %></th>
                 <th><%= t("views.right_panel.detail.order_status") %></th>
@@ -57,10 +60,14 @@
             </thead>
 
             <tbody>
-              <% @orders.each do |order| %>
+              <% @orders.each do |order| 
+                @dining = BookingOrder.find_by_order_id(order.order_id).booking.dining_facility
+                %>
 
                 <tr>
                   <td><%= link_to order.order_id, transactions_order_path(order) %></td>
+                  <td><%= @dining.type %>-<%= @dining.name %></td>
+                  <td><%= order.waiters %></td>
                   <td><%= order.order_type %></td>
                   <td><%= order.customer.name rescue '-' %></td>
                   <td><%= order.status %></td>

app/views/transactions/orders/show.html.erb

@@ -17,21 +17,25 @@
           <table class="table table-striped">
             <thead>
               <tr>
+                <th><%= t :table %>/<%= t :room %></th>
+                <th><%= t("views.right_panel.detail.order_by") %></th>
                 <th><%= t("views.right_panel.detail.type") %></th>
                 <th><%= t :customer %></th>
                 <th><%= t("views.right_panel.detail.order_status") %></th>
                 <th><%= t("views.right_panel.detail.order_date") %></th>
-                <th><%= t("views.right_panel.detail.order_by") %></th>
+               
               </tr>
             </thead>
 
             <tbody>
                 <tr>
+                  <td><%= @dining.type %>-<%= @dining.name %></td>
+                  <td> <%= @order.waiters rescue '-' %> </td>
                   <td><%= @order.order_type %></td>
                   <td><%= @order.customer.name rescue '-' %></td>
                   <td><%= @order.status %></td>
                   <td> <%= @order.date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
-                  <td> <%= @order.waiters rescue '-' %> </td>
+                  
                 </tr>             
             </tbody>
           </table>