code update

Emergency fix problem with group payment (reported by Eileen)

See merge request CIEFWorldwideSdnBhd/shipping-portal!184

app/Classes/General/Eloquent/Filters/CreatedAfterOrEqual.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreatedAfterOrEqual implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $table = $builder->getModel()->getTable();
+        $startDate = Carbon::createFromFormat('d-m-Y', $value)->startOfDay();
+        return $builder->where("{$table}.created_at", '>=', $startDate);
+    }
+}

app/Classes/General/Eloquent/Filters/CreatedBeforeOrEqual.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreatedBeforeOrEqual implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $table = $builder->getModel()->getTable();
+        $endDate = Carbon::createFromFormat('d-m-Y', $value)->endOfDay();    
+        return $builder->where("{$table}.created_at", '<=', $endDate);
+    }
+}

app/Classes/General/Eloquent/Filters/OrderByIdDesc.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OrderByIdDesc implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->orderBy('id', 'desc');
+    }
+
+}

app/Classes/General/Eloquent/Filters/OrderByUpdatedAtDesc.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OrderByUpdatedAtDesc implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->orderBy('updated_at', 'desc');
+    }
+
+}

app/Classes/General/Eloquent/Filters/OwnerId.php

@@ -14,7 +14,8 @@ class OwnerId implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('owner_id', $value);
+        $table = $builder->getModel()->getTable();
+        return $builder->where("{$table}.owner_id", $value);
     }
 
 }

app/Classes/General/Eloquent/Filters/OwnerType.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OwnerType implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $table = $builder->getModel()->getTable();
+        return $builder->where("{$table}.owner_type", $value);
+    }
+
+}

app/Classes/General/Eloquent/Filters/StatusIn.php

@@ -14,7 +14,8 @@ class StatusIn implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->whereIn('status', $value);
+        $table = $builder->getModel()->getTable();
+        return $builder->whereIn("{$table}.status", $value);
     }
 
 }

app/Classes/General/Eloquent/Filters/WithAgingColumn.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Eloquent\Builder;
+
+class WithAgingColumn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $today = Carbon::now();
+        return $builder->select('packing_lists.*')
+        ->addSelect(DB::raw("DATEDIFF('$today', transactions.updated_at) as days_over_duedate"))
+        ->addSelect(DB::raw("CASE
+        WHEN DATEDIFF('$today', transactions.updated_at) <= 0 THEN 0
+        WHEN DATEDIFF('$today', transactions.updated_at) > 0 AND DATEDIFF('$today', transactions.updated_at) <= 30 THEN 1
+        WHEN DATEDIFF('$today', transactions.updated_at) > 30 AND DATEDIFF('$today', transactions.updated_at) <= 60 THEN 2
+        WHEN DATEDIFF('$today', transactions.updated_at) > 60 AND DATEDIFF('$today', transactions.updated_at) <= 90 THEN 3
+        ELSE 4
+        END AS due_date_number"));
+    }
+}

app/Classes/General/Eloquent/Filters/WithOrderReferenceLike.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithOrderReferenceLike implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->join('transactions as t2', 't2.payment_reference', '=', 'transactions.bill_no')
+            ->join('transactions as t3', 't3.id', '=', 't2.owner_id')
+            ->join('packing_lists', 'packing_lists.id', '=', 't3.owner_id')
+            ->join('orders', function ($join) use ($value) {
+                $join->on('orders.id', '=', 'packing_lists.owner_id')
+                    ->where('orders.reference', 'LIKE', '%'.$value.'%');
+            })
+            ->addSelect(['transactions.*', 't2.id as paymentTransactionId', 't3.id as invoiceTransactionId', 'packing_lists.id as packingListId', 'orders.reference as orderReference']);
+    }
+}

app/Classes/General/Eloquent/Filters/WithTrashed.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithTrashed implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->withTrashed();
+    }
+}

app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php

@@ -14,14 +14,17 @@ use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
 use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
+use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Group;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 class CallbackBillplzLogic
 {
@@ -46,6 +49,12 @@ class CallbackBillplzLogic
     /** @var CreatePaymentTransactionProcessor */
     private $createPaymentTransactionProcessor;
 
+    /** @var CallbackBillplzProcessor */
+    private $callbackBillplzProcessor;
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -54,8 +63,10 @@ class CallbackBillplzLogic
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
      * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+     * @param CallbackBillplzProcessor $callbackBillplzProcessor
+     * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, CallbackBillplzProcessor $callbackBillplzProcessor, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
@@ -64,6 +75,8 @@ class CallbackBillplzLogic
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
         $this->updatesWalletBalance = $updatesWalletBalance;
         $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
     }
 
 
@@ -103,44 +116,13 @@ class CallbackBillplzLogic
             $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
         }
 
+        Log::info('Debug billPlz status: '.$status);
+
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        // check if is wallet top up
-        if($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
-            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-        }
-
-        // group payment
-        if ($transaction->type == TransactionType::GROUP_PAYMENT && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
-            $group = Group::where('reference', $billplzXSignatureObject->getBillPlzId())->first();
-
-            foreach($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
-            }
-
-            $group->status = $status;
-            $group->save();
-        }
-
-        $this->updatesTransactionStatus->execute($transaction, $status);
-
-        if (!$transaction->owner instanceof Wallet) {
-            $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
-
-            if(($invoice->amount - $totalPaidAmount) < 0.01) {
-                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-    
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
-    
-                if(app()->environment('production')){
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                    $this->updateDoFromYDPortalProcessor->execute($packingList);
-                }
-            }
-        }
+        $this->storageInvoiceBackDoorPreventionCheck($transaction, $status);
+        $result = $this->callbackBillplzProcessor->execute($transaction, $status);
 
         $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
 
@@ -151,6 +133,22 @@ class CallbackBillplzLogic
             $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
         }
 
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status, 'result' => $result]);
+    }
+
+    private function storageInvoiceBackDoorPreventionCheck($transaction, $status){
+        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
+            $group = Group::where('reference', $transaction->payment_reference)->first();
+            if ($group) {
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+                    $pL = $invoice->owner;
+                    $order = $pL->owner;
+                    if($order){
+                        $this->storageInvoiceTransactionProcessor->executeOrder($order, false); //original was set true here so that no group is soft deleted or billplz bill got deleted
+                    }
+                }
+            }
+        }
     }
 }

app/Classes/Modules/Billplzs/Processors/CallbackBillplzProcessor.php

@@ -0,0 +1,128 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Processors;
+
+use Illuminate\Http\Request;
+use App\Models\Wallet;
+use App\Models\Group;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use Illuminate\Support\Facades\Log;
+
+class CallbackBillplzProcessor
+{
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor;
+
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
+    /**
+     * CreateUserProcessor constructor.
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param UpdatesWalletBalance $updatesWalletBalance
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+     * @param ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
+     */
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
+    }
+
+
+    /**
+     * @param Request $request
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute($transaction, $status)
+    {
+        $invoice = $transaction->owner;
+        $packingList = $invoice->owner;
+
+        $proceed = $this->checkForGroupPayment($transaction);
+        if(!$proceed) return false;
+
+        $this->updatesTransactionStatus->execute($transaction, $status);
+
+        // check if is wallet top up
+        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
+
+            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
+
+            $group = Group::where('reference', $transaction->payment_reference)->first();
+
+            // check if is group payment
+            if ($group) {
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+
+                    $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
+
+                    if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                        $pL = $invoice->owner;
+                        $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                    }
+                }
+
+                $group->status = $status;
+                $group->save();
+            }
+        }
+
+        if (!$transaction->owner instanceof Wallet) {
+            $this->releaseGoodsToCustomerProcessor->execute($packingList, $invoice);
+        }
+
+        return true;
+    }
+
+    private function checkForGroupPayment($transaction){
+        //This check is targetting group payment that expired and soft deleted
+        //command:check-storage-invoices must already run for this part of the code to work properly
+        $group = Group::withTrashed()->where('reference', $transaction->payment_reference)->first();
+        if ($group) {
+            $totalAmountToBePaid = 0;
+            $actualAmountPaid = $transaction->amount;
+
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $totalAmountToBePaid += $invoice->amount;
+            }
+
+            if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){
+
+            }
+            else{
+                Log::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid); //cief todo: to be removed
+                Log::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount); //cief todo: to be removed
+                return false;
+            }
+        }
+        return true;
+    }
+}

app/Classes/Modules/Billplzs/Services/DeletesBillplzBill.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class DeletesBillplzBill
+{
+
+    /**
+     * @param string $billID
+     * @throws MalformedRequestException
+     */
+    public function execute(string $billID) {
+        try{
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->delete(config('billplz.base_url').'/api/v3/bills/'.$billID);
+            Log::channel('storage_invoices')->info('DeletesBillplzBill response: '.json_encode($response));
+
+            if($response->successful()){
+                $data = $response->json();
+
+                // $data['url'] = $data['url'].'?auto_submit=true';
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server: ' . $exception->getMessage());
+        }
+    }
+}

app/Classes/Modules/Exports/Services/ExportsAgingList.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Models\Order;
+use App\Models\PackingList;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use App\Classes\General\Eloquent\ApplyFiltersToQuery;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use DateTime;
+
+class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
+{
+    use Exportable;
+
+    private $filters;
+
+    public function __construct()
+    {
+        $this->filters = [
+            "has_invoice_status_in"                 => [2],
+            "packing_list_ordered_by_invoice_date"  => true,
+            "with_aging_column"                     => true
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Company Name',
+            'Customer Marking',
+            'Order Number',
+            'Invoice No',
+            'Invoice Date',
+            'Days',
+            'Amount',
+        ];
+    }
+
+    public function query()
+    {
+        return (new ApplyFiltersToQuery())->execute(PackingList::query(), $this->filters);
+    }
+
+    public function map($list): array
+    {
+        $marking = null;
+        $orderNo = null;
+        $name    = null;
+        $invDate = 'n/a';
+        $invNo   = 'n/a';
+        $days    = 'n/a';
+
+        if ($list->owner instanceof Order) {
+            $inviterPivotInviteeReference = $list->owner->companyModule->inviters()->withPivot('invitee_reference')->first();
+
+            if ($inviterPivotInviteeReference) {
+                $marking = $inviterPivotInviteeReference->pivot->invitee_reference;
+                $orderNo = $list->owner->reference;
+            }
+            $name = $list->owner->companyModule->company->name;
+        }
+
+        $transaction = $list->transactions()->whereIn('status', [ApprovalStatus::APPROVED])->first();
+        if ($transaction) {
+
+            $invoiceDate = $transaction->created_at;
+            $invDate     = date_format($invoiceDate, 'd-m-Y');
+            $invNo       = $transaction->bill_no;
+            $amt         = number_format($transaction->amount, 2);
+
+            $currentDate = new DateTime();
+            $interval    = $currentDate->diff($invoiceDate);
+            $days        = $interval->format('%a');
+        }
+
+        return [
+            $name,
+            $marking,
+            $orderNo,
+            $invNo,
+            $invDate,
+            $days,
+            $amt,
+        ];
+    }
+
+    private function dueDateColumn($colNum, $dueDateNumber, $amt)
+    {
+        if ($colNum == $dueDateNumber) return $amt;
+        return null;
+    }
+}

app/Classes/Modules/Exports/Services/ExportsCustomersWalletTransactionHistory.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use App\Models\Company;
+use App\Models\Wallet;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+
+class ExportsCustomersWalletTransactionHistory implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+    private $runningBalance = 0;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Date',
+            'Description',
+            'Incoming',
+            'Outgoing',
+            'Balance',
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $wallet = Wallet::find($this->request->route('wallet_id'));
+        $transactions = $wallet->transactions()->whereIn('transactions.status', [2, 3])->orderBy('id');
+
+        return $transactions;
+    }
+
+    /**
+     * @param Transaction $transaction
+     *
+     * @return array
+     */
+    public function map($transaction): array
+    {
+        $decimals = $this->request->route('is_precise') == 'true' ? 5 : 2;
+
+        $description = '';
+        switch ((int) $transaction->type) {
+            case TransactionType::TOP_UP:
+                $description = (float) $transaction->amount . ' Credit Top up';
+                break;
+            case TransactionType::GROUP_PAYMENT:
+                $description = (float) $transaction->amount . ' Credit Top up';
+                break;
+            case TransactionType::CREDIT_NOTE:
+                $description = 'Credit Voucher for ' . $transaction->payment_reference;
+                break;
+            case TransactionType::PAYMENT:
+                $booking = Transaction::where('payment_reference', $transaction->bill_no)->first()->owner;
+
+                if (!$booking) {
+                    $description = 'Payment for unknown booking, please contact tech support.';
+                    break;
+                }
+
+                $marking = $booking->marking;
+                $description = 'Payment For booking refs' . $marking;
+                break;
+            case TransactionType::DEBIT_NOTE:
+                $description = 'Debit Voucher for ' . $transaction->payment_reference;
+                break;
+        }
+
+        $incoming = $outgoing = '';
+
+        if (in_array($transaction->type, [TransactionType::TOP_UP, TransactionType::CREDIT_NOTE, TransactionType::GROUP_PAYMENT])) {
+            $incoming =  number_format($transaction->amount, $decimals, '.', ',');
+            $this->runningBalance += $transaction->amount;
+        }
+
+        if (in_array($transaction->type, [TransactionType::PAYMENT, TransactionType::DEBIT_NOTE])) {
+            $outgoing =  number_format($transaction->amount, $decimals, '.', ',');
+            $this->runningBalance -= $transaction->amount;
+        }
+
+        return [
+            Carbon::parse($transaction->created_at)->format('d-m-Y h:i:s A'),
+            $description,
+            $incoming,
+            $outgoing,
+            number_format($this->runningBalance, $decimals, '.', ',')
+        ];
+    }
+}

app/Classes/Modules/Exports/Services/ExportsFeedback.php

@@ -20,9 +20,11 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
     public function headings(): array
     {
         return [
+            'Version',
             'Question Set',
             'Question Text',
-            'Answer',
+            'Answer Text',
+            'Answer Value',
             'Source System',
             'Source Marking',
             'Source Email',
@@ -38,7 +40,7 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
         return QAUserAnswerSelected::whereHas('question', function ($query) {
             $query->whereHas('questionnaire', function ($innerQuery) {
                 $innerQuery->where('group', 'feedback');
-            })->where('created_at', '>',  Carbon::now()->subMonths(1));
+            }); //->where('created_at', '>',  Carbon::now()->subMonths(1));
         })->orderBy('created_at', 'desc');
     }
 
@@ -56,11 +58,14 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
             $companyModule = $user->companyModule()->first();
             $user_marking = $companyModule ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : "";
         }
+        $answer = $userAnswer->answer;
 
         return [
+            $userAnswer->question->questionnaire->version,
             $userAnswer->question->questionnaire->description,
             $userAnswer->question->question_text,
-            $userAnswer->free_text_answer,
+            $answer->display_text,
+            $answer->value,
             $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
             $user ? $user_marking : $source->marking,
             $user ? $user->email : $source->email,

app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php

@@ -74,7 +74,8 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $approvalStatus = ApprovalStatus::APPROVED;
         }
 
-        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
+        // $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
+        $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->whereIn('status', [$approvalStatus]);
 
         if($start_date && $end_date) {
             $query->whereBetween('updated_at', [
@@ -102,7 +103,12 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
         $container = $transaction->owner->containers()->first();
         $order = $transaction->owner->owner;
         $company = $order->companyModule->company;
-        $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+        if($transaction->type === TransactionType::STORAGE_INVOICE){
+            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'STORAGE_FEE')->first();
+        }
+        else{
+            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
+        }
         $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
         $contact = $order->companyModule->company->contacts->first();
         $userName = $order->companyModule->employees()->first();
@@ -118,6 +124,8 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
                 $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
             elseif($item->reference === 'MIN_CBM_CHARGES')
                 $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
+            elseif($item->reference === 'STORAGE_FEE')
+                $furtherDescription .= str_replace('<br>', ' | ', $item->name).' '."\n";
             else
                 $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
         }

app/Classes/Modules/HelpMenu/ControllersLogic/ListQuestionsQALogic.php

@@ -59,7 +59,7 @@ class ListQuestionsQALogic extends AbstractControllerLogic
         $delimiter = "|";
         $parts = explode($delimiter, $decriptedToken);
         $questionSet = $parts[3];
-        $query = $this->listsHelpMenuQuestions->execute(['questionnaire_set_id' => $questionSet]);
+        $query = $this->listsHelpMenuQuestions->execute(['questionnaire_set_id' => $questionSet, 'order_by' => (object)['column' => 'order','DESC' => false]]);
         return $this->collectionResponse(HelpMenuQuestionResource::collection($query));
     }
 

app/Classes/Modules/Orders/ControllersLogic/FetchOrderV2Logic.php

@@ -53,8 +53,12 @@ class FetchOrderV2Logic extends AbstractControllerLogic
 
         $query = $this->fetchesOrder->execute(['reference' => $request->route('id'), 'with_packing_lists' => true]);
 
+        if($request->input('storages')){
+            $query->storages = $request->input('storages'); //from middleware
+        }
+
         return $this->resourceResponse(new OrderV2Resource($query));
 
     }
 
-}
+}

app/Classes/Modules/Orders/Processors/UpdateDoFromVTPortalProcessor.php

@@ -9,6 +9,8 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\PackingList;
 use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Support\Facades\Log;
+
 class UpdateDoFromVTPortalProcessor
 {
     /** @var FetchesDataFromVTPortal */
@@ -36,6 +38,8 @@ class UpdateDoFromVTPortalProcessor
      */
     public function execute(PackingList $packing_list) {
 
+        Log::info('Trying to Call UpdateDoFromVTPortalProcessor');
+
         if(!app()->environment(['production'])){
             return [];
         }

app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php

@@ -37,6 +37,9 @@ class UpdateDoFromYDPortalProcessor
      * @throws InternalServerErrorException
      */
     public function execute(PackingList $packingList) {
+        Log::info('Trying to Call UpdateDoFromYDPortalProcessor');
+        Log::channel('storage_invoices')->info('UpdateDoFromYDPortalProcessor: '.json_encode($packingList));
+
         if(!app()->environment(['production'])){
             return;
         }
@@ -70,6 +73,7 @@ class UpdateDoFromYDPortalProcessor
 
 
         } catch (\Exception $exception){
+            log::debug($exception);
             throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
         }
     }

app/Classes/Modules/PackingLists/Processors/FetchContainersFromYdPortalProcessor.php

@@ -121,7 +121,7 @@ class FetchContainersFromYdPortalProcessor
                     $containerReference = explode('预计到港时间', $tracking[1])[0];
                     $loadingDate = Carbon::parse($trackingRow->trackingtime);
                     $etd = Carbon::parse($tracking[2])->subDays(5);
-                    $eta = Carbon::parse($tracking[2])->addDays(2);
+                     $eta = Carbon::parse($tracking[2]);
                 }
             }
 

