{{ order.quantity + order.quantitypreordered }}
- {{ (order.quantity + order.quantitypreordered) }} x €
+ {{ order.quantity + order.quantitypreordered }} x €
{{ order.price ? order.price : 0 }}
@@ -103,8 +114,8 @@
>€
{{
(
- (order.price * order.quantity) +
- (order.price * order.quantitypreordered)
+ order.price * order.quantity +
+ order.price * order.quantitypreordered
).toFixed(2)
}}) rec._id === id)
+ if (idprod >= 0 && key) {
+ productStore.products[idprod][key as keyof IProduct] = value
+ }
+ }
+
console.log('mydatatosave', mydatatosave)
// @ts-ignore
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index 5f32466a..ec560771 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -224,7 +224,7 @@ export interface IUserFields {
numinvitati?: number
numinvitatiattivi?: number
cart?: ICart
- ordercart?: IOrderCart
+ orderscart?: IOrderCart
calcstat?: ICalcStat|null
account?: IAccount
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 9d1e11ed..a13a0e7c 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -240,6 +240,7 @@ const msg_it = {
ricevo_dono_long: 'Evviva!!!
QUESTO MOVIMENTO È REALE E POSSIBILE SE LO FACCIAMO FUNZIONARE TUTTI INSIEME !',
},
dialog: {
+ azzera: 'Azzera',
continue: 'Continuare',
close: 'Chiudi',
copyclipboard: 'Copiato negli appunti',
@@ -1713,6 +1714,8 @@ const msg_it = {
offerta_gas_raggiunta: 'Complimenti! Gli ordini hanno superato il minimo quantitativo di {qta} {unit}',
note: 'Note',
apriordine: 'Vedi Ordine',
+ ordine_scaduto: 'l\'Ordine è stato chiuso il {date}!',
+ ricarica: 'Ricarica',
},
gas: {
name: 'Ordine Gas',
@@ -1735,6 +1738,7 @@ const msg_it = {
sendmail_test: 'Invia Email TEST',
email_sent: '{inviate} email inviate !',
email_not_send: 'Email non inviata',
+ update_order: 'Aggiorna Ordine',
},
cash: {
creatorUserId: 'Creatore',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 28459d1b..3984b8ad 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -8259,18 +8259,18 @@ export const tools = {
let unitrec = shared_consts.Units_Of_Measure_ListBox.find((rec: any) => rec.value === unit)
let mystr = ''
if (unitrec && unitrec.value === shared_consts.UNITS_OF_MEASURE.CHILI && weight && weight < 1) {
- unitrec = shared_consts.Units_Of_Measure_ListBox.find((rec: any) => rec.value === shared_consts.UNITS_OF_MEASURE.GRAMMI)
+ unitrec = shared_consts.Units_Of_Measure_ListBox.find((rec: any) => rec.value === shared_consts.UNITS_OF_MEASURE.GRAMMI)
}
if (unitrec && unitrec.value === shared_consts.UNITS_OF_MEASURE.LITRI && weight && weight < 1) {
- unitrec = shared_consts.Units_Of_Measure_ListBox.find((rec: any) => rec.value === shared_consts.UNITS_OF_MEASURE.MILLILITRI)
+ unitrec = shared_consts.Units_Of_Measure_ListBox.find((rec: any) => rec.value === shared_consts.UNITS_OF_MEASURE.MILLILITRI)
}
- mystr = unitrec ? (short ? unitrec.short : unitrec.label) : ''
+ mystr = unitrec ? (short ? unitrec.short : unitrec.label) : ''
return mystr
},
- getWeightByUnit(unit: number, short: boolean, weight: number|undefined) {
+ getWeightByUnit(unit: number, short: boolean, weight: number | undefined) {
let unitrec = shared_consts.Units_Of_Measure_ListBox.find((rec: any) => rec.value === unit)
- if (unitrec && unitrec.value === shared_consts.UNITS_OF_MEASURE.CHILI && weight && weight < 1) {
+ if (unitrec && unitrec.value === shared_consts.UNITS_OF_MEASURE.CHILI && weight && weight < 1) {
return weight * 1000
}
if (unitrec && unitrec.value === shared_consts.UNITS_OF_MEASURE.LITRI && weight && weight < 1) {
@@ -8323,18 +8323,22 @@ export const tools = {
// Calculate the difference in milliseconds
const countdown = targetTime - currentDate.getTime();
- // Convert milliseconds to seconds
- const countdownInSeconds = Math.floor(countdown / 1000);
+ if (countdown > 0) {
+ // Convert milliseconds to seconds
+ const countdownInSeconds = Math.floor(countdown / 1000);
- const days = Math.floor(countdownInSeconds / (60 * 60 * 24));
- const hours = Math.floor((countdownInSeconds % (60 * 60 * 24)) / (60 * 60));
- const minutes = Math.floor((countdownInSeconds % (60 * 60)) / 60);
- const seconds = countdownInSeconds % 60;
+ const days = Math.floor(countdownInSeconds / (60 * 60 * 24));
+ const hours = Math.floor((countdownInSeconds % (60 * 60 * 24)) / (60 * 60));
+ const minutes = Math.floor((countdownInSeconds % (60 * 60)) / 60);
+ const seconds = countdownInSeconds % 60;
- const gg = days > 0 ? 'giorni' : ''
- const strgg = gg ? `${days} giorni` : ''
+ const gg = days > 0 ? 'giorni' : ''
+ const strgg = gg ? `${days} giorni` : ''
- return (`${strgg} ${this.pad(hours)}:${this.pad(minutes)}:${this.pad(seconds)}`);
+ return (`${strgg} ${this.pad(hours)}:${this.pad(minutes)}:${this.pad(seconds)}`);
+ } else {
+ return '';
+ }
},
diff --git a/src/store/Products.ts b/src/store/Products.ts
index 03d9fbed..430248d4 100755
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -303,8 +303,8 @@ export const useProducts = defineStore('Products', {
getOrdersCartByIdProduct: (state: IProductsState) => (idproduct: string): IOrderCart[] | [] => {
try {
if (state.orders) {
- const ris = state.orders.filter((ordercart: IOrderCart) => {
- return ordercart.items!.some(item => {
+ const ris = state.orders.filter((orderscart: IOrderCart) => {
+ return orderscart.items!.some(item => {
if (item.order)
return (item.order.idProduct === idproduct)
&& (item.order.status! < shared_consts.OrderStatus.CHECKOUT_SENT)
@@ -322,8 +322,8 @@ export const useProducts = defineStore('Products', {
getOrdersCartInAttesaByIdProduct: (state: IProductsState) => (idproduct: string): IOrderCart[] | [] => {
try {
if (state.orders) {
- const ris = state.orders.filter((ordercart: IOrderCart) => {
- return ordercart.items!.some(item => {
+ const ris = state.orders.filter((orderscart: IOrderCart) => {
+ return orderscart.items!.some(item => {
if (item.order)
return (item.order.idProduct === idproduct)
&& (item.order.status! <= shared_consts.OrderStatus.CHECKOUT_SENT)
@@ -435,24 +435,100 @@ export const useProducts = defineStore('Products', {
return ris
},
- async loadProduct({ code }: { code: any }) {
+ async updateOrderByOrder(idOrdersCart: string, idOrder: string, paramstoupdate: any) {
+
+ const userStore = useUserStore()
+ const globalStore = useGlobalStore()
+
+ // console.log('loadProducts')
+
+ if (!globalStore.site.confpages.enableEcommerce)
+ return null
+
+ console.log('updateOrderByOrder', 'userid=', userStore.my._id)
+
+ let ris = null
+
+ ris = await Api.SendReq('/orders/updateord', 'POST', { idOrdersCart, idOrder, paramstoupdate })
+ .then((res) => {
+ let myorderscart = res.data.orderscart
+ if (res) {
+ myorderscart = res.data && res.data.orderscart ? res.data.orderscart : null
+ if (myorderscart) {
+ const idord = this.orders.findIndex((ord: IOrderCart) => ord._id === myorderscart._id)
+ if (idord >= 0) {
+ console.log('aggiorna ordine')
+ this.orders[idord] = {...myorderscart}
+ }
+ }
+ }
+ return myorderscart
+ })
+ .catch((error) => {
+ console.log('error updateOrderByOrder', error)
+ userStore.setErrorCatch(error)
+ return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error)
+ })
+
+ // ApiTables.aftercalling(ris, checkPending, 'categories')
+
+ return ris
+ },
+
+ async updateOrdersCartById(idOrdersCart: string, paramstoupdate: any) {
+
+ const userStore = useUserStore()
+ const globalStore = useGlobalStore()
+
+ // console.log('loadProducts')
+
+ if (!globalStore.site.confpages.enableEcommerce)
+ return null
+
+ console.log('updateOrdersCartById', 'userid=', userStore.my._id)
+
+ let ris = null
+
+ ris = await Api.SendReq('/orders/update', 'POST', { idOrdersCart, paramstoupdate })
+ .then((res) => {
+ let myorderscart = res.data.orderscart
+ if (res) {
+ if (myorderscart) {
+ const idord = this.orders.findIndex((ord: IOrderCart) => ord._id === myorderscart._id)
+ if (idord >= 0) {
+ console.log('aggiorna orderscart')
+ this.orders[idord] = myorderscart
+ }
+ }
+ }
+ return myorderscart
+ })
+ .catch((error) => {
+ console.log('error updateOrderByOrder', error)
+ userStore.setErrorCatch(error)
+ return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error)
+ })
+
+ // ApiTables.aftercalling(ris, checkPending, 'categories')
+
+ return ris
+ },
+
+ async loadProductById(id: string) {
- console.log('loadProduct', code)
const userStore = useUserStore()
const globalStore = useGlobalStore()
if (!globalStore.site.confpages.enableEcommerce)
return null
- console.log('getProduct', 'code', code)
-
// if (userStore.my._id === '') {
// return new Types.AxiosError(0, null, 0, '')
// }
let ris = null
- ris = await Api.SendReq('/products/' + code, 'POST', { code })
+ ris = await Api.SendReq('/products/id/' + id, 'GET', null)
.then((res) => {
console.log('product', res.data.product)
if (res.data.product) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories)
diff --git a/src/views/ecommerce/orderInfo/orderInfo.ts b/src/views/ecommerce/orderInfo/orderInfo.ts
index 2ee0d469..668c3142 100755
--- a/src/views/ecommerce/orderInfo/orderInfo.ts
+++ b/src/views/ecommerce/orderInfo/orderInfo.ts
@@ -221,8 +221,8 @@ export default defineComponent({
function updateorders() {
myorderscart.value = getOrdersCart()
if (myorderscart.value) {
- for (const ordercart of myorderscart.value) {
- myarrrec.value[ordercart._id] = Object.keys(ordercart)
+ for (const orderscart of myorderscart.value) {
+ myarrrec.value[orderscart._id] = Object.keys(orderscart)
}
}
diff --git a/src/views/ecommerce/orderInfo/orderInfo.vue b/src/views/ecommerce/orderInfo/orderInfo.vue
index 35039144..99bd8485 100755
--- a/src/views/ecommerce/orderInfo/orderInfo.vue
+++ b/src/views/ecommerce/orderInfo/orderInfo.vue
@@ -300,14 +300,14 @@