Merge branch 'r-1902001-01' into foodcourt

app/views/inventory/inventory_definitions/_form.html.erb

@@ -172,11 +172,31 @@
   });
 
   $(document).ready(function () {
-    var menus = JSON.parse(localStorage.getItem("menus"));;
-    if (menus != null) {
-      menu_cache_append(menus);
-    }else{
-      $("#menu_data").removeClass("hidden");
+    // var menus = JSON.parse(localStorage.getItem("menus"));;
+    // if (menus != null) {
+    //   menu_cache_append(menus);
+    // }else{
+    //   getAllMenu();
+    //   $("#menu_data").removeClass("hidden");
+    // }
+    getAllMenu();
+    
+    function getAllMenu(){
+      $.ajax({
+          type: "GET",
+          url: '/origami/get_all_menu',
+          data: {},
+          success:function(result){
+            var menus = JSON.stringify(result);
+            localStorage.setItem("menus", menus);
+            if (result != null ) {
+              menu_cache_append(result);
+              $("#loading_wrapper").hide();
+              $("#oqs_loading_wrapper").css("display", "none");
+              $(".page-loader-wrapper").css("display", "none");
+            }
+          }
+      });
     }
 
     function menu_cache_append(menus){
@@ -328,6 +348,66 @@
     });
     //End menu category Click
 
+    //show menu item list when click menu category
+    function show_sub_category_list(url,sub_category,menu_id){
+
+      var sub_category_list = $('.sub_category_list');
+       sub_category_list.empty();
+
+      menus = JSON.parse(localStorage.getItem("menus"));
+      if (menus != null) {
+        for(var j in menus) {
+          var categories = menus[j]["categories"];
+          for(var ii in categories) {
+            if (menu_id == categories[ii]["parent_id"]) {
+              $(sub_category).removeClass('hidden');
+              row = '<li class="menu_sub_category fadeInTop" data-id="'+categories[ii].id+'">'
+                +'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ categories[ii].name+'</a>'
+              +'</li>' ;
+              $(sub_category).append(row);
+            }
+          }
+        }
+      }else{
+        if (type != -1 && modify_order != -1) {
+          var url = "../../../addorders/"+url;
+        }if(modify_order== -1 && type != -1){
+          var url = 'addorders/'+url;
+        }
+        if (type ==-1 && modify_order == -1){
+          var url = url;
+        }
+        //Start Ajax
+        $.ajax({
+          type: "GET",
+          url: url,
+          data: {},
+          dataType: "json",
+          success: function(data) {
+            var sub_category_list = $('.sub_category_list');
+            sub_category_list.empty();
+            data = data.sub_category;
+            if (data.length > 0) {
+              // if ((sub_category.hasClass('hidden'))) {
+                $(sub_category).removeClass('hidden');
+              // }else{
+                // $(sub_category).addClass('hidden');
+              // }
+              for(var i in data) {
+
+                    row = '<li class="menu_sub_category fadeInTop" data-id="'+data[i].id+'">'
+                             +'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ data[i].name+'</a>'
+                           +'</li>' ;
+                    $(sub_category).append(row);
+                //end is_sub_item false
+              }
+            }
+          }
+        });
+        //end Ajax
+      }
+    }
+
     //click menu sidebar menu category
     $(document).on('click', '.menu_sub_category', function(event){
     //   event.preventDefault();

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

@@ -1386,7 +1386,7 @@
             });
           }
         });
