Pull from master

app/views/inventory/inventory/_inventory_list.html.erb

@@ -5,12 +5,14 @@
     <th><%= t("views.right_panel.detail.product") %></th>
     <th><%= t("views.right_panel.detail.min_order") %></th>
     <th><%= t("views.right_panel.detail.max_stock") %></th>
-    <th><%= t("views.right_panel.detail.created_by") %></th>
-    <th><%= t("views.right_panel.detail.created_time") %></th>
+    <th><%= t("views.right_panel.detail.balance") %></th>
+    <th><%= t("views.right_panel.detail.action") %></th>
+    <!-- <th><%= t("views.right_panel.detail.created_by") %></th>
+    <th><%= t("views.right_panel.detail.created_time") %></th> -->
   </tr>
   <%
   count = 0
-  @products.each do |item|
+  @inventory_definitions.each do |item|
     count += 1
     %>
     <tr>
@@ -26,9 +28,20 @@
       </td>
       <td><%= item.min_order_level %></td>
       <td><%= item.max_stock_level %></td>
-      <td><%= Employee.find(item.created_by).name rescue '-' %></td>
-      <td><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
+      <td><%= item.balance rescue '0' %></td>
+      <td>
+        <button type="button" data-value="<%= item.id %>" class="btn bg-blue waves-effect btn-link show_track"><%= t("views.btn.show") %> <%= t("views.right_panel.detail.stock_check") %></button>
+      </td>
+      <!-- <td><%= Employee.find(item.created_by).name rescue '-' %></td>
+      <td><%= item.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td> -->
     </tr>
     <% end %>
-  </table>
+</table>
 
+<script>
+  $('.show_track').on('click', function () {
+    var ID = $(this).attr("data-value");
+    window.location.href = '/inventory/'+ID+'/show';
+  });
+
+</script>

app/views/inventory/inventory/index.html.erb

@@ -12,10 +12,10 @@
 <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
       <div class="m-b-10 clearfix">
-          <button id="stock_check_report" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> <%= t("views.btn.stock_check_report") %>
-          </button>
-          <button id="stock_taking" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> <%= t("views.btn.new_stock_taking") %></button>
-          <button id='new_inventory_product' class='btn btn-primary  float-right waves-effect' style='margin-left:5px;'><%= t("views.btn.new") + " " + (t :inventory) %>
+          <!-- <button id="stock_check_report" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> <%= t("views.btn.stock_check_report") %>
+          </button> -->
+          <button id="stock_taking" type="button" class="btn bg-blue float-right waves-effect" style='margin-left:5px;'> <%= t("views.btn.stock_taking") %></button>
+          <button id='new_inventory_product' class='btn btn-primary  float-right waves-effect' style='margin-left:5px;'><%= (t :track) +" "+ t("views.btn.new") + " " + (t :inventory) %>
          </button>     
       </div>
       <div class="card">
@@ -27,14 +27,14 @@
       <div class="body">
         <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
         <p>
-        1) <%= t("views.btn.new") + " " + (t :inventory) %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.inventory") %> <br>
+        1) <%= (t :track) +" "+ t("views.btn.new") + " " + (t :inventory) %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.inventory") %> <br>
         </p>
         <p>
-        2) <%= t("views.btn.new") + " " + t("views.right_panel.detail.stock_taking") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.stock_taking_txt") %> <br>
+        2) <%= t("views.right_panel.detail.stock_taking") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.stock_taking_txt") %> <br>
         </p>
-        <p>
+        <!-- <p>
         3) <%= t("views.right_panel.detail.stock_check_report") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.stock_check_report_txt") %> <br>
-        </p>
+        </p> -->
         <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
         <p>
           1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
@@ -51,12 +51,12 @@
     window.location.href = '<%= inventory_stock_checks_path %>';
   });
 
