Compare commits
No commits in common. "955f00cc9d626dabb55facf31971d0a1b24cbecf" and "61d8f563850eadeb6fb88f2bb31c8b350f57c058" have entirely different histories.
955f00cc9d
...
61d8f56385
|
@ -29,19 +29,17 @@ export default <ReportConfigEntity>{
|
||||||
column_configs: [
|
column_configs: [
|
||||||
{
|
{
|
||||||
column: 'main__date',
|
column: 'main__date',
|
||||||
query: 'main.created_at',
|
query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
|
||||||
label: 'Tanggal',
|
label: 'Tanggal',
|
||||||
type: DATA_TYPE.DIMENSION,
|
type: DATA_TYPE.DIMENSION,
|
||||||
format: DATA_FORMAT.DATE_EPOCH,
|
format: DATA_FORMAT.TEXT,
|
||||||
date_format: 'DD-MM-YYYY',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
column: 'main__time',
|
column: 'main__time',
|
||||||
query: 'main.created_at',
|
query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
|
||||||
label: 'Jam',
|
label: 'Jam',
|
||||||
type: DATA_TYPE.DIMENSION,
|
type: DATA_TYPE.DIMENSION,
|
||||||
format: DATA_FORMAT.DATE_EPOCH,
|
format: DATA_FORMAT.TEXT,
|
||||||
date_format: 'HH:mm',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
column: 'main__drawn_by_name',
|
column: 'main__drawn_by_name',
|
||||||
|
|
|
@ -29,19 +29,17 @@ export default <ReportConfigEntity>{
|
||||||
column_configs: [
|
column_configs: [
|
||||||
{
|
{
|
||||||
column: 'main__date',
|
column: 'main__date',
|
||||||
query: 'main.created_at',
|
query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'DD-MM-YYYY')`,
|
||||||
label: 'Tanggal',
|
label: 'Tanggal',
|
||||||
type: DATA_TYPE.DIMENSION,
|
type: DATA_TYPE.DIMENSION,
|
||||||
format: DATA_FORMAT.DATE_EPOCH,
|
format: DATA_FORMAT.TEXT,
|
||||||
date_format: 'DD-MM-YYYY',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
column: 'main__time',
|
column: 'main__time',
|
||||||
query: 'main.created_at',
|
query: `TO_CHAR(to_timestamp(main.created_at::double precision / 1000), 'HH24:MI')`,
|
||||||
label: 'Jam',
|
label: 'Jam',
|
||||||
type: DATA_TYPE.DIMENSION,
|
type: DATA_TYPE.DIMENSION,
|
||||||
format: DATA_FORMAT.DATE_EPOCH,
|
format: DATA_FORMAT.TEXT,
|
||||||
date_format: 'HH:mm',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
column: 'main__type',
|
column: 'main__type',
|
||||||
|
|
|
@ -54,9 +54,8 @@ export class CancelReconciliationManager extends BaseUpdateStatusManager<Transac
|
||||||
status: this.dataStatus,
|
status: this.dataStatus,
|
||||||
reconciliation_status: this.dataStatus,
|
reconciliation_status: this.dataStatus,
|
||||||
payment_date: this.data.payment_date,
|
payment_date: this.data.payment_date,
|
||||||
settlement_date:
|
|
||||||
this.dataStatus === STATUS.REJECTED ? null : this.data.settlement_date,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,6 @@ export class ConfirmReconciliationManager extends BaseUpdateStatusManager<Transa
|
||||||
status: STATUS.SETTLED,
|
status: STATUS.SETTLED,
|
||||||
reconciliation_status: this.dataStatus,
|
reconciliation_status: this.dataStatus,
|
||||||
payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
|
payment_code: await generateInvoiceCodeHelper(this.dataService, 'PMY'),
|
||||||
settlement_date:
|
|
||||||
this.dataStatus === STATUS.CONFIRMED
|
|
||||||
? this.data.payment_date
|
|
||||||
: this.data.settlement_date,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -24,7 +24,7 @@ export class MidtransCallbackHandler
|
||||||
async handle(event: MidtransCallbackEvent) {
|
async handle(event: MidtransCallbackEvent) {
|
||||||
const data_id = event.data.id;
|
const data_id = event.data.id;
|
||||||
const data = event.data.data;
|
const data = event.data.data;
|
||||||
let old_data = undefined;
|
let old_data;
|
||||||
|
|
||||||
const transaction = await this.dataService.getOneByOptions({
|
const transaction = await this.dataService.getOneByOptions({
|
||||||
where: {
|
where: {
|
||||||
|
|
|
@ -68,7 +68,7 @@ export class SettledTransactionHandler
|
||||||
data.payment_total_net_profit ?? 0,
|
data.payment_total_net_profit ?? 0,
|
||||||
);
|
);
|
||||||
|
|
||||||
// console.log(data, 'dsa');
|
console.log(data, 'dsa');
|
||||||
const google_calendar = await CreateEventCalendarHelper(data);
|
const google_calendar = await CreateEventCalendarHelper(data);
|
||||||
|
|
||||||
Object.assign(data, {
|
Object.assign(data, {
|
||||||
|
@ -80,7 +80,7 @@ export class SettledTransactionHandler
|
||||||
calendar_link: google_calendar?.htmlLink,
|
calendar_link: google_calendar?.htmlLink,
|
||||||
});
|
});
|
||||||
} else if (oldSettled) {
|
} else if (oldSettled) {
|
||||||
// console.log(data, 'data oldSettled');
|
console.log(data, 'data oldSettled');
|
||||||
const google_calendar = await CreateEventCalendarHelper(data);
|
const google_calendar = await CreateEventCalendarHelper(data);
|
||||||
|
|
||||||
Object.assign(data, {
|
Object.assign(data, {
|
||||||
|
|
Loading…
Reference in New Issue