fix conflit

app/controllers/inventory/inventory_controller.rb

@@ -1,6 +1,6 @@
 class Inventory::InventoryController < BaseInventoryController
 
    def index
-     
+     @products = InventoryDefinition.all.active.order('created_at desc') 
    end
 end

app/controllers/inventory/inventory_definitions_controller.rb

@@ -28,7 +28,7 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
 
     respond_to do |format|
       if @inventory_definition.save
-        format.html { redirect_to @inventory_definition, notice: 'Inventory definition was successfully created.' }
+        format.html { redirect_to inventory_path, notice: 'Inventory definition was successfully created.' }
         format.json { render :show, status: :created, location: @inventory_definition }
       else
         format.html { render :new }
@@ -69,6 +69,6 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def inventory_definition_params
-      params.fetch(:inventory_definition, {})
+      params.require(:inventory_definition).permit(:item_code, :min_order_level, :max_stock_level)
     end
 end

app/controllers/inventory/stock_check_items_controller.rb

@@ -1,4 +1,4 @@
-class StockCheckItemsController < ApplicationController
+class Inventory::StockCheckItemsController < BaseInventoryController
   before_action :set_stock_check_item, only: [:show, :edit, :update, :destroy]
 
   # GET /stock_check_items
@@ -28,7 +28,7 @@ class StockCheckItemsController < ApplicationController
 
     respond_to do |format|
       if @stock_check_item.save
-        format.html { redirect_to @stock_check_item, notice: 'Stock check item was successfully created.' }
+        format.html { redirect_to inventory_stock_checks_path, notice: 'Stock check item was successfully created.' }
         format.json { render :show, status: :created, location: @stock_check_item }
       else
         format.html { render :new }
@@ -69,6 +69,6 @@ class StockCheckItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def stock_check_item_params
-      params.fetch(:stock_check_item, {})
+      params.require(:stock_check_item).permit(:item_code, :stock_count)
     end
 end

app/controllers/inventory/stock_checks_controller.rb

@@ -1,74 +1,98 @@
-class StockChecksController < ApplicationController
-  before_action :set_stock_check, only: [:show, :edit, :update, :destroy]
+class Inventory::StockChecksController < BaseInventoryController
+
+  def index
+    @check = StockCheck.new
+  end
+
+  def create
+    item_list = JSON.parse(params[:stock_item])
+    reason = params[:reason]
+    check = StockCheck.new
+    @check = check.create(current_user, reason, item_list)
+  end
+
+  def show
+    @check = StockCheck.find(params[:id])
+  end
+
+  def save_to_journal
+    check = params[:data]
+    stockCheck = StockCheck.find(check)
+    stockCheck.stock_check_items.each do |item|
+      StockJournal.from_stock_check(item)
+    end
+  end
+  
+  # before_action :set_stock_check, only: [:show, :edit, :update, :destroy]
 
   # GET /stock_checks
   # GET /stock_checks.json
