From a7f343545f6d24a3ebd3dc1f9a230d59de8e6a77 Mon Sep 17 00:00:00 2001
From: Victor Turgeon <masfervic@hotmail.com>
Date: Fri, 25 Nov 2022 12:19:02 -0500
Subject: [PATCH] =?UTF-8?q?afficher=20le=20x=20que=20lorsque=20la=20comman?=
 =?UTF-8?q?de=20est=20confirm=C3=A9=20ou=20en=20pr=C3=A9paration=20et=20fi?=
 =?UTF-8?q?x=20de=20la=20page=20Invoice=20d'admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/InvoiceItem.js                    |  5 +++--
 .../grosses-mitaines-ui/src/pages/Invoices.js        | 12 ++++++------
 .../grosses-mitaines-ui/src/pages/MyInvoices.js      |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/GrossesMitaines/grosses-mitaines-ui/src/components/InvoiceItem.js b/GrossesMitaines/grosses-mitaines-ui/src/components/InvoiceItem.js
index 4b21cbe..678e525 100644
--- a/GrossesMitaines/grosses-mitaines-ui/src/components/InvoiceItem.js
+++ b/GrossesMitaines/grosses-mitaines-ui/src/components/InvoiceItem.js
@@ -105,8 +105,9 @@ const InvoiceItem = ({ invoice, onCancel }) => {
             <div className="invoice-item-products">
                 <div className="invoice-product-delete">
                     <h4 className='simple-item-title' >Produits</h4>
-                    <h1 className='simple-item-buttons'><FontAwesomeIcon icon={faTimes} className='btn-effacer-morceau' style={{ color: "red", cursor: 'pointer', margin: 'auto'}}
-                        onClick={() => onCancel(invoice.id)} /></h1>
+                    {(invoice.status == 0 || invoice.status == 2 )&&
+                        <h1 className='simple-item-buttons'><FontAwesomeIcon icon={faTimes} className='btn-effacer-morceau' style={{ color: "red", cursor: 'pointer', margin: 'auto' }}
+                            onClick={() => onCancel(invoice.id)} /></h1>}
                 </div>
                 <ul className="invoice-item-product-list">
                     {invoice.products.map((p) => (
diff --git a/GrossesMitaines/grosses-mitaines-ui/src/pages/Invoices.js b/GrossesMitaines/grosses-mitaines-ui/src/pages/Invoices.js
index 1172408..eccb20b 100644
--- a/GrossesMitaines/grosses-mitaines-ui/src/pages/Invoices.js
+++ b/GrossesMitaines/grosses-mitaines-ui/src/pages/Invoices.js
@@ -33,16 +33,16 @@ const Invoices = () => {
     const handleCancelInvoice = async (id) => {
 
         mySwal.fire({
-            title: `Effacer la commande?`,
-            text: 'Êtes-vous certain de vouloir effacer cette commande (cette action est irréversible)?',
+            title: `Annuler la commande?`,
+            text: 'Êtes-vous certain de vouloir annuler cette commande (cette action est irréversible)?',
             icon: 'warning',
             showCancelButton: true,
             confirmButtonText: 'Oui',
             cancelButtonText: 'Non',
         }).then(async (result) => {
             if (result.isConfirmed) {
-                fetch(`https://localhost:7292/api/Invoice?id=${id}`, {
-                    method: 'CANCEL',
+                fetch(`https://localhost:7292/api/Invoice/Cancel/${id}`, {
+                    method: 'POST',
                     mode: 'cors',
                     credentials: 'include'
                 }).then(async (response) => {
@@ -50,11 +50,11 @@ const Invoices = () => {
                         const deletedId = await response.json();
                         setInvoices(invoices.filter((invoice) => invoice.id !== deletedId));
 
-                        onShowAlert('Suppression de la commande avec succès!', 2000);
+                        onShowAlert('Annulation de la commande avec succès!', 2000);
                     }
                     else {
                         mySwal.fire({
-                            title: `Erreur lors de la suppression de la commande...`,
+                            title: `Erreur lors de l'annulation de la commande...`,
                             text: `L'erreur: ${response}`,
                             icon: 'error',
                         });
diff --git a/GrossesMitaines/grosses-mitaines-ui/src/pages/MyInvoices.js b/GrossesMitaines/grosses-mitaines-ui/src/pages/MyInvoices.js
index 0af3bc2..6d62068 100644
--- a/GrossesMitaines/grosses-mitaines-ui/src/pages/MyInvoices.js
+++ b/GrossesMitaines/grosses-mitaines-ui/src/pages/MyInvoices.js
@@ -29,8 +29,8 @@ const MyInvoices = () => {
     const handleCancelInvoice = async (id) => {
 
         mySwal.fire({
-            title: `Effacer la commande?`,
-            text: 'Êtes-vous certain de vouloir effacer cette commande (cette action est irréversible)?',
+            title: `Annuler la commande?`,
+            text: 'Êtes-vous certain de vouloir annuler cette commande (cette action est irréversible)?',
             icon: 'warning',
             showCancelButton: true,
             confirmButtonText: 'Oui',
@@ -54,7 +54,7 @@ const MyInvoices = () => {
                     }
                     else {
                         mySwal.fire({
-                            title: `Erreur lors de la suppression de la commande...`,
+                            title: `Erreur lors de l'annulation de la commande...`,
                             text: `L'erreur: ${await response.json()}`,
                             icon: 'error',
                         });