From ea2b7996d13e8dfe1736ea5916665547d1edd828 Mon Sep 17 00:00:00 2001
From: David Mott <lowlee@lowlee.info>
Date: Wed, 18 Aug 2021 18:41:21 +1000
Subject: [PATCH] fix: add variable definition and reorder args used in
 ConsumeProduct

---
 controllers/StockApiController.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/controllers/StockApiController.php b/controllers/StockApiController.php
index 86c54b91..9b0ec84e 100644
--- a/controllers/StockApiController.php
+++ b/controllers/StockApiController.php
@@ -278,14 +278,14 @@ class StockApiController extends BaseApiController
 			}
 
 			$specificStockEntryId = 'default';
-			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
-			{
-				$specificStockEntryId = $requestBody['stock_entry_id'];
-			}
-			elseif (array_key_exists('stock_id', $args) && !empty($args['stock_id']))
+			if (array_key_exists('stock_id', $args) && !empty($args['stock_id']))
 			{
 				$specificStockEntryId = $args['stock_id'];
 			}
+			elseif (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_id'];
+			}
 
 			$locationId = null;
 			if (array_key_exists('location_id', $requestBody) && !empty($requestBody['location_id']) && is_numeric($requestBody['location_id']))
@@ -326,6 +326,7 @@ class StockApiController extends BaseApiController
 	{
 		try
 		{
+			$barcode = $args['barcode'];
 			if (Grocycode::Validate($barcode))
 			{
 				$gc = new Grocycode($barcode);