-  $('#stock_check_report').on('click', function () {
-    window.location.href = '<%= reports_stock_check_index_path %>';
-  });
+  // $('#stock_check_report').on('click', function () {
+  //   window.location.href = '<%= reports_stock_check_index_path %>';
+  // });
 
   $('#new_inventory_product').on('click',function(){
    window.location.href = '/inventory/inventory_definitions/new';
-})
+  });
 
 </script>

app/views/inventory/inventory/show.html.erb

@@ -0,0 +1,70 @@
+<div class="page-header">
+ <ol class="breadcrumb">
+  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>"><%= t("views.right_panel.button.home") %></a></li>
+  <li class="breadcrumb-item active"><%= t :inventory %></li>
+  <span class="float-right">
+    <%= link_to t('.back', :default => t("views.btn.back")), inventory_path %>
+  </span>
+</ol>
+</div>
+
+
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+    <table class="table table-responsive table-striped table-hover">
+      <thead>
+        <tr>
+          <th><%= t("views.right_panel.detail.date") %></th>
+          <th><%= t("views.right_panel.detail.type") %></th>
+          <th><%= t("views.right_panel.detail.item") %> <%= t("views.right_panel.detail.name") %></th>
+          <th><%= t :credit %></th>
+          <th><%= t :debit %></th>
+          <th><%= t("views.right_panel.detail.balance") %></th>
+          <th><%= t("views.right_panel.detail.remark") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% total_credit = 0 %>
+        <% total_debit = 0 %>
+        <% total_balance = 0 %>
+
+        <% if !@stock_journals.nil? && !@stock_journals.empty? %>
+          <% @stock_journals.each do |result| %>
+          <tr>
+            <td><%= result.created_at.strftime('%e %b %Y %I:%M %p') rescue '-' %></td>
+            <td><%= result.trans_type rescue '-' %></td>
+            <td>
+              <% menu_item = MenuItemInstance.find_by_item_instance_code(result.item_code)%>
+              <% if menu_item.nil? %>
+              <%= Product.find_by_item_code(result.item_code).name rescue "-" %>
+              <% else %>
+              <%= menu_item.menu_item.name rescue "-" %>
+              - <%= menu_item.item_instance_name rescue "-" %>
+              <% end %>
+            </td>
+            <td><%= result.credit rescue '-' %></td>
+            <td><%= result.debit rescue '-' %></td>
+            <td><%= result.balance rescue '-' %></td>
+            <td><%= result.remark rescue '-' %></td>
+          </tr>
+          <% !result.credit.nil? ? total_credit += result.credit : total_credit += 0 %>
+          <% !result.debit.nil? ? total_debit += result.debit : total_debit += 0 %>
+          <% !result.balance.nil? ? total_balance += result.balance : total_balance += 0 %>
+          <% end %>
+
+          <!-- <tr style="border-top: 3px solid grey;">
+            <td colspan="3"></td>
+            <td><b><%= total_credit rescue '-' %></b></td>
+            <td><b><%= total_debit rescue '-' %></b></td>
+            <td><b><%= total_balance rescue '-' %></b></td>
+            <td colspan="2"></td>
+          </tr> -->
+        <% else %>
+          <tr>
+            <td colspan="8" class="text-center">There is no record...</td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

app/views/inventory/stock_checks/index.html.erb

@@ -101,14 +101,25 @@
 </div>
 
 <script>
-
     var count = 0;
