From 4c58e491693f05920e563ae9accad5bd646237f8 Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Thu, 11 Nov 2021 17:20:53 +0200
Subject: [PATCH] fix: SMS notification types.

---
 .../NotifyEstimateViaSMSForm.js               |  5 +++--
 .../NotifyInvoiceViaSMSForm.js                | 21 ++++++++++++-------
 .../NotifyPaymentReceiveViaSMSForm.js         |  7 +++++--
 .../NotifyReceiptViaSMSForm.js                |  3 ++-
 .../NotifyViaSMS/NotifyViaSMSFormFields.js    |  4 ++--
 src/lang/ar/index.json                        |  7 ++++++-
 src/lang/en/index.json                        |  7 ++++++-
 7 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/containers/Dialogs/NotifyEstimateViaSMSDialog/NotifyEstimateViaSMSForm.js b/src/containers/Dialogs/NotifyEstimateViaSMSDialog/NotifyEstimateViaSMSForm.js
index 30b58a3c5..13bcefe70 100644
--- a/src/containers/Dialogs/NotifyEstimateViaSMSDialog/NotifyEstimateViaSMSForm.js
+++ b/src/containers/Dialogs/NotifyEstimateViaSMSDialog/NotifyEstimateViaSMSForm.js
@@ -13,7 +13,7 @@ import { compose } from 'utils';
 
 const notificationType = {
   key: 'sale-estimate-details',
-  label: 'Sale estimate details',
+  label: intl.get('sms_notification.estimate_details.type'),
 };
 
 function NotifyEstimateViaSMSForm({
@@ -60,6 +60,7 @@ function NotifyEstimateViaSMSForm({
 
   const initialValues = {
     ...estimateSMSDetail,
+    notification_key: notificationType.key,
   };
   // Handle the form cancel.
   const handleFormCancel = () => {
@@ -69,7 +70,7 @@ function NotifyEstimateViaSMSForm({
   return (
     <NotifyViaSMSForm
       initialValues={initialValues}
-      notificationTypes={notificationType}
+      notificationTypes={[notificationType]}
       onCancel={handleFormCancel}
       onSubmit={handleFormSubmit}
       calloutCodes={calloutCode}
diff --git a/src/containers/Dialogs/NotifyInvoiceViaSMSDialog/NotifyInvoiceViaSMSForm.js b/src/containers/Dialogs/NotifyInvoiceViaSMSDialog/NotifyInvoiceViaSMSForm.js
index 4c703c347..4ce2349fe 100644
--- a/src/containers/Dialogs/NotifyInvoiceViaSMSDialog/NotifyInvoiceViaSMSForm.js
+++ b/src/containers/Dialogs/NotifyInvoiceViaSMSDialog/NotifyInvoiceViaSMSForm.js
@@ -15,6 +15,18 @@ const transformFormValuesToRequest = (values) => {
   return pick(values, ['notification_key']);
 };
 
+// Momerize the notification types.
+const notificationTypes = [
+  {
+    key: 'details',
+    label: intl.get('sms_notification.invoice_details.type'),
+  },
+  {
+    key: 'reminder',
+    label: intl.get('sms_notification.invoice_reminder.type'),
+  },
+];
+
 /**
  * Notify Invoice Via SMS Form.
  */
@@ -80,14 +92,7 @@ function NotifyInvoiceViaSMSForm({
       setNotificationType(values.notification_key);
     }
   };
-  // Momerize the notification types.
-  const notificationTypes = React.useMemo(
-    () => [
-      { key: 'details', label: 'Invoice details' },
-      { key: 'reminder', label: 'Invoice reminder' },
-    ],
-    [],
-  );
+
   return (
     <NotifyViaSMSForm
       initialValues={initialValues}
diff --git a/src/containers/Dialogs/NotifyPaymentReceiveViaSMSDialog/NotifyPaymentReceiveViaSMSForm.js b/src/containers/Dialogs/NotifyPaymentReceiveViaSMSDialog/NotifyPaymentReceiveViaSMSForm.js
index ee8a413cf..42604817e 100644
--- a/src/containers/Dialogs/NotifyPaymentReceiveViaSMSDialog/NotifyPaymentReceiveViaSMSForm.js
+++ b/src/containers/Dialogs/NotifyPaymentReceiveViaSMSDialog/NotifyPaymentReceiveViaSMSForm.js
@@ -13,7 +13,7 @@ import { compose } from 'utils';
 
 const notificationType = {
   key: 'payment-receive-details',
-  label: 'Payment receive thank you.',
+  label: intl.get('sms_notification.payment_details.type'),
 };
 
 /**
@@ -67,7 +67,10 @@ function NotifyPaymentReceiveViaSMSForm({
 
   // Form initial values.
   const initialValues = React.useMemo(
-    () => ({ ...paymentReceiveMSDetail }),
+    () => ({
+      ...paymentReceiveMSDetail,
+      notification_key: notificationType.key,
+    }),
     [paymentReceiveMSDetail],
   );
 
diff --git a/src/containers/Dialogs/NotifyReceiptViaSMSDialog/NotifyReceiptViaSMSForm.js b/src/containers/Dialogs/NotifyReceiptViaSMSDialog/NotifyReceiptViaSMSForm.js
index 7597b3dcb..185d25301 100644
--- a/src/containers/Dialogs/NotifyReceiptViaSMSDialog/NotifyReceiptViaSMSForm.js
+++ b/src/containers/Dialogs/NotifyReceiptViaSMSDialog/NotifyReceiptViaSMSForm.js
@@ -13,7 +13,7 @@ import { compose } from 'utils';
 
 const notificationType = {
   key: 'sale-receipt-details',
-  label: 'Sale receipt details',
+  label: intl.get('sms_notification.receipt_details.type'),
 };
 
 /**
@@ -66,6 +66,7 @@ function NotifyReceiptViaSMSForm({
   const initialValues = React.useMemo(
     () => ({
       ...receiptSMSDetail,
+      notification_key: notificationType.key,
     }),
     [receiptSMSDetail],
   );
diff --git a/src/containers/NotifyViaSMS/NotifyViaSMSFormFields.js b/src/containers/NotifyViaSMS/NotifyViaSMSFormFields.js
index 3b08b070e..d8dcb4aa0 100644
--- a/src/containers/NotifyViaSMS/NotifyViaSMSFormFields.js
+++ b/src/containers/NotifyViaSMS/NotifyViaSMSFormFields.js
@@ -16,7 +16,7 @@ export default function NotifyViaSMSFormFields({ notificationTypes }) {
   return (
     <NotifyViaSMSFormFieldsRoot>
       <FastField name={'notification_key'}>
-        {({ form, meta: { error, touched } }) => (
+        {({ form, field: { value }, meta: { error, touched } }) => (
           <FormGroup
             label={<T id={'notify_via_sms.dialog.notification_type'} />}
             className={classNames(CLASSES.FILL)}
@@ -26,7 +26,7 @@ export default function NotifyViaSMSFormFields({ notificationTypes }) {
             <ListSelect
               items={notificationTypes}
               selectedItemProp={'key'}
-              selectedItem={'details'}
+              selectedItem={value}
               textProp={'label'}
               popoverProps={{ minimal: true }}
               filterable={false}
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json
index 62af42e11..2b75235c9 100644
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -1473,5 +1473,10 @@
   "send_sms": "إرسال رسالة قصيرة",
   "save_sms_message": "حفظ رسالة قصيرة",
   "sms_message.edit_form.reset_to_default_message": "إعادة التعيين إلى الرسالة الافتراضية.",
-  "report.compute_running.refresh": "تحديث"
+  "report.compute_running.refresh": "تحديث",
+  "sms_notification.invoice_details.type": "تفاصيل الفاتورة",
+  "sms_notification.invoice_reminder.type": "تذكير بالفاتورة",
+  "sms_notification.estimate_details.type": "تفاصيل فاتورة عرض الاسعار",
+  "sms_notification.payment_details.type": "شكر علي عملية الدفع",
+  "sms_notification.receipt_details.type": "تفاصيل إيصال البيع"
 }
\ No newline at end of file
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index 6756eedfa..dbd3c027b 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1460,5 +1460,10 @@
   "send_sms": "Send SMS",
   "save_sms_message": "Save SMS Message",
   "sms_message.edit_form.reset_to_default_message": "Reset to default message.",
-  "report.compute_running.refresh": "Refresh"
+  "report.compute_running.refresh": "Refresh",
+  "sms_notification.invoice_details.type": "Invoice details",
+  "sms_notification.invoice_reminder.type": "Invoice reminder",
+  "sms_notification.estimate_details.type": "Sale estimate details",
+  "sms_notification.payment_details.type": "Payment receive thank you.",
+  "sms_notification.receipt_details.type": "Sale receipt details"
 }
\ No newline at end of file