app/Classes/Modules/PackingLists/Processors/FetchContainersUpdatesFromYdPortalProcessor.php

@@ -147,7 +147,6 @@ class FetchContainersUpdatesFromYdPortalProcessor
 
             if($delayDate){
 
-                $delayDate = $delayDate->addDays(2);
                 $transport = $container->transports()->first();
 
                 if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {

app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php

@@ -162,7 +162,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
 
-                $eta = Carbon::parse($containerInfo[4])->addDays(2);
+                $eta = Carbon::parse($containerInfo[4]);
                 $etd = Carbon::parse($eta)->subDays(7);
 
                 $delayDate = $containerInfo[7];
@@ -183,7 +183,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 if($delayDate){
-                    $delayDate = Carbon::parse($delayDate)->addDays(2);
+                    $delayDate = Carbon::parse($delayDate);
                     $transport = $container->transports()->first();
 
                     if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {

app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php

@@ -199,7 +199,7 @@ class FetchOrderListsFromYdPortalProcessor
                                 $containerReference = explode('预计到港时间', $tracking[1])[0];
                                 $loadingDate = Carbon::parse($trackingRow->trackingtime);
                                 $etd = Carbon::parse($tracking[2])->subDays(5);
-                                $eta = Carbon::parse($tracking[2])->addDays(2);
+                                $eta = Carbon::parse($tracking[2]);
                             }
 
                             $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
@@ -415,7 +415,7 @@ class FetchOrderListsFromYdPortalProcessor
                         }
 
                         if($delayDate){
-                            $delayDate = $delayDate->addDays(2);
+                            $delayDate = $delayDate;
                             $transport = $container->transports()->first();
 
                             if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {

app/Classes/Modules/Transactions/ControllersLogic/ApprovePaymentTransactionLogic.php

@@ -4,18 +4,15 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-
+use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
-use App\Classes\Modules\Documents\Services\FetchesDocument;
 use App\Classes\Modules\Documents\Services\RejectsDocument;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -29,15 +26,15 @@ class ApprovePaymentTransactionLogic extends AbstractControllerLogic
      * @param RejectsDocument $rejectsDocument
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
      */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, CallbackBillplzProcessor $callbackBillplzProcessor)
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->approvesDocument = $approvesDocument;
         $this->rejectsDocument = $rejectsDocument;
-        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
-        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
     }
 
     /**
@@ -62,11 +59,8 @@ class ApprovePaymentTransactionLogic extends AbstractControllerLogic
     /** @var RejectsDocument */
     private $rejectsDocument;
 
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor ;
+    /** @var CallbackBillplzProcessor */
+    private $callbackBillplzProcessor;
 
     /**
      * @param Request $request
@@ -82,29 +76,14 @@ class ApprovePaymentTransactionLogic extends AbstractControllerLogic
 
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('transaction_id')]);
 
-        $status === 'approve' ? $this->approvesDocument->execute($transaction->documents()->first()) : $this->rejectsDocument->execute($transaction->documents()->first());
+        $status === 'approve' ? $this->approvesDocument->execute($transaction->documents()->where('status', ApprovalStatus::PENDING_VERIFICATION)->first()) : $this->rejectsDocument->execute($transaction->documents()->where('status', ApprovalStatus::PENDING_VERIFICATION)->first());
 
         $this->updatesTransactionStatus->execute($transaction, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-        if($transaction->status === ApprovalStatus::APPROVED){
-            $invoice = $transaction->owner;
-            $packingList = $invoice->owner;
-
-            if(($invoice->amount - $transaction->amount) < 0.01) {
-                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
-
-                if(app()->environment('production')){
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                    $this->updateDoFromYDPortalProcessor->execute($packingList);
-                }
-            }
-
+        if ($status === 'approve') {
+            $this->callbackBillplzProcessor->execute($transaction, ApprovalStatus::APPROVED);
         }
 
-
         return $this->response([]);
     }
 

app/Classes/Modules/Transactions/ControllersLogic/CreateGroupsLogic.php

@@ -21,6 +21,8 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\GroupTransaction;
 use App\Http\Resources\WalletTransactionResource;
 use App\Models\Wallet;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+
 
 class CreateGroupsLogic extends AbstractControllerLogic
 {
@@ -55,13 +57,18 @@ class CreateGroupsLogic extends AbstractControllerLogic
     /** @var CreatesGroup */
     private $createsGroup;
 
+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
+
     public function __construct(
-        FetchesTransaction $fetchesTransaction, 
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
+        FetchesTransaction $fetchesTransaction,
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
         FetchesCompanyModule $fetchesCompanyModule,
         CreateWalletTopUpTransactionProcessor $createWalletTopUpTransactionProcessor,
         CreatePaymentTransactionProcessor $createPaymentTransactionProcessor,
-        CreatesGroup $createsGroup
+        CreatesGroup $createsGroup,
+        ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
     )
     {
         $this->fetchesTransaction = $fetchesTransaction;
@@ -70,6 +77,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
         $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
         $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
         $this->createsGroup = $createsGroup;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
     }
 
     public function logic(Request $request) : JsonResponse
@@ -84,6 +92,25 @@ class CreateGroupsLogic extends AbstractControllerLogic
         // $invoices = $this->fetchesTransaction->execute(['id_in' => $invoice_ids]);
         $invoices       = Transaction::whereIn('id', $invoice_ids)->get();
 
+        foreach ($invoices as $invoice) {
+            $order = null;
+            if ($invoice->owner instanceof Transaction) {
+                if ($invoice->owner) {
+                    if ($invoice->owner->owner) {
+                        $order = $invoice->owner->owner->owner;
+                    }
+                }
+            } else if (!($invoice->owner instanceof Transaction) && !($invoice->owner instanceof Wallet)) {
+                if ($invoice->owner) {
+                    $order = $invoice->owner->owner;
+                }
+            }
+
+            if (!$order) {
+                throw new MalformedRequestException("There is an error while paying for invoice {$invoice->bill_no}");
+            }
+        }
+
         if ($payment_method == PaymentMethodType::WALLET) {
 
             $companyModuleId = $invoices->first()->receiver;
@@ -127,7 +154,12 @@ class CreateGroupsLogic extends AbstractControllerLogic
 
         foreach ($invoices as $invoice) {
             if ($payment_method == PaymentMethodType::WALLET) {
-                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'));
+                $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'), false);
+
+                if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                    $pL = $invoice->owner;
+                    $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                }
             }
 
             $issuer                 = $invoice->issuer;
@@ -153,7 +185,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
             $companyModuleId = $invoice->receiver;
             $companyModule = $this->fetchesCompanyModule->execute(['id' => $companyModuleId]);
 
-            $topUpTransaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'), true, $payment_method);
+            $topUpTransaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'), $payment_method, $billNumber, true);
         }
 
         $group->issuer                  = $issuer;

app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentTransactionLogic.php

@@ -10,6 +10,8 @@ use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 class CreatePaymentTransactionLogic extends AbstractControllerLogic
 {
@@ -30,13 +32,18 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
     /** @var CreatePaymentTransactionProcessor */
     private $createPaymentTransactionProcessor;
 
+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
     public function __construct(
         FetchesTransaction $fetchesTransaction,
-        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor,
+        ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
     )
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
     }
 
     public function logic(Request $request) : JsonResponse
@@ -45,7 +52,12 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
 
         $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->input('transaction_id')]);
 
-        $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'));
+        $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'), false);
+
+        if($payment_transaction && $payment_transaction->status == ApprovalStatus::APPROVED){
+            $pL = $invoice_transaction->owner;
+            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice_transaction);
+        }
 
         //cief todo: at exchange there is a transition step - starts
         // if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
@@ -63,4 +75,7 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
 
         return $this->resourceResponse(new TransactionResource($payment_transaction));
     }
+
+
+
 }

app/Classes/Modules/Transactions/ControllersLogic/DeleteGroupLogic.php

@@ -50,6 +50,11 @@ class DeleteGroupLogic extends AbstractControllerLogic
     {
         $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
 
+        foreach ($group->groupTransactions as $groupTransaction) {
+            // $groupTransaction->transaction->delete();
+            $groupTransaction->delete();
+        }
+
         $this->deletesGroup->execute($group);
 
         return $this->response([]);

app/Classes/Modules/Transactions/ControllersLogic/DeletePaymentTransactionLogic.php

@@ -0,0 +1,57 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeletePaymentTransactionLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Delete Payment Transaction',
+            'message' => 'You have successfully deleted the payment transaction'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+
+    /**
+     * SuspendTransactionLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+    }
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
+
+        $transaction->delete();
+
+        $invoice = $transaction->owner;
+
+        $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::APPROVED);
+
+        return $this->response([]);
+    }
+}

app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsLogic.php

@@ -5,10 +5,11 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Http\Resources\BookingResource;
 use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
 
 class ListTransactionsLogic extends AbstractControllerLogic
 {
@@ -38,13 +39,18 @@ class ListTransactionsLogic extends AbstractControllerLogic
 
     public function logic(Request $request) : JsonResponse
     {
-
         $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
 
+        if($request->input('storages')){
+            foreach ($query->items() as &$item) {
+                $transactionId = $item['id'];
+                $filteredStorages = array_filter($request->input('storages'), function ($storage) use ($transactionId) {
+                    return isset($storage['parentInvoiceId']) &&  $storage['parentInvoiceId'] == $transactionId;
+                });
+                $item['storages'] = $filteredStorages;
+            }
+        }
+
         return $this->collectionResponse(TransactionResource::collection($query));
-
     }
-
-
-
 }

app/Classes/Modules/Transactions/ControllersLogic/ListWalletTransactionsLogic.php

@@ -0,0 +1,79 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Http\Resources\WalletTransactionResource ;
+use App\Models\Transaction;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListWalletTransactionsLogic extends AbstractControllerLogic
+{
+    /**
+     * ListTransactionsLogic constructor.
+     * @param ListsTransactions $listsTransactions
+     */
+    public function __construct(ListsTransactions $listsTransactions)
+    {
+        $this->listsTransactions = $listsTransactions;
+    }
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Wallet Transactions',
+            'message' => 'You have successfully retrieved a list of transactions'
+        ];
+    }
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
+
+        if (str_contains($request->input('filters'), "owner_id") && $query->count() > 0) {
+            $wallet_total_incoming = Transaction::where('owner_type', $query->first()->owner_type)
+                ->where('owner_id', $query->first()->owner_id)
+                ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->whereIn('type', [TransactionType::TOP_UP, TransactionType::CREDIT_NOTE, TransactionType::GROUP_PAYMENT])
+                ->sum('amount');
+            
+            $wallet_total_outgoing = Transaction::where('owner_type', $query->first()->owner_type)
+                ->where('owner_id', $query->first()->owner_id)
+                ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->whereIn('type', [TransactionType::PAYMENT, TransactionType::DEBIT_NOTE])
+                ->sum('amount');
+
+            $currentWalletBalance = $wallet_total_incoming - $wallet_total_outgoing;
+            $incoming = Transaction::where('owner_type', $query->first()->owner_type)
+                ->where('owner_id', $query->first()->owner_id)
+                ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->whereIn('type', [TransactionType::TOP_UP, TransactionType::CREDIT_NOTE, TransactionType::GROUP_PAYMENT])
+                ->where('id', '>', $query->first()->id)
+                ->sum('amount');
+            $outgoing = Transaction::where('owner_type', $query->first()->owner_type)
+                ->where('owner_id', $query->first()->owner_id)
+                ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->whereIn('type', [TransactionType::PAYMENT, TransactionType::DEBIT_NOTE])
+                ->where('id', '>', $query->first()->id)
+                ->sum('amount');
+            $runningBalanceInReverse = $currentWalletBalance - $incoming + $outgoing;
+            $request['running_balance'] = $runningBalanceInReverse;
+        }
+
+        return $this->collectionResponse(WalletTransactionResource::collection($query));
+
+    }
+
+
+
+}

app/Classes/Modules/Transactions/ControllersLogic/RegenerateSingleShippingInvoiceTransactionLogic.php

@@ -0,0 +1,76 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Models\Document;
+
+class RegenerateSingleShippingInvoiceTransactionLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Regenerate Shipping Invoice',
+            'message' => 'You have successfully regenerated shipping invoice'
+        ];
+    }
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /**
+     * @param CreatesDocument $createsDocument
+     */
+    public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFiles, FetchesTransaction $fetchesTransaction)
+    {
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+        $this->fetchesTransaction = $fetchesTransaction;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $invoice = $this->fetchesTransaction->execute(['id' => $request->route('invoice_id')]);
+
+        $invoice->documents()->delete();
+
+        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
+
+        $document_object = new DocumentObject(
+            DocumentType::SHIPPING_INVOICE,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'shipping_invoice'
+        );
+
+        $document =$this->createsDocument->execute($invoice, $document_object);
+
+        $this->createsFiles->execute($document, $document_object);
+
+        // dump($document);
+
+        return $this->response([]);
+    }
+
+}

app/Classes/Modules/Transactions/Processors/ApproveShippingInvoiceTransactionProcessor.php

@@ -17,6 +17,8 @@ use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\Jobs\CreatePerfexCRMInvoice;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Models\Order;
 
 class ApproveShippingInvoiceTransactionProcessor
 {
@@ -30,17 +32,21 @@ class ApproveShippingInvoiceTransactionProcessor
     /** @var CreatesFiles */
     private $createsFiles;
 
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
 
     /**
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param CreatesDocument $createsDocument
      * @param CreatesFiles $createsFiles
      */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
     {
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->createsDocument = $createsDocument;
         $this->createsFiles = $createsFiles;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
     }
 
 
@@ -50,7 +56,6 @@ class ApproveShippingInvoiceTransactionProcessor
      */
     public function execute(PackingList $packingList)
     {
-
         /** @var Transaction $invoice_transaction */
         $invoice_transaction = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
 
@@ -75,6 +80,11 @@ class ApproveShippingInvoiceTransactionProcessor
             $user->notify(new InvoiceIssuedEmail($user, $packingList));
         }
 
+        $order = $packingList->owner()->first();
+        if($order instanceof Order){
+            $this->storageInvoiceTransactionProcessor->executeOrder($order);
+        }
+
         return;
     }
 

app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php

