diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js
index 700c2ba9a..1cedd9ef9 100644
--- a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js
@@ -3,24 +3,28 @@ import intl from 'react-intl-universal';
import styled from 'styled-components';
import { FFormGroup, FEditableText, FormattedMessage as T } from 'components';
+/**
+ * Payment made form footer left-side.
+ * @returns {JSX.Element}
+ */
export function PaymentMadeFormFooterLeft() {
return (
- {/* --------- Statement--------- */}
- }
- hintText={'Will be displayed on the Payment'}
+ {/* --------- Internal Note--------- */}
+ }
>
-
+
);
}
-const StatementFormGroup = styled(FFormGroup)`
+
+const InternalNoteFormGroup = styled(FFormGroup)`
&.bp3-form-group {
margin-bottom: 40px;
diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.js b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.js
index af51416f8..e11f0a691 100644
--- a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.js
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.js
@@ -103,7 +103,7 @@ function PaymentMadeFormProvider({ query, paymentMadeId, ...props }) {
}
- hintText={'Will be displayed on the invoice'}
>
- }
+ placeholder={intl.get(
+ 'credit_note.label_terms_and_conditions.placeholder',
+ )}
/>
diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js
index 426c67f94..98181f91a 100644
--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js
@@ -10,7 +10,6 @@ export function InvoiceFormFooterLeft() {
}
- hintText={'Will be displayed on the invoice'}
>
}
+ label={}
name={'terms_conditions'}
>
{/* --------- Statement--------- */}
- }
- hintText={'Will be displayed on the Payment'}
+ }
>
+
+
+ {/* --------- Internal Note--------- */}
+ }
+ >
+
@@ -32,3 +42,17 @@ const TermsConditsFormGroup = styled(FFormGroup)`
}
}
`;
+
+const PaymentMsgFormGroup = styled(FFormGroup)`
+ &.bp3-form-group {
+ margin-bottom: 40px;
+
+ .bp3-label {
+ font-size: 12px;
+ margin-bottom: 12px;
+ }
+ .bp3-form-content {
+ margin-left: 10px;
+ }
+ }
+`;
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormFooterLeft.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormFooterLeft.js
index c09d7db5e..4f3edc6ec 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormFooterLeft.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormFooterLeft.js
@@ -1,5 +1,6 @@
import React from 'react';
import styled from 'styled-components';
+import intl from 'react-intl-universal';
import { FFormGroup, FEditableText, FormattedMessage as T } from 'components';
export function WarehouseTransferFormFooterLeft() {
@@ -7,14 +8,12 @@ export function WarehouseTransferFormFooterLeft() {
{/* --------- Terms and conditions --------- */}
}
+ label={}
name={'reason'}
>
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeader.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeader.js
index 3137b1e99..7a6ebc57a 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeader.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeader.js
@@ -1,7 +1,5 @@
import React from 'react';
import classNames from 'classnames';
-import { useFormikContext } from 'formik';
-import intl from 'react-intl-universal';
import { CLASSES } from 'common/classes';
import WarehouseTransferFormHeaderFields from './WarehouseTransferFormHeaderFields';
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js
index 038d99a8a..acebd4c14 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js
@@ -183,20 +183,6 @@ function WarehouseTransferFormHeaderFields({
)}
- {/*------------ reason -----------*/}
-
- {({ field, meta: { error, touched } }) => (
- }
- className={'form-group--reason'}
- intent={inputIntent({ error, touched })}
- inline={true}
- helperText={}
- >
-
-
- )}
-
);
}
diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json
index 1c5cde331..48edb6793 100644
--- a/src/lang/ar/index.json
+++ b/src/lang/ar/index.json
@@ -2003,7 +2003,7 @@
"estimate.warehouse_button.label": "المخزن: {label}",
"receipt.branch_button.label": "الفرع: {label}",
"receipt.warehouse_button.label": "المخزن: {label}",
- "warehouse_transfer.empty_status.title": "",
- "warehouse_transfer.empty_status.description": "",
+ "warehouse_transfer.empty_status.title": "إدارة عمليات النقل بين المستودعات",
+ "warehouse_transfer.empty_status.description": "غالبًا ماتحتاج الاعمال ذات مستودعات متعددة لطلبات نقل البضائع من مستودع إلى آخر عندما تكون في حاجة ماسة إلى البائعين.",
"item.error.you_could_not_delete_item_has_associated": "لا يمكنك حذف العنصر لديه معاملات مرتبطة به "
}
\ No newline at end of file
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index fd2ad8d65..43e936ab8 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1525,9 +1525,9 @@
"credit_note.label_credit_note": "Credit Note #",
"credit_note.label_amount_to_credit": "Amount to credit",
"credit_note.label_credit_note_details": "Credit Note details",
- "credit_note.label_customer_note": "Customer note",
- "credit_note.label_terms_conditions": "Terms conditions",
- "credit_note.label_customer_note.placeholder": "Thanks for your business and have a great day!",
+ "credit_note.label_customer_note": "Customer Note",
+ "credit_note.label_terms_conditions": "Terms & Conditions",
+ "credit_note.label_customer_note.placeholder": "The customer note will be displayed on the credit note.",
"credit_note.label_terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
"credit_note.label_total": "TOTAL",
"credit_note.label_subtotal": "Subtotal",
@@ -1948,42 +1948,51 @@
"estimate_form.label.total": "TOTAL",
"estimate_form.label.subtotal": "Subtotal",
"estimate_form.label.customer_note": "Customer Note",
- "estimate_form.label.terms_conditions": "Terms conditions",
- "estimate_form.customer_note.placeholder": "Thanks for your business and have a great day!",
+ "estimate_form.label.terms_conditions": "Terms & Conditions",
+ "estimate_form.customer_note.placeholder": "This message will be displayed on the estimate.",
"estimate_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
"invoice_form.label.total": "TOTAL",
"invoice_form.label.subtotal": "Subtotal",
"invoice_form.label.due_amount": "Due amount",
"invoice_form.label.payment_amount": "Payment amount",
"invoice_form.label.invoice_message": "Invoice Message",
- "invoice_form.invoice_message.placeholder": "Thanks for your business and have a great day!",
- "invoice_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+ "invoice_form.label.terms_conditions": "Terms & Conditions",
+ "invoice_form.invoice_message.placeholder": "This message will be displayed on the invoice.",
+ "invoice_form.terms_and_conditions.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction.",
"receipt_form.label.total": "TOTAL",
"receipt_form.label.subtotal": "Subtotal",
"receipt_form.label.due_amount": "Due amount",
"receipt_form.label.payment_amount": "Payment amount",
"receipt_form.label.receipt_message": "Receipt Message",
- "receipt_form.receipt_message.placeholder": "Thanks for your business and have a great day!",
+ "receipt_form.receipt_message.placeholder": "This message will be displayed on the receipt.",
"receipt_form.label.statement": "Statement",
"receipt_form.statement.placeholder": "Thanks for your business and have a great day!",
- "payment_receive_form.label.statement": "Statement",
- "payment_receive_form.statement.placeholder": "Thanks for your business and have a great day!",
+
+ "payment_receive_form.label.internal_note": "Internal Note",
+ "payment_receive_form.internal_note.placeholder": "Internal notes, Not visible to the customer.",
+
+ "payment_receive_form.message.label": "Payment Message",
+ "payment_receive_form.message.placeholder": "This message will be displayed on the payment receipt.",
+
"payment_receive_form.label.subtotal": "Subtotal",
"payment_receive_form.label.total": "TOTAL",
+
"bill_form.label.note": "Note",
- "bill_form.label.note.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+ "bill_form.label.note.placeholder": "Internal note. Not visible to the vendor.",
"bill_form.label.subtotal": "Subtotal",
"bill_form.label.total": "TOTAL",
"bill_form.label.due_amount": "Due amount",
"bill_form.label.payment_amount": "Payment amount",
"vendor_credit_form.label.note": "Note",
- "vendor_credit_form.note.placeholder": "Enter the terms and conditions of your business to be displayed in your transaction",
+ "vendor_credit_form.note.placeholder": "Internal note. Not visible to the vendor.",
"vendor_credit_form.label.subtotal": "Subtotal",
"vendor_credit_form.label.total": "TOTAL",
"payment_made_form.label.statement": "Statement",
"payment_made_form.statement.placeholder": "Thanks for your business and have a great day!",
"payment_made_form.label.subtotal": "Subtotal",
"payment_made_form.label.total": "TOTAL",
+ "payment_made.form.internal_note.label": "Note",
+ "payment_made.form.internal_note.placeholder": "Internal note. Not visible to the vendor.",
"make_journal.label.subtotal": "Subtotal",
"make_journal.label.total": "TOTAL",
"expense.label.subtotal": "Subtotal",
@@ -2002,6 +2011,10 @@
"estimate.warehouse_button.label": "Warehouse: {label}",
"receipt.branch_button.label": "Branch: {label}",
"receipt.warehouse_button.label": "Warehouse: {label}",
- "warehouse_transfer.empty_status.title": "",
- "warehouse_transfer.empty_status.description": ""
+
+ "warehouse_transfer.empty_status.title": "Manage transfer orders between warehouses.",
+ "warehouse_transfer.empty_status.description": "Business with multiply warehouses often transfers items from on warehouse to another when they are in immediate need of vendors.",
+
+ "warehouse_transfer.form.reason.label": "Reason",
+ "warehouse_transfer.form.reason.placeholder": "Enter the reason behind the transfer order."
}
\ No newline at end of file