stock_check report template

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

@@ -22,11 +22,19 @@
       %>
         <tr>
           <td><%= count %></td>
-          <td><%= item.item_code rescue ""%></td>
+          <td>
+            <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
+            <% if menu_item.nil? %>
+                <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
+            <% else %>
+                <%= menu_item.menu_item.name rescue "-" %>
+                - <%= menu_item.item_instance_name rescue "-" %>
+            <% end %>
+          </td>
           <td><%= item.min_order_level %></td>
           <td><%= item.max_stock_level %></td>
-          <td><%= item.created_by %></td>
-          <td><%= item.created_at%></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>

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

@@ -1,22 +1,27 @@
-
- <div class="row">
+<div class="row">
   <div class="col-lg-10 col-md-10 col-sm-10">
-      <%= render 'inventory_list' %>
+    <%= render 'inventory_list' %>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
-       <button id="back" type="button" class="btn btn-block btn-primary"> Back </button>
-    <%end%>
-    <button id="stock_taking" type="button" class="btn btn-block btn-primary"> New Stock Taking </button>
+    <% if current_login_employee.role == "administrator" || current_login_employee.role == 'manager' %>
+        <button id="back" type="button" class="btn btn-block btn-primary"> Back</button>
+    <% end %>
+    <button id="stock_taking" type="button" class="btn btn-block btn-primary"> New Stock Taking</button>
     <button id="stock_check_report" type="button" class="btn btn-block btn-primary"> Stock Check Report</button>
   </div>
 </div>
 
 <script>
-$('#stock_taking').on('click',function(){
-  window.location.href = '/inventory/stock_checks';
-})
-$('#stock_check_report').on('click', function(){
-  window.location.href = '';
-})
+    $('#stock_taking').on('click', function () {
+        window.location.href = '<%= inventory_stock_checks_path %>';
+    });
+
+    $('#stock_check_report').on('click', function () {
+        window.location.href = '<%= reports_stock_check_index_path %>';
+    });
+
+    $('#back').on('click', function () {
+        window.location.href = '<%= dashboard_path %>';
+    });
+
 </script>

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

@@ -45,7 +45,8 @@
     </div>
 
     <div class="form-actions">
-      <%= f.button :submit %>
+      <%= link_to 'Back', inventory_path, class: 'btn btn-success' %>
+      <%= f.button :submit, class: 'btn btn-primary' %>
     </div>
 
 <% end %>

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

@@ -1,6 +1,10 @@
-<h1>Editing Inventory Definition</h1>
-
-<%= render 'form', inventory_definition: @inventory_definition %>
-
-<%= link_to 'Show', @inventory_definition %> |
-<%= link_to 'Back', inventory_definitions_path %>
+<div class="span12">
+  <div class="page-header">
+    <ul class="breadcrumb">
+      <li><a href="<%= root_path %>">Home</a></li>
+      <li><a href="<%= inventory_path %>">Product Inventory</a></li>
+      <li>Edit</li>
+    </ul>
+  </div>
+  <%= render 'form', inventory: @inventory_definition %>
+</div>

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

@@ -20,8 +20,14 @@
         <select class='form-control' id='product_sku'>
           <option value="">Select Product</option>
           <% @inventory_definitions.each do |id| %>
-              <%	item_name = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
-              <option value="<%= id.item_code %>"><%= item_name.item_instance_name %></option>
+              <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 %>
         </select>
       </div>
@@ -50,7 +56,7 @@
       <div class="col-md-12">
         <table class="table table-striped" id='stock_item'>
           <tr>
-            <th>#</th>
+            <!--<th>#</th>-->
             <th>Product</th>
             <th>Balance</th>
             <th></th>
@@ -61,6 +67,7 @@
   </div>
   <div class="col-md-1">
     <div class="row">
+      <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='back'> Back</button>
       <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish</button>
     </div>
   </div>
@@ -80,13 +87,13 @@
         count += 1;
         product_sku = $('#product_sku').val();
         product_qty = $('#product_qty').val();
-        product_name = $("#product_sku option:selected").text();
+        product_name = $("#product_sku").find("option:selected").text();
         var tr = '<tr>'
-            + '<td>' + count + '</td>'
+            //+ '<td>' + count + '</td>'
             + '<td><input type=hidden value="' + product_sku + '" id="item_sku_' + count + '" name=' + count + '/>'
-            + '<input type=text value="' + product_name + '" id="item_name_' + count + '" name=' + count + ' disabled/></td>'
+            + product_name + '</td>'
             + '<td><input type=text value="' + product_qty + '" id="item_qty_' + count + '" name=' + count + '/></td>'
-            + '<td><input type=button value="Remove" id="item_qty_' + count + '" name=' + count + '/></td>'
+            + '<td><input type=button value="X" id="item_remove_' + count + '" name=' + count + ' onclick="remove_row('+ count +')"/></td>'
             + '</tr>';
         $('#stock_item').append(tr);
 //        $('#product_sku').val('');
@@ -101,7 +108,9 @@
         for (var i = 1; i <= count; i++) {
             itemname = $('#item_sku_' + i).val();
             itemqty = $('#item_qty_' + i).val();
-            arr.push({sku: itemname, qty: itemqty});
+            if(itemname !== undefined){
+                arr.push({sku: itemname, qty: itemqty});
+            }
             jsonStr = JSON.stringify(arr);
         }
         console.log(jsonStr);
@@ -113,6 +122,14 @@
                 window.location.href = '/inventory/stock_checks/' + data['stock_id'];
             }
         })
-    })
+    });
+
+    $('#back').on('click', function () {
+        window.location.href = '/inventory';
+    });
+
+    function remove_row(row) {
+        $("#item_remove_"+row).parent().parent().remove();
+    }
 
 </script>

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

@@ -3,81 +3,96 @@
   <div class="col-md-10">
     <div class="row">
       <div class="col-md-2">
-          Check by
+        Check by
       </div>
       <div class="col-md-8">
-        <%= @check.check_by %>
+        <%= Employee.find(@check.check_by).name rescue '' %>
       </div>
     </div>
     <div class="row">
       <div class="col-md-2">
-          Check At
+        Check At
       </div>
       <div class="col-md-8">
-        <%= @check.created_at %></div>
+        <%= @check.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></div>
     </div>
     <div class="row">
       <div class="col-md-2">
-          Reason
+        Reason
       </div>
       <div class="col-md-8">
-          <%= @check.reason %>
+        <%= @check.reason %>
       </div>
     </div>
     <br>
     <div class="row">
-    <table class="table table-striped col-md-12">
-      <tr>
-        <th>#</th>
-        <th>Product</th>
-        <th>Stock Count</th>
-        <th>Stock Balance</th>
-        <th>Different</th>
-        <th>Remark</th>
-      </tr>
-      <%
-      count = 0
-      @check.stock_check_items.each do |item|
-      count += 1
-      %>
+      <table class="table table-striped col-md-12">
         <tr>
-          <td><%= count %></td>
-          <td><%= item.item_code %></td>
-          <td><%= item.stock_count %></td>
-          <td><%= item.stock_balance %></td>
-          <td><%= item.different %></td>
-          <td><%= item.remark %></td>
+          <th>#</th>
+          <th>Product</th>
+          <th>Stock Count</th>
+          <th>Stock Balance</th>
+          <th>Different</th>
+          <th>Remark</th>
         </tr>
-      <% end %>
-    </table>
+        <%
+          count = 0
+          @check.stock_check_items.each do |item|
+            count += 1
+        %>
+            <tr>
+              <td><%= count %></td>
+              <td>
+                <% menu_item = MenuItemInstance.find_by_item_instance_code(item.item_code)%>
+                <% if menu_item.nil? %>
+                    <%= Product.find_by_item_code(item.item_code).name rescue "-" %>
+                <% else %>
+                    <%= menu_item.menu_item.name rescue "-" %>
+                    - <%= menu_item.item_instance_name rescue "-" %>
+                <% end %>
+              </td>
+              <td><%= item.stock_count %></td>
+              <td><%= item.stock_balance %></td>
+              <td><%= item.different %></td>
+              <td><%= item.remark %></td>
+            </tr>
+        <% end %>
+      </table>
+    </div>
   </div>
-</div>
   <div class="col-md-2">
-      <button id="back" type="button" class="btn btn-block btn-primary"> Back </button>
-      <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal </button>
-      <button id="print" type="button" class="btn btn-block btn-primary"> Print </button>
+    <button id="back" type="button" class="btn btn-block btn-primary"> Back</button>
+    <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> Save to Journal</button>
+    <button id="print" type="button" class="btn btn-block btn-primary"> Print</button>
   </div>
 </div>
 
 <script>
-$('#save_to_journal').on('click', function(){
-   check_id = $('#stock_check_id').val();
-   $.ajax({
-     type: 'post',
-     url: '<%= inventory_save_to_journal_path %>',
-     data: 'data='+ check_id,
-     success: function(){
-        alert('success')
-     }
-   })
-})
 
-$('#print').on('click',function(){
-  check_id = $('#stock_check_id').val();
-  $.ajax({
-    type: 'post',
-    url: '<%= inventory_print_stock_check_path %>',
-    data: 'stock_check_id='+ check_id
-  })
-})
+    $('#save_to_journal').on('click', function () {
+        check_id = $('#stock_check_id').val();
+        $.ajax({
+            type: 'post',
+            url: '<%= inventory_save_to_journal_path %>',
+            data: 'data=' + check_id,
+            success: function () {
+                alert('Successfully saved to journal.');
+                window.location.href = '/inventory';
+            }
+        })
+    });
+
+    $('#print').on('click', function () {
+        check_id = $('#stock_check_id').val();
+        $.ajax({
+            type: 'post',
+            url: '<%= inventory_print_stock_check_path %>',
+            data: 'stock_check_id=' + check_id
+        })
+    });
+
+    $('#back').on('click', function () {
+        window.location.href = '/inventory';
+    });
+
 </script>

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

