mirror of
				https://github.com/grocy/grocy.git
				synced 2025-10-29 06:45:38 +00:00 
			
		
		
		
	* viewjs consume: implement location and update stock specific * Transfer Products * services StockService#GetProductStockEntriesByLocation: add method * services StockService#AddProduct: check for stock and locations * services StockService: include location_id * services StockService#LocationExists: add method * services StockService#UndoBooking: fix based on stockRow * Reimplement StockServer->TransferProduct (one loop for the whole action to preserve stock_id) * Ensure that the location_id is never NULL in the stock and stock_log table (checked by an INSERT trigger, sets the products default location if empty) * Only consider stock amount at the given location on consume, if supplied * Restore more/old display text for "specific stock entry" * Don't allow transfering tare weight enabled products * Various small changes (code style, missing OpenAPI endpoint, remove location_id null checking) * Updated translations strings * Added transaction_id and correlation_id to stock_log entries to group them together * ProductCard - location to default location label change * Also undo correlated bookings on undo * Added API endpoints for listing and undoing transactions and use them on purchase/consume/inventory/stockoverview * Initial Stock detail page * Allow Undo for Tranfers * Price step to .01 * Some localization string changes & fixes
		
			
				
	
	
		
			92 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
			
		
		
	
	
			92 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
| @extends('layout.default')
 | |
| 
 | |
| @section('title', $__t('Inventory'))
 | |
| @section('activeNav', 'inventory')
 | |
| @section('viewJsName', 'inventory')
 | |
| 
 | |
| @section('content')
 | |
| <div class="row">
 | |
| 	<div class="col-xs-12 col-md-6 col-xl-4 pb-3">
 | |
| 		<h1>@yield('title')</h1>
 | |
| 
 | |
| 		<form id="inventory-form" novalidate>
 | |
| 
 | |
| 			@include('components.productpicker', array(
 | |
| 				'products' => $products,
 | |
| 				'nextInputSelector' => '#new_amount'
 | |
| 			))
 | |
| 
 | |
| 			@include('components.numberpicker', array(
 | |
| 				'id' => 'new_amount',
 | |
| 				'label' => 'New amount',
 | |
| 				'hintId' => 'new_amount_qu_unit',
 | |
| 				'min' => 0,
 | |
| 				'value' => 1,
 | |
| 				'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
 | |
| 				'additionalAttributes' => 'data-not-equal="-1"',
 | |
| 				'additionalHtmlElements' => '<div id="inventory-change-info" class="form-text text-muted small d-none"></div>',
 | |
| 				'additionalHtmlContextHelp' => '<div id="tare-weight-handling-info" class="text-small 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>'
 | |
| 			))
 | |
| 			
 | |
| 			@php
 | |
| 				$additionalGroupCssClasses = '';
 | |
| 				if (!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING)
 | |
| 				{
 | |
| 					$additionalGroupCssClasses = 'd-none';
 | |
| 				}
 | |
| 			@endphp
 | |
| 			@include('components.datetimepicker', array(
 | |
| 				'id' => 'best_before_date',
 | |
| 				'label' => 'Best before',
 | |
| 				'hint' => 'This will apply to added products',
 | |
| 				'format' => 'YYYY-MM-DD',
 | |
| 				'initWithNow' => false,
 | |
| 				'limitEndToNow' => false,
 | |
| 				'limitStartToNow' => false,
 | |
| 				'invalidFeedback' => $__t('A best before date is required'),
 | |
| 				'nextInputSelector' => '#best_before_date',
 | |
| 				'additionalGroupCssClasses' => 'date-only-datetimepicker',
 | |
| 				'shortcutValue' => '2999-12-31',
 | |
| 				'shortcutLabel' => 'Never expires',
 | |
| 				'earlierThanInfoLimit' => date('Y-m-d'),
 | |
| 				'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'),
 | |
| 				'additionalGroupCssClasses' => $additionalGroupCssClasses
 | |
| 			))
 | |
| 			@php $additionalGroupCssClasses = ''; @endphp
 | |
| 
 | |
| 			@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
 | |
| 			@include('components.numberpicker', array(
 | |
| 				'id' => 'price',
 | |
| 				'label' => 'Price',
 | |
| 				'min' => 0,
 | |
| 				'step' => 0.01,
 | |
| 				'value' => '',
 | |
| 				'hint' => $__t('in %s per purchase quantity unit', GROCY_CURRENCY),
 | |
| 				'additionalHtmlContextHelp' => '<br><span class="small text-muted">' . $__t('This will apply to added products') . '</span>',
 | |
| 				'invalidFeedback' => $__t('The price cannot be lower than %s', '0'),
 | |
| 				'isRequired' => false
 | |
| 			))
 | |
| 			@else
 | |
| 			<input type="hidden" name="price" id="price" value="0">
 | |
| 			@endif
 | |
| 
 | |
| 			@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)
 | |
| 			@include('components.locationpicker', array(
 | |
| 				'locations' => $locations,
 | |
| 				'hint' => $__t('This will apply to added products')
 | |
| 			))
 | |
| 			@else
 | |
| 			<input type="hidden" name="location_id" id="location_id" value="1">
 | |
| 			@endif
 | |
| 
 | |
| 			<button id="save-inventory-button" class="btn btn-success">{{ $__t('OK') }}</button>
 | |
| 
 | |
| 		</form>
 | |
| 	</div>
 | |
| 
 | |
| 	<div class="col-xs-12 col-md-6 col-xl-4 hide-when-embedded">
 | |
| 		@include('components.productcard')
 | |
| 	</div>
 | |
| </div>
 | |
| @stop
 |