From 455d5148d0da9bb321e95745e35d7ce2b179d7c9 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 4 Aug 2020 09:53:13 -0700
Subject: [PATCH] Added negative validation on entering invoices for credit
 memos BOD-219

---
 bodyshop_translations.babel                   |  21 +++
 .../invoice-form/invoice-form.component.jsx   | 153 ++++++++++--------
 .../invoice-form.lines.component.jsx          |  49 +++---
 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, 140 insertions(+), 86 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 1a1ec7f14..6963e536d 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -8350,6 +8350,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>enteringcreditmemo</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>federal_tax</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/invoice-form/invoice-form.component.jsx b/client/src/components/invoice-form/invoice-form.component.jsx
index 52daf7cdf..be50940f3 100644
--- a/client/src/components/invoice-form/invoice-form.component.jsx
+++ b/client/src/components/invoice-form/invoice-form.component.jsx
@@ -9,6 +9,7 @@ import {
 } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
+import AlertComponent from "../alert/alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
@@ -50,17 +51,18 @@ export default function InvoiceFormComponent({
   }, [form, setDiscount, vendorAutoCompleteOptions, loadLines]);
 
   return (
-    <div className='invoice-form-wrapper'>
-      <div className='invoice-form-invoice-details'>
+    <div className="invoice-form-wrapper">
+      <div className="invoice-form-invoice-details">
         <Form.Item
-          name='jobid'
+          name="jobid"
           label={t("invoices.fields.ro_number")}
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}>
+          ]}
+        >
           <JobSearchSelect
             options={roAutoCompleteOptions}
             disabled={invoiceEdit}
@@ -73,74 +75,82 @@ export default function InvoiceFormComponent({
         </Form.Item>
         <Form.Item
           label={t("invoices.fields.vendor")}
-          name='vendorid'
+          name="vendorid"
           style={{ display: invoiceEdit ? "none" : null }}
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}>
+          ]}
+        >
           <VendorSearchSelect
             options={vendorAutoCompleteOptions}
             onSelect={handleVendorSelect}
           />
         </Form.Item>
       </div>
-      <div className='invoice-form-invoice-details'>
+      <div className="invoice-form-invoice-details">
         <Form.Item
           label={t("invoices.fields.invoice_number")}
-          name='invoice_number'
+          name="invoice_number"
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}>
+          ]}
+        >
           <Input />
         </Form.Item>
         <Form.Item
           label={t("invoices.fields.date")}
-          name='date'
+          name="date"
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}>
+          ]}
+        >
           <DatePicker />
         </Form.Item>
         <Form.Item
           label={t("invoices.fields.is_credit_memo")}
-          name='is_credit_memo'
-          valuePropName='checked'>
+          name="is_credit_memo"
+          valuePropName="checked"
+        >
           <Switch />
         </Form.Item>
         <Form.Item
           label={t("invoices.fields.total")}
-          name='total'
+          name="total"
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}>
-          <CurrencyInput />
+          ]}
+        >
+          <CurrencyInput min={0} />
         </Form.Item>
         <Form.Item
           label={t("invoices.fields.federal_tax_rate")}
-          name='federal_tax_rate'>
-          <CurrencyInput />
+          name="federal_tax_rate"
+        >
+          <CurrencyInput min={0} />
         </Form.Item>
         <Form.Item
           label={t("invoices.fields.state_tax_rate")}
-          name='state_tax_rate'>
-          <CurrencyInput />
+          name="state_tax_rate"
+        >
+          <CurrencyInput min={0} />
         </Form.Item>
         <Form.Item
           label={t("invoices.fields.local_tax_rate")}
-          name='local_tax_rate'>
-          <CurrencyInput />
+          name="local_tax_rate"
+        >
+          <CurrencyInput min={0} />
         </Form.Item>
       </div>
       <InvoiceFormLines
@@ -151,18 +161,19 @@ export default function InvoiceFormComponent({
       />
 
       <Form.Item
-        name='upload'
-        label='Upload'
+        name="upload"
+        label="Upload"
         style={{ display: invoiceEdit ? "none" : null }}
-        valuePropName='fileList'
+        valuePropName="fileList"
         getValueFromEvent={(e) => {
           console.log("Upload event:", e);
           if (Array.isArray(e)) {
             return e;
           }
           return e && e.fileList;
-        }}>
-        <Upload name='logo' beforeUpload={() => false} listType='picture'>
+        }}
+      >
+        <Upload name="logo" beforeUpload={() => false} listType="picture">
           <Button>Click to upload</Button>
         </Upload>
       </Form.Item>
