From 70a6ffc7db6cb4e9a5174e184768111230536c27 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 13 Apr 2021 10:36:41 -0700
Subject: [PATCH] IO-897 Save and New for payment modal

---
 bodyshop_translations.babel                   | 23 ++++++-
 .../payment-form/payment-form.component.jsx   |  3 +-
 .../payment-modal/payment-modal.container.jsx | 64 ++++++++++++++-----
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 6 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 2f84f3454..df6015085 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -12480,6 +12480,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>none</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>out</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/payment-form/payment-form.component.jsx b/client/src/components/payment-form/payment-form.component.jsx
index c384898fe..d010c8259 100644
--- a/client/src/components/payment-form/payment-form.component.jsx
+++ b/client/src/components/payment-form/payment-form.component.jsx
@@ -140,9 +140,10 @@ export function PaymentFormComponent({
       <Form.Item
         label={t("general.labels.sendby")}
         name="sendby"
-        initialValue="email"
+        initialValue="none"
       >
         <Radio.Group disabled={disabled}>
+          <Radio value="none">{t("general.labels.none")}</Radio>
           <Radio value="email">{t("general.labels.email")}</Radio>
           <Radio value="print">{t("general.labels.print")}</Radio>
         </Radio.Group>
diff --git a/client/src/components/payment-modal/payment-modal.container.jsx b/client/src/components/payment-modal/payment-modal.container.jsx
index 33138d605..c77a6be14 100644
--- a/client/src/components/payment-modal/payment-modal.container.jsx
+++ b/client/src/components/payment-modal/payment-modal.container.jsx
@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { CardElement, useElements, useStripe } from "@stripe/react-stripe-js";
-import { Form, Modal, notification } from "antd";
+import { Button, Form, Modal, notification } from "antd";
 import axios from "axios";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -41,6 +41,7 @@ function BillEnterModalContainer({
   setEmailOptions,
 }) {
   const [form] = Form.useForm();
+  const [enterAgain, setEnterAgain] = useState(false);
   const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
   const [updatePayment] = useMutation(UPDATE_PAYMENT);
   const stripe = useStripe();
@@ -119,20 +120,22 @@ function BillEnterModalContainer({
           notification["error"]({ message: t("payments.errors.payment") });
         }
         const Templates = TemplateList("payment");
-        GenerateDocument(
-          {
-            name: Templates.payment_receipt.key,
-            variables: {
-              id: newPayment.data.insert_payments.returning[0].id,
+        if (sendby !== "none") {
+          GenerateDocument(
+            {
+              name: Templates.payment_receipt.key,
+              variables: {
+                id: newPayment.data.insert_payments.returning[0].id,
+              },
             },
-          },
-          {
-            // to: [appData.email],
-            replyTo: bodyshop.email,
-            subject: Templates.payment_receipt.subject,
-          },
-          sendby === "email" ? "e" : "p"
-        );
+            {
+              // to: [appData.email],
+              replyTo: bodyshop.email,
+              subject: Templates.payment_receipt.subject,
+            },
+            sendby === "email" ? "e" : "p"
+          );
+        }
       } else {
         const updatedPayment = await updatePayment({
           variables: {
@@ -149,10 +152,17 @@ function BillEnterModalContainer({
       }
 
       if (actions.refetch) actions.refetch();
-      toggleModalVisible();
+      if (enterAgain) {
+        form.resetFields();
+        form.setFieldsValue({ billlines: [] });
+      } else {
+        toggleModalVisible();
+      }
+      setEnterAgain(false);
     } catch (error) {
       console.log("error", error);
     } finally {
+      setEnterAgain(false);
       setLoading(false);
     }
   };
@@ -165,6 +175,10 @@ function BillEnterModalContainer({
     if (visible) form.resetFields();
   }, [visible, form, context]);
 
+  useEffect(() => {
+    if (enterAgain) form.submit();
+  }, [enterAgain, form]);
+
   return (
     <Modal
       title={
@@ -179,6 +193,26 @@ function BillEnterModalContainer({
       okButtonProps={{
         loading: loading,
       }}
+      afterClose={() => form.resetFields()}
+      footer={
+        <span>
+          <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
+          <Button loading={loading} onClick={() => form.submit()}>
+            {t("general.actions.save")}
+          </Button>
+          {paymentModal.context && paymentModal.context.id ? null : (
+            <Button
+              type="primary"
+              loading={loading}
+              onClick={() => {
+                setEnterAgain(true);
+              }}
+            >
+              {t("general.actions.saveandnew")}
+            </Button>
+          )}
+        </span>
+      }
     >
       <Form
         onFinish={handleFinish}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 9ce7156d9..ec257a3f6 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -796,6 +796,7 @@
 				"monday": "Monday",
 				"na": "N/A",
 				"no": "No",
+				"none": "None",
 				"out": "Out",
 				"password": "Password",
 				"passwordresetsuccess": "A password reset link has been sent to you.",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 647e67c0c..e0b4064db 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -796,6 +796,7 @@
 				"monday": "",
 				"na": "N / A",
 				"no": "",
+				"none": "",
 				"out": "Afuera",
 				"password": "",
 				"passwordresetsuccess": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index c62951f7b..85087ad45 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -796,6 +796,7 @@
 				"monday": "",
 				"na": "N / A",
 				"no": "",
+				"none": "",
 				"out": "En dehors",
 				"password": "",
 				"passwordresetsuccess": "",