-    } 
+    }
 
   function check_emp_access_code(access_code,type) {
       var url = "/origami/check_emp_access_code/" + access_code ;

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

@@ -107,9 +107,9 @@
                 <%if @sale_payment.nil? && @changable_tax %>
                   <% if @current_user.role == 'cashier' %>
                     <button class="btn btn-link waves-effect bg-info access_modal" data-type="change_tax">Change Tax</button>
-                <% else %>
+                  <% else %>
                   <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
-                <% end %>
+                  <% end %>
                 <% end %>
               </td>
               <td class="item-attr"><strong><span id="total_tax"><%= number_format(@sale_data.total_tax, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i )%></span></strong></td>

app/views/reports/receipt_no_detail/index.html.erb

@@ -26,11 +26,12 @@
 									<th colspan="7"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 								</tr>
 							<% end %>
-						    <tr>
-				        	<th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
-									<th><b><%= t("views.right_panel.detail.table") %></b></th>
-									<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
+								<tr>
+				        	<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
+									<th><b><%= t("views.right_panel.detail.receipt_date") %></b></th>
+									<th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
 									<th><b><%= t :cashier %> <%= t("views.right_panel.detail.name") %></b></th>
+									<th><b><%= t("views.right_panel.detail.table") %></b></th>
 					        <th><b><%= t("views.right_panel.detail.revenue") %></b></th>
 								<th>&nbsp;</th>
 						    </tr>
@@ -46,24 +47,25 @@
 						     end %>
 							    <% grand_total = grand_total + result.grand_total %>
 								<tr style="border-top:4px double #666;">
-									<td><%= @shift_from %> -  <%= @shift_to  %></td>
-									<td><%= table_type %> -  <%= table_name  %></td>
 									<td><%= result.receipt_no rescue '-' %> </td>
+									<td><%=l result.receipt_date.getlocal, :format => :short rescue '-' %> </td>
+									<td><%= @shift_from %> -  <%= @shift_to  %></td>
 									<td><%= result.cashier_name rescue '-' %></td>
+									<td><%= table_type %> -  <%= table_name  %></td>
 				  		  	<td><%= number_format(result.grand_total, precision: precision, delimiter: delimiter) %></td>
 									<!-- <td>&nbsp;</td> -->
 								</tr>
-
 								<tr>
+									<th>&nbsp;</th>
 									<th><b><%= t("views.right_panel.detail.product") %></b></th>
 									<th><b><%= t("views.right_panel.detail.qty") %></b></th>
 									<th><b><%= t("views.right_panel.detail.unit_price") %></b></th>
-									<th><b><%= t("views.right_panel.detail.total_price") %></b></th>
-									<th><b><%= t("views.right_panel.detail.created_at") %></b></th>
+									<th colspan="2"><b><%= t("views.right_panel.detail.total_price") %></b></th>
 								</tr>
 
 								<% result.sale_items.each do |item|%>
 									<tr>
+										<td>&nbsp;</td>
 										<td>
 											<% if item.price < 0 %>
 												<% if item.qty < 0 %>
@@ -77,18 +79,18 @@
 										</td>
 										<td><%= item.qty rescue '-' %></td>
 										<td><%= number_format(item.unit_price, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) rescue '-' %></td>
-										<td><%= number_format(item.price, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) rescue '-' %></td>
-										<td><%=l item.created_at.getlocal, :format => :short rescue '-' %> </td>
+										<td colspan="2"><%= number_format(item.price, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) rescue '-' %></td>
 									</tr>
 								<% end %>
 
-								<tr><td colspan="5">&nbsp;</td></tr>
+								<tr><td colspan="6">&nbsp;</td></tr>
 
 								<%survey = result.survey%>
 								<% if !survey.nil?%>
 									<tr>
 									    <td>&nbsp;</td>
 									    <td>&nbsp;</td>
+											<td>&nbsp;</td>
 									    <td>No. of Guest</td>
 									    <td><%= survey.total_customer rescue '-' %></td>
 									    <td>&nbsp;</td>
@@ -97,6 +99,7 @@
 
 								<% if !result.total_amount.nil?%>
 									<tr>
+										<td>&nbsp;</td>
 										<td>&nbsp;</td>
 										<td>&nbsp;</td>
 										<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
@@ -107,6 +110,7 @@
 
 								<% if result.total_discount > 0 %>
 									<tr>
+										<td>&nbsp;</td>
 										<td>&nbsp;</td>
 										<td>&nbsp;</td>
 										<td><%= t("views.right_panel.detail.total") %>
@@ -119,6 +123,7 @@
 
 								<% if !result.total_tax.nil? %>
 									<tr>
+										<td>&nbsp;</td>
 										<td>&nbsp;</td>
 										<td>&nbsp;</td>
 										<td>Tax Amount </td>
@@ -133,13 +138,15 @@
 											<tr>
 												<td>&nbsp;</td>
 												<td>&nbsp;</td>
-												<td>Payment <%= rec.payment_method.upcase %></td>
-												<td><%= number_format(rec.payment_amount, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %> ( <%= rec.payment_status %> )</td>
+												<td>&nbsp;</td>
+												<td>Payment <%= rec.payment_method.upcase %> ( <%= rec.payment_status %> )</td>
+												<td><%= number_format(rec.payment_amount, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %></td>
 												<td>&nbsp;</td>
 											</tr>
 
 											<% if !rec.payment_reference.nil? %>
 												<tr>
+													<td>&nbsp;</td>
 													<td>&nbsp;</td>
 													<td>&nbsp;</td>
 													<td>Payment Ref.</td>
@@ -151,6 +158,7 @@
 									<% end %>
 									<% if result.amount_changed != 0 %>
 										<tr>
+											<td>&nbsp;</td>
 											<td>&nbsp;</td>
 											<td>&nbsp;</td>
 											<td><%= t("views.right_panel.detail.change") %> <%= t("views.right_panel.detail.amount") %></td>
@@ -160,6 +168,7 @@
 									<% end %>
 									<% if !result.customer_id.nil?%>
 										<tr>
+											<td>&nbsp;</td>
 											<td>&nbsp;</td>
 											<td>&nbsp;</td>
 											<td>Customer</td>
@@ -176,6 +185,7 @@
 								<td>&nbsp;</td>
 								<td>&nbsp;</td>
 								<td>&nbsp;</td>
+								<td>&nbsp;</td>
 								<td><b>Total Nett</b> - <b><%= number_format(grand_total, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %></b></td>
 								<td>&nbsp;</td>
 							</tr>

app/views/reports/receipt_no_detail/index.xls.erb

@@ -24,12 +24,13 @@
 									<th colspan="7"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 								</tr>
 							<% end %>
-						    <tr>
-						        <th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
-								<th><b><%= t("views.right_panel.detail.table") %></b></th>
-								<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
-								<th><b><%= t :cashier %> <%= t("views.right_panel.detail.name") %></b></th>
-						        <th><b><%= t("views.right_panel.detail.revenue") %></b></th>
+                <tr>
+				        	<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
+									<th><b><%= t("views.right_panel.detail.receipt_date") %></b></th>
+									<th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
+									<th><b><%= t :cashier %> <%= t("views.right_panel.detail.name") %></b></th>
+									<th><b><%= t("views.right_panel.detail.table") %></b></th>
+					        <th><b><%= t("views.right_panel.detail.revenue") %></b></th>
 								<th>&nbsp;</th>
 						    </tr>
 						</thead>
@@ -43,25 +44,26 @@
 						      table_type = table.type
 						      table_name = table.name
 						     end %>
-								<tr style="border-top:4px double #666;">
-									<td><%= @shift_from %> -  <%= @shift_to  %></td>
-									<td><%= table_type %> -  <%= table_name  %></td>
+                <tr style="border-top:4px double #666;">
 									<td><%= result.receipt_no rescue '-' %> </td>
+									<td><%=l result.receipt_date.getlocal, :format => :short rescue '-' %> </td>
+									<td><%= @shift_from %> -  <%= @shift_to  %></td>
 									<td><%= result.cashier_name rescue '-' %></td>
-						  		  	<td><%=result.grand_total%></td>
-									<!-- <td>&nbsp;</td> -->
+									<td><%= table_type %> -  <%= table_name  %></td>
+				  		  	<td><%= number_format(result.grand_total, precision: precision, delimiter: delimiter) %></td>
 								</tr>
 
-								<tr>
+                <tr>
+									<th>&nbsp;</th>
 									<th><b><%= t("views.right_panel.detail.product") %></b></th>
 									<th><b><%= t("views.right_panel.detail.qty") %></b></th>
 									<th><b><%= t("views.right_panel.detail.unit_price") %></b></th>
 									<th><b><%= t("views.right_panel.detail.total_price") %></b></th>
-									<th><b><%= t("views.right_panel.detail.created_at") %></b></th>
 								</tr>
 
 								<% result.sale_items.each do |item|%>
 									<tr>
+                    <td>&nbsp;</td>
 										<td>
 											<% if item.price.to_i < 0.to_i %>
 												<% if item.qty.to_i < 0.to_i%>
@@ -76,7 +78,6 @@
 										<td><%= item.qty rescue '-' %></td>
 										<td><%= item.unit_price rescue '-' %></td>
 										<td><%= item.price rescue '-' %></td>
-										<td><%=l item.created_at.utc.getlocal, :format => :short rescue '-' %> </td>
 									</tr>
 								<% end %>
 
@@ -87,6 +88,7 @@
 									<tr>
 									    <td>&nbsp;</td>
 									    <td>&nbsp;</td>
+                      <td>&nbsp;</td>
 									    <td>No. of Guest</td>
 									    <td><%= survey.total_customer rescue '-' %></td>
 									    <td>&nbsp;</td>
@@ -97,6 +99,7 @@
 									<tr>
 										<td>&nbsp;</td>
 										<td>&nbsp;</td>
+                    <td>&nbsp;</td>
 										<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
 										<td><%= result.total_amount %></td>
 										<td>&nbsp;</td>
@@ -107,6 +110,7 @@
 									<tr>
 										<td>&nbsp;</td>
 										<td>&nbsp;</td>
+                    <td>&nbsp;</td>
 										<td><%= t("views.right_panel.detail.total") %>
 											<%= t("views.right_panel.detail.discount") %>
 											<%= t("views.right_panel.detail.amount") %></td>
@@ -119,6 +123,7 @@
 									<tr>
 										<td>&nbsp;</td>
 										<td>&nbsp;</td>
+                    <td>&nbsp;</td>
 										<td>Tax Amount </td>
 										<td><%= result.total_tax %> </td>
 										<td>&nbsp;</td>
@@ -132,8 +137,9 @@
 											<tr>
 												<td>&nbsp;</td>
 												<td>&nbsp;</td>
-												<td>Payment <%= rec.payment_method.upcase %></td>
-												<td><%= rec.payment_amount %> ( <%= rec.payment_status %> )</td>
+                        <td>&nbsp;</td>
+												<td>Payment <%= rec.payment_method.upcase %>( <%= rec.payment_status %> )</td>
+												<td><%= rec.payment_amount %></td>
 												<td>&nbsp;</td>
 											</tr>
 
@@ -141,6 +147,7 @@
 												<tr>
 													<td>&nbsp;</td>
 													<td>&nbsp;</td>
+                          <td>&nbsp;</td>
 													<td>Payment Ref.</td>
 													<td><%= rec.payment_reference %></td>
 													<td>&nbsp;</td>
@@ -152,6 +159,7 @@
 										<tr>
 											<td>&nbsp;</td>
 											<td>&nbsp;</td>
+                      <td>&nbsp;</td>
 											<td><%= t("views.right_panel.detail.change") %> <%= t("views.right_panel.detail.amount") %></td>
 											<td><%= result.amount_changed %></td>
 											<td>&nbsp;</td>
@@ -161,6 +169,7 @@
 										<tr>
 											<td>&nbsp;</td>
 											<td>&nbsp;</td>
+                      <td>&nbsp;</td>
 											<td>Customer</td>
 											<td><%= result.customer.name rescue '-'%>
 											    (<%= result.customer.company  rescue '-' %>)
@@ -175,6 +184,7 @@
 								<td>&nbsp;</td>
 								<td>&nbsp;</td>
 								<td>&nbsp;</td>
+                <td>&nbsp;</td>
 								<td><b>Total Nett</b> - <b><%= grand_total %></b></td>
 								<td>&nbsp;</td>
 							</tr>

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

@@ -19,7 +19,7 @@
                        <div class="row clearfix">
                          <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3 mbl-style">
                            <label class="font-14"><%= t("views.right_panel.detail.enter_keyboards") %></label>
-                           <input type="text" name="receipt_no" class="form-control m-t-3" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
+                           <input type="text" name="filter" class="form-control m-t-3" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
                          </div>
                          <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 col-mbl-view mbl-style">
                           <label class="font-14"><%= t("views.right_panel.detail.select_customer") %></label>
@@ -48,7 +48,7 @@
                           <label class="font-14"> &nbsp;</label><br>
                           <input type="submit" value="Search" class='btn btn-primary btn-md'>
                         </div>
-                       </div>
+                      </div>
                     <% end %>
                   </td>
                </tr>