Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into show_extra_parcel_information

# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue

app/Classes/Exceptions/JobResourceNotFoundException.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Classes\Exceptions;
-
-use App\Classes\ValueObjects\Constants\HttpStatus;
-
-final class JobResourceNotFoundException extends ServiceApiException {
-    public function __construct(?string $message = null) {
-        parent::__construct($message ?? 'Unable to find the requested resource', HttpStatus::RESOURCE_NOT_FOUND);
-    }
-}

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -15,8 +15,6 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\DB;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use Illuminate\Support\Facades\Log;
 
 abstract class AbstractControllerLogic
 {
@@ -64,19 +62,6 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
-            if ($exception instanceof JobResourceNotFoundException) {
-                Log::error(sprintf(
-                    "Uncaught exception '%s' with message '%s' in %s:%d",
-                    get_class($exception),
-                    $exception->getMessage(),
-                    $exception->getTrace()[0]['file'],
-                    $exception->getTrace()[0]['line']
-                ));
-            }
-            else{
-                Log::error($exception);
-            }
-
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
                 !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 

app/Classes/General/Eloquent/AbstractFetchRecord.php

@@ -6,8 +6,6 @@ namespace App\Classes\General\Eloquent;
 use App\Classes\Exceptions\ResourceNotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-
 
 abstract class AbstractFetchRecord extends AbstractGetRecord
 {
@@ -28,18 +26,12 @@ abstract class AbstractFetchRecord extends AbstractGetRecord
      * @return Model
      * @throws ResourceNotFoundException
      */
-    public function getResults(Builder $query, array $param = []): Model {
+    public function getResults(Builder $query): Model {
         if(!$query->exists()){
-            $table = $query->getModel()->getTable();
-            if($table ==='job_results'){
-                throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
-            }
-            else{
-                throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
-            }
+            throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
         }
 
         return $query->first();
     }
 
-}
+}

app/Classes/General/Eloquent/AbstractGetRecord.php

@@ -50,9 +50,9 @@ abstract class AbstractGetRecord
      * @param array $filters
      * @return mixed
      */
-    public function handler(array $filters, array $params = []){
+    public function handler(array $filters){
         $this->filters = collect($filters);
-        return $this->getResults($this->applyFiltersToQuery(), $params);
+        return $this->getResults($this->applyFiltersToQuery());
     }
 
 
@@ -65,6 +65,6 @@ abstract class AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    abstract function getResults(Builder $query, array $params = []);
+    abstract function getResults(Builder $query);
 
-}
+}

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -16,10 +16,11 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @return mixed
      * @throws MalformedRequestException
      */
-    public function execute(array $filters = [], array $param = []){
+    public function execute(array $filters = []){
 
         try{
-            return $this->handler($filters, $param);
+
+            return $this->handler($filters);
 
         } catch (QueryException $exception){
             throw new MalformedRequestException('Unable to fetch the list of records due to unexpected error');
@@ -31,7 +32,7 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    public function getResults(Builder $query, array $param = []) {
+    public function getResults(Builder $query) {
         $filters = $this->getDecorationFilters();
 
         if($filters->has('order_by')){
@@ -43,12 +44,8 @@ abstract class AbstractListRecord extends AbstractGetRecord
         }
 
         //dd($query->toSql());
-        if(!empty($param)){
-            return $filters->has('per_page') ? $query->paginate($filters->get('per_page'), ['*'], 'page', $param['page']) : $query->get(); //page data from query parameters e.g ?page=1
-        }
-        else{
-            return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
-        }
+        return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
+
     }
 
 }

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

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

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

@@ -1,20 +0,0 @@
-<?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

@@ -1,20 +0,0 @@
-<?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/PostcodeLike.php

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

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

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

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

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

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

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

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

@@ -1,20 +0,0 @@
-<?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/General/Helper.php

@@ -2,7 +2,6 @@
 
 namespace App\Classes\General;
 
-use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 
@@ -41,12 +40,4 @@ class Helper
             }
         }
     }
-
-    /**
-     * @param ResourceCollection $collection
-     * @return array
-     */
-    static function collectionResponse(ResourceCollection $collection){
-        return json_decode($collection->response()->getContent(), true);
-    }
 }

app/Classes/Jobs/ListPackingListsJob.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PackingLists\Processors\ListPackingListsJobProcessor;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-
-class ListPackingListsJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 900;
-
-    /** @var ListGenericJobObject */
-    private $listGenericJobObject;
-
-    /**
-     * ListPackingListsJob constructor.
-     * @param ListGenericJobObject $listGenericJobObject
-     */
-    public function __construct(ListGenericJobObject $listGenericJobObject)
-    {
-        $this->listGenericJobObject = $listGenericJobObject;
-    }
-
-    public function handle()
-    {
-        $rawPayload = $this->job->payload();
-        if(isset($rawPayload['data']['commandName'])){
-            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
-        }
-
-        if(isset($rawPayload['data']['command'])){
-            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
-        }
-
-        $result = (App()->make(ListPackingListsJobProcessor::class))->execute($this->listGenericJobObject);
-    }
-}

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

@@ -18,13 +18,11 @@ 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
 {
@@ -52,9 +50,6 @@ class CallbackBillplzLogic
     /** @var CallbackBillplzProcessor */
     private $callbackBillplzProcessor;
 
-    /** @var CheckStorageInvoiceTransactionProcessor */
-    private $storageInvoiceTransactionProcessor;
-
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -64,9 +59,8 @@ class CallbackBillplzLogic
      * @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, CallbackBillplzProcessor $callbackBillplzProcessor, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, CallbackBillplzProcessor $callbackBillplzProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
@@ -76,7 +70,6 @@ class CallbackBillplzLogic
         $this->updatesWalletBalance = $updatesWalletBalance;
         $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
         $this->callbackBillplzProcessor = $callbackBillplzProcessor;
-        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
     }
 
 
@@ -116,13 +109,10 @@ 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);
 
-        $this->storageInvoiceBackDoorPreventionCheck($transaction, $status);
-        $result = $this->callbackBillplzProcessor->execute($transaction, $status);
+        $this->callbackBillplzProcessor->execute($transaction, $status);
 
         $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
 
@@ -133,22 +123,6 @@ 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, '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
-                    }
-                }
-            }
-        }
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
     }
 }

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

@@ -6,14 +6,13 @@ use Illuminate\Http\Request;
 use App\Models\Wallet;
 use App\Models\Group;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 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
 {
@@ -32,9 +31,6 @@ class CallbackBillplzProcessor
     /** @var CreatePaymentTransactionProcessor */
     private $createPaymentTransactionProcessor;
 
-    /** @var ReleaseGoodsToCustomerProcessor */
-    private $releaseGoodsToCustomerProcessor;
-
     /**
      * CreateUserProcessor constructor.
      * @param UpdatesTransactionStatus $updatesTransactionStatus
@@ -42,16 +38,14 @@ class CallbackBillplzProcessor
      * @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)
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
     {
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
         $this->updatesWalletBalance = $updatesWalletBalance;
         $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
-        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
     }
 
 
@@ -64,9 +58,6 @@ class CallbackBillplzProcessor
         $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
@@ -75,54 +66,33 @@ class CallbackBillplzProcessor
             $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);
-                    }
+                    $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
                 }
-
+    
                 $group->status = $status;
                 $group->save();
             }
         }
 
         if (!$transaction->owner instanceof Wallet) {
-            $this->releaseGoodsToCustomerProcessor->execute($packingList, $invoice);
-        }
+            $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
 
-        return true;
-    }
+            if (($invoice->amount - $totalPaidAmount) < 0.01) {
+                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
 
-    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;
+                $packingList->status = ApprovalStatus::APPROVED;
+                $packingList->save();
 
-            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;
+                if (app()->environment('production')) {
+                    $this->updateDoFromVTPortalProcessor->execute($packingList);
+                    $this->updateDoFromYDPortalProcessor->execute($packingList);
+                }
             }
         }
-        return true;
     }
 }

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

@@ -1,34 +0,0 @@
-<?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/ExportsPaymentTransactions.php

@@ -74,8 +74,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $approvalStatus = ApprovalStatus::APPROVED;
         }
 
-        // $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
-        $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->whereIn('status', [$approvalStatus]);
+        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
 
         if($start_date && $end_date) {
             $query->whereBetween('updated_at', [
@@ -103,12 +102,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
         $container = $transaction->owner->containers()->first();
         $order = $transaction->owner->owner;
         $company = $order->companyModule->company;
-        if($transaction->type === TransactionType::STORAGE_INVOICE){
-            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'STORAGE_FEE')->first();
-        }
-        else{
-            $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
-        }
+        $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();
@@ -124,8 +118,6 @@ 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/Jobs/ControllersLogic/FetchJobResultLogic.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Jobs\Processors\FetchesJobResultProcessor;
-use App\Http\Resources\JobResultResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchJobResultLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Data',
-            'message' => 'You have successfully retrieved data'
-        ];
-    }
-
-    /** @var FetchesJobResultProcessor */
-    private $fetchesJobResultProcessor;
-
-    /**
-     * FetchJobResultLogic constructor.
-     * @param FetchesJobResultProcessor $fetchesJobResultProcessor
-     */
-    public function __construct(FetchesJobResultProcessor $fetchesJobResultProcessor)
-    {
-        $this->fetchesJobResultProcessor = $fetchesJobResultProcessor;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->fetchesJobResultProcessor->execute($request);
-
-        return $this->resourceResponse(new JobResultResource($query));
-    }
-
-}

app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php

@@ -1,118 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class ListGenericJobObject implements DataTransferObject
-{
-    /** @var string */
-    private $name;
-
-    /** @var array */
-    private $payload;
-
-    /** @var string */
-    private $jobId;
-
-    /** @var string */
-    private $requestSignature;
-
-    /** @var string */
-    private $resultSignature;
-
-    /** @var object */
-    private $userInfo;
-
-    /** @var string */
-    private $jobCommandName;
-
-    /** @var string */
-    private $jobCommand;
-
-    public function __construct(string $name, array $payload, string $requestSignature, ?string $resultSignature, string $jobId, object $userInfo = null)
-    {
-        $this->name = $name;
-        $this->payload = $payload;
-        $this->jobId = $jobId;
-        $this->requestSignature = $requestSignature;
-        $this->resultSignature = $resultSignature;
-        $this->userInfo = $userInfo;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPayload(): array
-    {
-        return $this->payload;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobId(): string
-    {
-        return $this->jobId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRequestSignature(): string
-    {
-        return $this->requestSignature;
-    }
-
-    /**
-     * @return string
-     */
-    public function getResultSignature(): ?string
-    {
-        return $this->resultSignature;
-    }
-
-    /**
-     * @return object
-     */
-    public function getUserInfo(): object
-    {
-        return $this->userInfo;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommandName(): string
-    {
-        return $this->jobCommandName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommand(): string
-    {
-        return $this->jobCommand;
-    }
-
-
-    public function setJobCommandName(string $jobCommandName)
-    {
-        $this->jobCommandName = $jobCommandName;
-    }
-
-    public function setJobCommand(string $jobCommand)
-    {
-        $this->jobCommand = $jobCommand;
-    }
-
-}

app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class UpdateJobResultObject implements DataTransferObject
-{
-    /** @var string */
-    private $result;
-
-    /** @var string */
-    private $resultSignature;
-
-    /** @var string */
-    private $jobCommandName;
-
-    /** @var string */
-    private $jobCommand;
-
-    public function __construct(string $result, string $resultSignature, string $jobCommandName, string $jobCommand)
-    {
-        $this->result = $result;
-        $this->resultSignature = $resultSignature;
-        $this->jobCommandName = $jobCommandName;
-        $this->jobCommand = $jobCommand;
-    }
-
-    /**
-     * @return string
-     */
-    public function getResult(): string
-    {
-        return $this->result;
-    }
-
-    /**
-     * @return array
-     */
-    public function getResultSignature(): string
-    {
-        return $this->resultSignature;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommandName(): string
-    {
-        return $this->jobCommandName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommand(): string
-    {
-        return $this->jobCommand;
-    }
-}

app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Processors;
-
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\Modules\Jobs\Services\FetchesJobResult;
-use Illuminate\Http\Request;
-
-
-class FetchesJobResultProcessor
-{
-    /** @var FetchesJobResult */
-    private $fetchesJobResult;
-
-
-    /**
-     * FetchesJobResultProcessor constructor.
-     * @param FetchesJobResult $fetchesJobResult
-     */
-    public function __construct(FetchesJobResult $fetchesJobResult)
-    {
-        $this->fetchesJobResult = $fetchesJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     * @throws \App\Classes\Exceptions\ResourceNotFoundException
-     */
-    public function execute(Request $request){
-
-        $res1 = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
-        if($request->route('is_last')){
-            $res2 = $this->fetchesJobResult->execute(['request_signature' => $res1->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
-            return $res2;
-        }
-
-        if(!$res1->result){
-            throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
-        }
-
-        return $res1;
-    }
-}

app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Processors;
-
-
-use App\Classes\Modules\Jobs\Services\UpdatesJobResult;
-use App\Classes\Modules\Jobs\Services\FetchesJobResult;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
-
-class UpdateJobResultProcessor
-{
-
-    /** @var FetchesJobResult */
-    private $fetchesJobResult;
-
-    /** @var UpdatesJobResult */
-    private $updatesJobResult;
-
-    /**
-     * UpdateJobResultProcessor constructor.
-     * @param FetchesJobResult $fetchesJobResult
-     * @param UpdatesJobResult $updatesJobResult
-     */
-    public function __construct(FetchesJobResult $fetchesJobResult, UpdatesJobResult $updatesJobResult)
-    {
-        $this->fetchesJobResult = $fetchesJobResult;
-        $this->updatesJobResult = $updatesJobResult;
-    }
-
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @param array $resultCurrent
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject, $resultCurrent) {
-        $jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $listGenericJobObject->getJobId()]);
-        $resultCurrentJson = json_encode($resultCurrent);
-        $resultSignatureCurrent = md5($resultCurrentJson);
-
-        try{
-            $jobResultExisting = $this->fetchesJobResult->execute(['request_signature' => $jobResultCurrent->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
-            $resultSignatureExisting = $jobResultExisting->result_signature;
-            //if($resultSignatureExisting != $resultSignatureCurrent){
-                $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
-            //}
-        } catch (JobResourceNotFoundException $exception){
-            $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
-        }
-    }
-
-    private function updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobCommandName, $jobCommand){
-        $updateJobResultObject = new UpdateJobResultObject(
-            $resultCurrentJson,
-            $resultSignatureCurrent,
-            $jobCommandName,
-            $jobCommand
-        );
-        $create = $this->updatesJobResult->execute($jobResultCurrent, $updateJobResultObject);
-    }
-}

app/Classes/Modules/Jobs/Services/CreatesJobResult.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\JobResult;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-
-class CreatesJobResult extends AbstractUpdateRecord
-{
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject)
-    {
-        $model = new JobResult();
-        $model->job_id = $listGenericJobObject->getJobId();
-        $model->request_signature = $listGenericJobObject->getRequestSignature();
-        $model->result_signature = $listGenericJobObject->getResultSignature();
-        $model->url = $listGenericJobObject->getName();
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Jobs/Services/FetchesJobResult.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-
-use App\Classes\General\Eloquent\AbstractFetchRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\JobResult;
-
-class FetchesJobResult extends AbstractFetchRecord
-{
-
-    /** @var JobResult */
-    private $repository;
-
-    /**
-     * FetchesJobResult constructor.
-     * @param JobResult $repository
-     */
-    public function __construct(JobResult $repository)
-    {
-        $this->repository = $repository;
-    }
-
-
-    /**
-     * @return Builder
-     */
-    public function getRepository(): Builder
-    {
-        return $this->repository->newQuery();
-    }
-}

app/Classes/Modules/Jobs/Services/ListsJobResult.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-
-use App\Classes\General\Eloquent\AbstractListRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\JobResult;
-
-class ListsJobResult extends AbstractListRecord
-{
-
-    /** @var JobResult */
-    private $repository;
-
-    /**
-     * ListsJobResult constructor.
-     * @param JobResult $repository
-     */
-    public function __construct(JobResult $repository)
-    {
-        $this->repository = $repository;
-    }
-
-
-    /**
-     * @return Builder
-     */
-    function getRepository(): Builder
-    {
-        return $this->repository->newQuery();
-    }
-}

app/Classes/Modules/Jobs/Services/UpdatesJobResult.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
-use App\Models\JobResult;
-
-class UpdatesJobResult extends AbstractUpdateRecord
-{
-
-    /**
-     * @param JobResult $model
-     * @param UpdateJobResultObject $updateJobResultObject
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(JobResult $model, UpdateJobResultObject $updateJobResultObject) {
-
-        $model->result = $updateJobResultObject->getResult();
-        $model->result_signature = $updateJobResultObject->getResultSignature();
-        $model->job_command_name = $updateJobResultObject->getJobCommandName();
-        $model->job_command = $updateJobResultObject->getJobCommand();
-
-        return $this->handler($model);
-
-    }
-}

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

@@ -53,12 +53,8 @@ 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/UpdateDoFromYDPortalProcessor.php

@@ -38,7 +38,6 @@ class UpdateDoFromYDPortalProcessor
      */
     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;

app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsJobLogic.php

@@ -1,78 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Jobs\ListPackingListsJob;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-
-class ListPackingListsJobLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Job Retrieving PackingLists',
-            'message' => 'You have successfully submit a job to retrieve a list of PackingLists'
-        ];
-    }
-
-    /** @var CreatesJobResult */
-    private $createsJobResult;
-
-    /**
-     * ListPackingListsJobLogic constructor.
-     * @param CreatesJobResult $createsJobResult
-     */
-    public function __construct(CreatesJobResult $createsJobResult)
-    {
-        $this->createsJobResult = $createsJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $jobId = uniqid();
-
-        $user = Auth::user();
-        $userInfo = (object) [
-            // 'email' => $user->email,
-            'type' => $user->type,
-        ];
-
-
-        $userInfoJson = json_encode($userInfo);
-        $requestSignature = md5($userInfoJson . $request->fullUrl());
-
-
-        $listGenericJobObject = new ListGenericJobObject(
-            $request->fullUrl(),
-            $request->all(),
-            $requestSignature,
-            null,
-            $jobId,
-            $userInfo
-        );
-
-        ListPackingListsJob::dispatch($listGenericJobObject)->onQueue('high_priority');
-
-        $result = [];
-        $result['job_id'] = $jobId;
-
-
-        $this->createsJobResult->execute($listGenericJobObject);
-
-        return $this->response(['data' => $result]);
-    }
-
-}

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]);
+                    $eta = Carbon::parse($tracking[2])->addDays(2);
                 }
             }
 

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

@@ -147,6 +147,7 @@ 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]);
+                $eta = Carbon::parse($containerInfo[4])->addDays(2);
                 $etd = Carbon::parse($eta)->subDays(7);
 
                 $delayDate = $containerInfo[7];
@@ -183,7 +183,7 @@ class FetchLoadedContainersFromVTPortalProcessor
                 }
 
                 if($delayDate){
-                    $delayDate = Carbon::parse($delayDate);
+                    $delayDate = Carbon::parse($delayDate)->addDays(2);
                     $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]);
