fix undefined transaction time
parent
9830bede34
commit
118fc1959b
|
|
@ -15,10 +15,10 @@ export default function addContractTransaction(contractTransactionForm, user) {
|
||||||
transactionIndex = maxIndexResult.transactionIndex + 1;
|
transactionIndex = maxIndexResult.transactionIndex + 1;
|
||||||
}
|
}
|
||||||
const rightNow = new Date();
|
const rightNow = new Date();
|
||||||
const transactionDate = contractTransactionForm.transactionDateString === ''
|
const transactionDate = (contractTransactionForm.transactionDateString ?? '') === ''
|
||||||
? dateToInteger(rightNow)
|
? dateToInteger(rightNow)
|
||||||
: dateStringToInteger(contractTransactionForm.transactionDateString);
|
: dateStringToInteger(contractTransactionForm.transactionDateString);
|
||||||
const transactionTime = contractTransactionForm.transactionTimeString === ''
|
const transactionTime = (contractTransactionForm.transactionTimeString ?? '') === ''
|
||||||
? dateToTimeInteger(rightNow)
|
? dateToTimeInteger(rightNow)
|
||||||
: timeStringToInteger(contractTransactionForm.transactionTimeString);
|
: timeStringToInteger(contractTransactionForm.transactionTimeString);
|
||||||
database
|
database
|
||||||
|
|
|
||||||
|
|
@ -48,14 +48,14 @@ export default function addContractTransaction(
|
||||||
const rightNow = new Date()
|
const rightNow = new Date()
|
||||||
|
|
||||||
const transactionDate =
|
const transactionDate =
|
||||||
contractTransactionForm.transactionDateString === ''
|
(contractTransactionForm.transactionDateString ?? '') === ''
|
||||||
? dateToInteger(rightNow)
|
? dateToInteger(rightNow)
|
||||||
: dateStringToInteger(
|
: dateStringToInteger(
|
||||||
contractTransactionForm.transactionDateString as DateString
|
contractTransactionForm.transactionDateString as DateString
|
||||||
)
|
)
|
||||||
|
|
||||||
const transactionTime =
|
const transactionTime =
|
||||||
contractTransactionForm.transactionTimeString === ''
|
(contractTransactionForm.transactionTimeString ?? '') === ''
|
||||||
? dateToTimeInteger(rightNow)
|
? dateToTimeInteger(rightNow)
|
||||||
: timeStringToInteger(
|
: timeStringToInteger(
|
||||||
contractTransactionForm.transactionTimeString as TimeString
|
contractTransactionForm.transactionTimeString as TimeString
|
||||||
|
|
|
||||||
|
|
@ -495,6 +495,7 @@ async function importFromPrepaidCSV() {
|
||||||
externalReceiptNumber: '',
|
externalReceiptNumber: '',
|
||||||
transactionAmount,
|
transactionAmount,
|
||||||
transactionDateString: contractStartDateString,
|
transactionDateString: contractStartDateString,
|
||||||
|
transactionTimeString: '00:00',
|
||||||
transactionNote: `Order Number: ${prepaidRow.CMPP_ORDER_NO}`
|
transactionNote: `Order Number: ${prepaidRow.CMPP_ORDER_NO}`
|
||||||
}, user);
|
}, user);
|
||||||
if (prepaidRow.CMPP_REMARK1 !== '') {
|
if (prepaidRow.CMPP_REMARK1 !== '') {
|
||||||
|
|
|
||||||
|
|
@ -794,6 +794,8 @@ async function importFromPrepaidCSV(): Promise<void> {
|
||||||
externalReceiptNumber: '',
|
externalReceiptNumber: '',
|
||||||
transactionAmount,
|
transactionAmount,
|
||||||
transactionDateString: contractStartDateString,
|
transactionDateString: contractStartDateString,
|
||||||
|
transactionTimeString: '00:00',
|
||||||
|
|
||||||
transactionNote: `Order Number: ${prepaidRow.CMPP_ORDER_NO}`
|
transactionNote: `Order Number: ${prepaidRow.CMPP_ORDER_NO}`
|
||||||
},
|
},
|
||||||
user
|
user
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue