diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb index 19188d2d..4491669e 100755 --- a/app/controllers/inventory/inventory_definitions_controller.rb +++ b/app/controllers/inventory/inventory_definitions_controller.rb @@ -26,26 +26,44 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController # POST /inventory_definitions # POST /inventory_definitions.json def create - inventory = InventoryDefinition.find_by_item_code(inventory_definition_params[:item_code]) + inventory = InventoryDefinition.find_by_item_code(params[:item_code]) if inventory.nil? - @inventory_definition = InventoryDefinition.new(inventory_definition_params) + + @inventory_definition = InventoryDefinition.new + @inventory_definition.item_code = params[:item_code] + @inventory_definition.min_order_level = params[:min_order_level] + @inventory_definition.max_stock_level = params[:max_stock_level] + @inventory_definition.save else @inventory_definition = InventoryDefinition.find(inventory.id) - @inventory_definition.min_order_level = inventory_definition_params[:min_order_level] - @inventory_definition.max_stock_level = inventory.max_stock_level.to_i + inventory_definition_params[:max_stock_level].to_i + @inventory_definition.min_order_level = params[:min_order_level] + @inventory_definition.max_stock_level = inventory.max_stock_level.to_i + params[:max_stock_level].to_i end @inventory_definition.created_by = current_user.id - respond_to do |format| - if @inventory_definition.save - 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 } - format.json { render json: @inventory_definition.errors, status: :unprocessable_entity } - end + if @inventory_definition.save + result = {:status=> true, :message => "Inventory definition was created successfully",:data=> @inventory_definition} + else + result = {:status=> false, :message => "Inventory definition was created successfully",:data=> @inventory_definition} end - - + render :json => result.to_json + # inventory = InventoryDefinition.find_by_item_code(inventory_definition_params[:item_code]) + # if inventory.nil? + # @inventory_definition = InventoryDefinition.new(inventory_definition_params) + # else + # @inventory_definition = InventoryDefinition.find(inventory.id) + # @inventory_definition.min_order_level = inventory_definition_params[:min_order_level] + # @inventory_definition.max_stock_level = inventory.max_stock_level.to_i + inventory_definition_params[:max_stock_level].to_i + # end + # @inventory_definition.created_by = current_user.id + # respond_to do |format| + # if @inventory_definition.save + # 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 } + # format.json { render json: @inventory_definition.errors, status: :unprocessable_entity } + # end + # end end # PATCH/PUT /inventory_definitions/1 diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb index 01e8f98f..0f4813f2 100755 --- a/app/views/inventory/inventory/_inventory_list.html.erb +++ b/app/views/inventory/inventory/_inventory_list.html.erb @@ -36,7 +36,7 @@ <% end %>