diff --git a/database/addContractTransaction.js b/database/addContractTransaction.js index dc1b6a70..5abdc9f2 100644 --- a/database/addContractTransaction.js +++ b/database/addContractTransaction.js @@ -15,10 +15,10 @@ export default function addContractTransaction(contractTransactionForm, user) { transactionIndex = maxIndexResult.transactionIndex + 1; } const rightNow = new Date(); - const transactionDate = contractTransactionForm.transactionDateString === '' + const transactionDate = (contractTransactionForm.transactionDateString ?? '') === '' ? dateToInteger(rightNow) : dateStringToInteger(contractTransactionForm.transactionDateString); - const transactionTime = contractTransactionForm.transactionTimeString === '' + const transactionTime = (contractTransactionForm.transactionTimeString ?? '') === '' ? dateToTimeInteger(rightNow) : timeStringToInteger(contractTransactionForm.transactionTimeString); database diff --git a/database/addContractTransaction.ts b/database/addContractTransaction.ts index c40beada..ea76d0ec 100644 --- a/database/addContractTransaction.ts +++ b/database/addContractTransaction.ts @@ -48,14 +48,14 @@ export default function addContractTransaction( const rightNow = new Date() const transactionDate = - contractTransactionForm.transactionDateString === '' + (contractTransactionForm.transactionDateString ?? '') === '' ? dateToInteger(rightNow) : dateStringToInteger( contractTransactionForm.transactionDateString as DateString ) const transactionTime = - contractTransactionForm.transactionTimeString === '' + (contractTransactionForm.transactionTimeString ?? '') === '' ? dateToTimeInteger(rightNow) : timeStringToInteger( contractTransactionForm.transactionTimeString as TimeString diff --git a/temp/legacyImportFromCsv/index.js b/temp/legacyImportFromCsv/index.js index 4522ce77..1601b263 100644 --- a/temp/legacyImportFromCsv/index.js +++ b/temp/legacyImportFromCsv/index.js @@ -495,6 +495,7 @@ async function importFromPrepaidCSV() { externalReceiptNumber: '', transactionAmount, transactionDateString: contractStartDateString, + transactionTimeString: '00:00', transactionNote: `Order Number: ${prepaidRow.CMPP_ORDER_NO}` }, user); if (prepaidRow.CMPP_REMARK1 !== '') { diff --git a/temp/legacyImportFromCsv/index.ts b/temp/legacyImportFromCsv/index.ts index e804d52c..1c57da27 100644 --- a/temp/legacyImportFromCsv/index.ts +++ b/temp/legacyImportFromCsv/index.ts @@ -794,6 +794,8 @@ async function importFromPrepaidCSV(): Promise { externalReceiptNumber: '', transactionAmount, transactionDateString: contractStartDateString, + transactionTimeString: '00:00', + transactionNote: `Order Number: ${prepaidRow.CMPP_ORDER_NO}` }, user