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