-  def index
-    @stock_checks = StockCheck.all
-  end
-
-  # GET /stock_checks/1
-  # GET /stock_checks/1.json
-  def show
-  end
-
-  # GET /stock_checks/new
-  def new
-    @stock_check = StockCheck.new
-  end
-
-  # GET /stock_checks/1/edit
-  def edit
-  end
-
-  # POST /stock_checks
-  # POST /stock_checks.json
-  def create
-    @stock_check = StockCheck.new(stock_check_params)
-
-    respond_to do |format|
-      if @stock_check.save
-        format.html { redirect_to @stock_check, notice: 'Stock check was successfully created.' }
-        format.json { render :show, status: :created, location: @stock_check }
-      else
-        format.html { render :new }
-        format.json { render json: @stock_check.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /stock_checks/1
-  # PATCH/PUT /stock_checks/1.json
-  def update
-    respond_to do |format|
-      if @stock_check.update(stock_check_params)
-        format.html { redirect_to @stock_check, notice: 'Stock check was successfully updated.' }
-        format.json { render :show, status: :ok, location: @stock_check }
-      else
-        format.html { render :edit }
-        format.json { render json: @stock_check.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /stock_checks/1
-  # DELETE /stock_checks/1.json
-  def destroy
-    @stock_check.destroy
-    respond_to do |format|
-      format.html { redirect_to stock_checks_url, notice: 'Stock check was successfully destroyed.' }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_stock_check
-      @stock_check = StockCheck.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def stock_check_params
-      params.fetch(:stock_check, {})
-    end
+#   def index
+#     @stock_checks = StockCheck.all
+#   end
+#
+#   # GET /stock_checks/1
+#   # GET /stock_checks/1.json
+#   def show
+#   end
+#
+#   # GET /stock_checks/new
+#   def new
+#     @stock_check = StockCheck.new
+#   end
+#
+#   # GET /stock_checks/1/edit
+#   def edit
+#   end
+#
+#   # POST /stock_checks
+#   # POST /stock_checks.json
+#   def create
+#     @stock_check = StockCheck.new(stock_check_params)
+#
+#     respond_to do |format|
+#       if @stock_check.save
+#         format.html { redirect_to @stock_check, notice: 'Stock check was successfully created.' }
+#         format.json { render :show, status: :created, location: @stock_check }
+#       else
+#         format.html { render :new }
+#         format.json { render json: @stock_check.errors, status: :unprocessable_entity }
+#       end
+#     end
+#   end
+#
+#   # PATCH/PUT /stock_checks/1
+#   # PATCH/PUT /stock_checks/1.json
+#   def update
+#     respond_to do |format|
+#       if @stock_check.update(stock_check_params)
+#         format.html { redirect_to @stock_check, notice: 'Stock check was successfully updated.' }
+#         format.json { render :show, status: :ok, location: @stock_check }
+#       else
+#         format.html { render :edit }
+#         format.json { render json: @stock_check.errors, status: :unprocessable_entity }
+#       end
+#     end
+#   end
+#
+#   # DELETE /stock_checks/1
+#   # DELETE /stock_checks/1.json
+#   def destroy
+#     @stock_check.destroy
+#     respond_to do |format|
+#       format.html { redirect_to stock_checks_url, notice: 'Stock check was successfully destroyed.' }
+#       format.json { head :no_content }
+#     end
+#   end
+#
+#   private
+#     # Use callbacks to share common setup or constraints between actions.
+#     def set_stock_check
+#       @stock_check = StockCheck.find(params[:id])
+#     end
+#
+#     # Never trust parameters from the scary internet, only allow the white list through.
+#     def stock_check_params
+#       params.fetch(:stock_check, {})
+#     end
 end

app/jobs/inventory_job.rb

@@ -0,0 +1,9 @@
+class InventoryJob < ApplicationJob
+  queue_as :default
+
+  def perform(sale_id)
+    saleObj = Sale.find(sale_id)
+    InventoryDefinition.calculate_product_count(saleObj)
+  end
+  
+end

app/models/inventory_definition.rb

@@ -1,2 +1,41 @@
 class InventoryDefinition < ApplicationRecord
+
+  scope :active, -> {where(:is_active => true)}
+
+  def self.calculate_product_count(saleObj)
+    saleObj.sale_items.each do |item|
+      found, inventory_definition = find_product_in_inventory(item)
+      if found
+        check_balance(item,inventory_definition)
+      end
+    end
+  end
+
+  def self.find_product_in_inventory(item)
+    product = InventoryDefinition.find_by_item_code(item.product_code)
+    if product.nil?
+      return false, nil
+    else
+      return true, product
+    end
+  end
+
+  def self.check_balance(item,inventory_definition) # item => saleItemOBj
+     stock = StockJournal.where('item_code=?', item.product_code).order('created_at desc').take
+     unless stock.nil?
+       modify_balance(item, stock, inventory_definition)
+     else
+       StockJournal.add_to_journal(item, 0, "out of stock", inventory_definition)
+     end
+  end
+
+  def self.modify_balance(item, stock, inventory_definition) #saleitemObj
+     if stock.balance.to_i >= item.qty
+       puts ">> stock is greater than orde qty"
+       StockJournal.add_to_journal(item, stock.balance, "ok", inventory_definition)
+     else
+       puts " << stock is less than order qty"
+       StockJournal.add_to_journal(item, stock.balance, "out of stock", inventory_definition)
+     end
+  end
 end

app/models/sale.rb

@@ -118,6 +118,8 @@ class Sale < ApplicationRecord
         create_saleitem_diningcharges(charges, diningprice, booking.dining_facility.name, dining_time)
       end
 
+      InventoryJob.perform_now(self.id)
+
       return true, self.id
     end
 

app/models/stock_check.rb

@@ -1,2 +1,17 @@
 class StockCheck < ApplicationRecord
+
+  has_many :stock_check_items
+
+  def create(user, eason, item_list)
+    self.reason = reason
+    self.check_by = user.id
+    self.check_start = Time.now
+    self.check_end = Time.now
+    self.save
+    item_list.each do |item|
+      stockItem = StockCheckItem.new
+      stockItem.create(self.id,item)
+    end
+    return self
+  end
 end

app/models/stock_check_item.rb

@@ -1,2 +1,36 @@
 class StockCheckItem < ApplicationRecord
+  
+  belongs_to :stock_check
+
+  def create(stock_id, item)
+    journal_id, balance = StockCheckItem.find_journal(item['sku'])
+    remark, different = StockCheckItem.stock_different(item['qty'], balance )
+    self.stock_check_id = stock_id
+    self.item_code = item['sku']
+    self.stock_count = item['qty']
+    self.stock_journal_id = journal_id
+    self.stock_balance = balance
+    self.different = different
+    self.remark = remark
+    self.save
+  end
+
+  def self.find_journal(item_code)
+     journal = StockJournal.where('item_code=?', item_code).order('created_at desc').take
+     if journal
+       return journal.id, journal.balance
+     else
+       return nil, 0
+     end
+  end
+
+  def self.stock_different(stock_check_qty, journal_balance)
+      if stock_check_qty.to_i == journal_balance.to_i
+        return 'match', stock_check_qty
+      elsif stock_check_qty.to_i > journal_balance.to_i
+        return 'missing order item', stock_check_qty.to_i - journal_balance.to_i
+      elsif stock_check_qty.to_i < journal_balance.to_i
+        return 'missing stock', stock_check_qty.to_i - journal_balance.to_i
+      end
+  end
 end

app/models/stock_journal.rb

@@ -1,2 +1,39 @@
 class StockJournal < ApplicationRecord
+
+  SALES_TRANS = "sale"
+  STOCK_CHECK_TRANS = "stock_check"
+
+  def self.add_to_journal(item, balance, stock_message, inventory_definition) # item => saleObj | balance => Stock journal
+
+    balance = calculate_balance(balance, item.qty)
+
+    journal = StockJournal.new
+    journal.item_code = item.product_code
+    journal.inventory_definition_id = inventory_definition.id
+    journal.debit = item.qty
+    journal.balance = balance
+    journal.remark = stock_message
+    journal.trans_ref = item.id
+    journal.trans_type = StockJournal::SALES_TRANS
+    journal.save
+  end
+
+  def self.calculate_balance(balance, qty)
+    return balance.to_i - qty.to_i
+  end
+
+  def self.from_stock_check(item)
+    definition_id = InventoryDefinition.find_by_item_code(item.item_code)
+    journal = StockJournal.new
+    journal.item_code = item.item_code
+    journal.inventory_definition_id = definition_id.id
+    journal.debit = 0
+    journal.credit = item.stock_count
+    journal.balance = item.stock_count
+    journal.remark = StockJournal::STOCK_CHECK_TRANS
+    journal.trans_ref = item.id
+    journal.trans_type = StockJournal::STOCK_CHECK_TRANS
+    journal.save
+  end
+
 end

app/views/home/dashboard.html.erb

@@ -58,7 +58,7 @@
 
   <div class="row">
     <div class="col-md-12">
-      <div class="card" id="backend" onclick="location.href='<%= inventory_inventory_path %>'">
+      <div class="card" id="backend" onclick="location.href='<%= inventory_path %>'">
         <div class="card-content">
           <span class="card-title">Inventory</span>
         </div>

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

@@ -0,0 +1,40 @@
+
+<div class="row">
+  <div class="col-md-8"><h2> Inventoy Product Lists</h2></div>
+  <div class="col-md-4"><button id='new_inventory_product' class='btn btn-primary' style='margin-top:15px;'>New Inventory Product</button></div>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <table class="table table-striped">
+      <tr>
+        <th>#</th>
+        <th>Product</th>
+        <th>Min Order</th>
+        <th>Max Stock</th>
+        <th>Created by</th>
+        <th>Created Time</th>
+      </tr>
+      <%
+      count = 0
+      @products.each do |item|
+      count += 1
+      %>
+        <tr>
+          <td><%= count %></td>
+          <td><%= item.item_code rescue ""%></td>
+          <td><%= item.min_order_level %></td>
+          <td><%= item.max_stock_level %></td>
+          <td><%= item.created_by%></td>
+          <td><%= item.created_at%></td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+</div>
+
+<script>
+$('#new_inventory_product').on('click',function(){
+   window.location.href = '/inventory/inventory_definitions/new';
+})
+</script>

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

@@ -1,17 +1,22 @@
-# Hello Inventory
-<div class="row">
-  <div class="col-lg-8 col-md-8 col-sm-8">
 
+ <div class="row">
+  <div class="col-lg-10 col-md-10 col-sm-10">
+      <%= render 'inventory_list' %>
   </div>
-  <div class="col-lg-4 col-md-4 col-sm-4">
-    <button id="refreshbutton" type="button" class="btn btn-block"> Inventory Product Lists</button>
-    <button id="cash_in" type="button" class="btn btn-block btn-primary"> Stock Taking </button>
-    <button id="cash_out" type="button" class="btn btn-block btn-primary"> Stock Check Report</button>
-
+  <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"><i class="fa fa-home fa-lg"></i> Back
-       </button>
+       <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 = '';
+})
+</script>

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