@@ -0,0 +1,360 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
+use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionDetail;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\Services\DeletesGroup;
+use App\Classes\Modules\Billplzs\Services\DeletesBillplzBill;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
+
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionDetailType;
+use App\Http\Resources\TransactionResource;
+use App\Models\Order;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+
+
+class CheckStorageInvoiceTransactionProcessor
+{
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var CreatesTransactionDetail */
+    private $createsTransactionDetail;
+
+    /** @var UpdatesTransaction */
+    private $updatesTransaction;
+
+    /** @var UpdatesTransactionDetail */
+    private $updatesTransactionDetail;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var DeletesGroup */
+    private $deletesGroup;
+
+    /** @var DeletesBillplzBill */
+    private $deletesBillplzBill;
+
+    /**
+     * @param FetchesOrder $fetchesOrder
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param FetchesTransaction $fetchesTransaction
+     * @param CreatesTransaction $createsTransaction
+     * @param CreatesTransactionDetail $createsTransactionDetail
+     * @param UpdatesTransaction $updatesTransaction
+     * @param UpdatesTransactionDetail $updatesTransactionDetail
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param DeletesGroup $deletesGroup
+     * @param DeletesBillplzBill $deletesBillplzBill
+     */
+    public function __construct(FetchesOrder $fetchesOrder, GeneratesTransactionBillNumber $generatesTransactionBillNumber, FetchesTransaction $fetchesTransaction, CreatesTransaction $createsTransaction, CreatesTransactionDetail $createsTransactionDetail, UpdatesTransaction $updatesTransaction, UpdatesTransactionDetail $updatesTransactionDetail, UpdatesTransactionStatus $updatesTransactionStatus, DeletesGroup $deletesGroup, DeletesBillplzBill $deletesBillplzBill)
+    {
+        $this->fetchesOrder = $fetchesOrder;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->createsTransaction = $createsTransaction;
+        $this->createsTransactionDetail = $createsTransactionDetail;
+        $this->updatesTransaction = $updatesTransaction;
+        $this->updatesTransactionDetail = $updatesTransactionDetail;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->deletesGroup = $deletesGroup;
+        $this->deletesBillplzBill = $deletesBillplzBill;
+    }
+
+    /**
+     * @throws MalformedRequestException
+     */
+    public function execute(int $orderReference)
+    {
+        $order = $this->fetchesOrder->execute(['reference' => $orderReference, 'with_packing_lists' => true]);
+        return $this->executeOrder($order);
+    }
+
+    public function executeOrder(Order $order, bool $isBackDoorCheck = false){
+        $results = [];
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        $is_credit_term = $order->companyModule->inviters()->withPivot('is_credit_term')->first()->pivot->is_credit_term;
+        if(!$is_credit_term){
+            Log::channel('storage_invoices')->info('orderId: '.$order->id.', orderReference: '.$order->reference.', marking: '.$marking.', is_credit_term: '.$is_credit_term);
+            $packingLists = $order->destinationWarehousePackages;
+
+            foreach ($packingLists as $packingList){
+                $arrivalDateAtChinaWarehouse = $this->getArrivalDateAtChinaWarehoue($packingList);
+                Log::channel('storage_invoices')->info('arrivalDateAtChinaWarehouse: '.json_encode($arrivalDateAtChinaWarehouse));
+                Log::channel('storage_invoices')->info('destinationWarehousePackage: '.json_encode($packingList));
+                $eta = $this->getEtaFromPackingList($packingList);
+                if($arrivalDateAtChinaWarehouse && $eta){
+                    $transactions = $packingList->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+                    // $transactions = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->where('transactions.status', ApprovalStatus::APPROVED)->get();
+
+                    /** @var Transaction $invoice_transaction */
+                    foreach ($transactions as $invoice_transaction){
+                        $result =  $this->processSingleTransactionOfTypeShippingInvoice($invoice_transaction, $packingList, $order->company_module_id, $eta, $isBackDoorCheck);
+                        if($result){
+                            $results[] = $result;
+                        }
+                    }
+                }
+            }
+        }
+        return $results;
+    }
+
+    private function getArrivalDateAtChinaWarehoue($packingList){
+        if($packingList->type === PackingListType::SHIPPING_PACKING_LIST){
+            $receive_packing_list = PackingList::where('reference', $packingList->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first();
+            Log::channel('storage_invoices')->info('receive_packing_list: '.json_encode($receive_packing_list->transports));
+            $transport = $receive_packing_list->transports->first();
+            if ($transport) {
+                $arrivalDateAtChinaWarehouse = Carbon::parse($transport->drop_date);
+                $dateToCompare = Carbon::parse(env('STORAGE_FEE_LAUNCH_DATE', '2023-12-11 00:00:00'));
+                // dd($dateToCompare);
+                if ($arrivalDateAtChinaWarehouse->isAfter($dateToCompare)) {
+                    Log::channel('storage_invoices')->info('transport: '.json_encode($transport));
+                    Log::channel('storage_invoices')->info('dateToCompare: '.$dateToCompare.', arrivalDateAtChinaWarehouse: '.$arrivalDateAtChinaWarehouse);
+                    return $arrivalDateAtChinaWarehouse;
+                }
+            }
+        }
+        return null;
+    }
+
+    private function getEtaFromPackingList($packingList){
+        if ($packingList) {
+            $package = $packingList->packages->first();
+            if ($package) {
+                $container = $package->container()->first();
+                if ($container) {
+                    $transport = $container->transports->first();
+                    if ($transport) {
+                        $schedule = $transport->schedules->last();
+                        if ($schedule) {
+                            return $schedule->eta;
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private function processSingleTransactionOfTypeShippingInvoice($transaction, $destinationWarehousePackage, $company_module_id, $eta, $isBackDoorCheck){
+        $pricePerCBM = 3;
+        $resultNumberOfDaysFree = 10;
+        $dt1 = $eta->copy()->addDay()->startOfDay();
+        $resultStartDate =  $dt1->format('Y-m-d');
+        $currentDatetime = Carbon::now();
+        $dt2 = $currentDatetime->copy()->addDay()->startOfDay();
+        $resultCurrentDate = $dt2->format('Y-m-d H:i:s');
+        $interval = Carbon::parse($dt2)->diff($dt1);
+
+        $resultNumberOfDaysExceeded = $interval->days - $resultNumberOfDaysFree;
+        $storageInvoice = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->first();
+        $storageInvoiceId = 0;
+        $transactionDetailsItems = $transaction->transactionDetails()->get();
+        $cbm = 0.00;
+        foreach ($transactionDetailsItems as $tdItem){
+            $quantity = $tdItem->quantity;
+            if($tdItem->price < 0.00){
+                $quantity = $quantity * -1;
+            }
+            $cbm =  $cbm + $quantity;
+        }
+
+        $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
+        Log::channel('storage_invoices')->info('storageInvoice: '.json_encode($storageInvoice).', $transaction->status: '.$transaction->status);
+        if(!$storageInvoice && $resultNumberOfDaysExceeded  > 0 && $transaction->status != ApprovalStatus::COMPLETED){
+            Log::channel('storage_invoices')->info('Created $transaction->id: '.$transaction->id);
+            $billNumber = $this->generatesTransactionBillNumber->execute('STOR-');
+            $storageInvoice = $this->createStorageInvoiceTransaction($destinationWarehousePackage, $billNumber, $company_module_id, $price_cbm);
+            $storageInvoiceId = $storageInvoice->id;
+            $this->createStorageInvoiceTransactionDetails($storageInvoice, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
+        }
+        else if($storageInvoice){
+
+            //Additional handling for calculation of numberOfDaysExceeded in the event of the storage already paid
+            $paymentStorageTransaction = $storageInvoice->transactions()->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', ApprovalStatus::APPROVED)->first();
+            if($paymentStorageTransaction){
+                $dateStorageInvoicePaid = $paymentStorageTransaction->created_at->copy()->addDay()->startOfDay();
+                Log::channel('storage_invoices')->info('dateStorageInvoicePaid: '.$dateStorageInvoicePaid.', resultCurrentDate: '.$resultCurrentDate);
+                $intervalRecalculate = Carbon::parse($dateStorageInvoicePaid)->diff($dt1);
+                $resultNumberOfDaysExceeded = $intervalRecalculate->days - $resultNumberOfDaysFree;
+                $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
+            }
+
+            $amount = $storageInvoice->amount;
+            $epsilon = 0.0001; // Tolerance for the comparison
+            Log::channel('storage_invoices')->info('Update $transaction->id: '.$transaction->id);
+            Log::channel('storage_invoices')->info('$storageInvoice->status: '.$storageInvoice->status);
+            Log::channel('storage_invoices')->info('price_cbm: '.$price_cbm."-".gettype($price_cbm));
+
+            if(abs($price_cbm - $amount) > $epsilon && $storageInvoice->status !== ApprovalStatus::COMPLETED){
+                $paymentTransactions = $storageInvoice->transactions()->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', ApprovalStatus::PENDING_SUBMISSION)->get();
+
+                if(!$isBackDoorCheck){
+                    if(count($paymentTransactions) > 0){
+                        $this->updatePaymentTransactionViaNonGroupPayment($paymentTransactions);
+                    }
+                    else{
+                        $this->updatePaymentTransactionViaGroupPayment($storageInvoice);
+                    }
+                }
+
+                $storageInvoice = $this->updateStorageInvoiceTransaction($storageInvoice, $price_cbm);
+                $invoiceTransactionDetails = $storageInvoice->transactionDetails()->first();
+                $this->updateStorageInvoiceTransactionDetails($invoiceTransactionDetails, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
+            }
+
+            $storageInvoiceId = $storageInvoice->id;
+        }
+
+        if($storageInvoiceId !== 0){
+            $result = [
+                'parentInvoiceId' => $transaction->id,
+                'storageInvoiceId' => $storageInvoiceId,
+                'numberOfDaysExceeded' => $resultNumberOfDaysExceeded,
+                'numberOfDaysFree' => $resultNumberOfDaysFree,
+                'startDate' => $resultStartDate,
+                'currentDate' => $resultCurrentDate,
+                'cbm' => $cbm,
+                'pricePerCBM' => $pricePerCBM,
+                'storageInvoice' => new TransactionResource($storageInvoice)
+            ];
+            return $result;
+        }
+
+    }
+
+    private function updatePaymentTransactionViaGroupPayment($storageInvoice){
+        Log::channel('storage_invoices')->info('updatePaymentTransactionViaGroupPayment');
+        $groups = $storageInvoice->groups()->get();
+        foreach ($groups as $grp){
+            $groupReference = $grp->reference;
+            $walletTransaction = $this->fetchesTransaction->execute(['payment_reference' => $groupReference]);
+            if($walletTransaction->status === ApprovalStatus::PENDING_SUBMISSION || $walletTransaction->status === ApprovalStatus::PENDING_VERIFICATION){
+                $grp->status = ApprovalStatus::EXPIRED;
+                $grp->save();
+                $this->deletesGroup->execute($grp);
+                $this->updatesTransactionStatus->execute($walletTransaction, ApprovalStatus::EXPIRED);
+                if($walletTransaction->payment_reference){
+                    $deletedBillplzBill = $this->deletesBillplzBill->execute($walletTransaction->payment_reference);
+                    Log::channel('storage_invoices')->info('deletedBillplzBill TransactionType::WALLET: '.json_encode($deletedBillplzBill));
+                }
+            }
+        }
+    }
+
+    private function updatePaymentTransactionViaNonGroupPayment($paymentTransactions){
+        Log::channel('storage_invoices')->info('updatePaymentTransactionViaNonGroupPayment');
+        foreach ($paymentTransactions as $paymentTransaction){
+            $this->updatesTransactionStatus->execute($paymentTransaction, ApprovalStatus::EXPIRED);
+            if($paymentTransaction->payment_reference){
+                $deletedBillplzBill = $this->deletesBillplzBill->execute($paymentTransaction->payment_reference);
+                Log::channel('storage_invoices')->info('deletedBillplzBill TransactionType::WALLET: '.json_encode($deletedBillplzBill));
+            }
+        }
+    }
+
+    private function updateStorageInvoiceTransaction(Transaction $transaction, float $totalAmount){
+
+        $object = new TransactionObject(
+            $transaction->bill_no,
+            TransactionType::STORAGE_INVOICE,
+            1,
+            $transaction->receiver,
+            1,
+            PaymentMethodType::CASH,
+            $totalAmount,
+            $totalAmount,
+            1,
+            1,
+            0,
+            0,
+            0,
+            null,
+            ApprovalStatus::APPROVED
+        );
+
+        /** @var Transaction $invoice_transaction */
+        $invoice_transaction = $this->updatesTransaction->execute($transaction, $object);
+
+        return $invoice_transaction;
+    }
+
+    private function updateStorageInvoiceTransactionDetails($invoice_transaction_details, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays){
+        $object_detail = new TransactionDetailObject(
+            'STORAGE_FEE',
+            TransactionDetailType::STORAGE_FEE.' for '.$numberOfDays. ' days * RM'.$pricePerCBM.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
+            $cbm,
+            $pricePerCBM * $numberOfDays
+        );
+
+        $this->updatesTransactionDetail->execute($invoice_transaction_details, $object_detail);
+    }
+
+    private function createStorageInvoiceTransaction(PackingList $packing_list, string $billNumber, int $companyModuleId, float $totalAmount){
+
+        $object = new TransactionObject(
+            $billNumber,
+            TransactionType::STORAGE_INVOICE,
+            1,
+            $companyModuleId,
+            1,
+            PaymentMethodType::CASH,
+            $totalAmount,
+            $totalAmount,
+            1,
+            1,
+            0,
+            0,
+            0,
+            null,
+            ApprovalStatus::APPROVED
+        );
+
+        /** @var Transaction $invoice_transaction */
+        $invoice_transaction = $this->createsTransaction->execute($packing_list, $object);
+
+        return $invoice_transaction;
+    }
+
+    private function createStorageInvoiceTransactionDetails($invoice_transaction, PackingList $packing_list, $cbm, $pricePerCBM, $numberOfDays){
+        $object_detail = new TransactionDetailObject(
+            'STORAGE_FEE',
+            TransactionDetailType::STORAGE_FEE.' for '.$numberOfDays. ' days * RM'.$pricePerCBM.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
+            $cbm,
+            $pricePerCBM * $numberOfDays
+        );
+
+        $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
+    }
+}

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;

app/Classes/Modules/Transactions/Processors/CreateStorageInvoiceDocTransactionProcessor.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Notifications\InvoiceIssuedEmail;
+use App\Models\Document;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+
+class CreateStorageInvoiceDocTransactionProcessor
+{
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
+
+
+    /**
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFiles
+     */
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+    }
+
+
+    /**
+     * @throws MalformedRequestException
+     */
+    public function execute(PackingList $packingList)
+    {
+         /** @var Transaction $invoice_transaction */
+         $invoice_transaction = $packingList->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->whereIn('status', [ApprovalStatus::COMPLETED])->first();
+
+        //  $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
+
+         $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice_transaction]);
+
+         $document_object = new DocumentObject(
+             DocumentType::STORAGE_INVOICE,
+             [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
+             '',
+             ApprovalStatus::COMPLETED,
+             'storage_invoice'
+         );
+
+        $invouce_transaction_document = $invoice_transaction->documents()->where('document_type', DocumentType::STORAGE_INVOICE)->first();
+        if(!$invouce_transaction_document){
+            /** @var Document $document */
+            $document = $this->createsDocument->execute($invoice_transaction, $document_object);
+
+            $this->createsFiles->execute($document, $document_object);
+            $user = $packingList->owner->companyModule->employees()->first();
+            if(app()->environment(['production'])) {
+                $user->notify(new InvoiceIssuedEmail($user, $packingList));
+            }
+        }
+    }
+
+}

app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Processors;
+
+use Illuminate\Http\Request;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Transactions\Processors\CreateStorageInvoiceDocTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use Illuminate\Support\Facades\Log;
+
+class ReleaseGoodsToCustomerProcessor
+{
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor;
+
+    /** @var CreateStorageInvoiceDocTransactionProcessor */
+    private $createStorageInvoiceDocTransactionProcessor;
+
+    /**
+     * ReleaseGoodsToCustomerProcessor constructor.
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param CreateStorageInvoiceDocTransactionProcessor $createStorageInvoiceDocTransactionProcessor
+     */
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, CreateStorageInvoiceDocTransactionProcessor $createStorageInvoiceDocTransactionProcessor)
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->createStorageInvoiceDocTransactionProcessor = $createStorageInvoiceDocTransactionProcessor;
+    }
+
+
+    /**
+     * @param $packingList
+     * @param $invoice
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute($packingList, $invoice = null)
+    {
+        $result = false;
+        $totalInvoicesAmountPaid = 0.00;
+        $totalInvoicesAmount = 0.00;
+        $invoiceTransactions = $packingList->transactions()->where('status', [ApprovalStatus::APPROVED])->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
+
+        //Part 1: Process each single invoice type and get the total of all invoices
+        foreach($invoiceTransactions as $invoiceTransaction){
+
+            $totalInvoiceAmountPaid = $invoiceTransaction->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+            if ($invoice && $invoice->type == $invoiceTransaction->type) {
+                if(($invoice->amount - $totalInvoiceAmountPaid) < 0.01){
+                    $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+
+                    if($invoice->type == TransactionType::STORAGE_INVOICE){
+                        $this->createStorageInvoiceDocTransactionProcessor->execute($packingList);
+                    }
+                }
+            }
+
+            $totalInvoicesAmount = $totalInvoicesAmount + $invoiceTransaction->amount;
+            $totalInvoicesAmountPaid = $totalInvoicesAmountPaid + $totalInvoiceAmountPaid;
+        }
+
+        Log::channel('storage_invoices')->info('Total invoice amount paid 1: '.$totalInvoicesAmount); //cief todo: to be removed
+        Log::channel('storage_invoices')->info('Total invoice amount paid 2: '.$totalInvoicesAmountPaid); //cief todo: to be removed
+
+        //Part 2: Based on the collected info for all the total of all invoices
+        if (($totalInvoicesAmount - $totalInvoicesAmountPaid) < 0.01 && $totalInvoicesAmountPaid > 0.01) {
+            Log::channel('storage_invoices')->info('Total invoice amount paid 3: '.$totalInvoicesAmountPaid); //cief todo: to be removed
+
+            $packingList->status = ApprovalStatus::APPROVED;
+            $packingList->save();
+
+            if (app()->environment('production')) {
+                $this->updateDoFromVTPortalProcessor->execute($packingList);
+                $this->updateDoFromYDPortalProcessor->execute($packingList);
+            }
+
+            $result = true;
+        }
+
+        return $result;
+    }
+}

app/Classes/Modules/Wallets/Processors/CreateWalletTopUpTransactionProcessor.php

@@ -61,7 +61,7 @@ class CreateWalletTopUpTransactionProcessor
     /**
      * @throws MalformedRequestException
      */
-    public function execute(CompanyModule $companyModule, $amount, $bank_code, ?bool $groupTransaction = false)
+    public function execute(CompanyModule $companyModule, $amount, $bank_code, ?int $payment_method = PaymentMethodType::PAYMENT_GATEWAY, ?string $payment_reference = null, ?bool $groupTransaction = false)
     {
         /** @var Wallet $wallet */
         $wallet = $companyModule->wallets()->first();
@@ -82,7 +82,9 @@ class CreateWalletTopUpTransactionProcessor
         $billPlzBill = $this->createsBillplzBill->execute($companyModule->name, $user->email, 'This payment is credit topup for company ref. ' . $companyModule->reference, $amount, $billNumber, $bank_code, true);
 
         // IF $groupTransaction, transaction type is GROUP_PAYMENT
-        $transaction_object = new TransactionObject($billNumber, $groupTransaction? TransactionType::GROUP_PAYMENT: TransactionType::TOP_UP, 1, $companyModule->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
+        // $transaction_object = new TransactionObject($billNumber, $groupTransaction? TransactionType::GROUP_PAYMENT: TransactionType::TOP_UP, 1, $companyModule->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
+        // no more group payment
+        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $companyModule->id, 1, $payment_method, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $payment_method === PaymentMethodType::PAYMENT_GATEWAY ? $billPlzBill->id : $payment_reference);
 
         $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);
 

app/Classes/Modules/Wallets/Services/UpdatesWalletBalance.php

@@ -5,6 +5,8 @@ namespace App\Classes\Modules\Wallets\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Wallet;
 use App\Models\Company;
 
@@ -16,10 +18,24 @@ class UpdatesWalletBalance extends AbstractUpdateRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Wallet $model, $amount) {
+    public function execute(Wallet $model, $amount)
+    {
+        $topups = 0;
+        $credit = 0;
+        $payments = 0;
+        $debit = 0;
 
-        $model->amount = $model->amount + $amount;
+        foreach ($model->transactions as $transaction) {
+            if (!in_array((int) $transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) continue;
+            if ((int) $transaction->type === TransactionType::TOP_UP)           $topups     += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::GROUP_PAYMENT)    $topups     += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::CREDIT_NOTE)      $credit     += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::PAYMENT)          $payments   += (float) $transaction->amount;
+            if ((int) $transaction->type === TransactionType::DEBIT_NOTE)       $debit      += (float) $transaction->amount;
+        }
+        $auditBalance = ($topups + $credit) - ($payments + $debit);
+
+        $model->amount = $auditBalance;
         return $this->handler($model);
-
     }
 }

app/Classes/ValueObjects/Constants/DocumentType.php

@@ -24,5 +24,6 @@ final class DocumentType {
 
 
     public const SHIPPING_INVOICE = 'SHIPPING_INVOICE';
+    public const STORAGE_INVOICE = 'STORAGE_INVOICE';
 
 }

app/Classes/ValueObjects/Constants/TransactionDetailType.php

@@ -11,4 +11,6 @@ final class TransactionDetailType {
     public const MIN_CBM_CHARGES = 'Minimum Charge for 0.3 CBM Per Container';
 
     public const CUSTOM_CHARGES = 'Custom charges';
+
+    public const STORAGE_FEE = 'Malaysia Warehouse Storage Fee';
 }

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -5,9 +5,9 @@ namespace App\Classes\ValueObjects\Constants;
 final class TransactionType {
 
     // public const PAYMENT_ATTEMPT = 0;
-    
+
     public const SHIPPING_INVOICE = 1;
-    
+
     public const PAYMENT = 2;
 
     // public const BILL = 3;
@@ -35,10 +35,11 @@ final class TransactionType {
     // public const SHIPPING_COST = 14;
 
     public const GROUP_PAYMENT = 15;
-    
+
     public const TRANSACTION_TYPE_ID = [
         self::SHIPPING_INVOICE   => "Shipping Invoice",
         self::PAYMENT            => "Payment",
     ];
 
+    public const STORAGE_INVOICE = 16;
 }

app/Console/Commands/CheckStorageInvoicesGroupTransactions.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Classes\Modules\Transactions\Services\ListsGroups;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Models\Order;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class CheckStorageInvoicesGroupTransactions extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'check-storage-invoices-group-transactions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check all storage invoices due to make sure that they are up to date daily, prevent \'back door\' cases';
+
+    /** @var ListsGroups */
+    private $listsGroups;
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(ListsGroups $listsGroups, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
+    {
+        parent::__construct();
+        $this->listsGroups = $listsGroups;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+    }
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $this->info(Carbon::now() . ': Start Check all pending group payment with storage invoice is valid.');
+        $start   = new Carbon();
+
+
+        $newfilters['order_by_updated_at_desc'] = true;
+        $newfilters['status_in'] = [0, 1];
+        $groups = $this->listsGroups->execute($newfilters);
+
+        foreach ($groups as $group){
+            $this->info('CheckForStorageInvoiceByTransactions group: '.json_encode($group));
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $packingList = $invoice->owner()->first();
+                if($packingList){
+                    $order = $packingList->owner()->first();
+                    if($order instanceof Order){
+                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                    }
+                }
+            }
+        }
+
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ': Done Check all pending group payment with storage invoice is valid. ElapsedTime: ' . $elapsedTime . '.');
+    }
+}

app/Console/Commands/CheckStorageInvoicesOrders.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Classes\Modules\Orders\Services\ListsOrders;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\ValueObjects\Constants\OrderType;
+use App\Models\Order;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class CheckStorageInvoicesOrders extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'check-storage-invoices-orders';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check all storage invoices due to make sure that they are up to date daily, prevent \'back door\' cases';
+
+    /** @var ListsOrders */
+    private $listsOrders;
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(ListsOrders $listsOrders, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
+    {
+        parent::__construct();
+        $this->listsOrders = $listsOrders;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+    }
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $this->info(Carbon::now() . ': Start Check all orders for storage invoice.');
+        $start   = new Carbon();
+
+        $orders = $this->listsOrders->execute(['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]);
+
+        $count = 0;
+        foreach ($orders as $order){
+            try{
+                $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                $count =  $count + 1;
+                $this->info('Order '.$count);
+            }
+            catch(\Exception $ex){
+                $this->info('Exception '.$ex->getMessage());
+                break;
+            }
+        }
+
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ': Done Check all orders for storage invoice. ElapsedTime: ' . $elapsedTime . '.');
+    }
+}

app/Console/Commands/FixBillplzFailedCallbackPayment.php

@@ -4,6 +4,7 @@ namespace App\Console\Commands;
 
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
+use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
 use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
@@ -53,12 +54,15 @@ class FixBillplzFailedCallbackPayment extends Command
     /** @var UpdateDoFromYDPortalProcessor */
     private $updateDoFromYDPortalProcessor ;
 
+     /** @var CallbackBillplzProcessor */
+     private $callbackBillplzProcessor;
+
     /**
      * Create a new command instance.
      *
      * @return void
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, CallbackBillplzProcessor $callbackBillplzProcessor)
     {
         parent::__construct();
         $this->getBillplzBill = $getBillplzBill;
@@ -66,6 +70,7 @@ class FixBillplzFailedCallbackPayment extends Command
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
     }
 
     /**
@@ -82,7 +87,7 @@ class FixBillplzFailedCallbackPayment extends Command
 
         $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
 
-        $transactions = Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP])->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+        $transactions = Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP, TransactionType::GROUP_PAYMENT])->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
         $totalTransactions = count($transactions);
 
         if ($totalTransactions) {
@@ -96,84 +101,15 @@ class FixBillplzFailedCallbackPayment extends Command
 
             if($response->successful()){
                 $data = $response->json();
-                if($data['paid']){
-                    $totalAmount += $transaction->amount;
-                    $invoiceStatus = null;
+                if($data['paid']) {
+                    $status = ApprovalStatus::PENDING_VERIFICATION;
 
-                    switch($transaction->owner->status) {
-                        case 3:
-                        $invoiceStatus = 'Payment Completed';
-                        break;
-                        case 5:
-                        $invoiceStatus = 'Dispute in progress';
-                        break;
-                        case 6:
-                        $invoiceStatus = 'Cancelled Invoice';
-                        break;
-                        default:
-                        $invoiceStatus = 'Pending Payment';
+                    if($data['state'] === 'paid') {
+                        $status = ApprovalStatus::APPROVED;
                     }
 
-                    $order = $transaction->owner->owner->owner;
-
-                    if (in_array($invoiceStatus , ['Pending Payment', 'Payment Completed'])) {
-                        // code here
-
-                        // $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
-
-                        // if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
-
-                        // $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
-
-                        $invoice = $transaction->owner;
-                        $packingList = $invoice->owner;
-                        $order = $packingList->owner;
-
-                        $status = ApprovalStatus::PENDING_VERIFICATION;
-
-                        if($data['state'] === 'paid') {
-                            $status = ApprovalStatus::APPROVED;
-                        }
-
-                        // if($data->state === 'due') {
-                        //     $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
-                        // }
-
-                        // $token = Auth::fromUser(User::find(1));
-                        // $request->headers->set('Authorization', 'Bearer '.$token);
-
-                        $this->updatesTransactionStatus->execute($transaction, $status);
-
-                        $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
-
-                        if(($invoice->amount - $totalPaidAmount) < 0.01) {
-                            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
-                            $packingList->status = ApprovalStatus::APPROVED;
-                            $packingList->save();
-
-                            if(app()->environment('production')){
-                                $this->updateDoFromVTPortalProcessor->execute($packingList);
-                                $this->updateDoFromYDPortalProcessor->execute($packingList);
-                            }
-
-                            $this->info('Updated invoice ' . $counter . ' of ' . $totalTransactions . '. Order: '. $order->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Status: ' . $approvalStatusArray[$transaction->status] . '. Invoice Status: ' . $invoiceStatus);
-                        } else {
-                            $this->info('Failed to update invoice due to unsufficeint payment ' . $counter . ' of ' . $totalTransactions . '. Order: '. $order->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Status: ' . $approvalStatusArray[$transaction->status] . '. Invoice Status: ' . $invoiceStatus);
-                        }
-
-
-                    } else {
-                        if(!$order instanceof Order) {
-                            $this->info("Error transaction id:" . $transaction->id . 'Type: ' . get_class($order));
-                        } else {
-                            $this->info($counter . ' of ' . $totalTransactions . '. Order: '. $order->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Status: ' . $approvalStatusArray[$transaction->status] . '. Invoice Status: ' . $invoiceStatus);
-                        }
-                    }
-
-                } else {
-                    // $totalAmount += $transaction->amount;
-                    // $this->appendToOutput($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
+                    $this->info(Carbon::now() . ' : Fixing ' . $transaction->payment_reference);
+                    $this->callbackBillplzProcessor->execute($transaction, $status);
                 }
             }else{
                 $this->info("billplz error</br>");

app/Console/Commands/FixGroupPaymentProblem.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Classes\Modules\Transactions\Services\FetchesGroup;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class FixGroupPaymentProblem extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-group-payment-problem';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This is a one time data patch for a problem result from Storage Invoice Implementation';
+
+    /** @var FetchesGroup */
+    private $fetchesGroup;
+
+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(FetchesGroup $fetchesGroup, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
+    {
+        parent::__construct();
+        $this->fetchesGroup = $fetchesGroup;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
+    }
+
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $this->info(Carbon::now() . ': Start data patch.');
+        $start   = new Carbon();
+
+        $group = $this->fetchesGroup->execute(['id' => 325]);
+
+        $this->info('FixGroupPaymentProblem group: '.json_encode($group));
+        if ($group) {
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                $this->info('FixGroupPaymentProblem group: '.json_encode($invoice));
+                //$paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+
+                //if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                    $pL = $invoice->owner;
+                    $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                //}
+            }
+            // $group->status = $status;
+            // $group->save();
+        }
+
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ': Done data patch. ElapsedTime: ' . $elapsedTime . '.');
+    }
+}

