From 1c31543af8d178aec2555f9d8f45fe0ac7c32967 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Fri, 16 Feb 2024 14:11:03 +0100 Subject: [PATCH] - aggiunto bottone per Confermare tutti gli ordini - 1 bottone per Consegnare e Pagare --- logtrans.txt | 14 +++++++++++++- src/server/router/cart_router.js | 27 ++++++++++++++------------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/logtrans.txt b/logtrans.txt index 3f131dc..52a9990 100644 --- a/logtrans.txt +++ b/logtrans.txt @@ -128,4 +128,16 @@ PaoloRiso: -44.4 €] Dom 07/01 ORE 16:24: [Euro]: Inviate Monete da PaoloRiso a 44.4 € [causale: Pagato Ordine n.101] Saldi: PaoloRiso: -88.8 €] -: 88.8 €] \ No newline at end of file +: 88.8 €] +Ven 16/02 ORE 13:51: [Euro]: Inviate Monete da PaoloRiso a piuchebuono 9.6 € [causale: Pagato Ordine n.169] +Saldi: +PaoloRiso: -98 €] +piuchebuono: 1109.1799999999998 €] +Ven 16/02 ORE 13:57: [Euro]: Inviate Monete da Barbara a piuchebuono 15.6 € [causale: Pagato Ordine n.171] +Saldi: +Barbara: -61.2 €] +piuchebuono: 1124.7799999999997 €] +Ven 16/02 ORE 14:05: [Euro]: Inviate Monete da Loabati a piuchebuono 6 € [causale: Pagato Ordine n.174] +Saldi: +Loabati: -24.6 €] +piuchebuono: 1130.7799999999997 €] \ No newline at end of file diff --git a/src/server/router/cart_router.js b/src/server/router/cart_router.js index deae1e7..13c78a5 100755 --- a/src/server/router/cart_router.js +++ b/src/server/router/cart_router.js @@ -376,25 +376,26 @@ router.post('/:userId/ordercartstatus', authenticate, async function (req, res, const userDest = await User.findById(myOrdersCart.userId).lean(); if (ris) { + let ordertype = ''; // Aggiorna gli Stati Interni ! myOrdersCart = await OrdersCart.updateCmd(myOrdersCart, status, true, options); - let ordertype = ''; + if ((options.hasOwnProperty('sendmail') && options.sendmail) || !options.hasOwnProperty('sendmail')) { + if (status === shared_consts.OrderStatus.ORDER_CONFIRMED) { + ordertype = 'order_confirmed'; + } else if (status === shared_consts.OrderStatus.DELIVERED) { + ordertype = 'order_consegnato'; + } else if (status === shared_consts.OrderStatus.CANCELED) { + ordertype = 'order_canceled'; + } - if (status === shared_consts.OrderStatus.ORDER_CONFIRMED) { - ordertype = 'order_confirmed'; - } else if (status === shared_consts.OrderStatus.DELIVERED) { - ordertype = 'order_consegnato'; - } else if (status === shared_consts.OrderStatus.CANCELED) { - ordertype = 'order_canceled'; - } + if (ordertype !== '') { + sendemail.sendEmail_Order(userDest.lang, idapp, myOrdersCart, userDest, ordertype, status) + .then((ris) => { - if (ordertype !== '') { - sendemail.sendEmail_Order(userDest.lang, idapp, myOrdersCart, userDest, ordertype, status) - .then((ris) => { - - }) + }) + } } }