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

Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
phyusin
2018-08-17 17:58:36 +06:30
parent 14e63dbadd dee3c89ad3
commit ad5815b23e
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ class Inventory::InventoryController < BaseInventoryController
least_stock = "SELECT (CASE WHEN SIGN(MIN(stock_journals.balance)) > 0 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 MIN(stock_journals.balance) WHEN stock_journals.remark NOT LIKE '%out of stock%'
THEN (SELECT balance FROM stock_journals THEN (SELECT balance FROM stock_journals
WHERE item_code = inventory_definitions.item_code AND balance > 0 WHERE item_code = inventory_definitions.item_code
AND remark NOT LIKE '%out of stock%' AND remark NOT LIKE '%out of stock%'
ORDER BY created_at DESC LIMIT 1) ELSE 0 END) ORDER BY created_at DESC LIMIT 1) ELSE 0 END)
FROM stock_journals FROM stock_journals

12
app/models/inventory_definition.rb
View File

@@ -45,11 +45,19 @@ class InventoryDefinition < ApplicationRecord
def self.modify_balance(item, stock, inventory_definition) #saleitemObj def self.modify_balance(item, stock, inventory_definition) #saleitemObj
if stock.balance.to_i >= item.qty if stock.balance.to_i >= item.qty
puts ">> stock is greater than orde qty" puts ">> stock is greater than order qty"
StockJournal.add_to_journal(item, stock.balance, "ok", inventory_definition) StockJournal.add_to_journal(item, stock.balance, "ok", inventory_definition)
else else
puts " << stock is less than order qty" puts " << stock is less than order qty"
StockJournal.add_to_journal(item, stock.balance, "out of stock", inventory_definition) item_data = item
if stock.balance.to_i > 0
item_data.qty = item.qty.to_i - stock.balance.to_i
StockJournal.add_to_journal(item_data, stock.balance, "out of stock", inventory_definition)
item.qty = stock.balance.to_i
StockJournal.add_to_journal(item, stock.balance, "ok", inventory_definition)
else
StockJournal.add_to_journal(item_data, stock.balance, "out of stock", inventory_definition)
end
end end
end end
end end