@@ -1,10 +1,15 @@
-<%= simple_form_for(@inventory_definition) do |f| %>
+
+<%= simple_form_for([:inventory,@inventory_definition]) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
+    <%= f.input :item_code %>
+    <%= f.input :min_order_level %>
+    <%= f.input :max_stock_level %>
   </div>
 
   <div class="form-actions">
     <%= f.button :submit %>
   </div>
+
 <% end %>

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

@@ -1,5 +1,11 @@
-<h1>New Inventory Definition</h1>
 
-<%= render 'form', inventory_definition: @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>New</li>
+		 </ul>
+		</div>
+    <%= render 'form', inventory: @inventory_definition %>
+</div>

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

@@ -1,10 +0,0 @@
-<%= simple_form_for(@stock_check) do |f| %>
-  <%= f.error_notification %>
-
-  <div class="form-inputs">
-  </div>
-
-  <div class="form-actions">
-    <%= f.button :submit %>
-  </div>
-<% end %>

app/views/inventory/stock_checks/_stock_check.json.jbuilder

@@ -1,2 +0,0 @@
-json.extract! stock_check, :id, :created_at, :updated_at
-json.url stock_check_url(stock_check, format: :json)

app/views/inventory/stock_checks/create.json.jbuilder

@@ -0,0 +1 @@
+json.stock_id @check.id

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

