kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-09-18 10:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Added option to include details in the webhook sent to label printers (#2704)

Browse Source 
* Added option to include details in the webhook sent to label printers

* Removed LABEL_PRINTER_INCLUDE_DETAILS flag

* Make this actually work

* Care about all places where webhooks are used / don't forget recipes

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
This commit is contained in:
Fándly Gergő
2025-03-21 17:34:33 +02:00
committed by GitHub
parent 541318e964
commit 89b8a9c1a9
5 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/BatteriesApiController.php
View File

@@ -69,11 +69,12 @@ class BatteriesApiController extends BaseApiController
{ {
try try
{ {
$battery = $this->getDatabase()->batteries()->where('id', $args['batteryId'])->fetch(); $batteryDetails = (object)$this->getBatteriesService()->GetBatteryDetails($args['batteryId']);
$webhookData = array_merge([ $webhookData = array_merge([
'battery' => $battery->name, 'battery' => $batteryDetails->battery->name,
'grocycode' => (string)(new Grocycode(Grocycode::BATTERY, $args['batteryId'])), 'grocycode' => (string)(new Grocycode(Grocycode::BATTERY, $args['batteryId'])),
'details' => $batteryDetails,
], GROCY_LABEL_PRINTER_PARAMS); ], GROCY_LABEL_PRINTER_PARAMS);
if (GROCY_LABEL_PRINTER_RUN_SERVER) if (GROCY_LABEL_PRINTER_RUN_SERVER)

5
controllers/ChoresApiController.php
View File

@@ -120,11 +120,12 @@ class ChoresApiController extends BaseApiController
{ {
try try
{ {
$chore = $this->getDatabase()->chores()->where('id', $args['choreId'])->fetch(); $choreDetails = (object)$this->getChoresService()->GetChoreDetails($args['choreId']);
$webhookData = array_merge([ $webhookData = array_merge([
'chore' => $chore->name, 'chore' => $choreDetails->chore->name,
'grocycode' => (string)(new Grocycode(Grocycode::CHORE, $args['choreId'])), 'grocycode' => (string)(new Grocycode(Grocycode::CHORE, $args['choreId'])),
'details' => $choreDetails,
], GROCY_LABEL_PRINTER_PARAMS); ], GROCY_LABEL_PRINTER_PARAMS);
if (GROCY_LABEL_PRINTER_RUN_SERVER) if (GROCY_LABEL_PRINTER_RUN_SERVER)

1
controllers/RecipesApiController.php
View File

@@ -90,6 +90,7 @@ class RecipesApiController extends BaseApiController
$webhookData = array_merge([ $webhookData = array_merge([
'recipe' => $recipe->name, 'recipe' => $recipe->name,
'grocycode' => (string)(new Grocycode(Grocycode::RECIPE, $args['recipeId'])), 'grocycode' => (string)(new Grocycode(Grocycode::RECIPE, $args['recipeId'])),
'details' => $recipe
], GROCY_LABEL_PRINTER_PARAMS); ], GROCY_LABEL_PRINTER_PARAMS);
if (GROCY_LABEL_PRINTER_RUN_SERVER) if (GROCY_LABEL_PRINTER_RUN_SERVER)

13
controllers/StockApiController.php
View File

@@ -672,11 +672,12 @@ class StockApiController extends BaseApiController
{ {
try try
{ {
$product = $this->getDatabase()->products()->where('id', $args['productId'])->fetch(); $productDetails = (object)$this->getStockService()->GetProductDetails($args['productId']);
$webhookData = array_merge([ $webhookData = array_merge([
'product' => $product->name, 'product' => $productDetails->product->name,
'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $product->id)), 'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $productDetails->product->id)),
'details' => $productDetails,
], GROCY_LABEL_PRINTER_PARAMS); ], GROCY_LABEL_PRINTER_PARAMS);
if (GROCY_LABEL_PRINTER_RUN_SERVER) if (GROCY_LABEL_PRINTER_RUN_SERVER)
@@ -697,11 +698,13 @@ class StockApiController extends BaseApiController
try try
{ {
$stockEntry = $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(); $stockEntry = $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch();
$product = $this->getDatabase()->products()->where('id', $stockEntry->product_id)->fetch(); $productDetails = (object)$this->getStockService()->GetProductDetails($stockEntry->product_id);
$webhookData = array_merge([ $webhookData = array_merge([
'product' => $product->name, 'product' => $productDetails->product->name,
'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $stockEntry->product_id, [$stockEntry->stock_id])), 'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $stockEntry->product_id, [$stockEntry->stock_id])),
'details' => $productDetails,
'stock_entry' => $stockEntry,
], GROCY_LABEL_PRINTER_PARAMS); ], GROCY_LABEL_PRINTER_PARAMS);
if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)

8
services/StockService.php
View File

@@ -227,6 +227,8 @@ class StockService extends BaseService
$webhookData = array_merge([ $webhookData = array_merge([
'product' => $productDetails->product->name, 'product' => $productDetails->product->name,
'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $productId, [$stockId])), 'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $productId, [$stockId])),
'details' => $productDetails,
'stock_entry' => $stockRow,
], GROCY_LABEL_PRINTER_PARAMS); ], GROCY_LABEL_PRINTER_PARAMS);
if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
@@ -278,6 +280,8 @@ class StockService extends BaseService
$webhookData = array_merge([ $webhookData = array_merge([
'product' => $productDetails->product->name, 'product' => $productDetails->product->name,
'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $productId, [$stockId])), 'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $productId, [$stockId])),
'details' => $productDetails,
'stock_entry' => $stockRow,
], GROCY_LABEL_PRINTER_PARAMS); ], GROCY_LABEL_PRINTER_PARAMS);
if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
@@ -1009,6 +1013,8 @@ class StockService extends BaseService
$webhookData = array_merge([ $webhookData = array_merge([
'product' => $productDetails->product->name, 'product' => $productDetails->product->name,
'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $productId, [$stockEntry->stock_id])), 'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $productId, [$stockEntry->stock_id])),
'details' => $productDetails,
'stock_entry' => $stockEntry,
], GROCY_LABEL_PRINTER_PARAMS); ], GROCY_LABEL_PRINTER_PARAMS);
if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
@@ -1321,6 +1327,8 @@ class StockService extends BaseService
$webhookData = array_merge([ $webhookData = array_merge([
'product' => $productDetails->product->name, 'product' => $productDetails->product->name,
'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $productId, [$stockEntry->stock_id])), 'grocycode' => (string)(new Grocycode(Grocycode::PRODUCT, $productId, [$stockEntry->stock_id])),
'details' => $productDetails,
'stock_entry' => $stockEntry,
], GROCY_LABEL_PRINTER_PARAMS); ], GROCY_LABEL_PRINTER_PARAMS);
if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) if (GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)