mirror of
https://github.com/grocy/grocy.git
synced 2026-04-05 20:36:15 +02:00
This *absolute commit monster* does the following things: - Introduce gulp to build javascript and css files. This includes moving node_modules out of the public/ folder. Use `gulp --tasks` to get a list of all tasks; however some of them are automatically generated. Use `gulp live` to watch for changes and automatically recompile what's needed. - Upgrade to yarn2 - Upgrade FullCalendar to 4.4.2 I know that 5.x is the current version, but two major version upgrades are too much right now. Also v5 would break any custom css as they renamed a bunch of classes. - Move Styles to sass (Most) global styles are now included in one sass file. This also means that we now compile our own bootstrap. - Javascript is now in strict mode Because everything is a module now, `use strict` is now in effect for all javascript files. There are probably still some parts left where implicit variable declarations were used. - grocy*.js were split up in modules. `window.Grocy` is now an instance of GrocyClass. API-wise nothing has changed (albeit some functions were added regarding Undo actions) At the Moment, this leaks a whole bunch of functions into window (that was easier than tracking those down). - FindObjectIn... style functions were removed. Array.prototype.find and Array.prototype.filter suffice. - Use babel to preprocess javascript. - Use rollup to bundle javascript. rollup bundles and tree-shakes es6 javascript bundles. It also allows to "import" css files and generate css files specific to this javascript file. This is used in viewjs scripts, for example when importing FullCalendar, to generate an associated viewcss file. - Use postcss to post-process css files. postcss uses autoprefixer to handle browser compatiblity. Internally this uses the package `browserslist`; and is currently configured to the default setting. - Minify assets when building in production `gulp publish` builds all assets in production mode, that is, the assets get minified. This includes javascript as well as css files. - css bundling concatCss is used to pull @imports of non-sass-files into one grocy.css - animate.css is now in the main bundle animate.css was used in so many places that it is now located in the main style bundle.
151 lines
5.1 KiB
PHP
151 lines
5.1 KiB
PHP
@extends('layout.default')
|
|
|
|
@section('title', $__t('Consume'))
|
|
@section('activeNav', 'consume')
|
|
@section('viewJsName', 'consume')
|
|
|
|
@section('content')
|
|
<script>
|
|
GrocyConfig.QuantityUnits = {!! json_encode($quantityUnits) !!};
|
|
GrocyConfig.QuantityUnitConversionsResolved = {!! json_encode($quantityUnitConversionsResolved) !!};
|
|
GrocyConfig.DefaultMinAmount = '{{$DEFAULT_MIN_AMOUNT}}';
|
|
</script>
|
|
|
|
<div class="row">
|
|
<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
|
|
<div class="title-related-links">
|
|
<h2 class="title">@yield('title')</h2>
|
|
<button class="btn btn-outline-dark d-md-none mt-2 float-right order-1 order-md-3 hide-when-embedded"
|
|
type="button"
|
|
data-toggle="collapse"
|
|
data-target="#related-links">
|
|
<i class="fas fa-ellipsis-v"></i>
|
|
</button>
|
|
<div class="related-links collapse d-md-flex order-2 width-xs-sm-100"
|
|
id="related-links">
|
|
@if(!$embedded)
|
|
<button id="scan-mode-button"
|
|
class="btn @if(boolval($userSettings['scan_mode_consume_enabled'])) btn-success @else btn-danger @endif m-1 mt-md-0 mb-md-0 float-right"
|
|
data-toggle="tooltip"
|
|
title="{{ $__t('When enabled, after changing/scanning a product and if all fields could be automatically populated (by product and/or barcode defaults), the transaction is automatically submitted') }}">{{ $__t('Scan mode') }} <span id="scan-mode-status">@if(boolval($userSettings['scan_mode_consume_enabled'])) {{ $__t('on') }} @else {{ $__t('off') }} @endif</span></button>
|
|
<input id="scan-mode"
|
|
type="checkbox"
|
|
class="d-none user-setting-control"
|
|
data-setting-key="scan_mode_consume_enabled"
|
|
@if(boolval($userSettings['scan_mode_consume_enabled']))
|
|
checked
|
|
@endif>
|
|
@else
|
|
<script>
|
|
Grocy.UserSettings.scan_mode_consume_enabled = false;
|
|
</script>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
|
|
<hr class="my-2">
|
|
|
|
<form id="consume-form"
|
|
novalidate>
|
|
|
|
@include('components.productpicker', array(
|
|
'products' => $products,
|
|
'barcodes' => $barcodes,
|
|
'nextInputSelector' => '#amount',
|
|
'disallowAddProductWorkflows' => true
|
|
))
|
|
|
|
<div id="consume-exact-amount-group"
|
|
class="form-group d-none">
|
|
<div class="custom-control custom-checkbox">
|
|
<input class="form-check-input custom-control-input"
|
|
type="checkbox"
|
|
id="consume-exact-amount"
|
|
name="consume-exact-amount"
|
|
value="1">
|
|
<label class="form-check-label custom-control-label"
|
|
for="consume-exact-amount">{{ $__t('Consume exact amount') }}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
|
|
@include('components.productamountpicker', array(
|
|
'value' => 1,
|
|
'additionalHtmlContextHelp' => '<div id="tare-weight-handling-info"
|
|
class="text-info font-italic d-none">' . $__t('Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated') . '</div>'
|
|
))
|
|
|
|
<div class="form-group @if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif">
|
|
<label for="location_id">{{ $__t('Location') }}</label>
|
|
<select required
|
|
class="custom-control custom-select location-combobox"
|
|
id="location_id"
|
|
name="location_id">
|
|
<option></option>
|
|
@foreach($locations as $location)
|
|
<option value="{{ $location->id }}">{{ $location->name }}</option>
|
|
@endforeach
|
|
</select>
|
|
<div class="invalid-feedback">{{ $__t('A location is required') }}</div>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<div class="custom-control custom-checkbox">
|
|
<input class="form-check-input custom-control-input"
|
|
type="checkbox"
|
|
id="spoiled"
|
|
name="spoiled"
|
|
value="1">
|
|
<label class="form-check-label custom-control-label"
|
|
for="spoiled">{{ $__t('Spoiled') }}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<div class="custom-control custom-checkbox">
|
|
<input class="form-check-input custom-control-input"
|
|
type="checkbox"
|
|
id="use_specific_stock_entry"
|
|
name="use_specific_stock_entry"
|
|
value="1">
|
|
<label class="form-check-label custom-control-label"
|
|
for="use_specific_stock_entry">{{ $__t('Use a specific stock item') }}
|
|
<i class="fas fa-question-circle text-muted"
|
|
data-toggle="tooltip"
|
|
title="{{ $__t('The first item in this list would be picked by the default rule which is "Opened first, then first due first, then first in first out"') }}"></i>
|
|
</label>
|
|
</div>
|
|
<select disabled
|
|
class="custom-control custom-select mt-2"
|
|
id="specific_stock_entry"
|
|
name="specific_stock_entry">
|
|
<option></option>
|
|
</select>
|
|
</div>
|
|
|
|
@if (GROCY_FEATURE_FLAG_RECIPES)
|
|
@include('components.recipepicker', array(
|
|
'recipes' => $recipes,
|
|
'isRequired' => false,
|
|
'hint' => $__t('This is for statistical purposes only')
|
|
))
|
|
@endif
|
|
|
|
<button id="save-consume-button"
|
|
class="btn btn-success">{{ $__t('OK') }}</button>
|
|
|
|
@if(GROCY_FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING)
|
|
<button id="save-mark-as-open-button"
|
|
class="btn btn-secondary permission-STOCK_OPEN">{{ $__t('Mark as opened') }}</button>
|
|
@endif
|
|
|
|
</form>
|
|
</div>
|
|
|
|
<div class="col-xs-12 col-md-6 col-xl-4 hide-when-embedded">
|
|
@include('components.productcard')
|
|
</div>
|
|
</div>
|
|
@stop
|