eigen
/
pos-be
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 295 Wiki Activity

Merge pull request 'feat(SPG-793): fix time at report log' (#54) from fix/bug-firman into development
continuous-integration/drone/tag Build is passing Details 

Reviewed-on: #54
pull/55/head devel_20.1.9
firmanr 2024-08-06 09:05:27 +00:00
parent 61d8f56385 b48a469720
commit 955f00cc9d
6 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts
View File

@ -29,17 +29,19 @@ export default <ReportConfigEntity>{
column_configs: [
{
column: 'main__date',
query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
query: 'main.created_at',
label: 'Tanggal',
type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT,
format: DATA_FORMAT.DATE_EPOCH,
date_format: 'DD-MM-YYYY',
},
{
column: 'main__time',
query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
query: 'main.created_at',
label: 'Jam',
type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT,
format: DATA_FORMAT.DATE_EPOCH,
date_format: 'HH:mm',
},
{
column: 'main__drawn_by_name',

10
src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts
View File

@ -29,17 +29,19 @@ export default <ReportConfigEntity>{
column_configs: [
{
column: 'main__date',
query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
query: 'main.created_at',
label: 'Tanggal',
type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT,
format: DATA_FORMAT.DATE_EPOCH,
date_format: 'DD-MM-YYYY',
},
{
column: 'main__time',
query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
query: 'main.created_at',
label: 'Jam',
type: DATA_TYPE.DIMENSION,
format: DATA_FORMAT.TEXT,
format: DATA_FORMAT.DATE_EPOCH,
date_format: 'HH:mm',
},
{
column: 'main__type',

3
src/modules/transaction/reconciliation/domain/usecases/managers/cancel-reconciliation.manager.ts
View File

@ -54,8 +54,9 @@ export class CancelReconciliationManager extends BaseUpdateStatusManager<Transac
status: this.dataStatus,
reconciliation_status: this.dataStatus,
payment_date: this.data.payment_date,
settlement_date:
this.dataStatus === STATUS.REJECTED ? null : this.data.settlement_date,
});
return;
}

4
src/modules/transaction/reconciliation/domain/usecases/managers/confirm-reconciliation.manager.ts
View File

@ -27,6 +27,10 @@ export class ConfirmReconciliationManager extends BaseUpdateStatusManager<Transa
status: STATUS.SETTLED,
reconciliation_status: this.dataStatus,
payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
settlement_date:
this.dataStatus === STATUS.CONFIRMED
? this.data.payment_date
: this.data.settlement_date,
});
return;

2
src/modules/transaction/transaction/domain/usecases/handlers/midtrans-transaction-callback.handler.ts
View File

@ -24,7 +24,7 @@ export class MidtransCallbackHandler
async handle(event: MidtransCallbackEvent) {
const data_id = event.data.id;
const data = event.data.data;
let old_data;
let old_data = undefined;
const transaction = await this.dataService.getOneByOptions({
where: {

4
src/modules/transaction/transaction/domain/usecases/handlers/settled-transaction.handler.ts
View File

@ -68,7 +68,7 @@ export class SettledTransactionHandler
data.payment_total_net_profit ?? 0,
);
console.log(data, 'dsa');
// console.log(data, 'dsa');
const google_calendar = await CreateEventCalendarHelper(data);
Object.assign(data, {
@ -80,7 +80,7 @@ export class SettledTransactionHandler
calendar_link: google_calendar?.htmlLink,
});
} else if (oldSettled) {
console.log(data, 'data oldSettled');
// console.log(data, 'data oldSettled');
const google_calendar = await CreateEventCalendarHelper(data);
Object.assign(data, {