Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard

app/Http/Controllers/Accounting/HistoryImportedTransactionMappedController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounting;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Classes\Modules\Accounting\ControllersLogic\HistoryImportedTransactionMappedControllerLogic;
+
+class HistoryImportedTransactionMappedController
+{
+    /**
+     * @param Request $request
+     * @param ApprovePaymentLogic $logic
+     * @return JsonResponse
+     */
+    public function getImported(Request $request, HistoryImportedTransactionMappedControllerLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Bookings/ListBookingsJobController.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace App\Http\Controllers\Bookings;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Bookings\ControllersLogic\ListBookingJobLogic;
+
+
+class ListBookingsJobController
+{
+    /**
+     * @param Request $request
+     * @param ListBookingJobLogic $logic
+     * @return JsonResponse
+     */
+
+    public function list(Request $request, ListBookingJobLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Documents/ListDocumentsJobController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Documents;
+
+use App\Classes\Modules\Documents\ControllersLogic\ListDocumentJobLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListDocumentsJobController
+{
+    /**
+     * @param Request $request
+     * @param ListDocumentJobLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListDocumentJobLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Exports/ExportCustomersToExcelController.php

@@ -18,6 +18,7 @@ use Maatwebsite\Excel\Excel;
 use App\Classes\Modules\Exports\Services\ExportsImportedInvoiceMappeds;
 use App\Models\TransactionMappingLog;
 use App\Classes\Modules\Exports\Services\ExportsReceiptTransactions;
+use App\Classes\Modules\Exports\Services\ExportsImportedReceiptMappeds;
 
 class ExportCustomersToExcelController
 {
@@ -91,4 +92,10 @@ class ExportCustomersToExcelController
         ob_end_clean();
         return $response;
     }
+
+    public function importedReceiptMapped(ExportsImportedReceiptMappeds $exportsImportedReceiptMappeds, Request $request) {
+        $response = $exportsImportedReceiptMappeds->download($request->input('fileName').'.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
 }

app/Http/Controllers/Imports/ImportStatementInvoiceController.php

@@ -100,6 +100,7 @@ class ImportStatementInvoiceController
 
                 TransactionMappingLog::create([
                     'imported_date'=>$importDate,
+                    'type' => 'invoices',
                     'data'=>$row,
                 ]);
                 array_push($data, $row);

app/Http/Controllers/Imports/ImportStatementReceiptsController.php

@@ -69,6 +69,7 @@ class ImportStatementReceiptsController
 
                 TransactionMappingLog::create([
                     'imported_date'=>$importDate,
+                    'type' => 'receipts',
                     'data'=>$row,
                 ]);
                 array_push($data, $row);

app/Http/Controllers/Jobs/FetchJobResultController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Jobs;
+
+use App\Classes\Modules\Jobs\ControllersLogic\FetchJobResultLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchJobResultController
+{
+    /**
+     * @param Request $request
+     * @param FetchJobResultLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchJobResultLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Transactions/ListTransactionsJobController.php

@@ -0,0 +1,21 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Transactions\ControllersLogic\ListTransactionsJobLogic;
+
+
+class ListTransactionsJobController
+{
+    /**
+     * @param Request $request
+     * @param ListTransactionsJobLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListTransactionsJobLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Resources/BookingResource.php

@@ -11,11 +11,9 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Log;
 
 class BookingResource extends JsonResource
 {
-
     /**
      * Transform the resource into an array.
      *
@@ -34,7 +32,8 @@ class BookingResource extends JsonResource
             'amount' => $this->fix_amount,
             'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
             'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
-            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            // 'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) + floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)),
             'fixed_currency' => new CurrencyResource($this->fixedCurrency),
             'convertible_currency' => new CurrencyResource($this->convertibleCurrency),
             'conversion_currency' => new CurrencyResource($this->conversionCurrency),
@@ -60,7 +59,7 @@ class BookingResource extends JsonResource
                 'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
                 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
                     $query->where(function($query){
-                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED, ApprovalStatus::REFUNDED]);
                     })->orWhere(function($query){
                         $query->where(function($query){
                             $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);

app/Http/Resources/CompanyResource.php

@@ -15,7 +15,6 @@ use App\Models\SegmentConstant;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 
 class CompanyResource extends JsonResource
 {

app/Http/Resources/DocumentResource.php

@@ -3,10 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Models\Booking;
-use App\Models\Company;
-use App\Models\Document;
 use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class DocumentResource extends JsonResource

app/Http/Resources/JobResultResource.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class JobResultResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'job_id' => $this->job_id,
+            'result' => $this->result,
+        ];
+    }
+}

app/Http/Resources/ListBookingJobResource.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\Modules\Bookings\Services\CalculatesBookingFloatingAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ListBookingJobResource extends JsonResource
+{
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'company' => new CompanyResource($this->company, $this->userInfo),
+            'bank' => new BankResource($this->bank),
+            'service' => new ServiceTypeResource($this->service),
+            'marking' => $this->marking,
+            'amount' => $this->fix_amount,
+            'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'fixed_currency' => new CurrencyResource($this->fixedCurrency),
+            'convertible_currency' => new CurrencyResource($this->convertibleCurrency),
+            'conversion_currency' => new CurrencyResource($this->conversionCurrency),
+            'documents' => [
+                'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()),
+                'delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
+                'invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
+                'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
+                'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
+                'ecommerce_purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()),
+            ],
+            'status' => $this->status,
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
+            'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
+            $this->mergeWhen($this->relationLoaded('transactions'), [
+                'purchase_order' => new TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
+                'payment_attempts' => TransactionResource::collection(
+                    $this->transactions()
+                        ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
+                        ->whereDate('expires_on', '>=', Carbon::now())
+                        ->get()
+                ),
+                'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
+                'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
+                    $query->where(function($query){
+                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+                    })->orWhere(function($query){
+                        $query->where(function($query){
+                            $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
+                        })->orWhere(function($query){
+                            $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                        });
+                    });
+                })->latest()->get())
+            ])
+        ];
+    }
+}

app/Http/Resources/ListDocumentJobResource.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Models\Booking;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Resources\V2\BookingV2Resource;
+use App\Http\Resources\V2\CompanyV2Resource;
+
+class ListDocumentJobResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'reference' => $this->reference,
+            'status' => (int) $this->status,
+            'document_type' => $this->document_type,
+            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingV2Resource($this->owner, $this->userInfo) : new CompanyV2Resource($this->owner, $this->userInfo)) : null,
+            'files' => FileResource::collection($this->files),
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
+        ];
+    }
+}

app/Http/Resources/ListTransactionJobResource.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ListTransactionJobResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+
+        $booking = in_array((int)$this->type, [TransactionType::BILL, TransactionType::REFUND])? $this->owner->owner : $this->owner;
+        $days = $this->created_at->endOfDay()->addWeekdays($booking->service_id === 3 ? 3 : 1);
+
+        return [
+            'id' => $this->id,
+            'booking' => new BookingResource($booking),
+            'type' => (int) $this->type,
+            'bill_no' => $this->bill_no,
+            'payment_reference' => $this->payment_reference,
+            'payment_method' => (float) $this->payment_method,
+            'recipient_bank_account' => new BankResource($booking->bank),
+            'issuer_name' => $this->issuerCompany->name,
+            'issuer_id' => $this->issuerCompany->id,
+            'amount' => (double) $this->amount,
+            'original_amount' => (double) $this->original_amount,
+            'currency' => new CurrencyResource($this->currency),
+            'original_currency' => new CurrencyResource($this->original_currency),
+            'service_charge' => (double) $this->service_charge,
+            'tax' => (double) $this->tax,
+            'currency_rate' => (double) $this->currency_rate,
+            'status' => (int) $this->status,
+            'details' => TransactionDetailResource::collection($this->transactionDetails),
+            'documents' => new DocumentResource($this->documents()->first()),
+            'transaction_bill' => new TransactionResource($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->bills()->first())),
+            'transaction_refunds' => TransactionResource::collection($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->refunds()->get())),
+            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
+            'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
+            'interval' => [
+                'value' => $days->gt(Carbon::now()) ? '+' : '-',
+                'duration' => $days->diff(Carbon::now())->format('%d'),
+            ],
+            'redemption' => new VoucherRedemptionResource($this->voucherRedemption)
+        ];
+    }
+}

app/Http/Resources/TransactionMappingLogResource.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class TransactionMappingLogResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'imported_date' => $this->imported_date,
+            'type' => $this->type
+        ];
+    }
+}

app/Http/Resources/TransactionResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Booking;
 use Carbon\Carbon;
@@ -43,8 +44,10 @@ class TransactionResource extends JsonResource
             'documents' => new DocumentResource($this->documents()->first()),
             'transaction_bill' => new TransactionResource($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->bills()->first())),
             'transaction_refunds' => TransactionResource::collection($this->when((int) $this->type === TransactionType::PAYMENT,  $this->transactions()->refunds()->get())),
+            'refunded_amount' => $this->booking ? floatval((App()->make(CalculatesBookingRefundAmount::class))->calculateRefundAmount($this->resource, $this->booking->fix_currency_id)) : null,
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
             'interval' => [
                 'value' => $days->gt(Carbon::now()) ? '+' : '-',
                 'duration' => $days->diff(Carbon::now())->format('%d'),

app/Http/Resources/V2/BookingV2Resource.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Resources\V2;
+
+use App\Classes\Modules\Bookings\Services\CalculatesBookingFloatingAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount;
+use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Resources as V1;
+
+class BookingV2Resource extends JsonResource
+{
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo ?? ($resource->userInfo ?? null);
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'company' => new CompanyV2Resource($this->company, $this->userInfo),
+            'bank' => new V1\BankResource($this->bank),
+            'service' => new V1\ServiceTypeResource($this->service),
+            'marking' => $this->marking,
+            'amount' => $this->fix_amount,
+            'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
+            'fixed_currency' => new V1\CurrencyResource($this->fixedCurrency),
+            'convertible_currency' => new V1\CurrencyResource($this->convertibleCurrency),
+            'conversion_currency' => new V1\CurrencyResource($this->conversionCurrency),
+            'documents' => [
+                'purchase_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()),
+                'delivery_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
+                'invoice' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
+                'supplier_delivery_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
+                'proforma_invoice' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
+                'ecommerce_purchase_order' => new V1\DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()),
+            ],
+            'status' => $this->status,
+            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
+            'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
+            $this->mergeWhen($this->relationLoaded('transactions'), [
+                'purchase_order' => new V1\TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
+                'payment_attempts' => V1\TransactionResource::collection(
+                    $this->transactions()
+                        ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
+                        ->whereDate('expires_on', '>=', Carbon::now())
+                        ->get()
+                ),
+                'expired_payment_attempts' => V1\TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
+                'payment_history' => V1\TransactionResource::collection($this->transactions()->where(function($query){
+                    $query->where(function($query){
+                        $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+                    })->orWhere(function($query){
+                        $query->where(function($query){
+                            $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION,  ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
+                        })->orWhere(function($query){
+                            $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                        });
+                    });
+                })->latest()->get())
+            ])
+        ];
+    }
+}

app/Http/Resources/V2/CompanyV2Resource.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Http\Resources\V2;
+
+use App\Classes\Modules\Companies\Services\FetchesCompanyServices;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BankAccountType;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Currency;
+use App\Models\SegmentConstant;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Auth;
+use App\Http\Resources as V1;
+
+
+class CompanyV2Resource extends JsonResource
+{
+    private $userInfo;
+
+    public function __construct($resource, $userInfo = null)
+    {
+        parent::__construct($resource);
+        $this->userInfo = $userInfo;
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
+        $totalPayments =  $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+
+        $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
+        $serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
+
+        $userResource = null;
+
+        $userInfoEmail = $this->userInfo && isset($this->userInfo->email) ? $this->userInfo->email : null;
+        $userInfoType = $this->userInfo && isset($this->userInfo->type) ? $this->userInfo->type : null;
+
+        if(!$userInfoEmail && Auth::user()){
+            $userInfoEmail = Auth::user()->email;
+        }
+        if(!$userInfoType && Auth::user()){
+            $userInfoType = Auth::user()->type;
+        }
+
+        if(!is_null($userInfoEmail) && !is_null($userInfoType)){
+            $userResource = new V1\UserResource($userInfoType === RoleTypes::USER ? $this->employees()->where('email', '=',  $userInfoEmail)->first() : $this->employees()->orderBy('id', 'DESC')->first());
+        }
+
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'reference' => $this->reference,
+            'debtor' => $this->debtor,
+            'type' => (int) $this->type,
+            'business_type' => (int) $this->business_type,
+            'status' => (int) $this->status,
+            'contact' => new V1\ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
+            'address' => new V1\AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())),
+            'employee' =>  $userResource,
+            'identification' => new V1\DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
+            'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
+            'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
+                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            })->count(),
+            'total_payments' => (float) $totalPayments,
+            'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
+            'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
+                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                })->count() : $totalPayments,
+            'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
+            'personal_banks' => V1\BankResource::collection($this->banks->where('type', BankAccountType::PERSONAL)),
+            'recipient_banks' => [
+                'accounts' => V1\BankResource::collection($this->banks->where('type', BankAccountType::EXTERNAL)),
+                'default' => new V1\BankResource($this->banks->where('type', BankAccountType::EXTERNAL)->where('default', true)->first())
+            ],
+            'segments' => V1\SegmentResource::collection($this->segments),
+            'seasonalSegment' => $this->whenLoaded('seasonalSegments', V1\SeasonalSegmentResource::collection($this->seasonalSegments)),
+            'services' => (new FetchesCompanyServices())->getServices($this->servicesConfigurations()),
+            'wallet' => $this->whenLoaded('wallets', new V1\WalletResource($this->wallets()->with('transactions')->first()), new V1\WalletResource($this->wallets()->first())),
+            'created_at' => $this->created_at->format('d-m-Y'),
+            $this->mergeWhen($this->business_type === BusinessType::CURRENCY_VENDOR, [
+                'currencies' => $segment ? V1\CurrencyResource::collection(Currency::whereIn('id', $segment->detail->currencies)->get()) : [],
+                'service_charge' => $serviceCharge
+            ])
+
+        ];
+    }
+}