Merge branch 'development' into 'devops-staging'

Development

See merge request empatnusabangsa/ppob/ppob-backend!55
This commit is contained in:
ilham dwi pratama 2021-12-22 17:45:18 +00:00
commit 5fa2c5b35b
2 changed files with 3 additions and 3 deletions

View File

@ -180,11 +180,11 @@ export class TransactionController {
}; };
} }
@Put('deposit-return/confirmation/:id') @Put('deposit-return/confirmation/:id/:status')
async confirmDepositReturn( async confirmDepositReturn(
@Param('id', ParseUUIDPipe) id: string, @Param('id', ParseUUIDPipe) id: string,
@Param('status') status: string,
@Request() req, @Request() req,
@Body() status: string,
) { ) {
return { return {
data: await this.transactionService.confirmationDepositReturn( data: await this.transactionService.confirmationDepositReturn(

View File

@ -470,7 +470,7 @@ export class TransactionService {
try { try {
await this.connection.transaction(async (manager) => { await this.connection.transaction(async (manager) => {
transactionData.status = transactionData.status =
statusApproval === 'Accept' statusApproval === 'accept'
? statusTransaction.APPROVED ? statusTransaction.APPROVED
: statusTransaction.REJECTED; : statusTransaction.REJECTED;