Pull from master

app/controllers/inventory/inventory_controller.rb

@@ -1,8 +1,36 @@
 class Inventory::InventoryController < BaseInventoryController
-   load_and_authorize_resource
-   def index
-     @products = InventoryDefinition.all.active.order('created_at desc') 
-   end
+  load_and_authorize_resource
+  def index
+    least_stock = "SELECT (CASE WHEN SIGN(MIN(stock_journals.balance)) > 0
+                  THEN MIN(stock_journals.balance) WHEN stock_journals.remark NOT LIKE '%out of stock%'
+                                THEN (SELECT balance FROM stock_journals
+                                  WHERE item_code = inventory_definitions.item_code
+                                        AND remark NOT LIKE '%out of stock%'
+                                      ORDER BY created_at DESC LIMIT 1) ELSE 0 END)
+                                      FROM stock_journals
+                                        WHERE stock_journals.item_code = inventory_definitions.item_code
+                                      ORDER BY stock_journals.created_at DESC"
+
+    @inventory_definitions = InventoryDefinition.select("inventory_definitions.*,
+   							(CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit,
+   							(CASE WHEN sj.debit IS NULL THEN 0 ELSE sj.debit END) as debit,
+   							(#{least_stock}) as balance")
+   							.joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id")
+   							.group("inventory_definitions.item_code")
+                .order("(CASE WHEN sj.balance > 0 THEN MIN(sj.balance) ELSE NULL END )")
+
+  end
+
+  def show
+    inventory_definition_id = params[:inventory_definition_id]
+    inventory = InventoryDefinition.find(inventory_definition_id)
+
+    @stock_journals = StockJournal.where(item_code: inventory.item_code)
+    respond_to do |format|
+      format.html
+      format.xls
+    end
+  end
 
    	#Shop Name in Navbor
 	helper_method :shop_detail

app/controllers/inventory/inventory_definitions_controller.rb

@@ -24,7 +24,14 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
   # POST /inventory_definitions
   # POST /inventory_definitions.json
   def create
-    @inventory_definition = InventoryDefinition.new(inventory_definition_params)
+    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