diff --git a/js/components/barcodescanner.js b/js/components/barcodescanner.js index 96864d8e..b5466142 100644 --- a/js/components/barcodescanner.js +++ b/js/components/barcodescanner.js @@ -286,7 +286,7 @@ class barcodescanner return; } - this.CheckCapabilities(); + self.CheckCapabilities(); Quagga.start(); }); diff --git a/views/quantityunitform.blade.php b/views/quantityunitform.blade.php index 559b1680..8373690a 100644 --- a/views/quantityunitform.blade.php +++ b/views/quantityunitform.blade.php @@ -11,7 +11,7 @@ @section('grocyConfigProps') EditMode: '{{ $mode }}', @if($mode == 'edit') -GrocyConfig.EditObjectId: {{ $quantityUnit->id }}, +EditObjectId: {{ $quantityUnit->id }}, @endif @endsection diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php index 9dabacfe..a146bfd5 100644 --- a/views/recipeform.blade.php +++ b/views/recipeform.blade.php @@ -11,9 +11,9 @@ @section('grocyConfigProps') EditMode: '{{ $mode }}', @if($mode == 'edit') - GrocyConfig.EditObjectId: {{ $recipe->id }}, + EditObjectId: {{ $recipe->id }}, @endif - QuantityUnits: {!! json_encode($quantityUnits) !!}, + QuantityUnits: {!! json_encode($quantityunits) !!}, QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, DefaultMinAmount: '{{$DEFAULT_MIN_AMOUNT}}', diff --git a/views/recipeposform.blade.php b/views/recipeposform.blade.php index adc39aea..18f7f5b6 100644 --- a/views/recipeposform.blade.php +++ b/views/recipeposform.blade.php @@ -13,7 +13,7 @@ EditObjectParentId: {{ $recipe->id }}, EditObject: {!! json_encode($recipePos) !!}, @if($mode == 'edit') - GrocyConfig.EditObjectId: {{ $recipePos->id }}, + EditObjectId: {{ $recipePos->id }}, @endif QuantityUnits: {!! json_encode($quantityUnits) !!}, QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, diff --git a/views/shoppinglistform.blade.php b/views/shoppinglistform.blade.php index 37064da6..343fae82 100644 --- a/views/shoppinglistform.blade.php +++ b/views/shoppinglistform.blade.php @@ -11,7 +11,7 @@ @section('grocyConfigProps') EditMode: '{{ $mode }}', @if($mode == 'edit') -GrocyConfig.EditObjectId: {{ $shoppingList->id }}, +EditObjectId: {{ $shoppingList->id }}, @endif @endsection diff --git a/views/shoppinglistitemform.blade.php b/views/shoppinglistitemform.blade.php index c640d3fb..5c34b400 100644 --- a/views/shoppinglistitemform.blade.php +++ b/views/shoppinglistitemform.blade.php @@ -11,7 +11,7 @@ @section('grocyConfigProps') EditMode: '{{ $mode }}', @if($mode == 'edit') - GrocyConfig.EditObjectId: {{ $listItem->id }}, + EditObjectId: {{ $listItem->id }}, @endif QuantityUnits: {!! json_encode($quantityUnits) !!}, QuantityUnitConversionsResolved: {!! json_encode($quantityUnitConversionsResolved) !!}, @@ -26,8 +26,12 @@