Use current day's date & minor changes (#1584)

use current date & minor changes Co-authored-by: “Apoorv <“[email protected]”> Co-authored-by: Prasanth Chaduvula <[email protected]>
saeloun · Nov 7, 2023 · af3cbce · af3cbce
1 parent 1a2d7de
commit af3cbce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/javascript/src/components/Invoices/Invoice/MarkInvoicePaidModal.tsx b/app/javascript/src/components/Invoices/Invoice/MarkInvoicePaidModal.tsx
@@ -23,7 +23,7 @@ const MarkInvoiceAsPaidModal = ({
   fetchInvoice,
 }) => {
   const { isDesktop } = useUserContext();
-  const [transactionDate, setTransactionDate] = useState<any>(null);
+  const [transactionDate, setTransactionDate] = useState<any>(dayjs());
   const [transactionType, setTransactionType] = useState<any>(null);
   const [note, setNote] = useState<any>(null);
   const [showDatePicker, setShowDatePicker] = useState<any>(false);
@@ -120,16 +120,17 @@ const MarkInvoiceAsPaidModal = ({
           }
         >
           <CustomInputText
-            disabled
+            readOnly
             id="transactionDate"
+            inputBoxClassName="cursor-pointer"
             label="Transaction Date"
             name="transactionDate"
             type="text"
             value={transactionDate && dayjs(transactionDate).format(dateFormat)}
             onChange={() => {}} //eslint-disable-line
           />
           <CalendarIcon
-            className="absolute top-0 bottom-0 right-1 mx-2 my-3 "
+            className="absolute top-0 bottom-0 right-1 mx-2 my-3 cursor-pointer "
             color="#5B34EA"
             size={20}
           />

diff --git a/app/javascript/src/components/payments/Modals/PaymentEntryForm.tsx b/app/javascript/src/components/payments/Modals/PaymentEntryForm.tsx
@@ -34,7 +34,7 @@ const PaymentEntryForm = ({
   const { isDesktop } = useUserContext();
 
   const [invoice, setInvoice] = useState<any>(null);
-  const [transactionDate, setTransactionDate] = useState<any>(null);
+  const [transactionDate, setTransactionDate] = useState<any>(dayjs());
   const [transactionType, setTransactionType] = useState<any>(null);
   const [amount, setAmount] = useState<any>(null);
   const [note, setNote] = useState<any>(null);
@@ -249,16 +249,17 @@ const PaymentEntryForm = ({
           }
         >
           <CustomInputText
-            disabled
+            readOnly
             id="transactionDate"
+            inputBoxClassName="cursor-pointer"
             label="Transaction Date"
             name="transactionDate"
             type="text"
             value={transactionDate && dayjs(transactionDate).format(dateFormat)}
             onChange={() => {}} //eslint-disable-line
           />
           <CalendarIcon
-            className="absolute top-0 bottom-0 right-1 mx-2 my-3 "
+            className="absolute top-0 bottom-0 right-1 mx-2 my-3 cursor-pointer"
             color="#5B34EA"
             size={20}
           />