+                                $eta = Carbon::parse($tracking[2])->addDays(2);
                             }
 
                             $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
@@ -415,7 +415,7 @@ class FetchOrderListsFromYdPortalProcessor
                         }
 
                         if($delayDate){
-                            $delayDate = $delayDate;
+                            $delayDate = $delayDate->addDays(2);
                             $transport = $container->transports()->first();
 
                             if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {

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

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
-use App\Classes\General\Helper;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Http\Resources\ListPackingListJobResource;
-
-class ListPackingListsJobProcessor
-{
-
-    /** @var ListsPackingLists */
-    private $listsPackingLists;
-
-    /** @var UpdateJobResultProcessor */
-    private $updateJobResultProcessor;
-
-    /**
-     * ListPackingListsJobProcessor constructor.
-     * @param ListsPackingLists $listsPackingLists
-     * @param UpdateJobResultProcessor $updateJobResultProcessor
-     */
-    public function __construct(ListsPackingLists $listsPackingLists, UpdateJobResultProcessor $updateJobResultProcessor)
-    {
-        $this->listsPackingLists = $listsPackingLists;
-        $this->updateJobResultProcessor = $updateJobResultProcessor;
-    }
-
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject) {
-
-        // $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]);
-
-        $query = $this->listsPackingLists->execute(array_merge($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]));
-
-        foreach ($query->items() as &$item) {
-            $item['userInfo'] = $listGenericJobObject->getUserInfo();
-        }
-        $resultCurrent = Helper::collectionResponse(ListPackingListJobResource::collection($query));
-        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-    }
-}

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

@@ -21,8 +21,6 @@ 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
 {
@@ -57,18 +55,13 @@ 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,
-        ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
+        CreatesGroup $createsGroup
     )
     {
         $this->fetchesTransaction = $fetchesTransaction;
@@ -77,7 +70,6 @@ class CreateGroupsLogic extends AbstractControllerLogic
         $this->createWalletTopUpTransactionProcessor = $createWalletTopUpTransactionProcessor;
         $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
         $this->createsGroup = $createsGroup;
-        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
     }
 
     public function logic(Request $request) : JsonResponse
@@ -154,12 +146,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
 
         foreach ($invoices as $invoice) {
             if ($payment_method == PaymentMethodType::WALLET) {
-                $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);
-                }
+                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'));
             }
 
             $issuer                 = $invoice->issuer;

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

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

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

@@ -5,11 +5,10 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Http\Resources\TransactionWithStorageResource;
+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
 {
@@ -39,18 +38,13 @@ 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));
 
-        return $this->collectionResponse(TransactionWithStorageResource::collection($query));
     }
+
+
+
 }

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

@@ -17,8 +17,6 @@ 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
 {
@@ -32,21 +30,17 @@ 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, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
     {
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->createsDocument = $createsDocument;
         $this->createsFiles = $createsFiles;
-        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
     }
 
 
@@ -56,6 +50,7 @@ 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();
 
@@ -80,11 +75,6 @@ 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

@@ -1,360 +0,0 @@
-<?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\TransactionWithStorageResource;
-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 TransactionWithStorageResource($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, $run = true)
+    public function execute(Transaction $invoice, $payment_method, $bank_code)
     {
         $amount             = $invoice->amount;
         Log::info($invoice->owner);
@@ -127,26 +127,22 @@ class CreatePaymentTransactionProcessor
 
             $this->updatesWalletBalance->execute($wallet, ($amount * -1));
 
-            if($run)
-            {
-                $packingList = $invoice->owner;
-                $order = $packingList->owner;
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
+            $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
-            if($run){
-                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-            }
+            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+
         }
         else {
             $payment_method = PaymentMethodType::CASH;

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

@@ -1,79 +0,0 @@
-<?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 CreateStorageInvoiceDocTransactionFixProcessor
-{
-
-    /** @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/CreateStorageInvoiceDocTransactionProcessor.php

@@ -1,79 +0,0 @@
-<?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

@@ -1,94 +0,0 @@
-<?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/ValueObjects/Constants/DocumentType.php

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

app/Classes/ValueObjects/Constants/TransactionDetailType.php

@@ -11,6 +11,4 @@ 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,11 +35,10 @@ 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

@@ -1,85 +0,0 @@
-<?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

@@ -1,82 +0,0 @@
-<?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/FixGroupPaymentProblem.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-
-use App\Classes\Modules\Transactions\Services\FetchesGroup;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
-use App\Classes\Modules\Transactions\Processors\CreateStorageInvoiceDocTransactionFixProcessor;
-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;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /** @var CreateStorageInvoiceDocTransactionFixProcessor */
-    private $createStorageInvoiceDocTransactionProcessor;
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct(FetchesGroup $fetchesGroup, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor, FetchesOrder $fetchesOrder, CreateStorageInvoiceDocTransactionFixProcessor $createStorageInvoiceDocTransactionProcessor)
-    {
-        parent::__construct();
-        $this->fetchesGroup = $fetchesGroup;
-        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->createStorageInvoiceDocTransactionProcessor = $createStorageInvoiceDocTransactionProcessor;
-    }
-
-
-    /**
-     * 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));
-                $pL = $invoice->owner;
-                $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
-            }
-        }
-        */
-
-        $order = $this->fetchesOrder->execute(['reference' => '729251424']);
-        $packingLists = $order->destinationWarehousePackages;
-
-        foreach ($packingLists as $packingList){
-            $this->createStorageInvoiceDocTransactionProcessor->execute($packingList, true);
-            dd(json_encode($packingList));
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-
-        $this->info(Carbon::now() . ': Done data patch. ElapsedTime: ' . $elapsedTime . '.');
-    }
-}

app/Console/Kernel.php

@@ -62,11 +62,6 @@ 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/Jobs/FetchJobResultController.php

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

app/Http/Controllers/PackingLists/ListPackingListsJobController.php

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

app/Http/Kernel.php

@@ -70,8 +70,5 @@ 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/CheckForStorageInvoiceByGroup.php

@@ -1,64 +0,0 @@
-<?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

@@ -1,36 +0,0 @@
-<?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

@@ -1,96 +0,0 @@
-<?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/Resources/GroupForOrderV2Resource.php

@@ -1,47 +0,0 @@
-<?php
-
-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;
-
-class GroupForOrderV2Resource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $payment_transaction = Transaction::where('payment_reference', $this->reference)->first();
-
-        return [
-            'id' => $this->id,
-            'original_amount' => (float) $this->original_amount,
-            'original_currency' => new CurrencyResource($this->original_currency),
-            'issuer_name' => $this->issuerCompany->name,
-            'issuer_id' => $this->issuerCompany->id,
-            'amount' => (float) $this->amount,
-            'service_charge' => (float) $this->amount,
-            'currency' => new CurrencyResource($this->currency),
-            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
-            'currency_rate' => (float) $this->currency_rate,
-            'status' => $this->status,
-            'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$this->status],
-            'payment_method' => (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),
-            'payment_transaction' => $payment_transaction ? [
-                'id' => $payment_transaction->id,
-                'status' => $payment_transaction->status,
-                'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status]
-            ] : []
-        ];
-    }
-}

app/Http/Resources/GroupTransactionsForOrderV2Resource.php

@@ -1,23 +0,0 @@
-<?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/JobResultResource.php

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

app/Http/Resources/ListPackingListJobResource.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Models\Order;
-use App\Models\PackingList;
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Http\Resources\V2\PackingListV2Resource;
-
-class ListPackingListJobResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $exceptionUsers = in_array($this->userInfo ? $this->userInfo->type : Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
-
-        return [
-            'id' => $this->id,
-            'claimant_id' => $this->claimant_id,
-            'reference' => $this->reference,
-            'status' => $this->status,
-            'transport' => new TransportResource($this->transports()->first()),
-            'type' => $this->type,
-            'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListV2Resource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first(), $this->userInfo)),
-            // 'packages' => PackageResource::collection($packages),
-            // $this->mergeWhen($this->owner instanceof Order, [
-            //     'order' => New OrderResource($this->owner)
-            // ]),
-            'container' => new ContainerResource($this->containers->first()),
-            'packages' => PackageWithoutOrderResource::collection($packages),
-            $this->mergeWhen($this->owner instanceof Order, [ 'order' => New OrderResource($this->owner) ]),
-            'shipping_transaction' => new TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first()),
-            'suspended_invoice' => new TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->first()),
-            // 'suspended_invoices' => TransactionResource::collection($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->get()),
-        ];
-    }
-}

app/Http/Resources/MappableTransactionResource.php

@@ -37,7 +37,6 @@ class MappableTransactionResource extends JsonResource
             'owner_type' => Transaction::class,
             'owner_id'=> $this->id,
             'owner_reference'=> $reference,
-            'created_at'=> $this->created_at, // invoice date
         ];
     }
 }

app/Http/Resources/MappableTransactionWithDetailsResource.php

@@ -27,19 +27,16 @@ class MappableTransactionWithDetailsResource extends JsonResource
             'order_reference' => null,
             'bill_no' => null,
             'marking' => null,
-            'created_at' => null
         ];
 
         if ($this->type === TransactionType::PAYMENT) {
             $order = $this->owner->owner->owner;
             $data['order_reference'] = $order->reference;
             $data['debtor_code'] = $order->companyModule->company->debtor;
-            $data['created_at'] = $this->owner->created_at; // invoice date
         } elseif (in_array($this->type, [TransactionType::GROUP_PAYMENT, TransactionType::TOP_UP])) {
             $connection = $this->owner->owner->inviters()->withPivot('invitee_reference')->first();
             $data['marking'] = $connection ? $connection->pivot->invitee_reference : '';
             $data['bill_no'] = $this->bill_no;
-            $data['created_at'] = $this->created_at;
         } else {
             $payments = $this->transactions()
                 ->payments()->where('status', ApprovalStatus::APPROVED)
@@ -57,7 +54,6 @@ class MappableTransactionWithDetailsResource extends JsonResource
                         'type' => $payment->type,
                         'marking' => null,
                         'amount' => $payment->amount,
-                        'created_at' => $this->created_at
                     ];
                 })->toArray();
             } else {
@@ -65,7 +61,6 @@ class MappableTransactionWithDetailsResource extends JsonResource
                 $data['amount'] = 'Transaction Type not allowed';
                 $data['transaction_type'] = $this->type;
                 $data['payment_transactions'] = null;
-                $data['created_at'] = null;
             }
         }
 

app/Http/Resources/OrderV2Resource.php

@@ -31,9 +31,8 @@ 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 TransactionWithStorageResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get());
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_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/PackageWithoutOrderResource.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Models\Order;
-use App\Models\PackingList;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class PackageWithoutOrderResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'type' => $this->type,
-            'description' => $this->description,
-            'width' => floatval($this->width),
-            'height' => floatval($this->height),
-            'length' => floatval($this->length),
-            'weight' => $this->weight,
-            'quantity' => $this->quantity,
-            'cbm' => (($this->width / 100) * ($this->height / 100) * ($this->length / 100)) * $this->quantity,
-            'reference' => $this->packingList->reference,
-            'status' => $this->status,
-            // $this->mergeWhen($originalPackingList->owner instanceof Order, [
-            //     'order' => New OrderResource($originalPackingList->owner)
-            // ]),
-            // 'container' => new ContainerResource($originalPackingList->containers()->first()),
-            // 'transport' => new TransportResource($originalPackingList->transports()->first())
-        ];
-    }
-}

app/Http/Resources/TransactionResource.php

@@ -24,6 +24,7 @@ class TransactionResource extends JsonResource
     {
         $order = null;
         $groupTransactions = null;
+        $packingListReference = null;
 
         if ($this->owner instanceof Transaction) {
             if ($this->owner) {
@@ -40,15 +41,16 @@ class TransactionResource extends JsonResource
             if ($group) {
                 $groupTransactions = GroupTransactionResource::collection($group->groupTransactions);
             }
-
+            
         }
 
         return [
             'id' => $this->id,
             'owner_type' => $this->owner_type,
             'order' => $order,
+            'packing_list_reference' => $packingListReference,
             'group_transactions' => $groupTransactions,
-            'group_reference' => $groupTransactions ? ($group ? $group->reference : null )  : null,
+            'group_reference' => $groupTransactions ? $group->reference : null,
             'documents' => $groupTransactions ? DocumentResource::collection($this->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)) : DocumentResource::collection($this->documents),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,

app/Http/Resources/TransactionWithStorageResource.php

@@ -1,128 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Group;
-use App\Models\Transaction;
-use App\Models\Wallet;
-use Carbon\Carbon;
-use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Log;
-
-class TransactionWithStorageResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $order = null;
-        $groupTransactions = null;
-        $group_payment_attempts = null;
-        $groupPaymentAttemptsFiltered = [];
-        $group_payment_expired = null;
-        $group_payment_history = null;
-        $groupTotalAmount = 0;
-
-        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]));
-                $group_payment_history  = GroupForOrderV2Resource::collection($this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED]));
-            }
-
-        } else {
-            $group = Group::where('reference', $this->payment_reference)->first();
-            if ($group) {
-                $groupTransactions = GroupTransactionResource::collection($group->groupTransactions);
-            }
-
-        }
-
-
-        $ts = $this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION])->last();
-        if ($ts) {
-            $paymentTransaction = Transaction::where('payment_reference',  $ts->reference)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION])->first();
-            if($paymentTransaction){
-                $groupTotalAmount = (double) $this->amount;
-
-                foreach ($group_payment_history as $key => $value) {
-                    if ($value->id === $ts->id && $value->reference === $ts->reference) {
-                        unset($group_payment_history[$key]);
-                    }
-                }
-
-                foreach ($group_payment_attempts as $key => $value) {
-                    if ($value->id === $ts->id && $value->reference == $ts->reference) {
-                        $groupPaymentAttemptsFiltered[$key] = $value;
-                    }
-                }
-            }
-        }
-
-
-        return [
-            'id' => $this->id,
-            'owner_type' => $this->owner_type,
-            'order' => $order,
-            'group_transactions' => $groupTransactions,
-            'group_reference' => $groupTransactions ? ($group ? $group->reference : null ) : null,
-            'groups_payment_attempts' => $groupPaymentAttemptsFiltered,
-            'groups_payment_expired' => $group_payment_expired,
-            'groups_payment_history' => $group_payment_history,
-            '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,
-            'payment_method' => (int) $this->payment_method,
-            'payment_reference' => $this->payment_reference,
-            'outstanding' => (double) $this->amount - ($this->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount')),
-            'floating' => $group_payment_attempts ? $groupTotalAmount : (double) $this->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION])->sum('amount'),
-            'service_charge' => (double) $this->service_charge,
-            'tax' => (double) $this->tax,
-            'original_amount' => (double) $this->original_amount,
-            'currency' => new CurrencyResource($this->currency),
-            'original_currency' => new CurrencyResource($this->original_currency),
-            'currency_rate' => (double) $this->currency_rate,
-            'status' => (int) $this->status,
-            'details' => TransactionDetailResource::collection($this->transactionDetails),
-            'transactions' => TransactionResource::collection($this->transactions),
-            'payment_attempts' => TransactionResource::collection(
-                $this->transactions()
-                    ->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()
-                    ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED])
-                    ->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/V2/PackingListV2Resource.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Http\Resources\V2;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Models\Order;
-use App\Models\PackingList;
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Http\Resources as V1;
-
-
-class PackingListV2Resource extends JsonResource
-{
-    private $userInfo;
-
-    public function __construct($resource, $userInfo = null)
-    {
-        parent::__construct($resource);
-        $this->userInfo = $userInfo;
-    }
-
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $user = $this->userInfo ? $this->userInfo : Auth()->user();
-        $exceptionUsers = in_array($user->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
-
-        return [
-            'id' => $this->id,
-            'claimant_id' => $this->claimant_id,
-            'reference' => $this->reference,
-            'status' => $this->status,
-            'transport' => new V1\TransportResource($this->transports()->first()),
-            'type' => $this->type,
-            'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListV2Resource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first(), $user)),
-            'packages' => V1\PackageResource::collection($packages),
-            $this->mergeWhen($this->owner instanceof Order, [
-                'order' => New V1\OrderResource($this->owner)
-            ]),
-            'shipping_transaction' => new V1\TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first()),
-            'suspended_invoice' => new V1\TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->first()),
-            // 'suspended_invoices' => V1\TransactionResource::collection($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->get()),
-        ];
-    }
-}

app/Models/JobResult.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class JobResult extends AbstractModel
-{
-    protected $table = 'job_results';
-
-    public $fillable = [
-        'job_id',
-        'result'
-   ];
-}

app/Models/Transaction.php

@@ -89,14 +89,6 @@ 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) {

config/logging.php

@@ -54,12 +54,6 @@ 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'),

config/queue.php

@@ -34,14 +34,6 @@ return [
             'driver' => 'sync',
         ],
 
-        'high_priority' => [
-            'driver' => 'database',
-            'table' => 'jobs',
-            'queue' => 'high_priority',
-            'retry_after' => 3600,
-            'after_commit' => false,
-        ],
-
         'database' => [
             'driver' => 'database',
             'table' => 'jobs',

database/migrations/2023_08_08_124848_create_job_results_table.php

@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateJobResultsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('job_results', function (Blueprint $table) {
-            $table->id();
-            $table->string('job_id', 50);
-            $table->longText('result')->nullable();
-            $table->timestamps();
-
-            // $table->foreign('job_id')->references('id')->on('jobs')->onDelete('cascade');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('job_results');
-    }
-}

database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddNewColumnToJobResultsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->longText('url')->after('result')->nullable();
-            $table->string('job_command_name')->after('url')->nullable();
-            $table->longText('job_command')->after('job_command_name')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->dropColumn('url');
-            $table->dropColumn('job_command_name');
-            $table->dropColumn('job_command');
-        });
-    }
-}

database/migrations/2023_11_13_140300_add_is_credit_term_to_company_connections.php

@@ -1,32 +0,0 @@
-<?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/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddNewColumn2ToJobResultsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->string('request_signature')->after('job_id')->nullable();
-            $table->string('result_signature')->after('request_signature')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->dropColumn('request_signature');
-            $table->dropColumn('result_signature');
-        });
-    }
-}

gulpfile.js

@@ -37,7 +37,6 @@ gulp.task('vendorCss', () => {
         .pipe(plugins.cleanCss())
         .pipe(plugins.replace('../../../font-awesome/', './'))
         .pipe(plugins.replace('../../jquery-ui-dist/', ''))
-        //.pipe(plugins.replace(/background-image:url\(\.\.\/\.\./g, `background-image:url(`)) //cief todo: gulp
         .pipe(gulp.dest(pkg.paths.build.css));
 });
 
@@ -116,4 +115,4 @@ gulp.task('watch', (done) => {
     gulp.watch(pkg.globs.sourceJs, gulp.series('sourceJs'));
     gulp.watch(pkg.globs.sourceJs, gulp.series('sourceFonts'));
     done();
-});
+});

resources/assets/vue/components/addresses/elements/DisplayWarehouseAddressComponent.vue

@@ -5,7 +5,7 @@
                <div class="col-auto">
                    <div class="row">
                         <div class="col">
-                            <h6 v-if="item" class="no-margin fs-12 text-black">{{item.street_one}} {{item.street_two}}, {{item.district.name}}, {{item.post_code}} {{item.state.name}}, {{item.country.name}}</h6>
+                            <h6 class="no-margin fs-12 text-black">{{item.street_one}} {{item.street_two}}, {{item.district.name}}, {{item.post_code}} {{item.state.name}}, {{item.country.name}}</h6>
                         </div>
                    </div>
                </div>

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

@@ -6,14 +6,13 @@
                     <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') && !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>
+                                <payments-billing-components v-if="endpoint == route('api.transaction.list')" :section="section" :data="data" :selectedInvoice="selectedInvoice" v-on:input="updateList($event)"></payments-billing-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', 'customerGroupPaymentExpiredInvoiceComponent'].includes(section)">
+                <div class="col-12 col-sm-12 col-md-4" v-if="!['customerPaidGroupInvoiceComponent', 'customerGroupPaymentInProgressInvoiceComponent'].includes(section)">
                     <div class="row align-items-center">
                         <div class="col">
                             <div class="row" v-if="section === 'customerPendingPaymentInvoiceComponent'">
@@ -95,10 +94,6 @@
                 type: String,
                 required: true
             },