app/Console/Commands/ShowFailediBllplzCallback.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Console\Commands;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class ShowFailediBllplzCallback extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'show-failed-billplz-callback';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Show all failled callback from billplz';
+
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $start   = new Carbon();
+
+        $transactions = Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP, TransactionType::GROUP_PAYMENT])->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+        $totalTransactions = count($transactions);
+
+        if ($totalTransactions) {
+            $this->info(Carbon::now() . ' : ' . $this->description);
+        }
+
+        $counter = 1;
+        $totalAmount = 0;
+        foreach ($transactions as $transaction){
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
+
+            if($response->successful()){
+                $data = $response->json();
+                if($data['paid']){
+                    dump($transaction->payment_reference);
+                    dump($transaction->id);
+                }
+            }else{
+                $this->info("billplz error</br>");
+            }
+            $counter++;
+        }
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        if ($totalTransactions) {
+            $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+        }
+
+    }
+}

app/Console/Kernel.php

@@ -62,6 +62,11 @@ class Kernel extends ConsoleKernel
             ->hourly()
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/fix_failed_callback_from_billplz.log');
+
+        $schedule->command('check-storage-invoices-group-transactions')
+            ->dailyAt('0:01')
+            ->withoutOverlapping()
+            ->appendOutputTo(storage_path().'/logs/check_storage_invoices.log');
     }
 
     /**

app/Http/Controllers/Exports/ExportArrivedParcelController.php

@@ -9,6 +9,7 @@ use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Excel;
+use App\Classes\Modules\Exports\Services\ExportsAgingList;
 
 class ExportArrivedParcelController
 {
@@ -46,4 +47,11 @@ class ExportArrivedParcelController
         ob_end_clean();
         return $response;
     }
+
+    public function aging(Request $request) {
+        $data = new ExportsAgingList();
+        $response = $data->download('aging_report.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
 }

app/Http/Controllers/Exports/ExportCustomersWalletTransactionToExcelController.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+use App\Classes\Modules\Exports\Services\ExportsCustomersWalletTransactionHistory;
+use App\Models\User;
+use App\Models\Wallet;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Maatwebsite\Excel\Excel;
+
+class ExportCustomersWalletTransactionToExcelController
+{
+
+    /**
+     * ExportCustomersWalletTransactionToExcelController constructor.
+     * @param Request $request
+     */
+    public function __construct(Request $request)
+    {
+        $token = Auth::fromUser(User::find(1));
+        $request->headers->set('Authorization', 'Bearer ' . $token);
+    }
+
+    public function export(Request $request)
+    {
+        $exportsTransactions = new ExportsCustomersWalletTransactionHistory($request);
+        $wallet = Wallet::find($request->route('wallet_id'));
+        $company_marking = $wallet->owner->connections->first()->invitee_reference;
+
+        $filename = $company_marking . '-wallet-' . ($request->route('is_precise') == 'true' ? 'precise-' : '') . 'transaction-history.xls';
+        $response = $exportsTransactions->download($filename, Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+}

app/Http/Controllers/Transactions/DeletePaymentTransactionController.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\DeletePaymentTransactionLogic;
+
+
+class DeletePaymentTransactionController
+{
+    /**
+     * @param Request $request
+     * @param DeletePaymentTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeletePaymentTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Transactions/ListWalletTransactionsController.php

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

app/Http/Controllers/Transactions/RegenerateSingleShippingInvoiceTransactionController.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\RegenerateSingleShippingInvoiceTransactionLogic;
+
+
+class RegenerateSingleShippingInvoiceTransactionController
+{
+    /**
+     * @param Request $request
+     * @param RegenerateShippingInvoiceTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function regenerate(Request $request, RegenerateSingleShippingInvoiceTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Kernel.php

@@ -38,11 +38,13 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\WebResponseTimeLog::class,
         ],
 
         'api' => [
             'throttle:300,1',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\ApiResponseTimeLog::class,
         ],
 
         'apipub' => [
@@ -70,5 +72,8 @@ class Kernel extends HttpKernel
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'valid.token' => ValidateToken::class,
         'token.check' => \App\Http\Middleware\TokenCheckerMiddleware::class,
+        'storage.invoice.check.byorder' => \App\Http\Middleware\CheckForStorageInvoiceByOrderId::class,
+        'storage.invoice.check.bytransactions' => \App\Http\Middleware\CheckForStorageInvoiceByTransactions::class,
+        'storage.invoice.check.bygroup' => \App\Http\Middleware\CheckForStorageInvoiceByGroup::class,
     ];
 }

app/Http/Middleware/ApiResponseTimeLog.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class ApiResponseTimeLog
+{
+	public function handle(Request $request, Closure $next)
+	{
+		// Get route information
+		$route = $request->route();
+		$routeName = $route ? $route->getName() : 'undefined';
+		$uri = $request->getPathInfo();
+
+		$startTime = microtime(true); // Start time
+
+		$response = $next($request); // Handle the request
+
+		$endTime = microtime(true); // End time
+		$responseTime = $endTime - $startTime; // Calculate the response time
+
+		Log::channel('apiResponseTimeLog')->info("\nRequest to route: {$uri} \nRoute name: {$routeName} \nTime Taken: " . number_format($responseTime * 1000, 2) . "ms\n");
+
+		return $response;
+	}
+}

app/Http/Middleware/CheckForStorageInvoiceByGroup.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\ListsGroups;
+use App\Models\Order;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class CheckForStorageInvoiceByGroup
+{
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+    /** @var ListsGroups */
+    private $listsGroups;
+
+
+    public function __construct(CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor, ListsGroups $listsGroups)
+    {
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+        $this->listsGroups = $listsGroups;
+    }
+
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        // :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [0, 1], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"
+        $filters = json_decode($request->input('filters'), true);
+        if(json_encode($filters['order_by']) == '{"column":"updated_at","DESC":true}'){
+            $filters['order_by_updated_at_desc'] = true;
+        }
+        unset($filters['order_by']);
+        $groups = $this->listsGroups->execute($filters);
+
+
+        if(isset($filters['check_for_storage_invoice'])){
+            foreach ($groups as $group){
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+                    $packingList = $invoice->owner()->first();
+                    if($packingList){
+                        $order = $packingList->owner()->first();
+                        if($order instanceof Order){
+                            $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                        }
+                    }
+                }
+            }
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/CheckForStorageInvoiceByOrderId.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use Illuminate\Http\Request;
+
+class CheckForStorageInvoiceByOrderId
+{
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+
+    public function __construct(CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
+    {
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+    }
+
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $orderId = $request->route('id');
+        $storages = $this->storageInvoiceTransactionProcessor->execute($orderId);
+        $request->merge(['storages' => $storages]);
+        return $next($request);
+    }
+}

app/Http/Middleware/CheckForStorageInvoiceByTransactions.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Classes\Modules\Transactions\Services\ListsGroups;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\CompanyConnection;
+use App\Models\Order;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class CheckForStorageInvoiceByTransactions
+{
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /** @var ListsGroups */
+    private $listsGroups;
+
+
+    public function __construct(CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor, ListsTransactions $listsTransactions, ListsGroups $listsGroups)
+    {
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
+        $this->listsTransactions = $listsTransactions;
+        $this->listsGroups = $listsGroups;
+    }
+
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $results = [];
+        $transactions = null;
+        $marking = $request->route('marking');
+        if($marking){ //for web route /customer/{marking}/payment-and-billing
+            $connection = CompanyConnection::where('invitee_reference', $marking)->first();
+            $company_module_id = $connection->invitee->id;
+            $filters = [
+                'per_page' => 999,
+                'status_in' => [2],
+                'receiver' =>  $company_module_id,
+                'type_in' => [TransactionType::SHIPPING_INVOICE]
+            ];
+            $transactions = $this->listsTransactions->execute($filters);
+        }
+        else{ //for api route /transactions/list
+            $filters = json_decode($request->input('filters'), true);
+            $filters['type_in'] = [TransactionType::SHIPPING_INVOICE];
+            if(json_encode($filters['order_by']) == '{"column":"id","DESC":true}'){
+                $filters['order_by_id_desc'] = true;
+            }
+            unset($filters['order_by']);
+            $transactions = $this->listsTransactions->execute($filters);
+        }
+
+
+        if(isset($filters['check_for_storage_invoice'])){
+            foreach($transactions as $transaction){
+                $packingList = $transaction->owner()->first();
+                if($packingList){
+                    $order = $packingList->owner()->first();
+                    if($order instanceof Order){
+                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                        if($storages){
+                            $results = array_merge($results, $storages);
+                        }
+                    }
+                }
+            }
+        }
+
+        $filteredResults = array_values(array_filter($results, function($item, $key) {
+            static $seen = array();
+            $hash = md5($item['parentInvoiceId'] . $item['storageInvoiceId']);
+            return !isset($seen[$hash]) && ($seen[$hash] = true);
+        }, ARRAY_FILTER_USE_BOTH));
+
+
+        $request->merge(['storages' => $filteredResults]);
+
+        return $next($request);
+    }
+}

app/Http/Middleware/WebResponseTimeLog.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class WebResponseTimeLog
+{
+	public function handle(Request $request, Closure $next)
+	{
+		// Get route information
+		$route = $request->route();
+		$routeName = $route ? $route->getName() : 'undefined';
+		$uri = $request->getPathInfo();
+
+		$startTime = microtime(true); // Start time
+
+		$response = $next($request); // Handle the request
+
+		$endTime = microtime(true); // End time
+		$responseTime = $endTime - $startTime; // Calculate the response time
+
+		Log::channel('webResponseTimeLog')->info("\nRequest to route: {$uri} \nRoute name: {$routeName} \nTime Taken: " . number_format($responseTime * 1000, 2) . "ms\n");
+
+		return $response;
+	}
+}

app/Http/Resources/GroupForOrderV2Resource.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class GroupForOrderV2Resource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        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' => (int)$this->payment_method,
+            'payment_method_name' => ucwords(PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method]),
+            'payment_reference' => $this->reference,
+            'transactions_ids' => GroupTransactionsForOrderV2Resource::collection($this->groupTransactions)
+        ];
+    }
+}

