-
-
+
-
{{ t('products.gasordine') }}
-
-
-
-
-
+
{{
- getSingleGasordine(myproduct.gasordines[0])
+ myproduct.gasordine.name
}}
@@ -624,12 +604,12 @@
-
+
-
+
{{ timerLabelScadenza }}
{{
@@ -639,8 +619,8 @@
:editOn="editOn"
:title="t('gas.dataora_chiusura_ordini')"
table="gasordines"
- :id="recgasordineSelected._id"
- :rec="recgasordineSelected"
+ :id="myproduct.gasordine._id"
+ :rec="myproduct.gasordine"
mykey="dataora_chiusura_ordini"
debounce="1000"
:save="updateproductmodif()"
@@ -651,7 +631,7 @@
-
+
@@ -662,8 +642,8 @@
:editOn="editOn"
:title="t('gas.data_arrivo_merce')"
table="gasordines"
- :id="recgasordineSelected._id"
- :rec="recgasordineSelected"
+ :id="myproduct.gasordine._id"
+ :rec="myproduct.gasordine"
mykey="data_arrivo_merce"
debounce="1000"
:save="updateproductmodif()"
@@ -674,7 +654,7 @@
-
+
@@ -685,8 +665,8 @@
:editOn="editOn"
:title="t('gas.dataora_ritiro')"
table="gasordines"
- :id="recgasordineSelected._id"
- :rec="recgasordineSelected"
+ :id="myproduct.gasordine._id"
+ :rec="myproduct.gasordine"
mykey="dataora_ritiro"
:justifycenter="false"
debounce="1000"
@@ -801,6 +781,7 @@
{{ t('ecomm.active') }}:
(cosa?: number): IProduct[] => {
if (!!cosa) {
return state.products.filter((rec: IProduct) => {
- const hasGasOrdines = rec.idGasordines && rec.idGasordines.length > 0;
+ const hasGasOrdines = rec.idGasordine
if ((cosa === shared_consts.PROD.GAS && hasGasOrdines) ||
- (cosa === shared_consts.PROD.BOTTEGA && ((!hasGasOrdines || (hasGasOrdines && rec.idGasordines?.length === 0))))) {
+ (cosa === shared_consts.PROD.BOTTEGA && ((!hasGasOrdines || (hasGasOrdines && rec.idGasordine))))) {
return true;
}
@@ -571,7 +571,7 @@ export const useProducts = defineStore('Products', {
ris = await Api.SendReq('/cart/' + userStore.my._id, 'GET', null)
.then((res) => {
- if (res.data.cart) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
+ if (res.data && res.data.cart) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
this.cart = res.data.cart
} else {
this.cart = { items: [], totalPrice: 0, totalQty: 0, userId: '' }
@@ -665,8 +665,8 @@ export const useProducts = defineStore('Products', {
}
}
if (!order.idGasordine && order.quantitypreordered > 0) {
- if (product.gasordines.length === 1) {
- order.idGasordine = product.gasordines[0]._id
+ if (product.gasordine && product.gasordine._id) {
+ order.idGasordine = product.gasordine._id
} else {
order.idGasordine = globalStore.gasordines ? globalStore.gasordines[0]._id : ''
}
diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue
index 7d8811d0..ad21e7a6 100755
--- a/src/views/admin/dbop/dbop.vue
+++ b/src/views/admin/dbop/dbop.vue
@@ -294,6 +294,11 @@
color="positive"
@click="EseguiFunz('CopyPriceToCalc')"
>
+