refs #6199 Added minQuantity in catalog and more
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Guillermo Bonet 2023-10-10 13:49:11 +02:00
parent 03afea3b8e
commit d2ce920f13
6 changed files with 40 additions and 23 deletions

View File

@ -185,7 +185,7 @@
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-input-number <vn-input-number
min="0" min="1"
label="Minimum sales quantity" label="Minimum sales quantity"
ng-model="$ctrl.item.minQuantity" ng-model="$ctrl.item.minQuantity"
vn-name="minQuantity" vn-name="minQuantity"

View File

@ -15,4 +15,5 @@ Generic: Genérico
This item does need a photo: Este artículo necesita una foto This item does need a photo: Este artículo necesita una foto
Do photo: Hacer foto Do photo: Hacer foto
Recycled Plastic: Plástico reciclado Recycled Plastic: Plástico reciclado
Non recycled plastic: Plástico no reciclado Non recycled plastic: Plástico no
Minimum sales quantity: Cantidad mínima de venta

View File

@ -2,3 +2,4 @@ Barcode: Códigos de barras
Other data: Otros datos Other data: Otros datos
Go to the item: Ir al artículo Go to the item: Ir al artículo
WarehouseFk: Calculado sobre el almacén de {{ warehouseName }} WarehouseFk: Calculado sobre el almacén de {{ warehouseName }}
Minimum sales quantity: Cantidad mínima de venta

View File

@ -100,8 +100,7 @@ module.exports = Self => {
)); ));
stmt = new ParameterizedSQL(` stmt = new ParameterizedSQL(`
SELECT SELECT i.id,
i.id,
i.name, i.name,
i.subName, i.subName,
i.image, i.image,
@ -116,15 +115,17 @@ module.exports = Self => {
i.stars, i.stars,
tci.price, tci.price,
tci.available, tci.available,
w.lastName AS lastName, w.lastName lastName,
w.firstName, w.firstName,
tci.priceKg, tci.priceKg,
ink.hex ink.hex,
i.minQuantity
FROM tmp.ticketCalculateItem tci FROM tmp.ticketCalculateItem tci
JOIN vn.item i ON i.id = tci.itemFk JOIN vn.item i ON i.id = tci.itemFk
JOIN vn.itemType it ON it.id = i.typeFk JOIN vn.itemType it ON it.id = i.typeFk
JOIN vn.worker w on w.id = it.workerFk JOIN vn.worker w on w.id = it.workerFk
LEFT JOIN vn.ink ON ink.id = i.inkFk`); LEFT JOIN vn.ink ON ink.id = i.inkFk
`);
// Apply order by tag // Apply order by tag
if (orderBy.isTag) { if (orderBy.isTag) {

View File

@ -37,6 +37,19 @@
value="{{::item.value7}}"> value="{{::item.value7}}">
</vn-label-value> </vn-label-value>
</div> </div>
<div class="container text-right text-caption" ng-if="::item.minQuantity" style="
display: flex;
align-items: center;
justify-content: flex-end;
color: #fb5252;
">
<vn-icon
icon="production_quantity_limits"
translate-attr="{title: 'Minimal quantity'}"
style="font-size: 18px; margin-right: 3px;">
</vn-icon>
<span>{{::item.minQuantity}}</span>
</div>
<vn-rating ng-if="::item.stars" <vn-rating ng-if="::item.stars"
ng-model="::item.stars"> ng-model="::item.stars">
</vn-rating> </vn-rating>

View File

@ -1 +1,2 @@
Order created: Orden creada Order created: Orden creada
Minimal quantity: Cantidad mínima