@@ -1,6 +0,0 @@
-<h1>Editing Stock Check</h1>
-
-<%= render 'form', stock_check: @stock_check %>
-
-<%= link_to 'Show', @stock_check %> |
-<%= link_to 'Back', stock_checks_path %>

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

@@ -1,25 +1,102 @@
-<p id="notice"><%= notice %></p>
+<div class="row">
+  <div class="col-md-6">
+    <div class="row">
+      <div class="col-md-12">
 
-<h1>Stock Checks</h1>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-12">
+       <input type='text' id='stock_check_reason' class='form-control' placeholder="Set Stock Check Reason" value=''></input>
+     </div>
+    </div>
+    <br>
+    <div class="row">
+      <div class="col-md-2"></div>
+      <div class="col-md-2">
+        Product
+      </div>
+      <div class="col-md-7">
+        <input type='text' class='form-control' placeholder="Product Name" id='product_sku' value=''></input>
+      </div>
+    </div>
+    <br>
+    <div class="row">
+      <div class="col-md-2"></div>
+      <div class="col-md-2">
+        Qty
+      </div>
+      <div class="col-md-7">
+        <input type='text' class='form-control' placeholder="Qty" id='product_qty' value=''></input>
+      </div>
+    </div>
+    <br>
+    <div class="row">
+      <div class="col-md-4"></div>
+      <div class="col-md-7">
+        <button class="btn btn-primary form-control" id='save_to_stock_check'> Save </button>
+      </div>
+    </div>
+  </div>
 
-<table>
-  <thead>
-    <tr>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
+  <div class="col-md-5">
+    <div class="row">
+      <div class="col-md-12">
+        <table class="table table-striped" id='stock_item'>
+          <tr>
+            <th>#</th>
+            <th>Product</th>
+            <th>Balance</th>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+  <div class="col-md-1">
+    <div class="row">
+      <button class="btn btn-primary pull-right form-control" style='margin-bottom:2px;' id='finish'> Finish </button>
+    </div>
+  </div>
+</div>
 
-  <tbody>
-    <% @stock_checks.each do |stock_check| %>
-      <tr>
-        <td><%= link_to 'Show', stock_check %></td>
-        <td><%= link_to 'Edit', edit_stock_check_path(stock_check) %></td>
-        <td><%= link_to 'Destroy', stock_check, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<script>
+  var count = 0
 
-<br>
+  $('#save_to_stock_check').on('click', function(){
+      count += 1;
+      product_sku = $('#product_sku').val();
+      product_qty = $('#product_qty').val();
+      var tr = '<tr>'
+             + '<td>'+ count +'</td>'
+             + '<td><input type=text value="'+ product_sku +'" id="item_sku_'+ count +'" name='+count+'></input></td>'
+             + '<td><input type=text value="'+ product_qty +'" id="item_qty_'+ count +'" name='+count+'></input></td>'
+             + '</tr>'
+        $('#stock_item').append(tr)
+        $('#product_sku').val('');
+        $('#product_qty').val('');
+  })
 
