{{ myorder.quantity + myorder.quantitypreordered }}
@@ -329,10 +396,16 @@
diff --git a/src/css/app.scss b/src/css/app.scss
index 037924d0..d257518e 100755
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -375,6 +375,18 @@ h3 {
}
}
+.my-card-selected {
+ transition: box-shadow 0.3s; /* Add a transition for a smooth effect */
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.5) !important;
+ color: blue;
+ background-color: lightblue;
+}
+
+.my-card-prod:hover {
+ transition: transform .2s;
+ transform: scale(1.02);
+}
+
.my-card-prod {
width: 100%;
max-width: 300px;
diff --git a/src/db/lang/ws_enUs.js b/src/db/lang/ws_enUs.js
index ecafb4ef..25b51103 100755
--- a/src/db/lang/ws_enUs.js
+++ b/src/db/lang/ws_enUs.js
@@ -9,6 +9,7 @@ const msg_website_enUs = {
quantity: 'Quantità',
quantityAvailable: 'Disponibili',
stockQty: 'In Magazzino',
+ stockBloccatiQty: 'Bloccati In Magazzino',
weight: 'Peso',
stars: 'Voto',
color: 'Colore',
diff --git a/src/model/Products.ts b/src/model/Products.ts
index 9a6fa0fc..ced3e1f4 100755
--- a/src/model/Products.ts
+++ b/src/model/Products.ts
@@ -41,10 +41,12 @@ export interface IProduct {
QuantitaOrdinateInAttesa?: number,
QuantitaPrenotateInAttesa?: number,
stockQty: number,
+ stockBloccatiQty: number,
minBuyQty: number,
- minStepQty?: number,
+ minStepQty: number,
maxBookableQty: number,
bookableQty: number,
+ bookableBloccatiQty: number,
canBeShipped?: boolean,
canBeBuyOnline?: boolean,
}
@@ -135,6 +137,7 @@ export interface IStorehouse {
email_html_footer?: string,
email_html_makeorder?: string,
email_html_order_confirmed?: string,
+ email_html_order_consegnato?: string,
}
export interface IProvider {
@@ -211,8 +214,6 @@ export interface IOrderCart {
date_spedito?: Date
ricevuto: boolean
date_ricevuto?: Date
- completato: boolean
- date_completato?: Date
created_at: Date
note: string
}
diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts
index fcab4285..221aa9f4 100755
--- a/src/rootgen/admin/importdata/importdata.ts
+++ b/src/rootgen/admin/importdata/importdata.ts
@@ -417,6 +417,7 @@ export default defineComponent({
strris += addfield(col, 'bookableQty', rec, false, true); col++;
strris += addfield(col, 'sconto1', rec, false, true); col++;
strris += addfield(col, 'sconto2', rec, false, true); col++;
+ strris += addfield(col, 'gas_name', rec, false, true); col++;
strris += '} '
} else if (cmd === shared_consts.Cmd.CITIES_SERVER) {
@@ -440,7 +441,7 @@ export default defineComponent({
if (cmd === shared_consts.Cmd.CITIES_SERVER) {
userStore.importToServerCmd($q, t, cmd, null)
} else if (cmd === shared_consts.Cmd.PRODUCTS) {
- let options = { aggiornaStockQta: checkAggiornaQta.value }
+ let options = { aggiornaStockQty: checkAggiornaQta.value }
if (importasulserver.value)
userStore.importToServerCmd($q, t, cmd, { arrdata: strris, options })
}
@@ -471,7 +472,7 @@ export default defineComponent({
}
function eseguiCmdProduct() {
- let options = { aggiornaStockQta: checkAggiornaQta.value }
+ let options = { aggiornaStockQty: checkAggiornaQta.value }
userStore.importToServerCmd($q, t, cosafare.value, { arrdata: risultato.value, options })
}
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 0f13096a..a0b645bd 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -62,7 +62,9 @@ const msg_it = {
quantity: 'Quantità',
quantityAvailable: 'Disponibili',
stockQty: 'In Magazzino',
+ stockBloccatiQty: 'Bloccati In Magazzino',
minBuyQty: 'Qta minima acquistabile',
+ minStepQty: 'Step Minimo',
maxBookableQty: 'Qtà massima prenotabile singolarm.',
bookableQty: 'Prenotabili',
bookableAvailableQty: 'Disponib. Prenotabili',
@@ -1120,8 +1122,9 @@ const msg_it = {
icon: 'Icona',
email_html_header: 'Instestazione',
email_html_footer: 'Footer',
- email_html_makeorder: 'Ordine Inviato',
- email_html_order_confirmed: 'Ordine Confermato',
+ email_html_makeorder: '1) Ordine Ricevuto',
+ email_html_order_confirmed: '2) Ordine Confermato da noi',
+ email_html_order_consegnato: '3) Ordine Completato Correttamente',
},
sectors: {
name: 'Settore',
@@ -1671,7 +1674,6 @@ const msg_it = {
consegnato: 'Ordine Consegnato',
pagato: 'Ordine Pagato',
spedito: 'Ordine Spedito',
- completed: 'Ordine Completato',
ricevuto: 'Prodotti Ricevuti',
listaord: 'Lista Ordini',
carrello_vuoto: 'Il Carrello è Vuoto',
@@ -1686,6 +1688,7 @@ const msg_it = {
code_add_to_cart: 'Aggiungi un codice al carrello',
qta_prenotate_in_attesa: '(Preordinate In attesa {qty})',
prodotti_trovati: '{qta} Prodotti trovati su {qtatot}',
+ bloccati: 'Bloccati',
},
gas: {
name: 'Ordine Gas',
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 278bcfe8..2129f311 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -439,6 +439,7 @@ export const colTableStorehouse = [
AddCol({ name: 'email_html_footer', label_trans: 'store.email_html_footer', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'email_html_makeorder', label_trans: 'store.email_html_makeorder', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'email_html_order_confirmed', label_trans: 'store.email_html_order_confirmed', fieldtype: costanti.FieldType.html }),
+ AddCol({ name: 'email_html_order_consegnato', label_trans: 'store.email_html_order_consegnato', fieldtype: costanti.FieldType.html }),
AddCol(DeleteRec),
AddCol(DuplicateRec),
]
@@ -2050,6 +2051,11 @@ export const colTableProducts = [
label_trans: 'products.minBuyQty',
fieldtype: costanti.FieldType.number
}),
+ AddCol({
+ name: 'minStepQty',
+ label_trans: 'products.minStepQty',
+ fieldtype: costanti.FieldType.number
+ }),
AddCol({
name: 'maxBookableQty',
label_trans: 'products.maxBookableQty',
@@ -2065,6 +2071,16 @@ export const colTableProducts = [
label_trans: 'products.bookableQty',
fieldtype: costanti.FieldType.number
}),
+ AddCol({
+ name: 'stockBloccatiQty',
+ label_trans: 'products.stockBloccatiQty',
+ fieldtype: costanti.FieldType.number
+ }),
+ AddCol({
+ name: 'bookableBloccatiQty',
+ label_trans: 'products.bookableBloccatiQty',
+ fieldtype: costanti.FieldType.number
+ }),
AddCol({ name: 'canBeShipped', label_trans: 'products.canBeShipped', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'canBeBuyOnline', label_trans: 'products.canBeBuyOnline', fieldtype: costanti.FieldType.boolean }),
AddCol(DeleteRec),
diff --git a/src/store/Products.ts b/src/store/Products.ts
index cde84c64..774f307b 100755
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -41,7 +41,9 @@ function getRecordProductEmpty() {
},
storehouses: [], scontisticas: [],
price: 0, stockQty: 0, bookableQty: 0, gasordines: [],
+ stockBloccatiQty: 0, bookableBloccatiQty: 0,
idGasordines: [], minBuyQty: 1, maxBookableQty: 0,
+ minStepQty: 1,
}
}
@@ -303,10 +305,12 @@ export const useProducts = defineStore('Products', {
quantityAvailable: 0,
bookableAvailableQty: 0,
stockQty: 0,
+ stockBloccatiQty: 0,
minBuyQty: 1,
minStepQty: 1,
maxBookableQty: 0,
bookableQty: 0,
+ bookableBloccatiQty: 0,
canBeShipped: false,
QuantitaOrdinateInAttesa: 0,
QuantitaPrenotateInAttesa: 0,
@@ -821,6 +825,16 @@ export const useProducts = defineStore('Products', {
return qty
},
+ getQtyBloccataAvailable(myproduct: IProduct): number {
+ let qty = myproduct.stockBloccatiQty
+ return qty
+ },
+
+ getQtyBloccataBookableAvailable(myproduct: IProduct): number {
+ let qty = myproduct.bookableBloccatiQty
+ return qty
+ },
+
enableSubQty(myorder: IOrder): boolean {
let qty = myorder.quantity + myorder.quantitypreordered
return qty ? qty > 0 : false
@@ -846,21 +860,21 @@ export const useProducts = defineStore('Products', {
},
qtaNextAdd(myorder: IOrder, myproduct: IProduct): number {
- let step = 1
+ let step = myproduct.minStepQty
if (this.getQtyAvailable(myproduct) > 0) {
if (myorder.quantity === 0)
- step = myproduct.minBuyQty | 1
+ step = myproduct.minBuyQty
} else {
if (myorder.quantitypreordered === 0)
- step = myproduct.minBuyQty | 1
+ step = myproduct.minBuyQty
}
return step
},
qtaNextSub(myorder: IOrder, myproduct: IProduct) {
- let step = 1
- let minqta = myproduct.minBuyQty | 1
+ let step = myproduct.minStepQty
+ let minqta = myproduct.minBuyQty
if (this.getQtyAvailable(myproduct) > 0) {
if (myorder.quantity === minqta)
step = minqta
diff --git a/src/views/ecommerce/orderInfo/orderInfo.vue b/src/views/ecommerce/orderInfo/orderInfo.vue
index eae06334..c1de1d31 100755
--- a/src/views/ecommerce/orderInfo/orderInfo.vue
+++ b/src/views/ecommerce/orderInfo/orderInfo.vue
@@ -183,8 +183,8 @@
{{ tools.getstrDateTime(props.row.created_at) }}
-
Completato il:
{{
- tools.getstrDateTime(props.row.date_completato)
+
Consegnato il:
{{
+ tools.getstrDateTime(props.row.date_consegnato)
}}
@@ -214,22 +214,18 @@
{{ tools.getstrDateTime(props.row.date_evaso) }}:
{{ $t('ecomm.evaso') }}
-
- {{ tools.getstrDateTime(props.row.date_consegnato) }}:
- {{ $t('ecomm.consegnato') }}
-
{{ tools.getstrDateTime(props.row.date_pagato) }}:
{{ $t('ecomm.pagato') }}
+
+ {{ tools.getstrDateTime(props.row.date_consegnato) }}:
+ {{ $t('ecomm.consegnato') }}
+
{{ tools.getstrDateTime(props.row.date_spedito) }}:
{{ $t('ecomm.spedito') }}
-
- {{ tools.getstrDateTime(props.row.date_completato) }}:
- {{ $t('ecomm.completed') }}
-
{{ tools.getstrDateTime(props.row.date_ricevuto) }}:
{{ $t('ecomm.ricevuto') }}
diff --git a/src/views/ecommerce/productInfo/productInfo.vue b/src/views/ecommerce/productInfo/productInfo.vue
index 2266ba73..c2bf469e 100755
--- a/src/views/ecommerce/productInfo/productInfo.vue
+++ b/src/views/ecommerce/productInfo/productInfo.vue
@@ -1,8 +1,8 @@
-
+