app/Http/Resources/GroupResource.php

@@ -4,6 +4,7 @@ namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Models\Transaction;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -19,6 +20,7 @@ class GroupResource extends JsonResource
     {
 
         // dd($this->groupTransactions);
+        $payment_transaction = Transaction::where('payment_reference', $this->reference)->first();
 
         return [
             'id' => $this->id,
@@ -37,6 +39,12 @@ class GroupResource extends JsonResource
             'payment_method_name' => ucwords(PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method]),
             'invoices' => GroupTransactionResource::collection($this->groupTransactions),
             '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)),
+            ] : []
         ];
     }
 }

app/Http/Resources/GroupTransactionsForOrderV2Resource.php

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

app/Http/Resources/HelpMenuQuestionResource.php

@@ -34,7 +34,7 @@ class HelpMenuQuestionResource extends JsonResource
                 'question_number' => $q->question_number,
                 'question_text' => $q->question_text,
                 'question_type' => $q->question_type,
-                'question_answers' => HelpMenuAnswerOptionsResource::collection(QAAnswerOptions::where('question_number', $q->question_number)->where('questionnaire_set_id', $q->questionnaire_set_id)->get()),
+                'question_answers' => HelpMenuAnswerOptionsResource::collection(QAAnswerOptions::where('question_number', $q->question_number)->where('questionnaire_set_id', $q->questionnaire_set_id)->orderBy('order', 'ASC')->get()),
                 'questionnaire_set_id' => $q->questionnaire_set_id,
                 'next_nested_question' => $q->next_nested_question,
                 'next_main_question' => $q->next_main_question,

app/Http/Resources/HelpMenuQuestionnaireSetsResource.php

@@ -18,6 +18,7 @@ class HelpMenuQuestionnaireSetsResource extends JsonResource
             'name' => $this->name,
             'description' => $this->description,
             'group' => $this->group,
+            'version' => $this->version,
         ];
     }
 }

app/Http/Resources/HelpMenuQuestionsAnswersResource.php

@@ -4,6 +4,7 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Classes\ValueObjects\Constants\QASystemSourceType;
+use App\Models\QAAnswerOptions;
 use App\Models\QAQuestions;
 use Carbon\Carbon;
 
@@ -20,6 +21,7 @@ class HelpMenuQuestionsAnswersResource extends JsonResource
         $question = QAQuestions::where('id', $this->question_id)->first();
         $source = new HelpMenuUserSourceResource($this->userSource);
         $user = $this->source_id === 0 ? new UserResource($this->user) : null;
+        $answerOption = QAAnswerOptions::where('id', $this->answer_option_id)->first();
 
         $user_marking = '';
         if($user){
@@ -31,7 +33,8 @@ class HelpMenuQuestionsAnswersResource extends JsonResource
             'question_id' => $this->question_id,
             'questionnaire' => new HelpMenuQuestionnaireSetsResource($this->question->questionnaire),
             'question_text' => $question ? $question->question_text : null,
-            'free_text_answer' => $this->free_text_answer,
+            'free_text_answer' => $answerOption ? $answerOption->display_text : null,
+            'answer_value' => $answerOption ? $answerOption->value : null,
             'source_system' => $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
             'source_marking' => $user ? $user_marking : $source->marking,
             'source_email' => $user ? $user->email : $source->email,

app/Http/Resources/OrderV2Resource.php

@@ -31,8 +31,9 @@ class OrderV2Resource extends JsonResource
             'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
             'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
             'invoices' => $this->whenLoaded('packingLists', function() {
-                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get());
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get());
             }),
+            'storages' => $this->storages ? $this->storages : null, //from middleware
             'remarks' => RemarkResource::collection($this->remarks),
             'created_at' => $this->created_at->format('d-m-Y')
         ];

app/Http/Resources/TransactionResource.php

@@ -3,13 +3,14 @@
 namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
+use App\Models\Group;
 use App\Models\Transaction;
+use App\Models\Wallet;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
+
 class TransactionResource extends JsonResource
 {
     /**
@@ -20,11 +21,44 @@ class TransactionResource extends JsonResource
      */
     public function toArray($request)
     {
+        $order = null;
+        $groupTransactions = null;
+        $group_payment_attempts = null;
+        $group_payment_expired = null;
+
+        if ($this->owner instanceof Transaction) {
+            if ($this->owner) {
+                if ($this->owner->owner) {
+                    $order = new OrderResource($this->owner->owner->owner);
+                }
+            }
+        } else if (!($this->owner instanceof Transaction) && !($this->owner instanceof Wallet)) {
+            if ($this->owner) {
+                $order = new OrderResource($this->owner->owner);
+            }
+
+            if($this->groups){
+                $group_payment_attempts = GroupForOrderV2Resource::collection($this->groups->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]));
+                $group_payment_expired = GroupForOrderV2Resource::collection($this->groupsWithTrashed->whereIn('status', [ApprovalStatus::EXPIRED]));
+            }
+
+        } else {
+            $group = Group::where('reference', $this->payment_reference)->first();
+            if ($group) {
+                $groupTransactions = GroupTransactionResource::collection($group->groupTransactions);
+            }
+
+        }
+
         return [
             'id' => $this->id,
             'owner_type' => $this->owner_type,
-            'order' => ($this->owner instanceof Transaction) ? new OrderResource($this->owner->owner->owner) : new OrderResource($this->owner->owner),
-            'documents' => DocumentResource::collection($this->documents),
+            'order' => $order,
+            'group_transactions' => $groupTransactions,
+            'group_reference' => $groupTransactions ? ($group ? $group->reference : null ) : null,
+            'groups_payment_attempts' => $group_payment_attempts,
+            'groups_payment_expired' => $group_payment_expired,
+            'documents' => $groupTransactions ? DocumentResource::collection($this->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)) : DocumentResource::collection($this->documents),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'amount' => (double) $this->amount,
@@ -46,6 +80,11 @@ class TransactionResource extends JsonResource
                     ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
                     ->get()
             ),
+            'payments_expired' => TransactionResource::collection(
+                $this->transactions()
+                    ->payments()->where('status', ApprovalStatus::EXPIRED)
+                    ->get()
+            ),
             'payment_history' => TransactionResource::collection(
                 $this->transactions()
                     ->payments()
@@ -53,6 +92,7 @@ class TransactionResource extends JsonResource
                     ->get()
             ),
             'remarks' => RemarkResource::collection($this->remarks),
+            'storages' => $this->storages ? $this->storages : null, //from middleware
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')

app/Http/Resources/WalletResource.php

@@ -23,7 +23,7 @@ class WalletResource extends JsonResource
             'amount' => (double) $this->amount,
             'company_id' => (int) $this->owner->id,
             'transactions' => $this->whenLoaded('transactions', WalletTransactionResource::collection($this->transactions()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->get()), []),
-            'top_up_records' => $this->whenLoaded('transactions', WalletTransactionResource::collection($this->transactions()->whereIn('type', [TransactionType::TOP_UP])->orderBy('id', 'DESC')->get()), []),
+            'top_up_records' => $this->whenLoaded('transactions', WalletTransactionResource::collection($this->transactions()->whereIn('type', [TransactionType::TOP_UP, TransactionType::GROUP_PAYMENT])->orderBy('id', 'DESC')->get()), []),
             'company_module_marking' => $this->owner->connections->first()->invitee_reference,
         ];
     }

app/Http/Resources/WalletTransactionResource.php