@@ -185,46 +196,54 @@ export default function InvoiceFormComponent({
             totals = CalculateInvoiceTotal(values);
           if (!!totals)
             return (
-              <div className='invoice-form-totals'>
-                <Statistic
-                  title={t("invoices.labels.subtotal")}
-                  value={totals.subtotal.toFormat()}
-                  precision={2}
-                />
-                <Statistic
-                  title={t("invoices.labels.federal_tax")}
-                  value={totals.federalTax.toFormat()}
-                  precision={2}
-                />
-                <Statistic
-                  title={t("invoices.labels.state_tax")}
-                  value={totals.stateTax.toFormat()}
-                  precision={2}
-                />
-                <Statistic
-                  title={t("invoices.labels.local_tax")}
-                  value={totals.localTax.toFormat()}
-                  precision={2}
-                />
-                <Statistic
-                  title={t("invoices.labels.entered_total")}
-                  value={totals.enteredTotal.toFormat()}
-                  precision={2}
-                />
-                <Statistic
-                  title={t("invoices.labels.invoice_total")}
-                  value={totals.invoiceTotal.toFormat()}
-                  precision={2}
-                />
-                <Statistic
-                  title={t("invoices.labels.discrepancy")}
-                  valueStyle={{
-                    color:
-                      totals.discrepancy.getAmount() === 0 ? "green" : "red",
-                  }}
-                  value={totals.discrepancy.toFormat()}
-                  precision={2}
-                />
+              <div>
+                <div className="invoice-form-totals">
+                  <Statistic
+                    title={t("invoices.labels.subtotal")}
+                    value={totals.subtotal.toFormat()}
+                    precision={2}
+                  />
+                  <Statistic
+                    title={t("invoices.labels.federal_tax")}
+                    value={totals.federalTax.toFormat()}
+                    precision={2}
+                  />
+                  <Statistic
+                    title={t("invoices.labels.state_tax")}
+                    value={totals.stateTax.toFormat()}
+                    precision={2}
+                  />
+                  <Statistic
+                    title={t("invoices.labels.local_tax")}
+                    value={totals.localTax.toFormat()}
+                    precision={2}
+                  />
+                  <Statistic
+                    title={t("invoices.labels.entered_total")}
+                    value={totals.enteredTotal.toFormat()}
+                    precision={2}
+                  />
+                  <Statistic
+                    title={t("invoices.labels.invoice_total")}
+                    value={totals.invoiceTotal.toFormat()}
+                    precision={2}
+                  />
+                  <Statistic
+                    title={t("invoices.labels.discrepancy")}
+                    valueStyle={{
+                      color:
+                        totals.discrepancy.getAmount() === 0 ? "green" : "red",
+                    }}
+                    value={totals.discrepancy.toFormat()}
+                    precision={2}
+                  />
+                </div>
+                {form.getFieldValue("is_credit_memo") ? (
+                  <AlertComponent
+                    type="warning"
+                    message={t("invoices.labels.enteringcreditmemo")}
+                  />
+                ) : null}
               </div>
             );
           return null;
diff --git a/client/src/components/invoice-form/invoice-form.lines.component.jsx b/client/src/components/invoice-form/invoice-form.lines.component.jsx
index 80793b2f8..3fe86b0f5 100644
--- a/client/src/components/invoice-form/invoice-form.lines.component.jsx
+++ b/client/src/components/invoice-form/invoice-form.lines.component.jsx
@@ -15,13 +15,13 @@ export default function InvoiceEnterModalLinesComponent({
   const { setFieldsValue, getFieldsValue } = form;
 
   return (
-    <Form.List name='invoicelines'>
+    <Form.List name="invoicelines">
       {(fields, { add, remove }) => {
         return (
-          <div className='invoice-form-lines-wrapper'>
+          <div className="invoice-form-lines-wrapper">
             {fields.map((field, index) => (
               <Form.Item required={false} key={field.key}>
-                <div className='invoice-form-line'>
+                <div className="invoice-form-line">
                   <Form.Item
                     label={t("invoicelines.fields.jobline")}
                     key={`${index}joblinename`}
@@ -31,7 +31,8 @@ export default function InvoiceEnterModalLinesComponent({
                         required: true,
                         message: t("general.validation.required"),
                       },
-                    ]}>
+                    ]}
+                  >
                     <InvoiceLineSearchSelect
                       options={lineData}
                       onSelect={(value, opt) => {
@@ -68,7 +69,8 @@ export default function InvoiceEnterModalLinesComponent({
                         required: true,
                         message: t("general.validation.required"),
                       },
-                    ]}>
+                    ]}
+                  >
                     <Input />
                   </Form.Item>
                   <Form.Item
@@ -80,8 +82,9 @@ export default function InvoiceEnterModalLinesComponent({
                         required: true,
                         message: t("general.validation.required"),
                       },
-                    ]}>
-                    <InputNumber precision={0} />
+                    ]}
+                  >
+                    <InputNumber precision={0} min={0} />
                   </Form.Item>
                   <Form.Item
                     label={t("invoicelines.fields.actual")}
@@ -92,8 +95,10 @@ export default function InvoiceEnterModalLinesComponent({
                         required: true,
                         message: t("general.validation.required"),
                       },
-                    ]}>
+                    ]}
+                  >
                     <CurrencyInput
+                      min={0}
                       onBlur={(e) => {
                         setFieldsValue({
                           invoicelines: getFieldsValue(
@@ -122,8 +127,9 @@ export default function InvoiceEnterModalLinesComponent({
                         required: true,
                         message: t("general.validation.required"),
                       },
-                    ]}>
-                    <CurrencyInput />
+                    ]}
+                  >
+                    <CurrencyInput min={0} />
                   </Form.Item>
                   <Form.Item shouldUpdate>
                     {() => {
@@ -151,7 +157,8 @@ export default function InvoiceEnterModalLinesComponent({
                         required: true,
                         message: t("general.validation.required"),
                       },
-                    ]}>
+                    ]}
+                  >
                     <Select style={{ width: "150px" }}>
                       {responsibilityCenters.costs.map((item) => (
                         <Select.Option key={item.name}>
@@ -164,22 +171,25 @@ export default function InvoiceEnterModalLinesComponent({
                     label={t("invoicelines.fields.federal_tax_applicable")}
                     key={`${index}fedtax`}
                     initialValue={true}
-                    valuePropName='checked'
-                    name={[field.name, "applicable_taxes", "federal"]}>
+                    valuePropName="checked"
+                    name={[field.name, "applicable_taxes", "federal"]}
+                  >
                     <Switch />
                   </Form.Item>
                   <Form.Item
                     label={t("invoicelines.fields.state_tax_applicable")}
                     key={`${index}statetax`}
-                    valuePropName='checked'
-                    name={[field.name, "applicable_taxes", "state"]}>
+                    valuePropName="checked"
+                    name={[field.name, "applicable_taxes", "state"]}
+                  >
                     <Switch />
                   </Form.Item>
                   <Form.Item
                     label={t("invoicelines.fields.local_tax_applicable")}
                     key={`${index}localtax`}
-                    valuePropName='checked'
-                    name={[field.name, "applicable_taxes", "local"]}>
+                    valuePropName="checked"
+                    name={[field.name, "applicable_taxes", "local"]}
+                  >
                     <Switch />
                   </Form.Item>
                   <DeleteFilled
@@ -192,11 +202,12 @@ export default function InvoiceEnterModalLinesComponent({
             ))}
             <Form.Item>
               <Button
-                type='dashed'
+                type="dashed"
                 onClick={() => {
                   add();
                 }}
-                style={{ width: "50%" }}>
+                style={{ width: "50%" }}
+              >
                 {t("invoicelines.actions.newline")}
               </Button>
             </Form.Item>
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 501385ca3..06306cb68 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -550,6 +550,7 @@
 				"actions": "Actions",
 				"discrepancy": "Discrepancy",
 				"entered_total": "Total of Entered Lines",
+				"enteringcreditmemo": "You are entering a credit memo. Please ensure you are also entering positive values.",
 				"federal_tax": "Federal Tax",
 				"invoice_total": "Invoice Total Amount",
 				"invoices": "Invoices",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 86578d663..d2dc257f6 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -550,6 +550,7 @@
 				"actions": "",
 				"discrepancy": "",
 				"entered_total": "",
+				"enteringcreditmemo": "",
 				"federal_tax": "",
 				"invoice_total": "",
 				"invoices": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 362999dc6..c0e8e6021 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -550,6 +550,7 @@
 				"actions": "",
 				"discrepancy": "",
 				"entered_total": "",
+				"enteringcreditmemo": "",
 				"federal_tax": "",
 				"invoice_total": "",
 				"invoices": "",