github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-09 14:06:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

productCard Fix

Browse Source
This commit is contained in:
Kurt Riddlesperger 2020-10-12 10:47:18 -05:00
parent e91bc0b01b
commit 95795a0c83
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
services/StockService.php
View File

@ -529,23 +529,41 @@ class StockService extends BaseService
$product = $this->getDatabase()->products($productId); $product = $this->getDatabase()->products($productId);
$productBarcodes = $this->getDatabase()->product_barcodes()->where('product_id', $productId)->fetchAll(); $productBarcodes = $this->getDatabase()->product_barcodes()->where('product_id', $productId)->fetchAll();
$productLastPurchased = $this->getDatabase()->products_last_purchased()->where('product_id', $productId)->fetch();
$productLastUsed = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone', 0)->max('used_date'); $productLastUsed = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone', 0)->max('used_date');
$nextBestBeforeDate = $this->getDatabase()->stock()->where('product_id', $productId)->min('best_before_date'); $nextBestBeforeDate = $this->getDatabase()->stock()->where('product_id', $productId)->min('best_before_date');
$quPurchase = $this->getDatabase()->quantity_units($product->qu_id_purchase); $quPurchase = $this->getDatabase()->quantity_units($product->qu_id_purchase);
$quStock = $this->getDatabase()->quantity_units($product->qu_id_stock); $quStock = $this->getDatabase()->quantity_units($product->qu_id_stock);
$location = $this->getDatabase()->locations($product->location_id); $location = $this->getDatabase()->locations($product->location_id);
$averageShelfLifeDays = intval($this->getDatabase()->stock_average_product_shelf_life()->where('id', $productId)->fetch()->average_shelf_life_days); $averageShelfLifeDays = intval($this->getDatabase()->stock_average_product_shelf_life()->where('id', $productId)->fetch()->average_shelf_life_days);
$lastPrice = $productLastPurchased->price;
$lastQuFactorPurchaseToStock = $productLastPurchased->qu_factor_purchase_to_stock;
$avgPrice = $this->getDatabase()->products_average_price()->where('product_id', $productId)->fetch(); $avgPrice = $this->getDatabase()->products_average_price()->where('product_id', $productId)->fetch();
$oldestPrice = $this->getDatabase()->products_oldest_stock_unit_price()->where('product_id', $productId)->fetch(); $oldestPrice = $this->getDatabase()->products_oldest_stock_unit_price()->where('product_id', $productId)->fetch();
$defaultShoppingLocation = null; $defaultShoppingLocation = null;
$lastShoppingLocation = $productLastPurchased->shopping_location_id;
$consumeCount = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone = 0 AND spoiled = 0')->sum('amount') * -1; $consumeCount = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone = 0 AND spoiled = 0')->sum('amount') * -1;
$consumeCountSpoiled = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone = 0 AND spoiled = 1')->sum('amount') * -1; $consumeCountSpoiled = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_CONSUME)->where('undone = 0 AND spoiled = 1')->sum('amount') * -1;
$productLastPurchased = $this->getDatabase()->products_last_purchased()->where('product_id', $productId)->fetch();
$lastPrice = null;
$lastQuFactorPurchaseToStock = null;
$lastShoppingLocation = null;
$lastPurchased = null;
if ($productLastPurchased != null)
{
$lastPrice = $productLastPurchased->price;
$lastQuFactorPurchaseToStock = $productLastPurchased->qu_factor_purchase_to_stock;
$lastShoppingLocation = $productLastPurchased->shopping_location_id;
$lastPurchased= $productLastPurchased->purchased_date;
}
if ($avgPrice != null)
{
$avgPrice = $avgPrice->price;
}
if ($oldestPrice != null)
{
$oldestPrice = $oldestPrice->price;
}
if ($consumeCount == 0) if ($consumeCount == 0)
{ {
$consumeCount = 1; $consumeCount = 1;
@ -556,7 +574,7 @@ class StockService extends BaseService
return [ return [
'product' => $product, 'product' => $product,
'product_barcodes' => $productBarcodes, 'product_barcodes' => $productBarcodes,
'last_purchased' => $productLastPurchased->purchased_date, 'last_purchased' => $lastPurchased,
'last_used' => $productLastUsed, 'last_used' => $productLastUsed,
'stock_amount' => $stockCurrentRow->amount, 'stock_amount' => $stockCurrentRow->amount,
'stock_factor_purchase_amount' => $stockCurrentRow->factor_purchase_amount, 'stock_factor_purchase_amount' => $stockCurrentRow->factor_purchase_amount,
@ -568,8 +586,8 @@ class StockService extends BaseService
'quantity_unit_stock' => $quStock, 'quantity_unit_stock' => $quStock,
'last_price' => $lastPrice, 'last_price' => $lastPrice,
'last_qu_factor_purchase_to_stock' => $lastQuFactorPurchaseToStock, 'last_qu_factor_purchase_to_stock' => $lastQuFactorPurchaseToStock,
'avg_price' => $avgPrice->price, 'avg_price' => $averagePrice,
'oldest_price' => $oldestPrice->price, 'oldest_price' => $oldestPrice,
'last_shopping_location_id' => $lastShoppingLocation, 'last_shopping_location_id' => $lastShoppingLocation,
'default_shopping_location_id' => $product->shopping_location_id, 'default_shopping_location_id' => $product->shopping_location_id,
'next_best_before_date' => $nextBestBeforeDate, 'next_best_before_date' => $nextBestBeforeDate,