mirror of
https://github.com/grocy/grocy.git
synced 2025-04-29 09:39:57 +00:00
2471e78188
* Grocycode: Productpicker, StockService * Grocycode: Datamatrix generation * Grocycode: Display in UI, make Images downloadable * Grocycode: Do not show on product card * Grocycode: Stockentry Label view * Grocycode: Webhooks & Labelprinter Feature * Grocycode: Manual Label printing * Grocycode: Print Label from product form * Quagga2: use zxing for DataMatrix recognition * Grocycode: Default settings for label printing * Prepare merge of master * Grocycode: docs * Docs: label printing webhook * Review - "grocy" is currently written lower-case everywhere, so let's do this also for "grocycode" - Unified phrases / capitalization - Minor UI adjustments (mainly context menu item ordering / ordering/spacing on product edit page) - Documented API changes for Swagger UI (grocy.openapi.json) - Reverted German localizations (those are managed via Transifex; would cause conflicts when manually edited - will import them later there) - Reverted a somehow messed up localization string (productform/help text for `cumulate_min_stock_amount_of_sub_products`) - Suppress deprecation warnings when generating Datamatrix PNG (otherwise the PNG is invalid, https://github.com/jucksearm/php-barcode/issues/3) - Default `FEATURE_FLAG_LABELPRINTER` to disabled Co-authored-by: Bernd Bestel <bernd@berrnd.de>
28 lines
714 B
PHP
28 lines
714 B
PHP
@if (!GROCY_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING)
|
|
|
|
@push('componentScripts')
|
|
<script src="{{ $U('/viewjs/components/barcodescanner.js', true) }}?v={{ $version }}"></script>
|
|
@endpush
|
|
|
|
@push('pageScripts')
|
|
<script src="{{ $U('/node_modules/@ericblade/quagga2/dist/quagga.min.js?v=', true) }}{{ $version }}"></script>
|
|
<script src="{{ $U('/components_unmanaged/quagga2-reader-datamatrix/index.js', true) }}?v={{ $version }}"></script>
|
|
@endpush
|
|
|
|
@push('pageStyles')
|
|
<style>
|
|
#barcodescanner-start-button {
|
|
position: absolute;
|
|
right: 0;
|
|
margin-top: 4px;
|
|
margin-right: 5px;
|
|
cursor: pointer;
|
|
}
|
|
|
|
.combobox-container #barcodescanner-start-button {
|
|
margin-right: 36px !important;
|
|
}
|
|
</style>
|
|
@endpush
|
|
|
|
@endif |