@@ -0,0 +1,89 @@
+<div class="row">
+  <div class="col-md-12">
+    <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
+        <% if period_type != false %>
+            <div class="row">
+
+              <div class="form-group col-md-3">
+                <label class="">Select Date Range</label>
+                <% if @daterange %>
+                    <input class="form-control" name="daterange" id="daterange" value="<%= @daterange %>" type="text" placeholder="Date Range" readonly="true">
+                <% else %>
+                    <input class="form-control" name="daterange" id="daterange" type="text" placeholder="Date Range" readonly="true">
+                <% end %>
+              </div>
+              <div class="form-group col-md-4">
+                <label class="">Definition 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 '-' %>
+                        <% end %>
+                      </option>
+                  <% end %>
+                </select>
+              </div>
+              <div class="form-group col-md-2 margin-top-20">
+                <input type="submit" value="Generate Report" class='btn btn-primary'>
+              </div>
+              <div class="form-group col-md-2 margin-top-20">
+                <input type="button" value="Clear Filter" id="clear_filter" class='btn btn-danger'>
+              </div>
+            </div>
+        <% end %>
+
+    <% end %>
+  </div>
+</div>
+
+<script type="text/javascript">
+
+    $(document).ready(function () {
+
+        $('#item_code').select2({
+            placeholder: 'Select Product',
+            allowClear: true
+        });
+
+        $('#clear_filter').click(function () {
+            $('#daterange').val('');
+            $('#item_code').val('').text('');
+        });
+
+        $('input[name="daterange"]').daterangepicker({
+                autoUpdateInput: false,
+                ranges: {
+                    'Today': [moment(), moment()],
+                    'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                    'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                    'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
+                    'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+                },
+                locale: {
+                    format: 'YYYY-MM-DD'
+                }
+            },
+            function (start, end, label) {
+                $('input[name="daterange"]').val(start.format('YYYY-MM-DD') + ' - ' + end.format('YYYY-MM-DD'));
+            });
+
+        $('input[name="daterange"]').on('apply.daterangepicker', function (ev, picker) {
+            $('input[name="daterange"]').val(picker.startDate.format('YYYY-MM-DD') + ' - ' + picker.endDate.format('YYYY-MM-DD'));
+
+            from_date = picker.startDate.format('YYYY-MM-DD 00:00:00');
+            to_date = picker.endDate.format('YYYY-MM-DD 23:59:59');
+        });
+
+        $('input[name="daterange"]').on('cancel.daterangepicker', function (ev, picker) {
+            $('input[name="daterange"]').val('');
+        });
+
+    });
+
+</script>

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

@@ -0,0 +1,79 @@
+<div class="page-header">
+  <ul class="breadcrumb">
+    <li><a href="<%= dashboard_path %>">Home</a></li>
+    <li>Stock Check Report</li>
+  </ul>
+</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="container">
+  <div class="row">
+    <div class="col-md-12 text-right">
+      <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-default">Export to
+        Excel</a>
+    </div>
+  </div>
+</div>
+
+<div class="container margin-top-20">
+  <div class="card row">
+    <div class="table-responsive">
+      <table class="table table-striped">
+        <thead>
+        <tr>
+          <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>Sale</th>
+          <th>Sale Item</th>
+          <th>Commissioner Name</th>
+          <th>Product Name</th>
+          <th>Qty</th>
+          <th>Commission Price</th>
+          <th>Commission Amount</th>
+          <th>Date</th>
+        </tr>
+        </thead>
+        <tbody>
+        <% total_qty = 0 %>
+        <% total_price = 0 %>
+        <% total_amount = 0 %>
+
+        <% @transaction.each do |result| %>
+            <tr>
+              <td><%= result.sale_id rescue '-' %></td>
+              <td><%= result.sale_item_id rescue '-' %></td>
+              <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="4"></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>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+<script>
+    $(function () {
+
+    });
+</script>

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

@@ -0,0 +1,52 @@
+<div class="container margin-top-20">
+  <div class="card row">
+    <div class="table-responsive">
+      <table class="table table-striped">
+        <thead>
+        <tr>
+          <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>
+        </tr>
+        </thead>
+        <tbody>
+        <% total_qty = 0 %>
+        <% total_price = 0 %>
+        <% total_amount = 0 %>
+
+        <% @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>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>