kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 01:55:47 +00:00
Code Issues Projects Releases Wiki Activity

Correct spelling (#1420)

Browse Source
This commit is contained in:
Edward Betts 2021-03-31 21:12:51 +01:00 committed by GitHub
parent c483c34598
commit 7bbcec91aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config-dist.php
View File

@ -124,7 +124,7 @@ DefaultUserSetting('stock_default_consume_amount_use_quick_consume_amount', fals
DefaultUserSetting('scan_mode_consume_enabled', false); DefaultUserSetting('scan_mode_consume_enabled', false);
DefaultUserSetting('scan_mode_purchase_enabled', false); DefaultUserSetting('scan_mode_purchase_enabled', false);
DefaultUserSetting('show_icon_on_stock_overview_page_when_product_is_on_shopping_list', true); 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 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 // Shopping list settings
@ -185,4 +185,4 @@ Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
// Feature settings // 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_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)

2
middleware/AuthMiddleware.php
View File

@ -87,7 +87,7 @@ abstract class AuthMiddleware extends BaseMiddleware
/** /**
* @param array $postParams * @param array $postParams
* @return bool True/False if the provided credentials were valid * @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); abstract public static function ProcessLogin(array $postParams);

2
public/viewjs/components/barcodescanner.js
View File

@ -32,7 +32,7 @@ Grocy.Components.BarcodeScanner.CheckCapabilities = async function()
Grocy.Components.BarcodeScanner.TorchOn(track); 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) if (!Grocy.Components.BarcodeScanner.LiveVideoSizeAdjusted)
{ {
var bc = document.getElementById('barcodescanner-container'); var bc = document.getElementById('barcodescanner-container');

8
services/StockService.php
View File

@ -958,8 +958,8 @@ class StockService extends BaseService
if ($productDetails->product->enable_tare_weight_handling == 1) if ($productDetails->product->enable_tare_weight_handling == 1)
{ {
// Hard fail for now, as we not yet support transfering tare weight enabled products // Hard fail for now, as we not yet support transferring tare weight enabled products
throw new \Exception('Transfering tare weight enabled products is not yet possible'); throw new \Exception('Transferring tare weight enabled products is not yet possible');
if ($amount < floatval($productDetails->product->tare_weight)) if ($amount < floatval($productDetails->product->tare_weight))
{ {
throw new \Exception('The amount cannot be lower than the defined 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) 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') if ($specificStockEntryId !== 'default')
@ -1104,7 +1104,7 @@ class StockService extends BaseService
'amount' => $restStockAmount '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([ $stockEntryNew = $this->getDatabase()->stock()->createRow([
'product_id' => $stockEntry->product_id, 'product_id' => $stockEntry->product_id,
'amount' => $amount, 'amount' => $amount,