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

avg_price and oldest_price in product details

Browse Source
This commit is contained in:
Kurt Riddlesperger 2020-04-18 23:03:00 -05:00
parent 160807aca0
commit e6c54d61d0
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
grocy.openapi.json
View File

@ -3828,6 +3828,14 @@
"type": "number", "type": "number",
"format": "number" "format": "number"
}, },
"avg_price": {
"type": "number",
"format": "number"
},
"oldest_price": {
"type": "number",
"format": "number"
},
"last_shopping_location_id": { "last_shopping_location_id": {
"type": "integer" "type": "integer"
}, },
@ -3886,6 +3894,8 @@
"plural_forms": null "plural_forms": null
}, },
"last_price": null, "last_price": null,
"avg_price": null,
"oldest_price": null,
"last_shopping_location_id": null, "last_shopping_location_id": null,
"next_best_before_date": "2019-07-07", "next_best_before_date": "2019-07-07",
"location": { "location": {

22
services/StockService.php
View File

@ -113,25 +113,19 @@ class StockService extends BaseService
} }
$product = $this->getDatabase()->products($productId); $product = $this->getDatabase()->products($productId);
$productLastPurchased = $this->getDatabase()->stock_log()->where('product_id', $productId)->where('transaction_type', self::TRANSACTION_TYPE_PURCHASE)->where('undone', 0)->max('purchased_date'); $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;
$lastPrice = null; $lastQuFactorPurchaseToStock = $productLastPurchased->qu_factor_purchase_to_stock;
$lastQuFactorPurchaseToStock = null; $avgPrice = $this->getDatabase()->products_average_price()->where('product_id', $productId)->fetch();
$oldestPrice = $this->getDatabase()->products_oldest_stock_unit_price()->where('product_id', $productId)->fetch();
$defaultShoppingLocation = null; $defaultShoppingLocation = null;
$lastShoppingLocation = null; $lastShoppingLocation = $productLastPurchased->shopping_location_id;
$lastLogRow = $this->getDatabase()->stock_log()->where('product_id = :1 AND transaction_type IN (:2, :3) AND undone = 0', $productId, self::TRANSACTION_TYPE_PURCHASE, self::TRANSACTION_TYPE_INVENTORY_CORRECTION)->orderBy('row_created_timestamp', 'DESC')->limit(1)->fetch();
if ($lastLogRow !== null && !empty($lastLogRow))
{
$lastPrice = $lastLogRow->price;
$lastQuFactorPurchaseToStock = $lastLogRow->qu_factor_purchase_to_stock;
$lastShoppingLocation = $lastLogRow->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;
@ -143,7 +137,7 @@ class StockService extends BaseService
return array( return array(
'product' => $product, 'product' => $product,
'last_purchased' => $productLastPurchased, 'last_purchased' => $productLastPurchased->purchased_date,
'last_used' => $productLastUsed, 'last_used' => $productLastUsed,
'stock_amount' => $stockCurrentRow->amount, 'stock_amount' => $stockCurrentRow->amount,
'stock_value' => $stockCurrentRow->value, 'stock_value' => $stockCurrentRow->value,
@ -154,6 +148,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,
'oldest_price' => $oldestPrice->price,
'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,