diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php index 1f104db4..3bf03445 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/ListGroupsLogic.php @@ -5,6 +5,7 @@ namespace App\Classes\Modules\Transactions\ControllersLogic; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Transactions\Services\ListsGroups; use App\Http\Resources\GroupPaidInvoicesPNBPageResource; +use App\Http\Resources\GroupPendingInvoicesPNBPageResource; use App\Http\Resources\GroupResource; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -45,6 +46,9 @@ class ListGroupsLogic extends AbstractControllerLogic if($section === 'customerPaidGroupInvoiceComponent'){ return $this->collectionResponse(GroupPaidInvoicesPNBPageResource::collection($query)); } + else if($section === 'customerGroupPaymentInProgressInvoiceComponent'){ + return $this->collectionResponse(GroupPendingInvoicesPNBPageResource::collection($query)); + } else{ return $this->collectionResponse(GroupResource::collection($query)); } diff --git a/app/Http/Resources/GroupPendingInvoicesPNBPageResource.php b/app/Http/Resources/GroupPendingInvoicesPNBPageResource.php new file mode 100644 index 00000000..9bfd3014 --- /dev/null +++ b/app/Http/Resources/GroupPendingInvoicesPNBPageResource.php @@ -0,0 +1,49 @@ +reference)->first(); + + return [ + 'id' => $this->id, + 'original_amount' => (float) $this->original_amount, + 'original_currency' => new CurrencyResource($this->original_currency), + 'issuer_name' => $this->issuerCompany->name, + 'issuer_id' => $this->issuerCompany->id, + 'amount' => (float) $this->amount, + 'service_charge' => (float) $this->amount, + 'currency' => new CurrencyResource($this->currency), + 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'), + 'currency_rate' => (float) $this->currency_rate, + 'status' => $this->status, + 'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$this->status], + 'payment_method' => $this->payment_method, + 'payment_method_name' => ucwords(PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method]), + 'reference' => $this->reference, + 'payment_transaction' => $payment_transaction ? [ + 'id' => $payment_transaction->id, + 'status' => $payment_transaction->status, + 'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status], + 'documents' => $this->status === ApprovalStatus::APPROVED ? DocumentResource::collection($payment_transaction->documents->where('status', ApprovalStatus::APPROVED)) : DocumentResource::collection($payment_transaction->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)), + ] : [] + ]; + } +} diff --git a/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue index 7cb4b22e..eb477023 100644 --- a/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue @@ -105,7 +105,7 @@