From 7bbcec91aab6eec88bbff7bbca1cd69edb97e0ae Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Wed, 31 Mar 2021 21:12:51 +0100 Subject: [PATCH] Correct spelling (#1420) --- config-dist.php | 4 ++-- middleware/AuthMiddleware.php | 2 +- public/viewjs/components/barcodescanner.js | 2 +- services/StockService.php | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config-dist.php b/config-dist.php index bc8f003e..83a7ae37 100644 --- a/config-dist.php +++ b/config-dist.php @@ -124,7 +124,7 @@ DefaultUserSetting('stock_default_consume_amount_use_quick_consume_amount', fals DefaultUserSetting('scan_mode_consume_enabled', false); DefaultUserSetting('scan_mode_purchase_enabled', false); DefaultUserSetting('show_icon_on_stock_overview_page_when_product_is_on_shopping_list', true); -DefaultUserSetting('show_purchased_date_on_purchase', false); // Wheter the purchased date should be editable on purchase (defaults to today otherwise) +DefaultUserSetting('show_purchased_date_on_purchase', false); // Whether the purchased date should be editable on purchase (defaults to today otherwise) DefaultUserSetting('show_warning_on_purchase_when_due_date_is_earlier_than_next', true); // Show a warning on purchase when the due date of the purchased product is earlier than the next due date in stock // Shopping list settings @@ -185,4 +185,4 @@ Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true); // Feature settings Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to true, opened items will be counted as missing for calculating if a product is below its minimum stock amount -Setting('FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA', true); // Enables the torch automaticaly (if the device has one) +Setting('FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA', true); // Enables the torch automatically (if the device has one) diff --git a/middleware/AuthMiddleware.php b/middleware/AuthMiddleware.php index e0d1f2f1..3b3d75f0 100644 --- a/middleware/AuthMiddleware.php +++ b/middleware/AuthMiddleware.php @@ -87,7 +87,7 @@ abstract class AuthMiddleware extends BaseMiddleware /** * @param array $postParams * @return bool True/False if the provided credentials were valid - * @throws \Exception Throws an \Exception if an error happended during credentials processing or if this AuthMiddleware doesn't provide credentials processing (e. g. handles this externally) + * @throws \Exception Throws an \Exception if an error happened during credentials processing or if this AuthMiddleware doesn't provide credentials processing (e. g. handles this externally) */ abstract public static function ProcessLogin(array $postParams); diff --git a/public/viewjs/components/barcodescanner.js b/public/viewjs/components/barcodescanner.js index b0116651..b60b8dd6 100644 --- a/public/viewjs/components/barcodescanner.js +++ b/public/viewjs/components/barcodescanner.js @@ -32,7 +32,7 @@ Grocy.Components.BarcodeScanner.CheckCapabilities = async function() Grocy.Components.BarcodeScanner.TorchOn(track); } - // Reduce the height of the video, if it's heigher than then the viewport + // Reduce the height of the video, if it's higher than then the viewport if (!Grocy.Components.BarcodeScanner.LiveVideoSizeAdjusted) { var bc = document.getElementById('barcodescanner-container'); diff --git a/services/StockService.php b/services/StockService.php index e26c6d7f..ad5ab038 100644 --- a/services/StockService.php +++ b/services/StockService.php @@ -958,8 +958,8 @@ class StockService extends BaseService if ($productDetails->product->enable_tare_weight_handling == 1) { - // Hard fail for now, as we not yet support transfering tare weight enabled products - throw new \Exception('Transfering tare weight enabled products is not yet possible'); + // Hard fail for now, as we not yet support transferring tare weight enabled products + throw new \Exception('Transferring tare weight enabled products is not yet possible'); if ($amount < floatval($productDetails->product->tare_weight)) { throw new \Exception('The amount cannot be lower than the defined tare weight'); @@ -973,7 +973,7 @@ class StockService extends BaseService if ($amount > $productStockAmountAtFromLocation) { - throw new \Exception('Amount to be transfered cannot be > current stock amount at the source location'); + throw new \Exception('Amount to be transferred cannot be > current stock amount at the source location'); } if ($specificStockEntryId !== 'default') @@ -1104,7 +1104,7 @@ class StockService extends BaseService 'amount' => $restStockAmount ]); - // The transfered amount gets into a new stock entry + // The transferred amount gets into a new stock entry $stockEntryNew = $this->getDatabase()->stock()->createRow([ 'product_id' => $stockEntry->product_id, 'amount' => $amount,