-<%= link_to 'New Stock Check', new_stock_check_path %>
+  $('#finish').on('click',function(){
+    var reason = $('#stock_check_reason').val();
+    var arr = [];
+    var jsonStr = ''
+
+    for(var i = 1; i <= count; i++){
+      itemname = $('#item_sku_'+i ).val();
+      itemqty = $('#item_qty_'+i ).val();
+      arr.push({sku:itemname, qty:itemqty})
+		  jsonStr = JSON.stringify(arr)
+    }
+    console.log(jsonStr)
+    $.ajax({
+      type: 'Post',
+      url: '<%= inventory_stock_check_save_path %>',
+      data:'stock_item='+ jsonStr + '&reason='+ reason,
+      success:function(data){
+         alert(data['stock_id'])
+         window.location.href = '/inventory/stock_checks/'+ data['stock_id'];
+      }
+    })
+  })
+
+</script>

app/views/inventory/stock_checks/index.json.jbuilder

@@ -1 +0,0 @@
-json.array! @stock_checks, partial: 'stock_checks/stock_check', as: :stock_check

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

@@ -1,5 +0,0 @@
-<h1>New Stock Check</h1>
-
-<%= render 'form', stock_check: @stock_check %>
-
-<%= link_to 'Back', stock_checks_path %>

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

@@ -1,4 +1,74 @@
-<p id="notice"><%= notice %></p>
+<div class="row">
+  <input type='hidden' id='stock_check_id' value='<%= @check.id %>'/>
+  <div class="col-md-10">
+    <div class="row">
+      <div class="col-md-2">
+          Check by
+      </div>
+      <div class="col-md-8">
+        <%= @check.check_by %>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-2">
+          Check At
+      </div>
+      <div class="col-md-8">
+        <%= @check.created_at %></div>
+    </div>
+    <div class="row">
+      <div class="col-md-2">
+          Reason
+      </div>
+      <div class="col-md-8">
+          <%= @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
+      %>
+        <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>
+        </tr>
+      <% end %>
+    </table>
+  </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>
+  </div>
+</div>
 
-<%= link_to 'Edit', edit_stock_check_path(@stock_check) %> |
-<%= link_to 'Back', stock_checks_path %>
+<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')
+     }
+   })
+})
+</script>

app/views/inventory/stock_checks/show.json.jbuilder

@@ -1 +0,0 @@
-json.partial! "stock_checks/stock_check", stock_check: @stock_check

app/views/layouts/inventory.html.erb

@@ -9,7 +9,7 @@
     <title>SmartSales : Restaurant</title>
     <%= csrf_meta_tags %>
 
-    <%= stylesheet_link_tag    'inventory', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'origami', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
      <%= stylesheet_link_tag    'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %>

config/routes.rb

@@ -334,9 +334,12 @@ Rails.application.routes.draw do
   # ----------- Inventory ---------------------------
 
   namespace :inventory do
-    get 'inventory' => 'inventory#index'
-    resources :stock_check_items
-    resources :stock_checks
+    get '/' => 'inventory#index'
+    get '/stock_checks' => 'stock_checks#index'
+    post 'save_stock' => 'stock_checks#create', as:'stock_check_save'
+    get '/stock_checks/:id' => 'stock_checks#show'
+    post 'save_to_journal' => 'stock_checks#save_to_journal', as: 'save_to_journal'
+    # resources :stock_checks
     resources :stock_journals
     resources :inventory_definitions
   end

db/migrate/20170824110103_create_inventory_definitions.rb

@@ -4,6 +4,8 @@ class CreateInventoryDefinitions < ActiveRecord::Migration[5.1]
       t.string :item_code
       t.integer :min_order_level, :default => 0
       t.integer :max_stock_level, :default => 0
+      t.integer :created_by
+      t.boolean :is_active, :default => true
       t.timestamps
     end
   end

db/migrate/20170824110130_create_stock_check_items.rb

@@ -1,7 +1,7 @@
 class CreateStockCheckItems < ActiveRecord::Migration[5.1]
   def change
     create_table :stock_check_items do |t|
-      t.integer :stock_check_id, :null => false
+      t.integer :stock_check_id
       t.string :item_code, :null => false
       t.integer :stock_count, :default => 0
       t.integer :stock_journal_id