diff --git a/app/Classes/Modules/Billplzs/Processors/CallbackBillplzDataPatchProcessor.php b/app/Classes/Modules/Billplzs/Processors/CallbackBillplzDataPatchProcessor.php index 7bbd0e82..15514fc1 100644 --- a/app/Classes/Modules/Billplzs/Processors/CallbackBillplzDataPatchProcessor.php +++ b/app/Classes/Modules/Billplzs/Processors/CallbackBillplzDataPatchProcessor.php @@ -88,14 +88,14 @@ class CallbackBillplzDataPatchProcessor $invoice = $groupTransaction->transaction; Log::info('CallbackBillplzDataPatchProcessor 3: '.json_encode($invoice)); - //if($invoice->status !== ApprovalStatus::COMPLETED){ - // $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false); + if($invoice->status !== ApprovalStatus::COMPLETED){ + $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false); - // if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){ + if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){ $pL = $invoice->owner; $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice, true); - //} - //} + } + } } $group->status = $status; diff --git a/app/Console/Commands/OneTimeTransactionFixBillplzFailedCallback.php b/app/Console/Commands/OneTimeTransactionFixBillplzFailedCallback.php index f3f3c7b7..ed7b9072 100644 --- a/app/Console/Commands/OneTimeTransactionFixBillplzFailedCallback.php +++ b/app/Console/Commands/OneTimeTransactionFixBillplzFailedCallback.php @@ -60,14 +60,14 @@ class OneTimeTransactionFixBillplzFailedCallback extends Command $this->outputArray = []; $start = new Carbon(); - //Transaction fix with this one time fix command: 15205, 16803, 17310 + //Transaction fix with this one time fix command: 15205, 16803, 17310, 20960 //This transaction, 16803 has approve payment but not its owner, shipping invoice - $transaction = Transaction::whereIn('id', [17310])->first(); - $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 17310 cron started.'); + $transaction = Transaction::whereIn('id', [20960])->first(); + $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 20960 cron started.'); - if($transaction && $transaction->id == 17310){ + if($transaction && $transaction->id == 20960){ - $this->info(Carbon::now() . ' : 17310.'); + $this->info(Carbon::now() . ' : 20960.'); $status = ApprovalStatus::APPROVED; // $this->callbackBillplzProcessor->execute($transaction, $status); $this->callbackBillplzDataPatchProcessor->execute($transaction, $status); @@ -76,6 +76,6 @@ class OneTimeTransactionFixBillplzFailedCallback extends Command $end = new Carbon(); $elapsedTime = $start->diff($end)->format('%H:%I:%S'); - $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 17310 cron ended. ElapsedTime: ' . $elapsedTime); + $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 20960 cron ended. ElapsedTime: ' . $elapsedTime); } }