git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove conflict

Browse Source
This commit is contained in:
phyusin
2018-08-20 12:08:51 +06:30
parent d486bcc0d2
commit a2fd489ec4
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/inventory/inventory_controller.rb
View File

@@ -1,17 +1,6 @@
class Inventory::InventoryController < BaseInventoryController class Inventory::InventoryController < BaseInventoryController
load_and_authorize_resource load_and_authorize_resource
def index def index
<<<<<<< HEAD
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"
=======
least_stock = "SELECT (CASE WHEN stock_journals.remark != 'out of stock' least_stock = "SELECT (CASE WHEN stock_journals.remark != 'out of stock'
THEN (SELECT balance FROM stock_journals THEN (SELECT balance FROM stock_journals
WHERE item_code = inventory_definitions.item_code WHERE item_code = inventory_definitions.item_code
@@ -19,7 +8,6 @@ class Inventory::InventoryController < BaseInventoryController
FROM stock_journals FROM stock_journals
WHERE stock_journals.item_code = inventory_definitions.item_code AND stock_journals.remark != 'out of stock' WHERE stock_journals.item_code = inventory_definitions.item_code AND stock_journals.remark != 'out of stock'
ORDER BY stock_journals.created_at DESC LIMIT 1" ORDER BY stock_journals.created_at DESC LIMIT 1"
>>>>>>> 49fd42722569262f77fc3bb0eed76195fd6cfe9d
@inventory_definitions = InventoryDefinition.select("inventory_definitions.*, @inventory_definitions = InventoryDefinition.select("inventory_definitions.*,
(CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit, (CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit,