diff --git a/app/Classes/Modules/Billplzs/Processors/CallbackBillplzProcessor.php b/app/Classes/Modules/Billplzs/Processors/CallbackBillplzProcessor.php index f8dfc119..e4ba38bf 100644 --- a/app/Classes/Modules/Billplzs/Processors/CallbackBillplzProcessor.php +++ b/app/Classes/Modules/Billplzs/Processors/CallbackBillplzProcessor.php @@ -82,7 +82,7 @@ class CallbackBillplzProcessor foreach ($group->groupTransactions as $groupTransaction) { $invoice = $groupTransaction->transaction; - $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null); + $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false); if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){ $pL = $invoice->owner; diff --git a/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php index 8f589de0..ad5e79ab 100644 --- a/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php @@ -85,7 +85,7 @@ class CreatePaymentTransactionProcessor /** * @throws MalformedRequestException */ - public function execute(Transaction $invoice, $payment_method, $bank_code) + public function execute(Transaction $invoice, $payment_method, $bank_code, $run = true) { $amount = $invoice->amount; Log::info($invoice->owner); @@ -127,22 +127,26 @@ class CreatePaymentTransactionProcessor $this->updatesWalletBalance->execute($wallet, ($amount * -1)); - // $packingList = $invoice->owner; - // $order = $packingList->owner; - // $packingList->status = ApprovalStatus::APPROVED; - // $packingList->save(); + if($run) + { + $packingList = $invoice->owner; + $order = $packingList->owner; + $packingList->status = ApprovalStatus::APPROVED; + $packingList->save(); - // if(app()->environment('production')){ - // $this->updateDoFromVTPortalProcessor->execute($packingList); - // $this->updateDoFromYDPortalProcessor->execute($packingList); - // } + if(app()->environment('production')){ + $this->updateDoFromVTPortalProcessor->execute($packingList); + $this->updateDoFromYDPortalProcessor->execute($packingList); + } + } // later use this variabke to create a approved payment transaction $approvalStatus = ApprovalStatus::APPROVED; // update invoice to completed - // $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED); - + if($run){ + $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED); + } } else { $payment_method = PaymentMethodType::CASH;