+    $(document).ready(function(){
+      clearFormData();
+    });
+    
+    function clearFormData(){
+      $('#stock_check_reason').val("");
+      $('#product_qty').val("");
+      $('#product_sku').val("");
+    }
 
     $('#save_to_stock_check').on('click', function () {
         count += 1;
         product_sku = $('#product_sku').val();
         product_qty = $('#product_qty').val();
         product_name = $("#product_sku").find("option:selected").text();
+
+        // clearFormData();
+
         var tr = '<tr>'
             //+ '<td>' + count + '</td>'
             + '<td><input type=hidden value="' + product_sku + '" id="item_sku_' + count + '" name=' + count + '/>'

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

@@ -176,12 +176,15 @@
     <!-- OQS Buttons -->
     <br>
     <a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
-    <% if ENV["SERVER_MODE"] != "cloud" %>
+   
     <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
+
       <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
+      <% if ENV["SERVER_MODE"] != "cloud" %>
     <%end%>    
   </div>
 </div>
+<input type="hidden" id="server_mode" value="<%=ENV["SERVER_MODE"]%>">
 
 <script type="text/javascript">
   $(document).on('turbolinks:load', function() {

app/views/reports/stock_check/_stock_check_report_filter.html.erb

@@ -21,19 +21,19 @@
                 <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
             </div>
             <div class="form-group col-md-4">
-                <label class="font-14">Definition Item</label>
+                <label class="font-14">Select Item</label>
                 <select class="form-control" name="item_code" id="item_code">
-                  <option value="">Select Product</option>
-                  <% @inventory_definitions.each do |id| %>
-                  <option value="<%= id.item_code %>">
-                    <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
-                    <% if menu_item.nil? %>
-                    <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
-                    <% else %>
-                    <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                    <option value="">Select Item</option>
+                    <% @inventory_definitions.each do |id| %>
+                        <option value="<%= id.item_code %>">
+                            <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
+                            <% if menu_item.nil? %>
+                                <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
+                            <% else %>
+                                <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
+                            <% end %>
+                        </option>
                     <% end %>
-                </option>
-                <% end %>
             </select>
         </div>
         <div class="form-group col-md-2 margin-top-20"><br>

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

@@ -3,102 +3,107 @@
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">Stock Check Report</li>
     <span class="float-right">
-      <%= link_to 'Back', inventory_path %>
+    <%= link_to 'Back', inventory_path %>
     </span>
   </ol>
 </div>
 <div class="row">
-  <div class="col-md-12">
-    
-    <!-- <div class="container"> -->
-    <%= render :partial => 'stock_check_report_filter',
-    :locals => {:period_type => true, :shift_name => true, :report_path => reports_stock_check_index_path} %>
-    <hr/>
-    <!-- </div> -->
+  <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
 
-    <!-- <div class="container"> -->
-    <!-- <div class="row"> -->
-    <div class="text-right">
-      <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-info wave-effects">Export to
-        Excel</a>
-      </div>
-      <!-- </div> -->
-      <!-- </div> -->
+  <!-- <div class="container"> -->
+  <%= render :partial => 'stock_check_report_filter',
+  :locals => {:period_type => true, :shift_name => true, :report_path => reports_stock_check_index_path} %>
+  <hr/>
+  <!-- </div> -->
 
-      <div class="margin-top-20">
-        <div class="card">
-          <div class="table-responsive">
-            <% if @print_settings.precision.to_i > 0
-              precision = @print_settings.precision
-            else
-              precision = 0
-            end
-            #check delimiter
-            if @print_settings.delimiter
-              delimiter = ","
-              else
-              delimiter = ""
-              end
-             %> 
-            <table class="table table-striped">
-              <thead>
-                <tr>
-                  <th colspan="8"><i> From Date </i>: <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <i>To Date</i> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
-                </tr>
-                <tr>
-                  <th>Stock Check Reason</th>
-                  <th>Checked By</th>
-                  <th>Item Name</th>
-                  <th>Stock Count</th>
-                  <th>Stock Balance</th>
-                  <th>Different</th>
-                  <th>Remark</th>
-                  <th>Date</th>
-                </tr>
-              </thead>
-              <tbody>
-                <% total_stock_count = 0 %>
-                <% total_stock_balance = 0 %>
-                <% total_different = 0 %>
+  <!-- <div class="container"> -->
+  <!-- <div class="row"> -->
+  <div class="text-right">
+  <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-info wave-effects">Export to
+    Excel</a>
+  </div>
+  <!-- </div> -->
+  <!-- </div> -->
 
-                <% @transaction.each do |result| %>
-                <tr>
-                  <td><%= result.stock_check.reason rescue '-' %></td>
-                  <td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
-                  <td>
-                    <% menu_item = MenuItemInstance.find_by_item_instance_code(result.item_code)%>
-                    <% if menu_item.nil? %>
+  <div class="margin-top-20">
+    <div class="card">
+      <div class="table-responsive">
+        <% if @print_settings.precision.to_i > 0
+          precision = @print_settings.precision
+        else
+          precision = 0
+        end
+        #check delimiter
+        if @print_settings.delimiter
+          delimiter = ","
+        else
+          delimiter = ""
+        end
+        %> 
+        <table class="table table-striped">
+          <thead>
+            <tr>
+              <th colspan="8"><i> From Date </i>: <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <i>To Date</i> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.item") %> <%= t("views.right_panel.detail.name") %></th>
+              <th><%= t("views.right_panel.detail.stock_count") %></th>
+              <th><%= t("views.right_panel.detail.stock_balance") %></th>
+              <th><%= t("views.right_panel.detail.different") %></th>
+              <th><%= t("views.right_panel.detail.remark") %></th>
+              <th><%= t("views.right_panel.detail.checked_by") %></th>
+              <th><%= t("views.right_panel.detail.stock_check") %> <%= t("views.right_panel.detail.reason") %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% total_stock_count = 0 %>
+            <% total_stock_balance = 0 %>
+            <% total_different = 0 %>
+            <% arr_item_code = [] %>
+            <% @transaction.each do |result| %>
+            <tr>
+              <td>
+                <% menu_item = MenuItemInstance.find_by_item_instance_code(result.item_code)%>
+                <% if menu_item.nil? %>
+                  <% if !arr_item_code.include?(result.item_code) %>  
                     <%= Product.find_by_item_code(result.item_code).name rescue "-" %>
-                    <% else %>
+                    <% arr_item_code.push(result.item_code) %>
+                  <% else %>
+                    &nbsp;
+                  <% end %>
+                <% else %>
+                  <% if !arr_item_code.include?(result.item_code) %>  
                     <%= menu_item.menu_item.name rescue "-" %>
                     - <%= menu_item.item_instance_name rescue "-" %>
-                    <% end %>
-                  </td>
-                  <td><%= result.stock_count rescue '-' %></td>
-                  <td><%= number_with_precision(result.stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
-                  <td><%= result.different rescue '-' %></td>
-                  <td><%= result.remark rescue '-' %></td>
-                  <td><%= result.created_at.strftime('%e %b %Y %I:%M %p') rescue '-' %></td>
-                </tr>
-                <% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
-                <% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>
-                <% !result.different.nil? ? total_different += result.different : total_different += 0 %>
+                    <% arr_item_code.push(result.item_code) %>
+                  <% else %>
+                    &nbsp;
+                  <% end %>
                 <% end %>
+              </td>
+              <td><%= result.stock_count rescue '-' %></td>
+              <td><%= result.stock_balance rescue '-' %></td>
+              <td><%= result.different rescue '-' %></td>
+              <td><%= result.remark rescue '-' %></td>
+              <td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
+              <td><%= result.stock_check.reason rescue '-' %></td>
+            </tr>
+            <% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
+            <% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>
+            <% !result.different.nil? ? total_different += result.different : total_different += 0 %>
+            <% end %>
 
-                <tr style="border-top: 3px solid grey;">
-                  <td colspan="3"></td>
-                  <td><b><%= total_stock_count rescue '-' %></b></td>
-                  <td><b><%= number_with_precision(total_stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></b></td>
-                  <td><b><%= total_different rescue '-' %></b></td>
-                  <td colspan="2"></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
+            <!-- <tr style="border-top: 3px solid grey;">
+              <td colspan="3"></td>
+              <td><b><%= total_stock_count rescue '-' %></b></td>
+              <td><b><%= number_with_precision(total_stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></b></td>
+              <td><b><%= total_different rescue '-' %></b></td>
+              <td></td>
+            </tr> -->
+          </tbody>
+        </table>
       </div>
-      <script>
-        $(function () {
-
-        });
-      </script>
+    </div>
+  </div>
+  </div>
+</div>

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

@@ -14,44 +14,60 @@
           <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
         </tr>
         <tr>
-          <th>Commissioner Name</th>
-          <th>Product Name</th>
-          <th>Qty</th>
-          <th>Commission Price</th>
-          <th>Commission Amount</th>
-          <th>Date</th>
+          <th><%= t("views.right_panel.detail.item") %> <%= t("views.right_panel.detail.name") %></th>
+              <th><%= t("views.right_panel.detail.stock_count") %></th>
+              <th><%= t("views.right_panel.detail.stock_balance") %></th>
+              <th><%= t("views.right_panel.detail.different") %></th>
+              <th><%= t("views.right_panel.detail.remark") %></th>
+              <th><%= t("views.right_panel.detail.checked_by") %></th>
+              <th><%= t("views.right_panel.detail.stock_check") %> <%= t("views.right_panel.detail.reason") %></th>
         </tr>
         </thead>
         <tbody>
-        <% total_qty = 0 %>
-        <% total_price = 0 %>
-        <% total_amount = 0 %>
+          <% total_stock_count = 0 %>
+          <% total_stock_balance = 0 %>
+          <% total_different = 0 %>
+          <% arr_item_code = [] %>
+          <% @transaction.each do |result| %>
+          <tr>
+            <td>
+              <% menu_item = MenuItemInstance.find_by_item_instance_code(result.item_code)%>
+              <% if menu_item.nil? %>
+                <% if !arr_item_code.include?(result.item_code) %>  
+                  <%= Product.find_by_item_code(result.item_code).name rescue "-" %>
+                  <% arr_item_code.push(result.item_code) %>
+                <% else %>
+                  &nbsp;
+                <% end %>
+              <% else %>
+                <% if !arr_item_code.include?(result.item_code) %>  
+                  <%= menu_item.menu_item.name rescue "-" %>
+                  - <%= menu_item.item_instance_name rescue "-" %>
+                  <% arr_item_code.push(result.item_code) %>
+                <% else %>
+                  &nbsp;
+                <% end %>
+              <% end %>
+            </td>
+            <td><%= result.stock_count rescue '-' %></td>
+            <td><%= result.stock_balance rescue '-' %></td>
+            <td><%= result.different rescue '-' %></td>
+            <td><%= result.remark rescue '-' %></td>
+            <td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
+            <td><%= result.stock_check.reason rescue '-' %></td>
+          </tr>
+          <% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
+          <% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>
+          <% !result.different.nil? ? total_different += result.different : total_different += 0 %>
+          <% end %>
 
-        <% @transaction.each do |result| %>
-            <tr>
-              <td>
-                <%= result.commissioner.name rescue '-' %>
-              </td>
-              <td>
-                <%= result.commission.menu_item.name rescue '-' %>
-              </td>
-              <td><%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %></td>
-              <td><%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %></td>
-              <td><%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %></td>
-              <td><%= result.updated_at.strftime("%e %b %Y %I:%M%p") rescue '-' %></td>
-            </tr>
-            <% total_qty += result.qty.to_f %>
-            <% total_price += result.price.to_f %>
-            <% total_amount += result.amount.to_f %>
-        <% end %>
-
-        <tr style="border-top: 3px solid grey;">
-          <td colspan="2"></td>
-          <td><b><%= sprintf("%.2f", total_qty) rescue '-' %></b></td>
-          <td><b><%= sprintf("%.2f", total_price) rescue '-' %></b></td>
-          <td><b><%= sprintf("%.2f", total_amount) rescue '-' %></b></td>
-          <td></td>
-        </tr>
+          <!-- <tr style="border-top: 3px solid grey;">
+            <td colspan="3"></td>
+            <td><b><%= total_stock_count rescue '-' %></b></td>
+            <td><b><%= number_with_precision(total_stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></b></td>
+            <td><b><%= total_different rescue '-' %></b></td>
+            <td></td>
+          </tr> -->
         </tbody>
       </table>
     </div>