@@ -20,28 +20,41 @@ class WalletTransactionResource extends JsonResource
     public function toArray($request)
     {
         $description = '';
+        $current_running_balance = $request['running_balance'];
         switch((int) $this->type){
             case TransactionType::TOP_UP:
                 $description = (double) $this->amount.' Credit Top up';
+                $request['running_balance'] = bcsub($request['running_balance'], $this->amount, 5);
                 break;
             case TransactionType::CREDIT_NOTE:
                 $description = 'Credit Voucher for '.$this->payment_reference;
+                $request['running_balance'] = bcsub($request['running_balance'], $this->amount, 5);
                 break;
             case TransactionType::PAYMENT:
-                $order = Transaction::where('payment_reference', $this->bill_no)->first()->owner->owner->owner;
+                $invoice = Transaction::where('payment_reference', $this->bill_no)->first();
+                if(!$invoice) {
+                    Log::channel('paymentUnknownOrderLog')->info('ID: ' . $this->id);
+                    $description = 'Payment for unknown invoice, please contact tech support.';
+                    break;
+                }
 
+                $order = $invoice->owner->owner->owner;
                 if(!$order) {
+                    Log::channel('paymentUnknownOrderLog')->info('ID: ' . $this->id);
                     $description = 'Payment for unknown order, please contact tech support.';
                     break;
                 }
 
+                $request['running_balance'] = bcadd($request['running_balance'], $this->amount, 5);
                 $marking = $order->reference;
                 $description = 'Payment For order refs.'.'<a href="'.route('order.details', $marking).'">'.$marking.'</a>';
                 break;
             case 11:
+                $request['running_balance'] = bcadd($request['running_balance'], $this->amount, 5);
                 $description = 'Debit Voucher for '.$this->payment_reference;
                 break;
             case 15:
+                $request['running_balance'] = bcsub($request['running_balance'], $this->amount, 5);
                 $description = (double) $this->amount.' Credit Top up';
                 break;
 
@@ -56,6 +69,7 @@ class WalletTransactionResource extends JsonResource
             'payment_method' => (float) $this->payment_method,
             // 'issuer_name' => $this->issuerCompany->name,
             'amount' => (double) $this->amount,
+            'running_balance' => (double) $current_running_balance,
             'service_charge' => (double) $this->service_charge,
             'tax' => (double) $this->tax,
             'status' => (int) $this->status,

app/Models/GroupTransaction.php

@@ -4,10 +4,12 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class GroupTransaction extends Model
 {
     protected $table = 'group_transactions';
+    use SoftDeletes;
     
     /**
      * @return BelongsTo

app/Models/QAUserAnswerSelected.php

@@ -46,4 +46,13 @@ class QAUserAnswerSelected extends AbstractModel implements Documentable
         return $this->BelongsTo(QAQuestions::class, 'question_id', 'id');
     }
 
+
+    /**
+     * @return BelongsTo
+     */
+    public function answer(): BelongsTo
+    {
+        return $this->BelongsTo(QAAnswerOptions::class, 'answer_option_id', 'id');
+    }
+
 }

app/Models/Transaction.php

@@ -89,6 +89,14 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
         return $this->BelongsToMany(Group::class, GroupTransaction::class, 'transaction_id');
     }
 
+    /**
+     * @return BelongsToMany
+     */
+    public function groupsWithTrashed(): BelongsToMany
+    {
+        return $this->BelongsToMany(Group::class, GroupTransaction::class, 'transaction_id')->withTrashed();;
+    }
+
     public function convert_original_amount()
     {
         if($this->booking()->first()->fix_currency_id !== 1) {
@@ -105,7 +113,7 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
      */
     public function scopePayments(Builder $query)
     {
-        return $query->where('type', TransactionType::PAYMENT);
+        return $query->whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP]);
     }
 
     /**

config/logging.php

@@ -54,6 +54,12 @@ return [
             'days' => 14,
         ],
 
+        'storage_invoices' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/laravel_storage_invoices.log'),
+            'level' => 'info',
+        ],
+
         'slack' => [
             'driver' => 'slack',
             'url' => env('LOG_SLACK_WEBHOOK_URL'),
@@ -100,6 +106,24 @@ return [
         'emergency' => [
             'path' => storage_path('logs/laravel.log'),
         ],
+
+        'paymentUnknownOrderLog' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/paymentUnknownOrderLog.log'),
+            'level' => 'info',
+        ],
+
+        'apiResponseTimeLog' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/apiResponseTime.log'),
+            'level' => 'info',
+        ],
+
+        'webResponseTimeLog' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/webResponseTimeLog.log'),
+            'level' => 'info',
+        ],
     ],
 
 ];

database/migrations/2023_11_13_140300_add_is_credit_term_to_company_connections.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddIsCreditTermToCompanyConnections extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('company_connections', function (Blueprint $table) {
+            $table->boolean('is_credit_term')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('company_connections', function (Blueprint $table) {
+            $table->dropColumn('is_credit_term');
+        });
+    }
+}

database/seeders/DatabaseSeeder.php

@@ -26,7 +26,12 @@ class DatabaseSeeder extends Seeder
         // $this->call(QAQuestionsDemoSeeder::class); //DEMO POC
         // $this->call(QAAnswerOptionsDemoSeeder::class); //DEMO POC
 
+        // 20230928 Set 1 to Set 3
         // $this->call(QAQuestionsSeeder::class);
         // $this->call(QAAnswerOptionsSeeder::class);
+
+        // 20231121 Set 4 to Set 6
+        // $this->call(QAQuestions2Seeder::class);
+        // $this->call(QAAnswerOptions2Seeder::class);
     }
 }

database/seeders/QAAnswerOptions2Seeder.php

@@ -0,0 +1,395 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use App\Models\QAAnswerOptions;
+
+class QAAnswerOptions2Seeder extends Seeder
+{
+    public function run()
+    {
+        // Set 1
+        // Option 1 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Dissatisfied";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 2 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Dissatisfied";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 3 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 4 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Satisfied";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 5 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Satisfied";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+
+
+        // Set 1
+        // Option 1 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Yes";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 2 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Partially";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 3 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "No";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+
+
+          // Set 1
+        // Option 1 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Clear";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 2 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Clear";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 3 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 4 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Unclear";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 5 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Unclear";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+
+
+
+
+        // Set 2
+        // Option 1 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Yes";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 2 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Somewhat";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 3 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "No";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+
+
+        // Set 2
+        // Option 1 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Exceeded Expectations";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 2 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Met Expectations";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 3 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Below Expectations";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+
+
+          // Set 2
+        // Option 1 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Dissatisfied";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 2 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Dissatisfied";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 3 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 4 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Satisfied";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 5 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Satisfied";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+
+
+
+
+        // Set 3
+        // Option 1 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Immediately";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 2 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Within a few hours";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 3 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Within a day";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 4 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "More than a day";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 5 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Never received a response";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+
+
+        // Set 3
+        // Option 1 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Clear";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 2 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Clear";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 3 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 4 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Unclear";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 5 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Unclear";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+
+
+        // Set 3
+        // Option 1 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Likely";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 2 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Likely";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 3 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 4 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Unlikely";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 5 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Unlikely";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+
+
+    }
+}

database/seeders/QAQuestions2Seeder.php

@@ -0,0 +1,148 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use App\Models\QAQuestionnaireSet;
+use App\Models\QAQuestions;
+use App\Classes\ValueObjects\Constants\QAType;
+
+class QAQuestions2Seeder extends Seeder
+{
+    public function run()
+    {
+        $questionnaireSets = [
+            [
+                'name' => 'Set 1',
+                'description' => 'Customer Support Satisfaction Survey',
+                'group' => 'feedback',
+                'version' => 2
+            ],
+            [
+                'name' => 'Set 2',
+                'description' => 'First Order Experience Feedback',
+                'group' => 'feedback',
+                'version' => 2
+            ],
+            [
+                'name' => 'Set 3',
+                'description' => 'Sales Inquiry Experience',
+                'group' => 'feedback',
+                'version' => 2
+            ],
+        ];
+
+        foreach ($questionnaireSets as $set) {
+            $questionnaireSet = QAQuestionnaireSet::create([
+                'name' => $set['name'],
+                'description' => $set['description'],
+                'group' => $set['group'],
+                'version' => $set['version'],
+            ]);
+
+            $questions = [];
+
+            switch ($set['name']) {
+                case 'Set 1':
+                    $questions = [
+                        [
+                            'question_number' => 10,
+                            'question_text' => 'How satisfied are you with the time it took to receive a response?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => true,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 20,
+                            'question_text' => 'Was your issue resolved during this interaction?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 30,
+                            'question_text' => 'How clear and understandable was the communication from the support team?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => true,
+                        ]
+                    ];
+                    break;
+                case 'Set 2':
+                    $questions = [
+                        [
+                            'question_number' => 10,
+                            'question_text' => 'Did you find what you were looking for without any issues?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => true,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 20,
+                            'question_text' => 'Did the service  meet your expectations?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 30,
+                            'question_text' => 'How satisfied are you with the delivery time?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => true,
+                        ]
+                    ];
+                    break;
+                case 'Set 3':
+                    $questions = [
+                        [
+                            'question_number' => 10,
+                            'question_text' => 'How quickly did our sales team respond to your inquiry?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => true,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 20,
+                            'question_text' => 'Was the information provided by our sales team clear and easy to understand?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 30,
+                            'question_text' => 'After interacting with our sales team, how likely are you to use our service?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => true,
+                        ]
+                    ];
+                    break;
+            }
+
+            foreach ($questions as $key => $questionData) {
+                $question = new QAQuestions;
+                $question->question_number = $questionData['question_number'];
+                $question->question_text = $questionData['question_text'];
+                $question->question_type = $questionData['question_type'];
+                $question->questionnaire_set_id = $questionnaireSet->id;
+
+                if (isset($questionData['next_nested_question'])) {
+                    $question->next_nested_question = $questionData['next_nested_question'];
+                }
+                if (isset($questionData['next_main_question'])) {
+                    $question->next_main_question = $questionData['next_main_question'];
+                }
+
+                $question->is_start = $questionData['is_start'];
+                $question->is_end = $questionData['is_end'];
+                if (isset($questionData['end_text'])) {
+                    $question->end_text = $questionData['end_text'];
+                }
+
+                $question->order = $key + 1;
+                $question->save();
+            }
+        }
+    }
+}

resources/assets/vue/components/companies/elements/CustomerPaymentBillingInnerComponent.vue

@@ -6,13 +6,14 @@
                     <div v-show="!$store.getters.isLoading(section)">
                         <list-component :section="section" :endpoint="endpoint" :options="options">
                             <template slot="list" slot-scope="{data}">
-                                <payments-billing-components v-if="endpoint == route('api.transaction.list')" :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components>
+                                <!-- <payments-billing-components v-if="endpoint == route('api.transaction.list') && !data.storages" :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components> -->
+                                <payments-billing-variant-2-components v-if="endpoint == route('api.transaction.list')" :section="section" :invoices="getMergedInvoices(data, data.storages)" :selectedInvoice="selectedInvoice" :isPaidInvoices="isPaidInvoices" v-on:input="updateList($event)"></payments-billing-variant-2-components>
                                 <group-payments-billing-components v-else :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></group-payments-billing-components>
                             </template>
                         </list-component>
                     </div>
                 </div>
-                <div class="col-12 col-sm-12 col-md-4" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent'].includes(section)">
+                <div class="col-12 col-sm-12 col-md-4" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent', 'customerGroupPaymentExpiredInvoiceComponent'].includes(section)">
                     <div class="row align-items-center">
                         <div class="col">
                             <div class="row" v-if="section === 'customerPendingPaymentInvoiceComponent'">
@@ -94,6 +95,10 @@
                 type: String,
                 required: true
             },
+            isPaidInvoices :{
+                type: Boolean,
+                default: false
+            }
         },
         data(){
             return {
@@ -117,7 +122,7 @@
             },
             selectedIds () {
                 return this.selectedInvoice.map(s=>s.id);
-            },
+            }
         },
         methods: {
             generateSummaryInvoice(){
@@ -126,9 +131,40 @@
             makePayment(){
                 this.submit(this.route('api.transaction.group.create', JSON.stringify(this.selectedId)), 'post', this.section, true, false);
             },
-            updateList(packageList){
-                this.selectedInvoice.includes(packageList) ? this.selectedInvoice.splice(this.selectedInvoice.indexOf(packageList), 1) : this.selectedInvoice.push(packageList);
+            updateList(invoices){
+                invoices.forEach(invoice => {
+                    if (this.selectedInvoice.includes(invoice)) {
+                        this.selectedInvoice.splice(this.selectedInvoice.indexOf(invoice), 1);
+                    } else {
+                        this.selectedInvoice.push(invoice);
+                    }
+                });
+
             },
+            getMergedInvoices(shippingInvoice, storages){
+                if(storages){
+                    const storageMap = {};
+                    for (const storage of storages) {
+                        storageMap[storage.parentInvoiceId] = storage.storageInvoiceId;
+                    }
+
+                    const storageInvoiceId = storageMap[shippingInvoice.id];
+                    const storage = storages.find((i) => {
+                        return i.storageInvoiceId === storageInvoiceId;
+                    });
+
+                    const mergedArray = [
+                        ...(shippingInvoice ? [shippingInvoice] : []),
+                        ...(storage && storage.storageInvoice.status !== 3 ? [storage.storageInvoice] : [])
+                    ];
+                    return mergedArray;
+                }
+
+                const mergedArray = [
+                    ...(shippingInvoice ? [shippingInvoice] : [])
+                ];
+                return mergedArray;
+            }
         }
     }
 </script>

resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue

@@ -43,6 +43,22 @@
                                                         </div>
                                                     </div>
                                                 </div>
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="groupPaymentExpired">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                width="35" height="35"
+                                                                viewBox="0 0 172 172"
+                                                                style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M39.81699,21.5l-18.31699,22.89414v106.10586h129v-2.15v-103.95586l-18.31699,-22.89414zM41.88301,25.8h88.23398l13.75664,17.2h-47.12363v2.15c0,5.96338 -4.78662,10.75 -10.75,10.75c-5.96338,0 -10.75,-4.78662 -10.75,-10.75v-2.15h-47.12363zM25.8,47.3h45.58672c1.08865,7.23076 7.08802,12.9 14.61328,12.9c7.52526,0 13.52463,-5.66924 14.61328,-12.9h45.58672v98.9h-120.4zM86,68.8c-15.41089,0 -27.95,12.53911 -27.95,27.95c0,15.41089 12.53911,27.95 27.95,27.95c15.41089,0 27.95,-12.53911 27.95,-27.95c0,-15.41089 -12.53911,-27.95 -27.95,-27.95zM86,73.1c13.087,0 23.65,10.563 23.65,23.65c0,13.087 -10.563,23.65 -23.65,23.65c-13.087,0 -23.65,-10.563 -23.65,-23.65c0,-13.087 10.563,-23.65 23.65,-23.65zM85.96641,77.37061c-1.18576,0.01854 -2.13264,0.9936 -2.11641,2.17939v16.125l-7.73916,5.80332c-0.95086,0.71198 -1.1445,2.05998 -0.43252,3.01084c0.71198,0.95086 2.05998,1.1445 3.01084,0.43252l9.46084,-7.09668v-18.275c0.00796,-0.58115 -0.21968,-1.14076 -0.63105,-1.55134c-0.41137,-0.41057 -0.97142,-0.63714 -1.55255,-0.62806zM38.7,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM55.9,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM64.5,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM73.1,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM81.7,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM98.9,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM107.5,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM116.1,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM133.3,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15z"></path></g></g>
+                                                            </svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Group Payment Expired</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
                                                 <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="paidGroupInvoice">
                                                     <div class="row justify-content-center m-b-5">
                                                         <div class="col-auto">
@@ -75,7 +91,7 @@
                                                         </div>
                                                     </div>
                                                 </div>
-                                            </div>  
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -84,22 +100,27 @@
                                 <div class="col bg-master-lightest p-1 p-sm-4">
                                     <div class="row tabsContainer tabContent" tab-name="pendingPayment">
                                         <div class="col">
-                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPendingPaymentInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, 'type': 1, 'does_not_have_payment_status_in': [0,1] ,'does_not_have_groups': 1}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPendingPaymentInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, 'type_in': [1], 'does_not_have_payment_status_in': [0,1] ,'does_not_have_groups': 1, 'check_for_storage_invoice': 1}"></customer-payment-billing-inner-component>
                                         </div>
                                     </div>
                                     <div class="row tabsContainer tabContent hide" tab-name="groupPaymentInProgress">
                                         <div class="col">
-                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerGroupPaymentInProgressInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [0, 1], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerGroupPaymentInProgressInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, 'status_in': [0, 1], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
+                                        </div>
+                                    </div>
+                                    <div class="row tabsContainer tabContent hide" tab-name="groupPaymentExpired">
+                                        <div class="col">
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerGroupPaymentExpiredInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, 'status_in': [6], 'receiver': company_module_id, 'with_trashed': true, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
                                         </div>
                                     </div>
                                     <div class="row tabsContainer tabContent hide" tab-name="paidGroupInvoice">
                                         <div class="col">
-                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerPaidGroupInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.group.list')" section="customerPaidGroupInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, 'status_in': [2], 'receiver': company_module_id, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
                                         </div>
                                     </div>
                                     <div class="row tabsContainer tabContent hide" tab-name="paidInvoice">
                                         <div class="col">
-                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPaidInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [3], 'receiver': company_module_id, 'type': 1, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPaidInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, 'status_in': [3], 'receiver': company_module_id, 'type_in': [1,16], order_by: {column: 'updated_at', DESC: true}}" :isPaidInvoices="true"></customer-payment-billing-inner-component>
                                         </div>
                                     </div>
                                 </div>

resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue

@@ -7,7 +7,7 @@
                         <div class="col">
                             <div class="row align-items-center justify-content-center m-b-10">
                                 <div class="col-auto p-r-10">
-                                    <h5 class="light">Welcome Abroad <span class="text-primary">{{$store.getters.getUserName}}</span>, we provide logistics services.</h5>
+                                    <h5 class="light">Welcome Aboard <span class="text-primary">{{$store.getters.getUserName}}</span>, we provide logistics services.</h5>
                                 </div>
                                 <div class="col-auto b-a b-thick b-primary padding-5">
                                     <h5 class="light no-margin">Powered by technology, delivered by experts.</h5>
@@ -99,4 +99,4 @@
             </div>
         </div>
     </div>
-</template>
+</template>

resources/assets/vue/components/feedback/elements/QuestionAnswerComponent.vue

@@ -1,8 +1,10 @@
 <template>
     <div class="row parentContainer">
+        <div class="col-1">{{ item.questionnaire.version }}</div>
         <div class="col-1">{{ item.questionnaire.description }}</div>
         <div class="col-2"> <p>{{ item.question_text }}</p> </div>
         <div class="col-1">{{ item.free_text_answer }}</div>
+        <div class="col-1">{{ item.answer_value }}</div>
         <div class="col-1">{{ item.source_system }}</div>
         <div class="col-1">{{ item.source_marking }}</div>
         <div class="col-2">{{ item.source_email }}</div>

resources/assets/vue/components/feedback/forms/GenerateFeedbackLinkFormComponent.vue

@@ -13,7 +13,7 @@
                         <div class="col-12 col-md-8">
                             <validation-wrapper-component selectable class="m-b-15" :validator="$v.parameters.question_set">
                                 <label class="text-primary">Question Set</label>
-                                <select-component :options="[{'id': 1, 'text': 'Customer Support Satisfaction Survey'}, {'id': 2, 'text': 'First Order Experience Feedback'}, {'id': 3, 'text': 'Sales Inquiry Experience'}]" v-model="parameters.question_set"></select-component>
+                                <select-component :options="[{'id': 4, 'text': 'Customer Support Satisfaction Survey'}, {'id': 5, 'text': 'First Order Experience Feedback'}, {'id': 6, 'text': 'Sales Inquiry Experience'}]" v-model="parameters.question_set"></select-component>
                             </validation-wrapper-component>
                         </div>
 

resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue

@@ -147,8 +147,11 @@
                                     <p>You can view your invoices here and make payment.</p>
                                 </div>
                             </div>
-                            <div class="row bg-master-lightest p-t-15" v-for="invoice in order.invoices">
-                                <div class="col">
+                            <div class="row bg-master-lightest p-t-15" v-for="invoice in order.invoices" v-if="invoice.type === 1">
+                                <div class="col" v-if="getMergedInvoices(invoice).length > 1">
+                                    <customer-payments-billing-variant-2-component :data="getMergedInvoices(invoice)" :storage="getStorageInfo(invoice)" invoice_status="Pending Payment" :section="section"></customer-payments-billing-variant-2-component>
+                                </div>
+                                <div class="col" v-else>
                                     <customer-payments-billing-component :data="invoice" invoice_status="Pending Payment" :section="section"></customer-payments-billing-component>
                                 </div>
                             </div>
@@ -180,6 +183,16 @@
         computed: {
             pendingQueue () {
                 return this.$store.getters.isInCompleteQueue(this.section);
+            },
+            orderStorageMap() {
+                // Create a map to link parent invoice IDs to storageInvoiceIds
+                const storageMap = {};
+                if(this.order.storages){
+                    for (const storage of this.order.storages) {
+                        storageMap[storage.parentInvoiceId] = storage.storageInvoiceId;
+                    }
+                }
+                return storageMap;
             }
         },
         watch: {
@@ -201,7 +214,36 @@
                 this.$store.dispatch('completeList', {'name': this.section, 'data': []});
                 this.isLoading = false;
                 this.order = response.payload.data;
-            }
+            },
+            getStorageInfo(invoice) {
+                const storageObject = this.findStorageInfoObject(invoice.id);
+                return storageObject;
+            },
+            findStorageInfoObject(shippingInvoiceId) {
+                if(this.order.storages){
+                    return this.order.storages.find(storage => storage.parentInvoiceId === shippingInvoiceId);
+                }
+                return null;
+            },
+            getMergedInvoices(invoice){
+                const storageInvoice = this.getStorageInvoice(invoice);
+                const mergedArray = [
+                    ...(invoice ? [invoice] : []),
+                    ...(storageInvoice ? [storageInvoice] : []),
+                ];
+                return mergedArray;
+            },
+            getStorageInvoice(invoice) {
+                // Retrieve the storageInvoiceId for the current shipping invoice from storage info (order.storages)
+                const storageInvoiceId = this.orderStorageMap[invoice.id];
+
+                // Find and return the storage invoice (type 16) from order.invoices
+                const storageInvoice = this.order.invoices.find((invoice) => {
+                    return invoice.type === 16 && invoice.id === storageInvoiceId;
+                });
+
+                return storageInvoice;
+            },
         }
     }
 </script>

resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue

@@ -84,6 +84,20 @@
                                                     <address-form-component :id="item.order.company_module.id" :section="section" :type=1></address-form-component>
                                                 </modal-component>
                                             </div>
+                                            <div class="row" v-if="item.order.company_module.billingAddress">
+                                                <div class="col">
+                                                    <div class="col-auto requestModal pointer" data-type="editBillingAddress">
+                                                        <i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
+                                                    </div>
+                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
+                                                        <div class="row">
+                                                            <div class="col bg-white">
+                                                                <address-form-component :id="item.order.company_module.id"  :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
+                                                            </div>
+                                                        </div>
+                                                    </modal-component>
+                                                </div>
+                                            </div>
                                             <div v-if="!item.order.address.post_code_area">
                                                 <div class="btn btn-xs btn-primary pointer m-t-10 requestModal btn-block" data-type="defineLocation">Define Location</div>
                                                 <modal-component class="animate_animated animatefast animate_fadeIn" styleType="fill-in" type="defineLocation">
@@ -110,34 +124,6 @@
                                     </modal-component>
                                 </div>
                             </div>
-                            <div class="row text-center parentContainer m-t-10" v-if="['Pending Invoice', 'Pending Approval'].includes(invoice_status)" >
-                                <div class="col">
-                                    <div class="row" v-if="!item.order.company_module.billingAddress">
-                                        <div class="col">
-                                            <div>
-                                                <div class="btn btn-primary btn-xs pointer requestModal btn-block" data-type="billingAddressComponent">Add Billing Address</div>
-                                                <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="billingAddressComponent">
-                                                    <address-form-component :id="item.order.company_module.id" :section="section" :type=1></address-form-component>
-                                                </modal-component>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="row" v-if="item.order.company_module.billingAddress">
-                                        <div class="col">
-                                            <div class="col-auto requestModal pointer" data-type="editBillingAddress">
-                                                <i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
-                                            </div>
-                                            <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
-                                                <div class="row">
-                                                    <div class="col bg-white">
-                                                        <address-form-component :id="item.order.company_module.id"  :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
-                                                    </div>
-                                                </div>
-                                            </modal-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                     </div>
                 </div>

resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue

@@ -64,6 +64,21 @@
                             </div>
                         </div>
                         <div class="col-auto p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
+                            <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="regenerateInvoice">
+                                <i class="fa fa-repeat"></i>
+                            </span>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="regenerateInvoice">
+                                <general-confirmation-form-component 
+                                    contentText="Are you sure you want to regenerate this Invoice?" 
+                                    modalType="delete" 
+                                    buttonText="Regenerate" 
+                                    class="text-center"
+                                    :apiRoute="route('api.transaction.invoice.regenerate', item.id)"
+                                    apiMethod="post"
+                                    :section="section"
+                                >
+                                </general-confirmation-form-component>
+                            </modal-component>
                             <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="deleteInvoice">
                                 <i class="fa fa-close"></i>
                             </span>
@@ -96,6 +111,20 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="row bg-master-lightest" v-if="item.payments_expired.length">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div class="font-head fs-10 all-caps">Payment Expired</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <payment-expired-component v-for="item in item.payments_expired" v-bind:key="item.id" :data="item" ></payment-expired-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="row bg-master-lightest" v-if="item.payment_history.length">
                                 <div class="col">
                                     <div class="row m-t-10 m-b-10">
@@ -200,12 +229,12 @@
             }
         },
         computed: {
-            cbm () {
-                return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? 0 : obj.cbm) + total, 0)) * 1000) / 1000).toFixed(3)
-            },
-            overweight(){
-                return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? obj.cbm : 0) + total, 0)) * 1000) / 1000).toFixed(3)
-            },
+            // cbm () {
+            //     return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? 0 : obj.cbm) + total, 0)) * 1000) / 1000).toFixed(3)
+            // },
+            // overweight(){
+            //     return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? obj.cbm : 0) + total, 0)) * 1000) / 1000).toFixed(3)
+            // },
             latestComment() {
                 let questions = this.item.remarks;
                 return questions.slice().reverse()[0];

resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingVariant2Component.vue

@@ -0,0 +1,302 @@
+<template>
+    <div class="row m-b-15 m-l-5 m-r-10 parentContainer">
+        <div class="col bg-white rounded">
+            <div v-for="item in items" class="row" :class="[{'b-danger': item.status == 5 ||item.status == 6, 'b-a': item.status == 5||item.status == 6}]">
+                <div class="col padding-20">
+                    <div class="row align-items-center">
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">Invoice Date</p>
+                            <div> {{ item.updated_at }}</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Status</p>
+                            <div class="all-caps" v-if="item.status == 3">Payment Completed</div>
+                            <div class="all-caps text-danger" v-else-if="item.status == 5">Dispute in progress</div>
+                            <div class="all-caps" v-else-if="item.status == 6">Cancelled Invoice</div>
+                            <div class="all-caps" v-else>Pending Payment</div>
+                        </div>
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">Amount</p>
+                            <div>MYR {{ item.amount.toFixed(2) }}</div>
+                        </div>
+                        <div class="col-2">
+                            <div v-if="item.remarks.length">
+                                <p class="no-margin fs-10 all-caps">Billing Question</p>
+                                <div>
+                                    {{  getLatestComment(item).content }}
+                                    <span class="btn requestModal no-border" v-if="item.remarks.length" size="large" data-type="chatmodal">
+                                        <i class="fa fa-comment-o"></i>
+                                    </span>
+                                </div>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="chatmodal">
+                                    <remark-component :section="section" :data="item" module_type="Transaction"></remark-component>
+                                </modal-component>
+                            </div>
+                            <div v-else>
+                                <p class="no-margin fs-10 all-caps invisible">Billing Question</p>
+                                <div>
+                                    <span class="btn requestModal no-border invisible">
+                                        <i class="fa fa-edit"></i>
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-2 p-l-0 p-r-0 d-flex justify-content-center align-items-center">
+                            <div v-if="item.type === 1"  :class="[{'invisible': [5, 6, 3].includes(item.status)}]">
+                                <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="billingRemark">Billing Question?</span>
+                            </div>
+                            <div v-else class="invisible">
+                                <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="billingRemark">Billing Question?</span>
+                            </div>
+                            <modal-component v-if="item.type === 1" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="billingRemark">
+                                <customer-invoice-remark-form-component module_type="Transaction" :data="item" :section="section"></customer-invoice-remark-form-component>
+                            </modal-component>
+                            <div v-if="item.documents.length">
+                                <div v-for="file in item.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
+                                    <document-file-viewer-component :file="file">
+                                        <template slot="button">
+                                            <div class="btn bg-grey no-border muted">
+                                                <i class="fa fa-file-pdf-o"></i>
+                                            </div>
+                                        </template>
+                                    </document-file-viewer-component>
+                                </div>
+                            </div>
+                            <div v-else>
+                                <div class="btn bg-grey no-border muted invisible">
+                                    <i class="fa fa-file-pdf-o"></i>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-1 p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
+                            <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="deleteInvoice">
+                                <i class="fa fa-close"></i>
+                            </span>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteInvoice">
+                                <delete-invoice-form-component :data="item" :section="section"></delete-invoice-form-component>
+                            </modal-component>
+                        </div>
+                        <div class="col-1 hide">
+                            <div class="btn btn-sm all-caps b-rad-none btn-block" :class="{'btn-success': !expanded, 'btn-default': expanded}" @click="expanded = !expanded">
+                                {{ expanded ? 'Cancel' : 'Make Payment' }}</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col" v-if="storage" v-show="item.type === 16">
+                            <p >Warehouse Storage Fee: {{ storage.numberOfDaysExceeded }} Days x RM {{ storage.pricePerCBM}} x {{ storage.cbm.toFixed(3) }} cbm</p>
+                        </div>
+                    </div>
+                    <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="[5, 6].includes(item.status)">
+                        <div class="col padding-20">
+                            <div class="row bg-master-lightest h-100 padding-20">
+                                <div class="col">
+                                    <h6 class="all-caps m-b-5 no-margin text-underline bold">Billing question</h6>
+                                    <remark-component :section="section" :data="item" module_type="Transaction"></remark-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" >
+                <div class="col-12 col-md-7 padding-20">
+                    <div class="row bg-master-lightest">
+                        <div class="col">
+                            <div v-for="(groupPaymentAttemptItem, index) in items" class="row bg-master-lightest" v-if="groupPaymentAttemptItem.groups_payment_attempts.length && groupPaymentAttemptItem.type == 1 && groupTransactionsExist(items, groupPaymentAttemptItem.groups_payment_attempts)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment Attempt</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <shipping-transaction-component v-for="group in groupPaymentAttemptItem.groups_payment_attempts" v-bind:key="group.id" :data="group" :section="section"></shipping-transaction-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-for="(groupPaymentAttemptItem, index) in items" class="row bg-master-lightest" v-if="groupPaymentAttemptItem.groups_payment_expired.length && groupPaymentAttemptItem.type == 1 && groupTransactionsExist(items, groupPaymentAttemptItem.groups_payment_expired)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment Expired</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <payment-expired-component v-for="group in groupPaymentAttemptItem.groups_payment_expired" v-bind:key="group.id" :data="group" :section="section"></payment-expired-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-for="(paymentAttemptItem, index) in items" class="row bg-master-lightest" v-if="items.some(x => x.payment_attempts && x.payment_attempts.length > 0)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment Attempt</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <shipping-transaction-component v-for="i in paymentAttemptItem.payment_attempts" v-bind:key="i.id" :data="i" :section="section"></shipping-transaction-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-for="(paymentExpiredItem, index) in items" class="row bg-master-lightest" v-if="items.some(x => x.payments_expired && x.payments_expired.length > 0)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment Expired</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <payment-expired-component v-for="i in paymentExpiredItem.payments_expired" v-bind:key="i.id" :data="i" ></payment-expired-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-for="(paymentHistoryItem, index) in items" class="row bg-master-lightest" v-if="items.some(x => x.payment_history && x.payment_history.length > 0)">
+                                <div class="col">
+                                    <div class="row m-t-10 m-b-10">
+                                        <div class="col">
+                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment History</div>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <payment-history-component v-for="i in paymentHistoryItem.payment_history" v-bind:key="i.id" :data="i" ></payment-history-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-md-5 padding-20 parentContainer">
+                    <div class="row bg-master-lightest h-100">
+                        <div class="col">
+                            <div class="row padding-10">
+                                <div class="col">
+                                    <div class="row align-items-end m-b-10 text-complete">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Total Amount:</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">MYR {{(Math.round((totalAmount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10 text-success">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Paid Total:</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                             <div class="font-heading fs-12">MYR {{(Math.round((totalAmount - totalOutstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end m-b-10">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">Floating Amount:</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                             <div class="font-heading fs-12">MYR {{(Math.round((totalFloating + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-end bold text-danger">
+                                        <div class="col">
+                                            <div class="font-heading all-caps fs-12">OutStanding Total:</div>
+                                        </div>
+                                        <div class="col-auto text-right">
+                                            <div class="font-heading fs-12">MYR {{(Math.round((totalOutstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                        </div>
+                                    </div>
+                                    <div class="row m-t-20" v-if="totalOutstanding - totalFloating > 0.009">
+                                        <div class="col">
+                                            <div class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="makePayment">Make Payment</div>
+                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="makePayment">
+                                                <group-payment-form-component :section="section" :selectedIds="selectedIds" :sumAmount="totalOutstanding.toFixed(2)"></group-payment-form-component>
+                                            </modal-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+
+        props: {
+            data: {
+                type: Array,
+            },
+            invoice_status: {
+                type: String,
+                required: true
+            },
+            section:{
+                type: String,
+                required: true
+            },
+            storage:{
+                type: Object
+            },
+        },
+        data(){
+            return {
+                items: this.data,
+                parameters: {
+                    packing_list_id: null,
+                    transaction_details: [],
+                },
+                expanded: true,
+            }
+        },
+        watch: {
+            data: function() {
+                this.items = this.data;
+            }
+        },
+        computed: {
+            totalAmount() {
+                return this.items.reduce((sum, item) => sum + item.amount, 0);
+            },
+            totalOutstanding() {
+                return this.items.reduce((sum, item) => sum + item.outstanding, 0);
+            },
+            totalFloating() {
+                return this.items.reduce((sum, item) => sum + item.floating, 0);
+            },
+            selectedIds() {
+                const ids = [];
+                this.items.forEach(item => {
+                    ids.push(item.id);
+                });
+                return ids;
+            },
+        },
+        methods: {
+            getLatestComment(item) {
+                let questions = item.remarks;
+                return questions.slice().reverse()[0];
+            },
+            successHandler(response){
+                this.item = response.payload.data;
+            },
+            groupTransactionsExist(items, groups) {
+                return groups.some(group =>
+                    group.transactions_ids.length === items.length &&
+                    group.transactions_ids.every(transaction =>
+                        items.some(item => item.id === transaction.transaction_id)
+                    )
+                );
+            }
+        }
+    }
+</script>

resources/assets/vue/components/paymentsBilling/elements/GroupPaymentsBillingComponents.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="row m-b-15 m-l-5 m-r-10">
+    <div class="row m-b-15 m-l-5 m-r-10 parentContainer">
         <div class="col bg-white rounded b-a" :class="{'b-white': !selected, 'b-primary': selected, 'bg-primary-lighter': selected, 'b-danger': item.status != 2, 'b-success': item.status == 2}">
-            <div class="row">
+            <div class="row parentContainer">
                 <div class="col padding-20">
                     <div class="row align-items-center">
                         <div class="col">
@@ -20,21 +20,21 @@
                             <p class="no-margin fs-10 all-caps">Payment Date</p>
                             <div>{{ item.created_at }}</div>
                         </div>
-                        <div class="col-auto pointer btn btn-success" v-if="item.payment_method == 5 && item.status != 2" @click="retryPayment()">
+                        <div class="col-auto pointer btn btn-success" v-if="item.payment_method == 5 && item.status != 2 && item.status != 6" @click="retryPayment()">
                             <div class=" no-border h-100">
                                 <i class="fa fa-repeat fs-20 text-white"></i>
                             </div>
                         </div>
-                        <div class="col-auto requestModal" v-if="item.status != 2" data-type="deleteGroupTransaction">
+                        <div class="col-auto requestModal" v-if="item.status != 2 && item.status != 6" data-type="deleteGroupTransaction">
                             <div class="btn bg-grey no-border">
                                 <i class="fa fa-times"></i>
                             </div>
                         </div>
                         <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteGroupTransaction">
-                            <general-confirmation-form-component 
-                                contentText="Are you sure you want to delete this Group Payment?" 
-                                modalType="delete" 
-                                buttonText="Delete" 
+                            <general-confirmation-form-component
+                                contentText="Are you sure you want to delete this Group Payment?"
+                                modalType="delete"
+                                buttonText="Delete"
                                 class="text-center"
                                 :apiRoute="route('api.transaction.group.delete', item.id)"
                                 apiMethod="delete"
@@ -43,17 +43,39 @@
                             </general-confirmation-form-component>
                         </modal-component>
                         <!-- payment method 1 -->
-                        <!-- <div class="col-auto pointer btn btn-success requestModal pointer" v-if="item.payment_method == 1 && item.status != 2" data-type="paymentProofModal" @click="selectedID(item.id)">
+                        <div class="col-auto pointer btn btn-success requestModal pointer" v-if="item.payment_method == 1 && [0, 4].includes(item.payment_transaction.status)" data-type="paymentProofModal" @click="selectedID(item.id)">
                             <div class="no-border h-100">
                                 <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="30" height="30" viewBox="0 0 172 172" style=" fill:#000000;"><defs><linearGradient x1="86" y1="70.76994" x2="86" y2="116.46013" gradientUnits="userSpaceOnUse" id="color-1_52139_gr1"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="61.8125" y1="34.48869" x2="61.8125" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-2_52139_gr2"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="130.34375" y1="34.48869" x2="130.34375" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-3_52139_gr3"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="86" y1="32.25" x2="86" y2="148.71013" gradientUnits="userSpaceOnUse" id="color-4_52139_gr4"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M102.45825,99.43213h-5.70825c-1.4835,0 -2.6875,1.16637 -2.6875,2.65256v8.10013c0,1.48081 -1.19862,2.68481 -2.67944,2.68481h-10.76612c-1.48081,0 -2.67944,-1.204 -2.67944,-2.68481v-8.10013c0,-1.48619 -1.204,-2.65256 -2.6875,-2.65256h-5.70825c-1.93769,0 -3.04225,-2.39188 -1.88125,-4.05275l14.577,-20.855c1.8275,-2.61494 5.69481,-2.61763 7.52231,-0.00538l14.577,20.86306c1.16369,1.66088 0.05644,4.05006 -1.87856,4.05006z" fill="url(#color-1_52139_gr1)"></path><path d="M51.0625,67.1875h5.375c0,-8.0625 7.23206,-16.12231 16.125,-16.12231v-5.375c-11.85456,0 -21.5,10.74731 -21.5,21.49731z" fill="url(#color-2_52139_gr2)"></path><path d="M139.75,80.625c0,-10.75 -8.44144,-18.80981 -18.8125,-18.80981v5.375c7.40944,0 13.4375,5.37231 13.4375,13.43481z" fill="url(#color-3_52139_gr3)"></path><path d="M148.09738,92.27263c1.59369,-3.68188 2.40263,-7.59219 2.40263,-11.64494c0,-16.29969 -13.26281,-29.5625 -29.5625,-29.5625c-6.5145,0 -12.68769,2.08819 -17.78588,5.96088c-4.30269,-13.03438 -16.52006,-22.08587 -30.58912,-22.08587c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,4.14681 0.16662,8.05981 1.42437,10.74731h-1.42437c-13.33806,0 -24.1875,10.84944 -24.1875,24.1875c0,11.56431 8.16194,21.24737 19.0275,23.62044c1.02394,6.39894 6.53869,11.31706 13.2225,11.31706h56.4375h16.125h5.375c6.54944,0 12.00238,-4.71388 13.18488,-10.92469c9.2235,-1.20131 16.37762,-9.08913 16.37762,-18.63513c0,-6.09256 -2.924,-11.72019 -7.77762,-15.23006zM126.3125,131.6875h-5.375h-16.125h-56.4375c-3.49912,0 -6.45538,-2.6875 -7.568,-5.375h93.0735c-1.11263,2.6875 -4.06888,5.375 -7.568,5.375zM137.0625,120.9375h-96.75c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125c0,-10.37106 8.44144,-18.8125 18.8125,-18.8125h9.51375l-1.68506,-3.78131c-2.23063,-5.01488 -2.45369,-7.48737 -2.45369,-12.341c0,-14.81888 12.05613,-26.875 26.875,-26.875c13.01825,0 24.13106,9.29875 26.42619,22.11275l0.92719,5.17075l3.64962,-3.77325c4.60638,-4.76225 10.77687,-7.38525 17.372,-7.38525c13.33806,0 24.1875,10.84944 24.1875,24.1875c0,3.6765 -0.81431,7.21056 -2.37575,10.41944l-1.763,3.32713l2.37037,1.26044c4.40481,2.34081 7.14338,6.88806 7.14338,11.868c0,7.40944 -6.02806,13.43481 -13.4375,13.43481z" fill="url(#color-4_52139_gr4)"></path></g></g></svg>
                             </div>
                         </div>
+                        <modal-component type="paymentProofModal">
+                            <payment-verification-form-component v-if="selected_id === item.id" :section="section" :data="{...item, id: item.payment_transaction.id}"></payment-verification-form-component>
+                        </modal-component>
+                        <div class="col-auto" v-if="item.payment_method == 1 && [1, 2].includes(item.payment_transaction.status)">
+                            <div class="fs-10  all-caps">Payment Proof</div>
+                            <div v-if="item.payment_transaction.documents.length">
+                                <div v-for="file in item.payment_transaction.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
+                                    <document-file-viewer-component :file="file">
+                                        <template slot="button">
+                                            <div class="icon-thumbnail fs-11 text-white icon-25 bg-primary btn-rounded float-left m-r-5">
+                                                <i class="fa fa-file-pdf-o"></i>
+                                            </div>
+                                        </template>
+                                    </document-file-viewer-component>
+                                </div>
+                            </div>
+                            <div v-else>
+                                <div class="btn bg-grey no-border muted invisible">
+                                    <i class="fa fa-file-pdf-o"></i>
+                                </div>
+                            </div>
+                        </div>
                         <div class="col-auto pointer btn btn-success invisible" v-else>
                             <div class=" no-border h-100">
                                 <i class="fa fa-repeat fs-20 text-white"></i>
                             </div>
-                        </div> -->
-                        <div class="col-auto">
+                        </div>
+                        <div class="col-auto" v-if="!['customerGroupPaymentExpiredInvoiceComponent'].includes(section)">
                             <div class="btn bg-grey no-border" @click="expanded = !expanded">
                                 <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
                             </div>
@@ -61,14 +83,11 @@
                     </div>
                 </div>
             </div>
-            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.invoices">
+            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.invoices && !['customerGroupPaymentExpiredInvoiceComponent'].includes(section)">
                 <div class="col">
                     <payments-billing-components :section="section" v-for="invoice in data.invoices" v-bind:key="invoice.id" :data="invoice" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-components>
                 </div>
             </div>
-            <modal-component type="paymentProofModal">
-                <payment-verification-form-component v-if="selected_id === item.id" :section="section" :data="item"></payment-verification-form-component>
-            </modal-component>
         </div>
     </div>
 </template>
@@ -79,7 +98,7 @@
             selectedInvoice: {
                 type: Array,
                 required: false,
-            }, 
+            },
             section:{
                 type: String,
                 default: null

resources/assets/vue/components/paymentsBilling/elements/PaymentExpiredComponent.vue

@@ -0,0 +1,41 @@
+<template>
+    <div class="row m-l-0 m-b-10 m-r-0 parentContainer" :class="[{'b-a': item.status === 4}, {'b-danger': item.status === 4}, {'b-a': item.status === 5}, {'b-danger': item.status === 5}]" >
+        <div class="col">
+            <div class="row" v-if="!item.transaction_bill">
+                <div class="col">
+                    <div class="row bg-white parentContainer">
+                        <div class="col p-t-10 p-b-10 p-r-0" :class="[{'bg-master-lighter': item.status === 1 && item.type !== 6}, {'bg-white': item.status !== 1 && item.status !== 4}, {'bg-warning-lighter': item.type === 6}]">
+                            <div class="row m-b-5">
+                                <div class="col-auto">
+                                    <div class="font-heading fs-8 muted all-caps">Status</div>
+                                    <div class="font-heading fs-10 bold" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
+                                        {{ item.status === 1 ? 'Pending Verification' : item.status === ( 4 || 5) ? 'Rejected' : 'Expired'}}
+                                    </div>
+                                </div>
+                                <div class="col-auto p-l-0">
+                                    <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
+                                    <div class="font-heading fs-10 bold">
+                                        {{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                    </div>
+                                </div>
+                                <div class="col-auto p-l-0">
+                                    <div class="font-heading fs-8 muted all-caps">Bill Number</div>
+                                    <div class="font-heading fs-10 bold">
+                                        {{ item.bill_no }}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>

resources/assets/vue/components/paymentsBilling/elements/PaymentHistoryComponent.vue

@@ -3,7 +3,7 @@
         <div class="col">
             <div class="row" v-if="!item.transaction_bill">
                 <div class="col">
-                    <div class="row bg-white ">
+                    <div class="row bg-white parentContainer">
                         <div class="col p-t-10 p-b-10 p-r-0 pointer" @click="clickExpand()" :class="[{'bg-master-lighter': item.status === 1 && item.type !== 6}, {'bg-white': item.status !== 1 && item.status !== 4}, {'bg-warning-lighter': item.type === 6}]">
                             <div class="row m-b-5">
                                 <div class="col-auto">
@@ -43,6 +43,25 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="col-auto" v-if="$store.getters.isSuperAdmin">
+                            <div class="row align-items-center h-100 bg-danger pointer requestModal" data-type="deleteInvoiceFunction">
+                                <div class="col">
+                                    <i class="fa fa-times text-white"></i>
+                                </div>
+                            </div>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteInvoiceFunction">
+                                <general-confirmation-form-component 
+                                    contentText="Are you sure you want to delete this Payment?" 
+                                    modalType="delete" 
+                                    buttonText="Delete" 
+                                    class="text-center"
+                                    :apiRoute="route('api.transaction.payment.delete', item.id)"
+                                    apiMethod="delete"
+                                    :section="section"
+                                >
+                                </general-confirmation-form-component>
+                            </modal-component>
+                        </div>
                     </div>
                     <div class="row align-items-center m-b-25" v-if="item.status === 0 && item.payment_method === 1">
                         <div class="col-auto p-r-0">

resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue

@@ -2,25 +2,39 @@
     <div class="row m-b-10 parentContainer">
         <div class="col">
             <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
-            <div class="row p-b-5 b-b b-grey" v-show="!isLoading">
+            <div class="row p-1 b-b b-grey" v-show="!isLoading">
                 <div class="col">
                     <div class="row">
                         <div class="col">
                             <div class="row m-b-10">
-                                <div class="col-auto">
+                                <div class="col-auto p-l-0">
                                     <div class="font-heading fs-10 muted all-caps">Date</div>
                                     <div class="font-heading fs-10">
                                         {{ item.updated_at }}
                                     </div>
                                 </div>
-                                <div class="col-auto">
-                                    <div class="font-heading fs-10 muted all-caps">Order</div>
-                                    <div class="font-heading fs-10"><a :href="route('order.show' , item.order.reference)" target="_blank">{{item.order.reference}}</a></div>
+                                <div v-if="item.order">
+                                    <div class="col-auto">
+                                        <div class="font-heading fs-10 muted all-caps">Order</div>
+                                        <div class="font-heading fs-10"><a :href="route('order.show' , item.order.reference)" target="_blank">{{item.order.reference}}</a></div>
+                                    </div>
+                                    <div class="col-auto">
+                                        <div class="font-heading fs-10 muted all-caps">Customer</div>
+                                        <div class="font-heading fs-10">
+                                            <a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a>
+                                        </div>
+                                    </div>
                                 </div>
-                                <div class="col-auto">
-                                    <div class="font-heading fs-10 muted all-caps">Customer</div>
-                                    <div class="font-heading fs-10">
-                                        <a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a>
+                                <div v-if="item.group_transactions">
+                                    <div class="col-auto">
+                                        <div class="font-heading fs-10 muted all-caps">Group Payment</div>
+                                        <div class="font-heading fs-10">{{item.group_reference}}</div>
+                                    </div>
+                                    <div class="col-auto">
+                                        <div class="font-heading fs-10 muted all-caps">Customer</div>
+                                        <div class="font-heading fs-10">
+                                            <a :href="route('customer.profile', item.group_transactions[0].order.company_module.marking)">{{item.group_transactions[0].order.company_module.marking}}</a>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="col text-right">
@@ -31,7 +45,7 @@
                                 </div>
                             </div>
                             <div class="row m-b-10">
-                                <div class="col">
+                                <div class="col p-l-0">
                                     <div class="font-heading fs-10 muted all-caps">Payment Proof</div>
                                     <div class="row no-margin" v-if="item.payment_method !==5 && item.payment_method !==4">
                                         <div v-for="file in item.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
@@ -132,6 +146,47 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="row m-t-10 m-b-10" v-if="item.group_transactions">
+                                <div class="col text-center p-l-0">
+                                    <div id="expend-method" class="padding-10 bg-master-lightest pointer" @click="expanded = !expanded">
+                                        <i class="fa m-r-10" :class="[{'fa-angle-up': expanded}, {'fa-angle-down': !expanded}]"></i>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row b-t b-grey p-t-10" v-show="expanded" v-if="item.group_transactions">
+                                <div class="col">
+                                    <div class="row p-b-10 b-b b-grey" v-for="(invoice, index) in item.group_transactions">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col-1">
+                                                    <p class="no-margin fs-10 all-caps">{{ index + 1 }}.</p>
+                                                </div>
+                                                <div class="col">
+                                                    <p class="no-margin fs-10 all-caps bold">Invoice No</p>
+                                                    <div class="fs-10">{{ invoice.bill_no }}</div>
+                                                </div>
+                                                <div class="col">
+                                                    <p class="no-margin fs-10 all-caps bold">Order</p>
+                                                    <div class="fs-10"><a :href="route('order.show', invoice.order.reference)">{{invoice.order.reference}}</a></div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-1">
+                                                    <p class="no-margin fs-10 all-caps bold"></p>
+                                                </div>
+                                                <div class="col">
+                                                    <p class="no-margin fs-10 all-caps bold">Invoice Date</p>
+                                                    <div class="fs-10">{{ invoice.created_at }}</div>
+                                                </div>
+                                                <div class="col">
+                                                    <p class="no-margin fs-10 all-caps bold">Amount</p>
+                                                    <div class="font-heading fs-14 text-success bold">{{ invoice.amount.toFixed(2) }}</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -147,6 +202,11 @@
         props: {
             no_action: Boolean
         },
+        data(){
+            return {
+                expanded: false,
+            }
+        },
         methods: {
             approvePayment(status){
                 this.isLoading = true;

resources/assets/vue/components/paymentsBilling/elements/PaymentsBillingComponents.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="row m-b-15 m-l-5 m-r-10">
+    <div class="row m-b-15 m-l-5 m-r-10" v-if="$store.getters.isAdmin || item.order">
         <div class="col bg-white rounded b-a" :class="{'b-white': !selected, 'b-primary': selected, 'bg-primary-lighter': selected}">
             <div class="row">
                 <div class="col padding-20">
@@ -13,7 +13,8 @@
                         </div>
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Order</p>
-                            <div><a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></div>
+                            <div v-if="item.order"><a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></div>
+                            <div class="text-danger" v-else>Error in retrieving order</div>
                         </div>
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Invoice Date</p>

resources/assets/vue/components/paymentsBilling/elements/PaymentsBillingVariant2Components.vue

@@ -0,0 +1,110 @@
+<template>
+    <div class="row m-b-15 m-l-5 m-r-10">
+        <div class="col bg-white rounded b-a" :class="{'b-white': !selected, 'b-primary': selected, 'bg-primary-lighter': selected}">
+            <div v-for="item in items" class="row" v-if="$store.getters.isAdmin || item.order">
+                <div class="col padding-20">
+                    <div class="row align-items-center">
+                        <div class="col-auto pointer align-items-center" style="min-width:70px;" @click="activate()" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent'].includes(section)">
+                            <i v-show="((item.type === 1 && !isPaidInvoices) || isPaidInvoices)" class="fa fs-30 fa-fw" :class="{'fa-square-o': !selected, 'fa-check-square': selected, 'text-primary':selected}" ></i>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Invoice No</p>
+                            <div>{{ item.bill_no }}</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Order</p>
+                            <div v-if="item.order"><a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a></div>
+                            <div class="text-danger" v-else>Error in retrieving order</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Invoice Date</p>
+                            <div>{{ item.created_at }}</div>
+                        </div>
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Amount</p>
+                            <div>MYR  {{ item.amount.toFixed(2) }}</div>
+                        </div>
+                        <div class="col" v-if="['customerPaidInvoiceComponent', 'customerPaidGroupInvoiceComponent'].includes(section)">
+                            <p class="no-margin fs-10 all-caps">Payment Date</p>
+                            <div>{{ item.payment_history[item.payment_history.length-1].created_at }}</div>
+                        </div>
+                        <div class="col" v-if="['customerPaidInvoiceComponent', 'customerPaidGroupInvoiceComponent'].includes(section)">
+                            <p class="no-margin fs-10 all-caps">Bill Number</p>
+                            <div>{{ item.payment_history[item.payment_history.length-1].payment_reference }}</div>
+                        </div>
+                        <div class="col-auto">
+                            <div v-if="item.documents.length">
+                                <div v-for="file in item.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
+                                    <document-file-viewer-component :file="file">
+                                        <template slot="button">
+                                            <div class="btn no-border muted" :class="{'btn-info': section === 'customerPaidInvoiceComponent', 'btn-success': section !== 'customerPaidInvoiceComponent'}">
+                                                <i class="fa fa-file-pdf-o"></i>
+                                            </div>
+                                        </template>
+                                    </document-file-viewer-component>
+                                </div>
+                            </div>
+                            <div v-else>
+                                <div class="btn bg-grey no-border muted invisible">
+                                    <i class="fa fa-file-pdf-o"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        props: {
+            selectedInvoice: {
+                type: Array,
+                required: false,
+            },
+            section:{
+                type: String,
+                default: null
+            },
+            invoices: {
+                type: Array,
+            },
+            isPaidInvoices :{
+                type: Boolean,
+                default: false
+            }
+        },
+        data(){
+            return {
+                items: this.invoices,
+                expanded: false,
+                selectedValue: false,
+            }
+        },
+        methods: {
+            activate(){
+                // this.select = !this.select;
+                this.$emit('input', this.invoices);
+            }
+        },
+        watch: {
+            invoices: function() {
+                this.items = this.invoices;
+            }
+        },
+        computed: {
+            selected() {
+                var response = false;
+                this.selectedInvoice.forEach((value, index) => {
+                    this.items.forEach(item => {
+                    if (item.id === value.id) {
+                        response = true;
+                    }
+                    });
+                });
+                return response;
+            }
+        }
+    }
+</script>

resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue

@@ -9,6 +9,43 @@
                             <h6>Transaction History</h6>
                         </div>
                     </div>
+                    <div class="row m-t-10 m-b-10">
+                        <div class="col">
+                            <div class="d-flex align-items-center h-100">
+                                <span class="btn btn-md fs-11 bg-primary text-white fs-12 m-r-5" :class="[{'bg-primary-darker': showingPreciseAmount}]" @click="showingPreciseAmount=!showingPreciseAmount">{{ showingPreciseAmount ? 'Showing Precise Wallet Transaction' : 'Show Precise Wallet Transaction'}}</span>
+                                <a v-if="wallet" :href="route('wallet.details-export', wallet.id, showingPreciseAmount)" target="_blank" class="btn btn-md btn-primary fs-11"><i class="fa fa-download m-r-5"></i>{{ showingPreciseAmount ? 'Download Precise Transaction' : 'Download Transaction'}}</a>
+                            </div>
+                        </div>
+                        <div class="col-3">
+                            <validation-wrapper-component selectable :validator="$v.showingTransactionCount">
+                                <label>Showing Rows</label>
+                                <select-component :options="[5, 10, 20, 30, 50]" v-model="showingTransactionCount"></select-component>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-5" @keyup.enter="submitSearch">
+                        <div class="col p-r-0">
+                            <validation-wrapper-component :validator="$v.reference_no">
+                                <label class="all-caps">Order Reference</label>
+                                <input type="text" class="form-control" v-model="reference_no">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col p-r-0">
+                            <validation-wrapper-component :validator="$v.startDate">
+                                <label class="all-caps">Start Date</label>
+                                <date-picker-component v-model.lazy="startDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col p-r-0">
+                            <validation-wrapper-component :validator="$v.endDate">
+                                <label class="all-caps">End Date</label>
+                                <date-picker-component v-model.lazy="endDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col col-md-auto d-flex justify-content-center align-items-center">
+                            <button type="button" class="btn btn-lg btn-primary fs-11 w-100" @click="submitSearch()">Search</button>
+                        </div>
+                    </div>
                     <div class="row" v-if="wallet.transactions">
                         <div class="col">
                             <div class="row padding-10">
@@ -19,17 +56,15 @@
                                 <div class="col-2 fs-10 text-right">Balance</div>
                             </div>
 
-                            <div class="row bg-white padding-10 m-b-10 rounded align-items-center" v-for="(item, index) in wallet.transactions" v-bind:key="item.id" :data="item">
-                                <div class="col-3 fs-12">{{item.created_at}}</div>
-                                <div class="col fs-12"><span v-html="item.description"></span> <a target=”_blank” v-if="[9,11].includes(item.type) " :href="route('transaction.credit_note.download', item.id)"><i class="fa fa-download fs-11 m-l-5 text-secondary hover-primary"></i></a></div>
-                                <div class="col-2 text-success text-center">{{[5, 9, 15].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
-                                <div class="col-2 text-danger text-center">{{[2, 11].includes(parseFloat(item.type)) ? '- ' + (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
-                                <div class="col-2 text-right">{{remainingBalance(index)}}</div>
-                            </div>  
+                            <list-component :key="key" section="walletTransactionSection" :endpoint="route('api.transaction.wallet.list')" :options="options">
+                                <template slot="list" slot-scope="{data}">
+                                    <customer-wallet-transaction-component :data="data" :showingPreciseAmount="showingPreciseAmount" ></customer-wallet-transaction-component>
+                                </template>
+                            </list-component>
                         </div>
                     </div>
 
-                    <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!wallet.transactions || !wallet.transactions.length">
+                    <!-- <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!wallet.transactions || !wallet.transactions.length">
                         <div class="col-12">
                             <div class="row align-items-center justify-content-center hint-text">
                                 <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"></div>
@@ -49,7 +84,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="col-4">
                     <wallet-component :data="wallet" :company_module_id="id" section="CompanyWalletTransactionSection" :creditable=true></wallet-component>
@@ -103,10 +138,22 @@ export default {
     },
     data(){
         return {
+            key: 1,
             section: 'customerTransactionSection',
             isLoading: true,
             wallet: null,
-            attention: false
+            showingPreciseAmount: false,
+            showingTransactionCount: 10,
+            attention: false,
+            reference_no: null,
+            startDate: null,
+            endDate: null,
+            options: {
+                status_in: [2, 3], 
+                owner_type: 'App\\Models\\Wallet', 
+                owner_id: 0, 
+                per_page: this.showingTransactionCount
+            }
         }
     },
     computed: {
@@ -119,8 +166,17 @@ export default {
             if(inComplete){
                 this.fetchWallet();
             }
+        },
+        showingTransactionCount() {
+            this.key ++;
         }
     },
+    validations: {
+        showingTransactionCount: {  },
+        reference_no: {  },
+        startDate: {  },
+        endDate: {  },
+    },
     created(){
         this.$store.dispatch('updateListQueue', {'name': this.section});
     },
@@ -130,22 +186,29 @@ export default {
             var filters = {with_transactions: true};
             this.submit(route('api.wallet.company_module.show', this.id) + '?filters=' + JSON.stringify(filters), 'get', this.section, false, false);
         },
-        remainingBalance(index) {
-            let tempBalance = 0;
+        submitSearch() {
+            console.log("searcvhing");
+            delete this.options.with_order_reference_like;
+            delete this.options.created_after_or_equal;
+            delete this.options.created_before_or_equal;
 
-            if(this.wallet){
-                let transactions = this.wallet.transactions.slice().reverse();
-                transactions.slice(0, transactions.length - index).map(function(transaction) {
-                    [2, 11].includes(transaction.type) ? tempBalance -= (transaction.amount) : tempBalance += (transaction.amount);
-                    return tempBalance
-                }, 0);
+            if (this.reference_no) {
+                this.options.with_order_reference_like = this.reference_no
             }
-
-            return (Math.round((tempBalance + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+            if (this.startDate) {
+                this.options.created_after_or_equal = this.startDate
+            }
+            if (this.endDate) {
+                this.options.created_before_or_equal = this.endDate
+            }
+            
+            this.key ++;
         },
         successHandler(response){
             this.isLoading = false;
             this.wallet = response.payload.data;
+            this.options.owner_id = this.wallet.id
+            this.key ++;
         }
     }
 }

resources/assets/vue/components/wallets/elements/CustomerWalletTransactionComponent.vue

@@ -0,0 +1,35 @@
+<template>
+    <div class="row bg-white padding-10 m-b-10 rounded align-datas-center">
+        <div class="col-3 fs-12">{{data.created_at}}</div>
+        <div class="col fs-12"><span v-html="data.description"></span> <a target=”_blank” v-if="[9,11].includes(data.type) " :href="route('transaction.credit_note.download', data.id)"><i class="fa fa-download fs-11 m-l-5 text-secondary hover-primary"></i></a></div>
+        <div class="col-2 text-success text-center">{{[5, 9, 15].includes(parseFloat(data.type)) ? formatValue(data.amount) : ''}}</div>
+        <div class="col-2 text-danger text-center">{{[2, 11].includes(parseFloat(data.type)) ? '- ' + formatValue(data.amount, ) : ''}}</div>
+        <div class="col-2 text-right">{{formatValue(data.running_balance)}}</div>
+    </div> 
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+
+    export default {
+        props: {
+            data: {
+                required: true,
+                type: Object
+            },
+            showingPreciseAmount: {
+                type: Boolean,
+                required: true
+            },
+        },
+        methods: {
+            formatValue(value) {
+                if (this.showingPreciseAmount) {
+                    return (Math.round((parseFloat(value) + Number.EPSILON) * 100000) / 100000).toLocaleString('en-US', { minimumFractionDigits: 5, maximumFractionDigits: 5 });
+                }
+
+                return (Math.round((parseFloat(value) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")
+            }
+        },
+        mixins: [componentHandler],
+    }
+</script>

resources/views/pages/dashboards/customer.blade.php

@@ -10,7 +10,7 @@
                                     <div class="col">
                                         <div class="row align-items-center justify-content-center m-b-10">
                                             <div class="col-auto p-r-10">
-                                                <h5 class="light">Welcome Abroad, we provide logistics services.</h5>
+                                                <h5 class="light">Welcome Aboard, we provide logistics services.</h5>
                                             </div>
                                             <div class="col-auto b-a b-thick b-primary padding-5">
                                                 <h5 class="light no-margin">Powered by technology, delivered by experts.</h5>
@@ -310,4 +310,4 @@
             </template>
         </list-component>
     </div>
-</div>
+</div>

resources/views/pages/feedback.blade.php

@@ -25,9 +25,11 @@
                                         </button>
                                     </anchor-link-component>
                                     <div class="row align-items-center m-t-10 p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
+                                        <div class="col-1">Version</div>
                                         <div class="col-1">Question Set</div>
                                         <div class="col-2">Question Text</div>
-                                        <div class="col-1">Answer</div>
+                                        <div class="col-1">Answer Text</div>
+                                        <div class="col-1">Answer Value</div>
                                         <div class="col-1">Source System</div>
                                         <div class="col-1">Source Marking</div>
                                         <div class="col-2">Source Email</div>

resources/views/pages/feedback/customer.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.base_no_login')
+@section('title', 'Share Your Feedback - CIEF Customer Service')
 @section('inner_content')
     <feedback-customer-section-component token="{{$token}}"></feedback-customer-section-component>
 @endsection

resources/views/pages/paymentAndBilling.blade.php

@@ -61,7 +61,7 @@
                         </div> --}}
                     </div>
                     <div class="row no-margin">
-                        <div class="col bg-white padding-25">
+                        <div class="col bg-white p-t-10">
                             <div class="row tabsContainer tabContent" tab-name="payments">
                                 <div class="col">
                                     <div class="row">