diff --git a/B00001.jpg b/B00001.jpg new file mode 100644 index 00000000..a2e34a2e Binary files /dev/null and b/B00001.jpg differ diff --git a/B00002.jpg b/B00002.jpg new file mode 100644 index 00000000..82a4a5e2 Binary files /dev/null and b/B00002.jpg differ diff --git a/B00003.jpg b/B00003.jpg new file mode 100644 index 00000000..1f37b6a0 Binary files /dev/null and b/B00003.jpg differ diff --git a/src/model/Products.ts b/src/model/Products.ts index 7d721cf4..5d545519 100755 --- a/src/model/Products.ts +++ b/src/model/Products.ts @@ -46,11 +46,13 @@ export interface IProduct { stockQty: number, // UPDATING stockBloccatiQty: number, // UPDATING + bookedQtyOrdered: number // UPDATING bookedQtyConfirmed: number // UPDATING qtyToReachForGas: number maxbookableGASQty: number bookedGASQtyOrdered: number // UPDATING + bookedGASQtyConfirmed: number // UPDATING bookableGASBloccatiQty: number // UPDATING minBuyQty: number diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 745448c3..298f2ac8 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -66,9 +66,12 @@ const msg_it = { minBuyQty: 'Qta minima acquistabile', minStepQty: 'Step Minimo', maxBookableSinglePersQty: 'Qtà massima prenotabile singolarm.', - maxbookableGASQty: 'Prenotabili', + bookedQtyOrdered: 'Quantità Ordered', bookedQtyConfirmed: 'Quantità Confermate', bookableAvailableQty: 'Disponib. Prenotabili', + maxbookableGASQty: 'Prenotabili', + bookedGASQtyConfirmed: 'Qtà GAS Confermate', + bookableGASBloccatiQty: 'Qtà GAS Bloccate', weight: 'Peso', unit: 'Unità di Misura', stars: 'Voto', diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index b6e1c734..7487c60b 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -2085,6 +2085,11 @@ export const colTableProducts = [ label_trans: 'products.stockBloccatiQty', fieldtype: costanti.FieldType.number }), + AddCol({ + name: 'bookedQtyOrdered', + label_trans: 'products.bookedQtyOrdered', + fieldtype: costanti.FieldType.number + }), AddCol({ name: 'bookedQtyConfirmed', label_trans: 'products.bookedQtyConfirmed', diff --git a/src/store/Products.ts b/src/store/Products.ts index b2ccf5fc..0d6cff5e 100755 --- a/src/store/Products.ts +++ b/src/store/Products.ts @@ -60,11 +60,14 @@ function getRecordProductEmpty(): IProduct { stockQty: 0, stockBloccatiQty: 0, + bookedQtyOrdered: 0, bookedQtyConfirmed: 0, qtyToReachForGas: 0, + maxbookableGASQty: 0, bookedGASQtyOrdered: 0, + bookedGASQtyConfirmed: 0, bookableGASBloccatiQty: 0, canBeShipped: false, @@ -621,6 +624,10 @@ export const useProducts = defineStore('Products', { return ris }, + getOptions() { + return {} + }, + async CreateOrdersCart({ cart_id, status, note }: { cart_id: string, status: number, note: string }) { const userStore = useUserStore() @@ -631,7 +638,7 @@ export const useProducts = defineStore('Products', { let ris = null - ris = await Api.SendReq('/cart/' + userStore.my._id + '/createorderscart', 'POST', { cart_id, status, note }) + ris = await Api.SendReq('/cart/' + userStore.my._id + '/createorderscart', 'POST', { cart_id, status, note, options: this.getOptions() }) .then((res) => { if (res.data.status === shared_consts.OrderStatus.CHECKOUT_SENT) { @@ -662,7 +669,7 @@ export const useProducts = defineStore('Products', { let ris = null - ris = await Api.SendReq('/cart/updatestatuscart', 'POST', { ordercart_id, status }) + ris = await Api.SendReq('/cart/updatestatuscart', 'POST', { ordercart_id, status, options: this.getOptions() }) .then((res) => { if (res.data.status === shared_consts.OrderStatus.CHECKOUT_SENT) { @@ -681,6 +688,8 @@ export const useProducts = defineStore('Products', { return ris }, + + async UpdateOrderCartStatus({ order_id, status }: { order_id: string, status: number }) { const userStore = useUserStore() @@ -691,7 +700,7 @@ export const useProducts = defineStore('Products', { let ris = null - ris = await Api.SendReq('/cart/' + userStore.my._id + '/ordercartstatus', 'POST', { order_id, status, options }) + ris = await Api.SendReq('/cart/' + userStore.my._id + '/ordercartstatus', 'POST', { order_id, status, options: this.getOptions() }) .then((res) => { this.updateDataProduct(res) diff --git a/src/views/ecommerce/checkOut/checkOut.ts b/src/views/ecommerce/checkOut/checkOut.ts index d81ad181..ef1f01bb 100755 --- a/src/views/ecommerce/checkOut/checkOut.ts +++ b/src/views/ecommerce/checkOut/checkOut.ts @@ -106,6 +106,8 @@ export default defineComponent({ oldrec.value = myrec.value note.value = mycart.value.note! + let options = {}; + if (mycart.value) { recOrderCart.value = await productStore.CreateOrdersCart({ cart_id: mycart.value._id, status: 0, note: note.value }) } diff --git a/upload/products/B00001.jpg b/upload/products/B00001.jpg new file mode 100644 index 00000000..a2e34a2e Binary files /dev/null and b/upload/products/B00001.jpg differ diff --git a/upload/products/B00002.jpg b/upload/products/B00002.jpg new file mode 100644 index 00000000..82a4a5e2 Binary files /dev/null and b/upload/products/B00002.jpg differ diff --git a/upload/products/B00003.jpg b/upload/products/B00003.jpg new file mode 100644 index 00000000..1f37b6a0 Binary files /dev/null and b/upload/products/B00003.jpg differ