From 9130ecfe76ceb60891944f1425b1c741ecd4f7c4 Mon Sep 17 00:00:00 2001
From: Paul Maillardet <paul@pulsanova.com>
Date: Thu, 22 Apr 2021 13:02:55 +0200
Subject: [PATCH] Corrige les devis

---
 client/src/components/EventDetails/index.js   | 2 +-
 client/src/components/EventOverview/index.js  | 2 +-
 client/src/locale/en/pages.js                 | 4 ++++
 client/src/locale/fr/pages.js                 | 4 ++++
 client/tests/unit/utils/formatOptions.spec.js | 6 +++++-
 server/src/views/pdf/estimate-default.twig    | 7 +++++++
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/client/src/components/EventDetails/index.js b/client/src/components/EventDetails/index.js
index 2732a72dc..674254fb1 100644
--- a/client/src/components/EventDetails/index.js
+++ b/client/src/components/EventDetails/index.js
@@ -118,7 +118,7 @@ export default {
         return;
       }
 
-      const { value } = await Alert.ConfirmDelete(this.$t, 'estimate', false);
+      const { value } = await Alert.ConfirmDelete(this.$t, 'estimate');
       if (!value) {
         return;
       }
diff --git a/client/src/components/EventOverview/index.js b/client/src/components/EventOverview/index.js
index 55778b606..840a597fe 100644
--- a/client/src/components/EventOverview/index.js
+++ b/client/src/components/EventOverview/index.js
@@ -104,7 +104,7 @@ export default {
         return;
       }
 
-      const { value } = await Alert.ConfirmDelete(this.$t, 'estimate', false);
+      const { value } = await Alert.ConfirmDelete(this.$t, 'estimate');
       if (!value) {
         return;
       }
diff --git a/client/src/locale/en/pages.js b/client/src/locale/en/pages.js
index 02aa89557..7b346e9fa 100644
--- a/client/src/locale/en/pages.js
+++ b/client/src/locale/en/pages.js
@@ -300,6 +300,10 @@ export default {
     'saved': "Tag saved.",
     'deleted': "Tag deleted.",
   },
+
+  'page-estimate': {
+    'confirm-delete': "Do you really want to delete this estimate?",
+  },
 };
 /* eslint-enable quotes */
 /* eslint-enable quote-props */
diff --git a/client/src/locale/fr/pages.js b/client/src/locale/fr/pages.js
index ce22d05da..ed56e2abf 100644
--- a/client/src/locale/fr/pages.js
+++ b/client/src/locale/fr/pages.js
@@ -300,6 +300,10 @@ export default {
     'saved': "Étiquette sauvegardée.",
     'deleted': "Étiquette supprimée.",
   },
+
+  'page-estimate': {
+    'confirm-delete': "Voulez-vous vraiment supprimer ce devis\u00a0?",
+  },
 };
 /* eslint-enable quotes */
 /* eslint-enable quote-props */
diff --git a/client/tests/unit/utils/formatOptions.spec.js b/client/tests/unit/utils/formatOptions.spec.js
index 901cadf9c..ae1fa39a6 100644
--- a/client/tests/unit/utils/formatOptions.spec.js
+++ b/client/tests/unit/utils/formatOptions.spec.js
@@ -29,7 +29,11 @@ describe('formatOptions', () => {
         company: { id: 1, name: 'Testing' },
       },
     ];
-    const getLabel = ({ title, phone, company }) => `${title} ${phone} − ${company?.name || ''}`;
+    const getLabel = ({ title, phone, company }) => {
+      const companyName = company?.name || '';
+      return `${title} ${phone} − ${companyName}`;
+    };
+
     const options = formatOptions(entities, getLabel);
     expect(options).toEqual([
       { value: 1, label: 'test1 0123456789 − ' },
diff --git a/server/src/views/pdf/estimate-default.twig b/server/src/views/pdf/estimate-default.twig
index 9de0a7f69..78e675938 100644
--- a/server/src/views/pdf/estimate-default.twig
+++ b/server/src/views/pdf/estimate-default.twig
@@ -194,6 +194,13 @@
             {% endif %}
         </tbody>
     </table>
+
+    <p class="vspace5 size10">
+        Date d'acceptation du devis :
+    </p>
+    <p class="size10">
+        Signature du client, précédée la mention « bon pour accord » :
+    </p>
 </div>
 
 <div class="changePage vspace5">