From 62267ef618518f591217f0cef6f1dd13320b1854 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Tue, 16 Jan 2024 16:56:57 +0100 Subject: [PATCH] aggio gasordine --- src/components/CCart/CCart.ts | 4 +- src/components/CMyPopupEdit/CMyPopupEdit.vue | 4 +- src/components/COrdersCart/COrdersCart.ts | 4 +- src/components/COrdersCart/COrdersCart.vue | 2 +- src/components/CProductCard/CProductCard.ts | 76 ++++--------------- src/components/CProductCard/CProductCard.vue | 49 ++++-------- src/model/Products.ts | 4 +- src/store/Modules/fieldsTable.ts | 10 ++- src/store/Products.ts | 14 ++-- src/views/admin/dbop/dbop.vue | 5 ++ upload/GAS00001.jpg | Bin 0 -> 161905 bytes upload/GAS00002.jpg | Bin 0 -> 77321 bytes upload/GAS00003.jpg | Bin 0 -> 181838 bytes upload/products/4251088900003.jpg | Bin 0 -> 401331 bytes upload/products/4251088900027.png | Bin 0 -> 530692 bytes upload/products/4251088900201.png | Bin 0 -> 575322 bytes upload/products/4251088900225.png | Bin 0 -> 502416 bytes upload/products/4251088923811.png | Bin 0 -> 578741 bytes upload/products/4251088980050.png | Bin 0 -> 502479 bytes upload/products/4251088980104.png | Bin 0 -> 489336 bytes upload/products/4251088980159.png | Bin 0 -> 495397 bytes 21 files changed, 57 insertions(+), 115 deletions(-) create mode 100644 upload/GAS00001.jpg create mode 100644 upload/GAS00002.jpg create mode 100644 upload/GAS00003.jpg create mode 100644 upload/products/4251088900003.jpg create mode 100644 upload/products/4251088900027.png create mode 100644 upload/products/4251088900201.png create mode 100644 upload/products/4251088900225.png create mode 100644 upload/products/4251088923811.png create mode 100644 upload/products/4251088980050.png create mode 100644 upload/products/4251088980104.png create mode 100644 upload/products/4251088980159.png diff --git a/src/components/CCart/CCart.ts b/src/components/CCart/CCart.ts index 0b8331cf..f9906602 100755 --- a/src/components/CCart/CCart.ts +++ b/src/components/CCart/CCart.ts @@ -215,8 +215,8 @@ export default defineComponent({ function getActualGasordine(myprod: IProduct) { // Ottieni il negozio attualmente selezionato: // Se ce n'è solo 1 allora prendi quello ! - if (myprod.gasordines.length === 1) { - return myprod.gasordines[0]._id + if (myprod.gasordine) { + return myprod.gasordine._id } else { // Ottieni il gasordine attualmente scelto ! return '' diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue index 80805d65..a46b2b54 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.vue +++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue @@ -226,10 +226,10 @@ :label="col.visulabel ? $t(col.label_trans) : col.label" > - + Diventerà: {{tools.generateURL(col.showLinkResult, myvalue)}} - +
- Note: {{ note }} + Note: {{ note }} null) const arrordersCart = ref([]) const timerInterval = ref(null) @@ -96,7 +94,7 @@ export default defineComponent({ return globalStore.getTableJoinByName(item.table, addall, addnone, item.filter) }) - + watch(() => editOn.value, (to: any, from: any) => { if (!editOn.value) ricarica() @@ -178,9 +176,6 @@ export default defineComponent({ myorder.idStorehouse = '' myorder.idGasordine = '' - gasordineSelected.value = '' - recgasordineSelected.value = null - } function updateproduct() { @@ -206,8 +201,6 @@ export default defineComponent({ try { myproduct.value = products.getProductById(props.id) - recgasordineSelected.value = myproduct.value.gasordines.find((rec: any) => rec._id === gasordineSelected.value) - updateLabel() } catch (e) { console.error('err', e) @@ -235,26 +228,6 @@ export default defineComponent({ return myarr } - function getGasordines() { - if (!myproduct.value) - return [] - - const myarr: any = [] - let ind = 1 - myproduct.value.gasordines.forEach((gasordine: IGasordine) => { - myarr.push( - { - id: ind, - label: getSingleGasordine(gasordine), - value: gasordine._id - }) - - ind++ - }) - - return myarr - } - function checkifCartDisable() { // return !myorder.idStorehouse return isOrdineChiuso() @@ -283,21 +256,13 @@ export default defineComponent({ myorder.idStorehouse = newval }) - watch(() => gasordineSelected.value, (newval, oldval) => { - if (newval) { - myorder.idGasordine = newval - recgasordineSelected.value = myproduct.value.gasordines.find((rec: any) => rec._id === gasordineSelected.value) - updateLabel() - } - }) - function updateLabel() { - if (recgasordineSelected.value) { + if (myproduct.value.gasordine) { //labelDataRitiro.value = tools.getstrDateTime(recgasordineSelected.value.dataora_ritiro) - if (recgasordineSelected.value.data_arrivo_merce) - labelDataArrivoMerce.value = tools.getstrDateShort(recgasordineSelected.value.data_arrivo_merce) - if (recgasordineSelected.value.dataora_ritiro) - labelDataRitiro.value = tools.getstrDateTime(recgasordineSelected.value.dataora_ritiro) + if (myproduct.value.gasordine.data_arrivo_merce) + labelDataArrivoMerce.value = tools.getstrDateShort(myproduct.value.gasordine.data_arrivo_merce) + if (myproduct.value.gasordine.dataora_ritiro) + labelDataRitiro.value = tools.getstrDateTime(myproduct.value.gasordine.dataora_ritiro) } else { labelDataArrivoMerce.value = '' labelDataRitiro.value = '' @@ -316,15 +281,15 @@ export default defineComponent({ } function updateTimerLabel() { - if (recgasordineSelected.value) - timerLabelScadenza.value = tools.getCountDown(recgasordineSelected.value.dataora_chiusura_ordini) + if (myproduct.value.gasordine && myproduct.value.gasordine._id && myproduct.value.gasordine.dataora_chiusura_ordini) + timerLabelScadenza.value = tools.getCountDown(myproduct.value.gasordine.dataora_chiusura_ordini) else timerLabelScadenza.value = '' } function isOrdineChiuso() { - return recgasordineSelected.value && recgasordineSelected.value.dataora_chiusura_ordini && - tools.getCountDown(recgasordineSelected.value.dataora_chiusura_ordini) === '' + return myproduct.value.gasordine && myproduct.value.gasordine.dataora_chiusura_ordini && + tools.getCountDown(myproduct.value.gasordine.dataora_chiusura_ordini) === '' } function startTimer() { @@ -347,9 +312,8 @@ export default defineComponent({ myorder.idStorehouse = myproduct.value.storehouses[0]._id } - if (myproduct.value.gasordines && myproduct.value.gasordines.length === 1) { - myorder.idGasordine = myproduct.value.gasordines[0]._id - gasordineSelected.value = myorder.idGasordine! + if (myproduct.value.gasordine) { + myorder.idGasordine = myproduct.value.gasordine._id } const ord = products.getOrderProductInCart(myproduct.value._id) @@ -357,21 +321,11 @@ export default defineComponent({ myorder.quantity = ord.quantity myorder.quantitypreordered = ord.quantitypreordered - if (ord.idGasordine) { - gasordineSelected.value = ord.idGasordine! - recgasordineSelected.value = myproduct.value.gasordines.find((rec: IGasordine) => rec._id === ord.idGasordine!) - } - // Seleziona il Negozio che avevo già scelto nell'ordine ! if (ord.idStorehouse) storeSelected.value = ord.idStorehouse } - - if (gasordineSelected.value) { - recgasordineSelected.value = myproduct.value.gasordines.find((rec: IGasordine) => rec._id === gasordineSelected.value) - } - } updateLabel() @@ -404,7 +358,7 @@ export default defineComponent({ } function isOrdGas(): boolean { - return myproduct.value && myproduct.value.idGasordines ? myproduct.value.idGasordines.length > 0 : false + return (myproduct.value && !!myproduct.value.idGasordine && myproduct.value.gasordine! && myproduct.value.gasordine.active) } function getpercqtaraggiunta(): number { @@ -472,7 +426,6 @@ export default defineComponent({ tools, t, storeSelected, - gasordineSelected, getQtyWarn, openlistorders, func_tools, @@ -485,8 +438,6 @@ export default defineComponent({ getQtyWarnPreOrdered, listord, sumval, - getGasordines, - recgasordineSelected, timerLabelScadenza, labelDataRitiro, labelDataArrivoMerce, @@ -497,7 +448,6 @@ export default defineComponent({ onTouchStart, onTouchMove, onTouchEnd, - $router, naviga, globalStore, editOn, diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue index 216a7831..250308d9 100755 --- a/src/components/CProductCard/CProductCard.vue +++ b/src/components/CProductCard/CProductCard.vue @@ -1,7 +1,6 @@