-            isPaidInvoices :{
-                type: Boolean,
-                default: false
-            }
         },
         data(){
             return {
@@ -122,7 +117,7 @@
             },
             selectedIds () {
                 return this.selectedInvoice.map(s=>s.id);
-            }
+            },
         },
         methods: {
             generateSummaryInvoice(){
@@ -131,40 +126,9 @@
             makePayment(){
                 this.submit(this.route('api.transaction.group.create', JSON.stringify(this.selectedId)), 'post', this.section, true, false);
             },
-            updateList(invoices){
-                invoices.forEach(invoice => {
-                    if (this.selectedInvoice.includes(invoice)) {
-                        this.selectedInvoice.splice(this.selectedInvoice.indexOf(invoice), 1);
-                    } else {
-                        this.selectedInvoice.push(invoice);
-                    }
-                });
-
+            updateList(packageList){
+                this.selectedInvoice.includes(packageList) ? this.selectedInvoice.splice(this.selectedInvoice.indexOf(packageList), 1) : this.selectedInvoice.push(packageList);
             },
-            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,22 +43,6 @@
                                                         </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">
@@ -91,7 +75,7 @@
                                                         </div>
                                                     </div>
                                                 </div>
-                                            </div>
+                                            </div>  
                                         </div>
                                     </div>
                                 </div>
@@ -100,27 +84,22 @@
                                 <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_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>
+                                            <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>
                                         </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, '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>
+                                            <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>
                                         </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, '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, 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>
                                         </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, '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>
+                                            <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>
                                         </div>
                                     </div>
                                 </div>

resources/assets/vue/components/general/elements/ListPollingComponent.vue

@@ -1,207 +0,0 @@
-<template>
-    <transition-component group enter-class="animate__animated animate__fadeInUp animate__delay-1 animate__faster p-r-30" leave-class="animate__animated animate__fadeOutDown animate__faster p-r-30" style="min-height: 300px;width:100%">
-        <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
-        <div class="row" key="2" v-show="!$store.getters.isLoading(section)">
-            <div class="col">
-                <div class="row">
-                    <div class="col">
-                        <div class="row align-items-center justify-content-center p-t-50 p-b-50"  v-show="!$store.getters.getListData(section).length && !isLoading && emptyListSection">
-                            <div class="col-10">
-                                <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>
-                                </div>
-                                <div class="row text-center">
-                                    <div class="col">
-                                        <div class="row m-t-20">
-                                            <div class="col">
-                                                <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here</p>
-                                            </div>
-                                        </div>
-                                        <div class="row m-t-5 align-items-center justify-content-center">
-                                            <div class="col">
-                                                <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">There is no results found, Try adjusting your filters to find what you are looking for.</small>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row" v-show="!isLoading">
-                            <div class="col">
-                                <div class="list disable-text-selection" data-check-all="checkAll">
-                                    <div class="row" ref="list" v-for="item in $store.getters.getListData(section)" v-bind:key="item.id" :data="item">
-                                        <div class="col">
-                                            <slot name="list" :data="item"></slot>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row" v-show="!isLoading">
-                            <div class="col">
-                                <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </transition-component>
-</template>
-
-<script>
-    import requestV2 from '../../../general/mixins/aws/requestV2'
-    export default {
-        props: {
-            section:{
-                type: String,
-                required: true
-            },
-            endpoint: {
-                type: String,
-                required: true
-            },
-            options: {
-                default () {
-                    return {}
-                }
-            },
-            emptyListSection: {
-                type: Boolean,
-                default: true,
-            }
-        },
-        data(){
-            return {
-                filters: this.options,
-                pollingInterval: null,
-                isPolling: false,
-                isFetchingResult: false,
-                isLoading: false,
-            }
-        },
-        created(){
-            this.setDecoratorDefault();
-            this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters}); //cief todo: Uncaught (in promise) null
-        },
-        computed: {
-            pendingList () {
-                return this.$store.getters.isInCompleteQueue(this.section);
-            }
-        },
-        watch: {
-            pendingList(inComplete){
-                if(inComplete){
-                    this.fetchList();
-                }
-            }
-        },
-        methods: {
-            fetchList(){
-                let listDecorators = this.$store.getters.getListDetails(this.section);
-                let url = this.endpoint + '?page=' + listDecorators.page + '&filters=' + JSON.stringify(listDecorators.filters);
-                this.isLoading = true;
-                this.submitJob(url);
-            },
-            successHandler(response){
-                let result = JSON.parse(response.payload.data.result);
-                result.meta = {
-                    current_page: result.meta.current_page,
-                    first_page_url: result.meta.first_page_url,
-                    from: result.meta.from,
-                    last_page: result.meta.last_page,
-                    last_page_url: result.meta.last_page_url,
-                    next_page_url: result.meta.next_page_url,
-                    path: result.meta.path,
-                    per_page: result.meta.per_page,
-                    prev_page_url: result.meta.prev_page_url,
-                    to: result.meta.to,
-                    total: result.meta.total
-                };
-
-                this.stopPolling();
-                this.$store.dispatch('completeList', {'name': this.section, 'data': result.data});
-                this.$refs.pagination.makePagination(result.meta, result.links);
-                this.isLoading = false;
-            },
-            errorHandler(error){
-                this.isFetchingResult = false;
-                this.isPolling = false;
-            },
-            startPolling(jobId, maxAttempts = 8) {
-                let attempts = 0;
-                let interval = 10000; // Initial interval
-
-                const resetPollingInterval = (customInterval) => {
-                    this.pollingInterval = setInterval(pollJobResult, customInterval);
-                };
-
-                const pollJobResult = () => {
-                    if (this.isPolling || this.isFetchingResult) {
-                        return;
-                    }
-                    this.isPolling = true;
-
-                    attempts++;
-                    if(attempts === 1){
-                        this.stopPolling();
-                        resetPollingInterval(5000);
-                    }
-
-                    if (attempts > maxAttempts) {
-                        this.stopPolling();
-                        this.isLoading = false;
-                        console.log(`Reached maximum attempts (${maxAttempts}). Polling stopped.`);
-                        return;
-                    }
-
-                    if(attempts === maxAttempts){
-                        this.fetchJobResult(jobId, true);
-                    }
-                    else{
-                        this.fetchJobResult(jobId);
-                    }
-                };
-
-                // pollJobResult();  // Initial call
-                this.pollingInterval = setInterval(pollJobResult, interval);
-            },
-            stopPolling() {
-                clearInterval(this.pollingInterval);
-                this.pollingInterval = null;
-                this.isPolling = false;
-                this.isFetchingResult = false;
-            },
-            submitJob(url){
-                try {
-                    this.$store.dispatch('crudRequestV2', {endpoint: url, method: 'get'}).then(response => {
-                        let success = response.ok;
-                        response.json().then(response => {
-                            if(!success){return;}
-                            let jobId = response.payload.data.job_id;
-                            if(jobId){
-                                this.startPolling(jobId);
-                            }
-                        });
-                    })
-                } catch (error) {
-                    console.error('Error submitJob', error);
-                }
-            },
-            fetchJobResult(jobId, isLastAttempt = false) {
-                // console.log('fetchJobResult: ', jobId);
-                this.isFetchingResult = true;
-                try {
-                    let anotherEndpoint = route('api.job.fetch', jobId);
-                    if(isLastAttempt){
-                        anotherEndpoint = route('api.job.fetch.last.attempt', jobId, isLastAttempt);
-                    }
-                    this.poll(anotherEndpoint, 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
-                } catch (error) {
-                    console.error('Error fetchJobResult', error);
-                }
-            }
-        },
-        mixins: [requestV2]
-    }
-</script>

resources/assets/vue/components/orders/elements/PackageComponent.vue

@@ -19,7 +19,7 @@
                                     <p class="bold m-b-5 fs-12">{{item.description}}</p>
                                 </div>
                             </div>
-                            <div class="row m-b-10 align-items-center" v-if="$store.getters.isAdmin">
+                            <div class="row m-b-10 align-items-center">
                                 <div class="col-auto">
                                     <p class="no-margin all-caps fs-10 lh-10 light">Reference</p>
                                     <p class="no-margin fs-12">{{item.reference}}</p>
@@ -58,7 +58,7 @@
                                             <small class="fs-10 all-caps muted">Status</small>
                                             <p class="no-margin bold">{{item.container ? item.container.transport.schedule_complete && status === 'Shipping' ? 'Custom Clearance' : status : status}}</p>
                                         </div>
-                                        <div class="col-auto" v-if="$store.getters.isAdmin">
+                                        <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Container</small>
                                             <p class="no-margin bold">{{item.container ? item.container.container_reference : '-'}}</p>
                                         </div>
@@ -66,7 +66,7 @@
                                     <div class="row">
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Warehouse</small>
-                                            <h6 class="no-margin small">{{item.order.warehouse.name}} {{$store.getters.isAdmin ? item.order.warehouse.reference : ''}}</h6>
+                                            <h6 class="no-margin small">{{item.order.warehouse.name}} {{ item.order.warehouse.reference }}</h6>
                                         </div>
                                         <div class="col-auto">
                                             <small class="fs-10 all-caps muted">Delivery Address</small>

resources/assets/vue/components/orders/elements/ParcelComponent.vue

@@ -30,7 +30,7 @@
                             <p class="no-margin all-caps fs-10 light">Est. CBM</p>
                             <p class="no-margin">{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}</p>
                         </div>
-                        <div class="col" v-if="$store.getters.isAdmin">
+                        <div class="col">
                             <p class="no-margin all-caps fs-10 light">Warehouse</p>
                             <p class="no-margin" v-if="item.order">{{item.order.warehouse.reference}}</p>
                             <span class='text-danger' v-if="!item.order">Unclaimed</span>
@@ -75,7 +75,7 @@
                             <p class="no-margin bold text-info fs-12"><a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a></p>
                         </div>
                     </div>
-                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                    <div class="row m-b-5">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Reference</p>
                         </div>

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

@@ -147,11 +147,8 @@
                                     <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" 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>
+                            <div class="row bg-master-lightest p-t-15" v-for="invoice in order.invoices">
+                                <div class="col">
                                     <customer-payments-billing-component :data="invoice" invoice_status="Pending Payment" :section="section"></customer-payments-billing-component>
                                 </div>
                             </div>
@@ -183,16 +180,6 @@
         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: {
@@ -214,36 +201,7 @@
                 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/AdminPaymentsBillingWithSearchComponent.vue

@@ -34,17 +34,11 @@
                     </div>
                 </div>
             </div>
-            <!-- CIEF TODO: For easy revert to old code -->
             <list-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list')" :options="options">
                 <template slot="list" slot-scope="{data}">
                     <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
                 </template>
             </list-component>
-            <!-- <list-polling-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list.job')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
-                </template>
-            </list-polling-component> -->
         </div>
     </div>
 </template>

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

@@ -1,90 +0,0 @@
-<template>
-    <div class="row m-t-20" @keyup.enter="search">
-        <div class="col">
-            <div class="row">
-                <div class="col-12 col-md">
-                    <div class="row m-b-15">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col p-r-0">
-                                    <div class="form-group no-margin form-group-default b-rad-none">
-                                        <label class="text-primary">Order Number Like</label>
-                                        <input type="text" class="form-control" v-model="marking" />
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-auto p-l-0 p-r-0">
-                            <div class="btn btn-primary b-rad-none" @click="search">
-                                <i class="fa fa-search lh-40"></i>
-                            </div>
-                        </div>
-                        <div class="col-auto p-l-0">
-                            <div class="btn btn-secondary b-rad-none" @click="reset">
-                                <i class="fa fa-remove lh-40"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-md">
-                    <div class="row" v-if="with_export">
-                        <div class="col">
-                            <download-billing-with-dates-component :section="section"></download-billing-with-dates-component>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!-- CIEF TODO: For easy revert to old code -->
-            <!-- <list-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
-                </template>
-            </list-component> -->
-            <list-polling-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list.job')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <single-admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></single-admin-payments-billing-component>
-                </template>
-            </list-polling-component>
-        </div>
-    </div>
-</template>
-<script>
-    export default {
-        props: {
-            invoice_status: {
-                type: String,
-                required: true
-            },
-            options: {
-                default () {
-                    return {}
-                }
-            },
-            section:{
-                type: String,
-                required: true
-            },
-            with_export:{
-                type: Boolean,
-                default: false
-            }
-        },
-        data(){
-            return {
-                marking: '',
-                currentKey: 1,
-            }
-        },
-        methods: {
-            search() {
-                this.options['order_marking_in'] = this.marking;
-                this.currentKey+=1;
-            },
-            reset() {
-                this.marking = '';
-                delete(this.options['order_marking_in']);
-                this.currentKey+=1;
-            },
-        },
-    }
-</script>

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

@@ -4,11 +4,19 @@
             <div 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 No</p>
+                            <div> {{ item.bill_no }}</div>
+                        </div>
+                        <div class="col-2">
+                            <p class="no-margin fs-10 all-caps">Reference</p>
+                            <div> {{ item.packing_list_reference }}</div>
+                        </div>
                         <div class="col-2">
                             <p class="no-margin fs-10 all-caps">Invoice Date</p>
                             <div> {{ item.updated_at }}</div>
                         </div>
-                        <div class="col">
+                        <div class="col-2">
                             <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>
@@ -19,7 +27,7 @@
                             <p class="no-margin fs-10 all-caps">Amount</p>
                             <div>MYR {{ item.amount.toFixed(2) }}</div>
                         </div>
-                        <div class="col-3" v-if="item.remarks.length">
+                        <div class="col-2" v-if="item.remarks.length">
                             <p class="no-margin fs-10 all-caps">Billing Question</p>
                             <div>
                                 {{ latestComment.content }}
@@ -31,35 +39,51 @@
                                 <remark-component :section="section" :data="item" module_type="Transaction"></remark-component>
                             </modal-component>
                         </div>
-                        <div class="col-3" v-else>
+                        <!-- <div class="col-2" >
                             <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 class="col-auto p-l-0 p-r-0 d-flex justify-content-center align-items-center">
-                            <div :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>
-                            <modal-component 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 class="col-2">
+                            <div class="row p-l-15">
+                                <div class="col-auto p-l-0 p-r-0 d-flex justify-content-center align-items-center">
+                                    <div :class="[{'invisible': [5, 6, 3].includes(item.status)}]">
+                                        <span class="d-inline-block text-primary bold text-underline pointer requestModal" data-type="billingRemark">Billing Question?</span>
+                                    </div>
+                                    <modal-component 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>
-                            <div v-else>
-                                <div class="btn bg-grey no-border muted invisible">
-                                    <i class="fa fa-file-pdf-o"></i>
+                                <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 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-auto 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>
@@ -111,20 +135,6 @@
                                     </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">
@@ -229,12 +239,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

@@ -1,316 +0,0 @@
-<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="(groupItem, index) in items" class="row bg-master-lightest" v-if="groupItem.groups_payment_attempts.length && groupItem.type == 1 && groupTransactionsExist(items, groupItem.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">
-                                            <single-group-payment-transaction-details-component v-for="group in groupItem.groups_payment_attempts" v-bind:key="group.id" :data="group" :section="section"></single-group-payment-transaction-details-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div v-for="(groupItem, index) in items" class="row bg-master-lightest" v-if="groupItem.groups_payment_expired.length && groupItem.type == 1 && groupTransactionsExist(items, groupItem.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 groupItem.groups_payment_expired" v-bind:key="group.id" :data="group" :section="section"></payment-expired-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div v-for="(groupItem, index) in items" class="row bg-master-lightest" v-if="groupItem.groups_payment_history.length && groupItem.type == 1 && groupTransactionsExist(items, groupItem.groups_payment_history)">
-                                <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">
-                                            <single-group-payment-history-transaction-details-component v-for="group in groupItem.groups_payment_history" v-bind:key="group.id" :data="group" :section="section"></single-group-payment-history-transaction-details-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)" :showManualPayment="true"></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

@@ -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 && item.status != 6" @click="retryPayment()">
+                        <div class="col-auto pointer btn btn-success" v-if="item.payment_method == 5 && item.status != 2" @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 && item.status != 6" data-type="deleteGroupTransaction">
+                        <div class="col-auto requestModal" v-if="item.status != 2" 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"
@@ -75,7 +75,7 @@
                                 <i class="fa fa-repeat fs-20 text-white"></i>
                             </div>
                         </div>
-                        <div class="col-auto" v-if="!['customerGroupPaymentExpiredInvoiceComponent'].includes(section)">
+                        <div class="col-auto">
                             <div class="btn bg-grey no-border" @click="expanded = !expanded">
                                 <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
                             </div>
@@ -83,7 +83,7 @@
                     </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 && !['customerGroupPaymentExpiredInvoiceComponent'].includes(section)">
+            <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="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>
@@ -98,7 +98,7 @@
             selectedInvoice: {
                 type: Array,
                 required: false,
-            },
+            }, 
             section:{
                 type: String,
                 default: null

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

@@ -1,41 +0,0 @@
-<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/PaymentsBillingComponents.vue

@@ -10,6 +10,8 @@
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Invoice No</p>
                             <div>{{ item.bill_no }}</div>
+                            <p class="no-margin fs-10 all-caps">Reference</p>
+                            <div>{{ item.packing_list_reference }}</div>
                         </div>
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Order</p>

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

@@ -1,110 +0,0 @@
-<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/paymentsBilling/elements/SingleAdminPaymentsBillingComponent.vue

@@ -1,322 +0,0 @@
-<template>
-    <div class="row m-b-15 m-l-5 m-r-10 parentContainer">
-        <div class="col bg-white rounded">
-            <div class="row">
-                <div class="col padding-20">
-                    <div class="row align-items-center">
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Marking</p>
-                            <div class="no-margin">
-                                <div v-if="item.order">
-                                    <a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a>/<a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a>
-                                    <p>{{item.loading_days_ago}}</p>
-                                </div>
-                                <div v-else class="text-danger">Unclaimed Packing List</div>
-                            </div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Container</p>
-                            <div v-if="item.container"> {{item.container.container_reference}}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Invoice Date</p>
-                            <div v-if="!item.shipping_transaction">n/a</div>
-                            <div v-if="item.shipping_transaction"> {{ item.shipping_transaction.updated_at }}</div>
-                        </div>
-                        <div class="col">
-                            <div v-if="item.order">
-                                <p class="no-margin fs-10 all-caps">Address</p>
-                                <div>{{ item.order.address.post_code_area}}</div>
-                                <div>{{ item.order.address.district.name +' '+item.order.address.postcode+' '+item.order.address.state.name  }}</div>
-                            </div>
-                            <div v-else class="text-danger">Unclaimed</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Status</p>
-                            <div class="all-caps">{{ invoice_status }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Amount</p>
-                            <div v-if="!item.shipping_transaction">n/a</div>
-                            <div v-if="item.shipping_transaction">MYR  {{ item.shipping_transaction.amount.toFixed(2) }}</div>
-                        </div>
-                        <div class="col-auto p-l-0 p-r-0" v-if="['Pending Payment', 'Paid Invoice', 'Suspended Invoice'].includes(invoice_status)">
-                            <div v-if="item.shipping_transaction">
-                                <div v-if="item.shipping_transaction.documents.length">
-                                    <div v-for="file in item.shipping_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="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>
-                        <div class="col-auto">
-                            <div class="row text-center parentContainer m-b-10" v-if="['Pending Invoice'].includes(invoice_status) && !item.receive_packing_list" >
-                                <div class="col">
-                                    <div class="requestModal pointer btn btn-primary btn-xs" data-type="addWarehouseTransport">
-                                        Add Warehouse Transport
-                                    </div>
-                                    <modal-component class="animate_animated animatefast animate_fadeIn" styleType="fill-in" type="addWarehouseTransport">
-                                        <create-warehouse-transport-form-component :packinglistId="item.id" :section="section"></create-warehouse-transport-form-component>
-                                    </modal-component>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col">
-                                    <div class="btn bg-grey no-border" @click="expanded = !expanded" v-if="['Pending Approval', 'Pending Payment'].includes(invoice_status)">
-                                        <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
-                                    </div>
-                                    <div v-if="!item.shipping_transaction">
-                                        <div v-if="item.order">
-                                            <div v-if="!item.order.company_module.billingAddress">
-                                                <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 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">
-                                                    <declare-postcode-area-form-component :data="item.order.address" :section="section"></declare-postcode-area-form-component>
-                                                </modal-component>
-                                            </div>
-                                            <div v-if="item.order.company_module.billingAddress && item.order.address.post_code_area" class="btn btn-outline-primary btn-lg pointer" @click="generateInvoice()">Generate Invoice</div>
-                                        </div>
-                                        <div v-else>
-                                            <div class="btn btn-outline-primary btn-lg pointer invisible">Generate Invoice</div>
-                                        </div>
-                                    </div>
-                                    <div class="btn bg-grey no-border muted requestModal" v-if="item.shipping_transaction && invoice_status == 'Pending Approval'" data-type="confirmInvoice">
-                                        <i class="fa fa-check fs-12"></i>
-                                    </div>
-                                    <div class="btn bg-grey no-border muted requestModal" v-if="item.shipping_transaction && invoice_status == 'Pending Approval'" data-type="deleteInoive">
-                                        <i class="fa fa-close fs-12"></i>
-                                    </div>
-                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="confirmInvoice">
-                                        <approve-shipping-invoice-form-component :section="section" :data="data"></approve-shipping-invoice-form-component>
-                                    </modal-component>
-                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteInoive">
-                                        <delete-shipping-invoice-form-component :section="section" :data="data"></delete-shipping-invoice-form-component>
-                                    </modal-component>
-                                </div>
-                            </div>
-                        </div>
-                    </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.shipping_transaction && ['Pending Approval', 'Suspended Invoice'].includes(invoice_status)">
-                <div class="col p-b-10">
-                    <div class="row">
-                        <div class="col p-l-20 p-r-20 p-t-10 p-b-10">
-                            <div class="row align-items-center">
-                                <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Container Reference</p>
-                                    <div v-if="item.packages.length">{{ item.container ? item.container.container_reference : 'n/a' }}</div>
-                                    <div v-else>n/a</div>
-                                </div>
-                                <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Due Date</p>
-                                    <div v-if="item.packages.length">
-                                        <div v-if="item.container">
-                                            <div v-if="item.container.transport">{{ item.container.transport.drop_date == null ? item.container.transport.current_schedule.etd : item.container.transport.drop_date }}</div>
-                                            <div v-else>n/a</div>
-                                        </div>
-                                        <div v-else>n/a</div>
-                                    </div>
-                                    <div v-else>n/a</div>
-                                </div>
-                                <!-- <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Paid Date</p>
-                                    <div>n/a</div>
-                                </div> -->
-                                <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Total CBM</p>
-                                    <div>{{ (parseFloat(cbm) + parseFloat(overweight)).toFixed(3) }}</div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <h5 class="text-underline text-center">Invoice Details</h5>
-                    <invoice-items-form-component :data="item.shipping_transaction" :section="section"></invoice-items-form-component>
-
-                    <div class="row">
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Subtotal</p>
-                            <div>{{ item.shipping_transaction.amount -  item.shipping_transaction.service_charge - item.shipping_transaction.tax }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Service Charges</p>
-                            <div>{{ item.shipping_transaction.service_charge }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Tax</p>
-                            <div>{{ item.shipping_transaction.tax }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Total</p>
-                            <div>{{ item.shipping_transaction.amount }}</div>
-                        </div>
-                    </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.shipping_transaction && invoice_status == 'Pending Payment'">
-                <div class="col-12 col-md-7 padding-20">
-                    <div class="row bg-master-lightest h-100">
-                        <div class="col">
-                            <div class="row bg-master-lightest" v-if="item.shipping_transaction.payment_attempts.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 Attempt</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <shipping-transaction-component v-for="item in item.shipping_transaction.payment_attempts" v-bind:key="item.id" :data="item" ></shipping-transaction-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row bg-master-lightest" v-if="item.shipping_transaction.payment_history.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 History</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <payment-history-component v-for="item in item.shipping_transaction.payment_history" v-bind:key="item.id" :data="item" ></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((item.shipping_transaction.amount + 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 hide">
-                                        <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((item.shipping_transaction.paid_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
-                                            <div class="font-heading fs-12">Paid Total</div>
-                                        </div>
-                                    </div>
-                                    <div class="row align-items-end m-b-10 hide">
-                                        <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((item.shipping_transaction.floating_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
-                                            <div class="font-heading fs-12">Floating Amount</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((item.shipping_transaction.outstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
-                                        </div>
-                                    </div>
-                                    <div class="row m-t-20" v-if="item.shipping_transaction.outstanding > 0">
-                                        <div class="col">
-                                            <div class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="makePayment">Make Payment</div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="makePayment">
-                                <payment-form-component :data="item.shipping_transaction" :section="section"></payment-form-component>
-                            </modal-component>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import componentHandler from '../../../general/mixins/componentHandler';
-    export default {
-        props: {
-            invoice_status: {
-                type: String,
-                required: true
-            },
-            section:{
-                type: String,
-                required: true
-            }
-        },
-        data(){
-            return {
-                parameters: {
-                    packing_list_id: null,
-                    transaction_details: [],
-                },
-                expanded: false,
-            }
-        },
-        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)
-            }
-        },
-        created(){
-            this.parameters.packing_list_id = this.data.id;
-        },
-        methods: {
-            generateInvoice() {
-                this.submit(this.route('api.transaction.invoice.create'), 'post', this.section, true, true);
-            },
-            successHandler(response){
-                this.item = response.payload.data;
-                this.updateList();
-            }
-        },
-        mixins: [componentHandler]
-    }
-</script>

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

@@ -1,73 +0,0 @@
-<template>
-    <div class="row m-l-0 m-b-10 m-r-0 parentContainer">
-        <div class="col-auto bg-master-lighter requestModal pointer" data-type="deleteAttempt">
-            <div class="row align-items-center h-100">
-                <div class="col">
-                    <i class="fa fa-times muted"></i>
-                </div>
-            </div>
-        </div>
-        <div class="col bg-white p-t-10 p-b-10 p-r-0">
-            <div class="row m-b-5">
-                <div class="col-auto">
-                    <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
-                    <div class="font-heading fs-10 bold">
-                        MYR {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-auto p-l-5 p-r-5 bg-success pointer" v-if="item.payment_method === 5">
-            <a :href="route('billplz.bill', item.payment_reference)">
-                <div class="row align-items-center h-100">
-                    <div class="col">
-                        <i class="fa fa-repeat fs-20 text-white p-l-10 p-r-10"></i>
-                    </div>
-                </div>
-            </a>
-        </div>
-        <div class="col-auto p-l-5 p-r-5 bg-success requestModal pointer" v-if="item.payment_method !== 5" data-type="paymentProofModal">
-            <div @click="selectedID(item.payment_transaction.id)" class="row align-items-center h-100">
-                <div class="col">
-                    <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>
-        </div>
-        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteAttempt">
-            <delete-payment-attempt-form-component :data="item" :section="section" class="text-center"></delete-payment-attempt-form-component>
-        </modal-component>
-        <modal-component type="paymentProofModal">
-            <payment-verification-form-component v-if="selected_id === item.payment_transaction.id" :section="section" :data="item"></payment-verification-form-component>
-        </modal-component>
-    </div>
-</template>
-
-<script>
-    import componentHandler from '../../../general/mixins/componentHandler';
-    export default {
-        data(){
-            return {
-                expandPaymentDetails: false,
-                amount: (Math.round(1000 * 100) / 100).toFixed(2),
-                selected_id: '',
-                parameters: {
-                    amount: (Math.round(1000 * 100) / 100).toFixed(2),
-                    bank_id: 1
-                },
-                section: 'bookingDetailSection',
-            }
-        },
-        mounted() {
-            this.item.id = this.item.payment_transaction.id;
-        },
-        methods: {
-            clickExpand(){
-                this.expandPaymentDetails = !this.expandPaymentDetails;
-            },
-            selectedID(id){
-                this.selected_id = id;
-            }
-        },
-        mixins: [componentHandler]
-    }
-</script>

resources/assets/vue/components/paymentsBilling/forms/GroupPaymentFormComponent.vue

@@ -55,7 +55,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div v-if="$store.getters.isSuperAdmin | showManualPayment">
+                                            <div v-if="$store.getters.isSuperAdmin">
                                                 <div class="row m-t-10 m-b-10">
                                                     <div class="col text-center"><div id="expend-method" class="padding-10 bg-master-lightest pointer" @click="$store.dispatch('toggleSection', {name: 'otherPaymentMethods', status: !$store.getters.isShowing('otherPaymentMethods')})"><i class="fa m-r-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i>{{$store.getters.isShowing('otherPaymentMethods') ? 'Hide' : 'Show'}} Alternative Methods <i class="fa m-l-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i></div></div>
                                                 </div>
@@ -94,7 +94,7 @@
                                                 <div class="row m-t-10" v-if="paymentMethod.id === 'cash'">
                                                     <div class="col">
                                                         <div class="row m-b-25" >
-                                                            <div class="col">
+                                                            <div class="col">   
                                                                 <div class="font-heading fs-11">You can proceed by bank in <span class="text-success bold">{{(Math.round((parseFloat(parameters.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR</span> to the bank account detailed below and upload your payment proof to proceed with your transfer after clicking on the proceed button below.</div>
                                                             </div>
                                                         </div>
@@ -128,7 +128,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-
+                                           
                                         </div>
                                     </div>
                                 </div>
@@ -164,16 +164,12 @@
             },
             company_module_id: {
                 type: Number,
-                // required: true,
+                required: true,
             },
             selectedIds: {
                 type: Array,
                 required: true,
             },
-            showManualPayment: {
-                type: Boolean,
-                default: false
-            },
         },
         data(){
             return {
@@ -215,7 +211,7 @@
             },
             successHandler(response){
                 // todo-new: when using the page reload, the section reload will auto refresh with new data and refresh again
-                // however if dont use the page reload, then the section will refresh with old data
+                // however if dont use the page reload, then the section will refresh with old data 
                 // if (response.payload) {
                 //     if (response.payload.data.payment_method === 5) {
                 //         window.location.href = this.route('billplz.bill', response.payload.data.reference) + '?auto_submit=true';

resources/assets/vue/components/paymentsBilling/sections/AdminPaymentsBillingSectionComponent.vue

@@ -6,7 +6,7 @@
                     <div class="row justify-content-end">
                         <div class="col">
                             <div class="row fs-12 text-center">
-                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" :class="{'active': item ? item.status === 2 : true }" tab-name="pendingInvoice" @click="setActiveTab($event)">
+                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" :class="{'active': item ? item.status === 2 : true }" tab-name="pendingInvoice">
                                     <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"
@@ -29,7 +29,7 @@
                     <div class="row justify-content-end">
                         <div class="col">
                             <div class="row fs-12 text-center">
-                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" tab-name="pendingApproval" @click="setActiveTab($event)">
+                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" tab-name="pendingApproval">
                                     <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"
@@ -52,7 +52,7 @@
                     <div class="row justify-content-end">
                         <div class="col">
                             <div class="row fs-12 text-center">
-                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" tab-name="pendingPayment" @click="setActiveTab($event)">
+                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" tab-name="pendingPayment">
                                     <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"
@@ -78,7 +78,7 @@
                     <div class="row justify-content-end">
                         <div class="col">
                             <div class="row fs-12 text-center">
-                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="paidInvoice" @click="setActiveTab($event)">
+                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="paidInvoice">
                                     <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"
@@ -100,23 +100,23 @@
             </div>
             <div class="row no-margin">
                 <div class="col bg-master-lightest p-1 p-sm-4">
-                    <div class="row tabsContainer tabContent" tab-name="pendingInvoice" v-if="isActiveTab('pendingInvoice') || showTabContent('pendingInvoice')">
+                    <div class="row tabsContainer tabContent" tab-name="pendingInvoice">
                         <div class="col">
                             <admin-payments-billing-with-search-component :options="{does_not_have_transaction_type: 1, type: 2, per_page: 5}" section="pendingInvoiceSection" invoice_status="Pending Invoice"></admin-payments-billing-with-search-component>
                         </div>
                     </div>
-                    <div class="row tabsContainer tabContent hide" tab-name="pendingApproval" v-if="isActiveTab('pendingApproval') || showTabContent('pendingApproval')">
+                    <div class="row tabsContainer tabContent hide" tab-name="pendingApproval">
                         <div class="col">
                             <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [0, 1], per_page: 5}" section="pendingApprovalSection" invoice_status="Pending Approval"></admin-payments-billing-with-search-component>
                         </div>
                     </div>
-                    <div class="row tabsContainer tabContent hide" tab-name="pendingPayment" v-if="isActiveTab('pendingPayment') || showTabContent('pendingPayment')">
+                    <div class="row tabsContainer tabContent hide" tab-name="pendingPayment">
                         <div class="col">
                             <payment-filter-component :endpoint="route('api.packing_list.list')" :data="data"></payment-filter-component>
                             <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [2], packing_list_ordered_by_invoice_date: true, per_page: 5}" section="pendingPaymentSection" invoice_status="Pending Payment" :with_export="true"></admin-payments-billing-with-search-component>
                         </div>
                     </div>
-                    <div class="row tabsContainer tabContent hide" tab-name="paidInvoice" v-if="isActiveTab('paidInvoice') || showTabContent('paidInvoice')">
+                    <div class="row tabsContainer tabContent hide" tab-name="paidInvoice">
                         <div class="col">
                             <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [3], per_page: 5}" section="paidInvoiceSection" invoice_status="Paid Invoice" :with_export="true"></admin-payments-billing-with-search-component>
                         </div>
@@ -128,14 +128,7 @@
 </template>
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
-    import tabHandler from '../../../general/mixins/tabHandler';
     export default {
-        data() {
-            return {
-                activeTab: 'pendingInvoice',
-                displayedTabs: ['pendingInvoice'],
-            };
-        },
-        mixins: [componentHandler, tabHandler]
+        mixins: [componentHandler]
     }
 </script>

resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="row m-b-15 parentContainer" :class="{'d-none': searchValue != data.postcode && searchValue != ''}">
+    <div class="row m-b-15 parentContainer">
         <div class="col">
             <div class="row align-items-center">
                 <div class="col-auto p-r-0">
@@ -55,10 +55,6 @@
                 type: Object,
                 required: false
             },
-            searchValue: {
-                type: String,
-                default: null
-            },
             section: {
                 default: ''
             },