code update

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::channel('vue_polling')->info(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/PackingListLimitOneByTypeOrderedByInvoiceDate.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\PackingList;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\DB;
-
-class PackingListLimitOneByTypeOrderedByInvoiceDate implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->select('packing_lists.*')->join('transactions', function($join){
-            $join->on('transactions.owner_id', '=', 'packing_lists.id');
-            $join->where('transactions.owner_type', '=', PackingList::class);
-            $join->where('transactions.status', '=', ApprovalStatus::APPROVED);
-            $join->whereRaw('(transactions.type <> 16 OR transactions.id = (
-                SELECT id FROM transactions WHERE owner_id = packing_lists.id AND type = 16 LIMIT 1
-            ))');
-        })->orderBy('transactions.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,23 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Log;
-
-class WithContainersPackages implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        // Log::info('WithContainersPackages: '.$value);
-        // return $builder->with(['containers', 'packages']);
-        return null;
-    }
-}

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/Jobs/UpdatePerfexCRMInvoice.php

@@ -47,7 +47,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
         $invoiceId = 0;
         $invoiceStatus = 0;
         $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-        Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
+        Log::error('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
 
         if(is_null($invoice)){
             $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
@@ -55,7 +55,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                 $invoiceId = $result->payload['id'];
             } else {
                 // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
-                Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+                Helper::debugLogger('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
             }
         }
         else{

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

@@ -145,7 +145,7 @@ class CallbackBillplzLogic
                     $pL = $invoice->owner;
                     $order = $pL->owner;
                     if($order){
-                        $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                        $this->storageInvoiceTransactionProcessor->executeOrder($order, false); //original was set true here so that no group is soft deleted or billplz bill got deleted
                     }
                 }
             }

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

@@ -80,13 +80,12 @@ class CallbackBillplzProcessor
             if ($group) {
                 foreach ($group->groupTransactions as $groupTransaction) {
                     $invoice = $groupTransaction->transaction;
-                    if($invoice->status !== ApprovalStatus::COMPLETED){
-                        $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
 
-                        if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
-                            $pL = $invoice->owner;
-                            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
-                        }
+                    $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
+
+                    if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                        $pL = $invoice->owner;
+                        $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
                     }
                 }
 
@@ -112,9 +111,7 @@ class CallbackBillplzProcessor
 
             foreach ($group->groupTransactions as $groupTransaction) {
                 $invoice = $groupTransaction->transaction;
-                if($invoice->status !== ApprovalStatus::COMPLETED){
-                    $totalAmountToBePaid += $invoice->amount;
-                }
+                $totalAmountToBePaid += $invoice->amount;
             }
 
             if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){

app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyCreditTermStatusLogic.php

@@ -1,121 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleIsCreditTerm;
-use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompanyModule;
-use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionIsWaived;
-use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-class UpdateCompanyCreditTermStatusLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Update Company Credit Term Status',
-            'message' => 'You have successfully updated Company Credit Term Status'
-        ];
-    }
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var UpdatesCompanyModuleIsCreditTerm */
-    private $updatesCompanyModuleIsCreditTerm;
-
-    /** @var CanUpdateCompanyModule */
-    private $canUpdateCompanyModule;
-
-    /** @var ListsTransactions */
-    private $listsTransactions;
-
-    /** @var UpdatesTransactionIsWaived */
-    private $updatesTransactionIsWaived;
-
-    /** @var CheckStorageInvoiceTransactionProcessor */
-    private $storageInvoiceTransactionProcessor;
-
-
-
-    /**
-     * UpdateCompanyCreditTermStatusLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param UpdatesCompanyModuleIsCreditTerm $updatesCompanyModuleIsCreditTerm
-     * @param CanUpdateCompanyModule $canUpdateCompanyModule
-     * @param UpdatesTransactionIsWaived $updatesTransactionIsWaived
-     * @param ListsTransactions $listsTransactions
-     * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor
-     */
-    public function __construct(FetchesCompany $fetchesCompany, UpdatesCompanyModuleIsCreditTerm $updatesCompanyModuleIsCreditTerm, CanUpdateCompanyModule $canUpdateCompanyModule, UpdatesTransactionIsWaived $updatesTransactionIsWaived, ListsTransactions $listsTransactions, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->updatesCompanyModuleIsCreditTerm = $updatesCompanyModuleIsCreditTerm;
-        $this->canUpdateCompanyModule = $canUpdateCompanyModule;
-        $this->listsTransactions = $listsTransactions;
-        $this->updatesTransactionIsWaived = $updatesTransactionIsWaived;
-        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
-    }
-
-    /**
-     * @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
-    {
-        $this->canUpdateCompanyModule->passes();
-
-        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-        $companyModule = $company->companyModules()->first();
-        $isCreditTerm = $companyModule->connections()->first()->is_credit_term;
-
-        if ($isCreditTerm == 1) {
-            $isCreditTerm = 0;
-        } else {
-            $isCreditTerm = 1;
-        }
-
-        if($isCreditTerm === 1){
-            //{"per_page":10,"order_by":{"column":"id","DESC":true},"status_in":[2],"receiver":190,"type_in":[1],"does_not_have_payment_status_in":[0,1],"does_not_have_groups":1,"check_for_storage_invoice":1}
-
-            $filters = [
-                'status_in' => [2],
-                'receiver' =>  $companyModule->id,
-                'type_in' => [TransactionType::STORAGE_INVOICE]
-            ];
-
-            $transactions = $this->listsTransactions->execute($filters);
-            foreach($transactions as $transaction){
-                $this->updatesTransactionIsWaived->execute($transaction);
-                $packingList = $transaction->owner()->first();
-                if($packingList){
-                    $order = $packingList->owner()->first();
-                    if($order instanceof Order){
-                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
-                    }
-                }
-            }
-        }
-
-        $this->updatesCompanyModuleIsCreditTerm->execute($company->companyModules()->first()->connections()->first(), $isCreditTerm);
-        Log::info(Auth::user()->email." updated credit term status for customer with id: " .$request->route('id'). " to status " . $isCreditTerm);
-
-        $result = ['is_credit_term' => $isCreditTerm];
-        return $this->response(['data' => $result]);
-    }
-}

app/Classes/Modules/Companies/Services/UpdatesCompanyModuleIsCreditTerm.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\CompanyConnection;
-
-class UpdatesCompanyModuleIsCreditTerm extends AbstractUpdateRecord
-{
-
-    /**
-     * @param CompanyConnection $model
-     * @param int $isCreditTerm
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CompanyConnection $model, int $isCreditTerm)
-    {
-        $model->is_credit_term = $isCreditTerm;
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Companies/Standards/Rules/CanUpdateCompanyModule.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-
-class CanUpdateCompanyModule extends AbstractRule
-{
-
-    /**
-     * CanUpdateCompanyModule constructor.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized($object): bool
-    {
-        $user = Auth()->user();
-        if($user){
-            $roleToCheck = Auth()->user()->type;
-            if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param CompanyObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}

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

@@ -70,31 +70,15 @@ class ExportsCustomersWalletTransactionHistory implements FromQuery, WithHeading
                 $description = 'Credit Voucher for ' . $transaction->payment_reference;
                 break;
             case TransactionType::PAYMENT:
-                $payment = Transaction::where('payment_reference', $transaction->bill_no)->first();
-                if (!$payment) {
-                    $description = 'Payment not found, please contact tech support.';
+                $booking = Transaction::where('payment_reference', $transaction->bill_no)->first()->owner;
+
+                if (!$booking) {
+                    $description = 'Payment for unknown booking, please contact tech support.';
                     break;
                 }
 
-                $invoice = $payment->owner;
-                if (!$invoice) {
-                    $description = 'Invoice not found, please contact tech support.';
-                    break;
-                }
-
-                $packingList = $invoice->owner;
-                if (!$packingList) {
-                    $description = 'Packing List not found, please contact tech support.';
-                    break;
-                }
-
-                $order = $packingList->owner;
-                if (!$order) {
-                    $description = 'Order not found, please contact tech support.';
-                    break;
-                }
-
-                $description = 'Payment For booking refs ' . $order->reference;
+                $marking = $booking->marking;
+                $description = 'Payment For booking refs' . $marking;
                 break;
             case TransactionType::DEBIT_NOTE:
                 $description = 'Debit Voucher for ' . $transaction->payment_reference;

app/Classes/Modules/Imports/Services/GenericImport.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Imports\Services;
-
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Illuminate\Support\Collection;
-use Maatwebsite\Excel\Concerns\ToCollection;
-
-
-class GenericImport implements ToCollection, WithHeadingRow
-{
-    function headingRow(): int { return 1; }
-
-    public $rows;
-
-    /**
-     * @param Collection $collection
-     */
-    public function collection(Collection $collection)
-    {
-        $this->rows = $collection;
-    }
-}

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/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/ControllersLogic/ListPackingListsLogic.php

@@ -6,8 +6,8 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanListPackingLists;
+use App\Http\Resources\PackingListNullOrderResource;
 use App\Http\Resources\PackingListResource;
-use App\Http\Resources\PackingListWithStorageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -54,14 +54,7 @@ class ListPackingListsLogic extends AbstractControllerLogic
 
         $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
 
-        if($request->input('storages')){
-            foreach ($query->items() as $item) {
-                $item['storages'] = $request->input('storages');
-            }
-            return $this->collectionResponse(PackingListWithStorageResource::collection($query));
-        }
-        else{
-            return $this->collectionResponse(PackingListResource::collection($query));
-        }
+        return $this->collectionResponse(PackingListResource::collection($query));
     }
+
 }

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

@@ -1,87 +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\Middleware\CheckForStorageInvoiceByPackingLists;
-use App\Http\Resources\ListPackingListJobResource;
-use App\Http\Resources\ListPackingListDetailsJobResource;
-use App\Http\Resources\ListPackingListJobWithStorageResource;
-use Illuminate\Support\Facades\Log;
-
-class ListPackingListsJobProcessor
-{
-
-    /** @var ListsPackingLists */
-    private $listsPackingLists;
-
-    /** @var UpdateJobResultProcessor */
-    private $updateJobResultProcessor;
-
-    /** @var CheckForStorageInvoiceByPackingLists */
-    private $checkForStorageInvoiceByPackingLists;
-
-    /**
-     * ListPackingListsJobProcessor constructor.
-     * @param ListsPackingLists $listsPackingLists
-     * @param UpdateJobResultProcessor $updateJobResultProcessor
-     */
-    public function __construct(ListsPackingLists $listsPackingLists, UpdateJobResultProcessor $updateJobResultProcessor, CheckForStorageInvoiceByPackingLists $checkForStorageInvoiceByPackingLists)
-    {
-        $this->listsPackingLists = $listsPackingLists;
-        $this->updateJobResultProcessor = $updateJobResultProcessor;
-        $this->checkForStorageInvoiceByPackingLists = $checkForStorageInvoiceByPackingLists;
-    }
-
-    /**
-     * @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($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
-        // $query = $this->listsPackingLists->execute(array_merge($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]));
-
-        $filtersArray = json_decode($listGenericJobObject->getPayload()['filters'], true);
-
-        $storages = [];
-        if(isset($filtersArray['check_for_storage_invoice']))
-        {
-            $myRequest = new \Illuminate\Http\Request();
-            $myRequest->setMethod('POST');
-            $myRequest->request->add($listGenericJobObject->getPayload());
-            $next = function ($request) {
-                return $request;
-            };
-
-            $response = $this->checkForStorageInvoiceByPackingLists->handle($myRequest, $next);
-            $storages = $response->input('storages');
-        }
-
-        foreach ($query->items() as &$item) {
-            $item['userInfo'] = $listGenericJobObject->getUserInfo();
-            $item['storages'] = $storages;
-        }
-
-        if(isset($filtersArray['does_not_have_transaction_type'])){ //For Payment and Billing page > Pending Invoice tab
-            $resultCurrent = Helper::collectionResponse(ListPackingListDetailsJobResource::collection($query));
-            $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-        }
-        else{
-            if($storages){ //For Payment and Billing page > Pending Payment tab, Paid Invoice tab
-                $resultCurrent = Helper::collectionResponse(ListPackingListJobWithStorageResource::collection($query));
-                $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-            }
-            else{
-                $resultCurrent = Helper::collectionResponse(ListPackingListJobResource::collection($query));
-                $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-            }
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php

@@ -61,7 +61,7 @@ class FetchPerfexCRMInvoiceProcessor
                 $invoiceId = $result->payload['id'];
             } else {
                 $log['message'] = 'FetchPerfexCRMInvoiceProcessor failed for transaction > bill_no: '.$number;
-                Log::channel('perfex_crm')->info($log);
+                Helper::debugLogger($log);
             }
         }
         else{

app/Classes/Modules/PerfexCRM/Services/ConvertsPerfexCRMLeadToCustomer.php

@@ -25,7 +25,7 @@ class ConvertsPerfexCRMLeadToCustomer
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('ConvertsPerfexCRMLeadToCustomer: '.$response);
+                Log::error('ConvertsPerfexCRMLeadToCustomer: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomer.php

@@ -28,7 +28,7 @@ class CreatesPerfexCRMCustomer
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMCustomer: '.$response);
+                Log::error('CreatesPerfexCRMCustomer: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerContact.php

@@ -35,7 +35,7 @@ class CreatesPerfexCRMCustomerContact
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMCustomerContact: '.$response);
+                Log::error('CreatesPerfexCRMCustomerContact: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerProject.php

@@ -34,7 +34,7 @@ class CreatesPerfexCRMCustomerProject
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMCustomerProject: '.$response);
+                Log::error('CreatesPerfexCRMCustomerProject: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoice.php

@@ -54,7 +54,7 @@ class CreatesPerfexCRMInvoice
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMInvoice: '.$response);
+                Log::error('CreatesPerfexCRMInvoice: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoicePayment.php

@@ -34,7 +34,7 @@ class CreatesPerfexCRMInvoicePayment
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMInvoicePayment: '.$response);
+                Log::error('CreatesPerfexCRMInvoicePayment: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMLead.php

@@ -41,7 +41,7 @@ class CreatesPerfexCRMLead
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMLead: '.$response);
+                Log::error('CreatesPerfexCRMLead: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMMilestone.php

@@ -37,7 +37,7 @@ class CreatesPerfexCRMMilestone
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMMilestone: '.$response);
+                Log::error('CreatesPerfexCRMMilestone: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMSupportTicket.php

@@ -34,7 +34,7 @@ class CreatesPerfexCRMSupportTicket
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info($response);
+                Log::error($response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php

@@ -58,7 +58,7 @@ class CreatesPerfexCRMTask
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('CreatesPerfexCRMTask: '.$response);
+                Log::error('CreatesPerfexCRMTask: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php

@@ -25,7 +25,7 @@ class FetchesPerfexCRMCustomer
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMCustomer: '.$response);
+                Log::error('FetchesPerfexCRMCustomer: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMInvoice.php

@@ -27,7 +27,7 @@ class FetchesPerfexCRMInvoice
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMInvoice: '.$response);
+                Log::error('FetchesPerfexCRMInvoice: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMLead.php

@@ -25,7 +25,7 @@ class FetchesPerfexCRMLead
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMLead: '.$response);
+                Log::error('FetchesPerfexCRMLead: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMMilestone.php

@@ -31,7 +31,7 @@ class FetchesPerfexCRMMilestone
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMMilestone: '.$response);
+                Log::error('FetchesPerfexCRMMilestone: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMProject.php

@@ -31,7 +31,7 @@ class FetchesPerfexCRMProject
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('FetchesPerfexCRMProject: '.$response);
+                Log::error('FetchesPerfexCRMProject: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php

@@ -45,7 +45,7 @@ class FetchesPerfexCRMTask
 
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info($response);
+                Helper::debugLogger($response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php

@@ -39,7 +39,7 @@ class UpdatesPerfexCRMCustomer
                 $data = $response->json();
                 return (object) $data;
             }else{
-                // Log::channel('perfex_crm')->info($response);
+                // Helper::debugLogger($response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMInvoice.php

@@ -61,7 +61,7 @@ class UpdatesPerfexCRMInvoice
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('UpdatesPerfexCRMInvoice: '.$response);
+                Log::error('UpdatesPerfexCRMInvoice: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMLead.php

@@ -42,7 +42,7 @@ class UpdatesPerfexCRMLead
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('UpdatesPerfexCRMLead: '.$response);
+                Log::error('UpdatesPerfexCRMLead: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMProject.php

@@ -34,7 +34,7 @@ class UpdatesPerfexCRMProject
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('UpdatesPerfexCRMProject: '.$response);
+                Log::error('UpdatesPerfexCRMProject: '.$response);
                 return null;
             }
         }

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php

@@ -39,7 +39,7 @@ class UpdatesPerfexCRMTask
                 $data = $response->json();
                 return (object) $data;
             }else{
-                Log::channel('perfex_crm')->info('UpdatesPerfexCRMTask: '.$response);
+                Log::error('UpdatesPerfexCRMTask: '.$response);
                 return null;
             }
         }

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

@@ -82,35 +82,16 @@ class CreateGroupsLogic extends AbstractControllerLogic
 
     public function logic(Request $request) : JsonResponse
     {
+        $payment_method     = PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')];
+        $groupPyamentStatus = ApprovalStatus::PENDING_VERIFICATION;
+
         $invoice_ids    = json_decode($request->route('transaction_ids'));
+        $billNumber     = $this->generatesTransactionBillNumber->execute('PYMT-');
 
         // todo-new: check why is this not working
         // $invoices = $this->fetchesTransaction->execute(['id_in' => $invoice_ids]);
         $invoices       = Transaction::whereIn('id', $invoice_ids)->get();
-        $isInvoicesApprove = $this->checkIfInvoicesAreApprove($invoices);
-        if(!$isInvoicesApprove){
-            $response =  ['message' => 'One of the transactions might be suspended; please check if there are any disputes in progress.'];
-            return $this->response(['data' => $response]);
-        }
-        else{
-            $paymentMethodStr = $request->input('payment_method');
-            $paymentMethod     = PaymentMethodType::PAYMENT_METHODS[$paymentMethodStr];
-            $amount = $request->input('amount');
-            $bankCode = $request->input('bank_code');
-            $result = $this->processInvoices($invoices, $paymentMethodStr, $amount, $bankCode);
 
-            if ($paymentMethod === PaymentMethodType::PAYMENT_GATEWAY) {
-                return $this->resourceResponse(new WalletTransactionResource($result));
-            }
-        }
-        return $this->response([]);
-    }
-
-    private function processInvoices($invoices, $reqPaymentMethod, $reqAmount, $reqBankCode){
-        $result = [];
-        $payment_method     = PaymentMethodType::PAYMENT_METHODS[$reqPaymentMethod];
-        $groupPyamentStatus = ApprovalStatus::PENDING_VERIFICATION;
-        $billNumber     = $this->generatesTransactionBillNumber->execute('PYMT-');
         foreach ($invoices as $invoice) {
             $order = null;
             if ($invoice->owner instanceof Transaction) {
@@ -137,7 +118,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
             $wallet = Wallet::where('owner_id', $companyModuleId)->first();
 
             // todo-new: verify currently checking wallet amount based on 'amount' value passed by frontend
-            if((float) number_format(($wallet->amount - $reqAmount),2) < 0){
+            if((float) number_format(($wallet->amount - $request->input('amount')),2) < 0){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 
@@ -173,7 +154,7 @@ class CreateGroupsLogic extends AbstractControllerLogic
 
         foreach ($invoices as $invoice) {
             if ($payment_method == PaymentMethodType::WALLET) {
-                $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $reqBankCode, false);
+                $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, $request->input('bank_code'), false);
 
                 if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
                     $pL = $invoice->owner;
@@ -200,12 +181,11 @@ class CreateGroupsLogic extends AbstractControllerLogic
 
         if (in_array($payment_method, [PaymentMethodType::PAYMENT_GATEWAY, PaymentMethodType::CASH])) {
             // create only one billplz payment for wallet top up
-            $amount = floatval(str_replace(',', '', $reqAmount));
+            $amount = floatval(str_replace(',', '', $request->input('amount')));
             $companyModuleId = $invoice->receiver;
             $companyModule = $this->fetchesCompanyModule->execute(['id' => $companyModuleId]);
 
-            $topUpTransaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $reqBankCode, $payment_method, $billNumber, true);
-            $result = $topUpTransaction;
+            $topUpTransaction = $this->createWalletTopUpTransactionProcessor->execute($companyModule, $amount, $request->input('bank_code'), $payment_method, $billNumber, true);
         }
 
         $group->issuer                  = $issuer;
@@ -221,15 +201,11 @@ class CreateGroupsLogic extends AbstractControllerLogic
         $group->status                  = $groupPyamentStatus;
         $group->save();
 
-        return $result;
-    }
+        if ($payment_method === PaymentMethodType::PAYMENT_GATEWAY) {
+            return $this->resourceResponse(new WalletTransactionResource($topUpTransaction));
 
-    private function checkIfInvoicesAreApprove($invoices){
-        foreach ($invoices as $invoice) {
-            if($invoice->status !== ApprovalStatus::APPROVED && $invoice->status !== ApprovalStatus::COMPLETED){
-                return false;
-            }
+        } else {
+            return $this->response([]);
         }
-        return true;
     }
 }

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

@@ -52,18 +52,28 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
 
         $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->input('transaction_id')]);
 
-        if($invoice_transaction->status === ApprovalStatus::APPROVED){
-            $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'), false);
+        $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);
-            }
-            return $this->resourceResponse(new TransactionResource($payment_transaction));
+        if($payment_transaction && $payment_transaction->status == ApprovalStatus::APPROVED){
+            $pL = $invoice_transaction->owner;
+            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice_transaction);
         }
 
-        $response =  ['message' => 'A transaction might be suspended; please check if there is any dispute in progress.'];
-        return $this->response(['data' => $response]);
+        //cief todo: at exchange there is a transition step - starts
+        // if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
+        //     $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
+        // }
+
+        // if(config('perfexcrm.is_enabled') == 'true'){
+        //     $this->transactionToPerfexCRMV2Processor->execute($transaction, $status);
+        // }
+
+        //To use
+        //ApprovalStatus::PENDING_VERIFICATION;
+        //use this to trigger  $this->transactionToPerfexCRMV2Processor->execute > defineTasks > defineTasks_handlePendingVerificationStatus > definePaymentTasks
+        //cief todo: at exchange there is a transition step - ends
+
+        return $this->resourceResponse(new TransactionResource($payment_transaction));
     }
 
 

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

@@ -48,8 +48,6 @@ class DeleteGroupLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        ini_set('memory_limit', '-1'); 
-
         $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
 
         foreach ($group->groupTransactions as $groupTransaction) {

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

@@ -1,90 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\General\Eloquent\Filters\PaymentMethod;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\Modules\Transactions\Services\FetchesGroup;
-use App\Classes\Modules\Transactions\Services\DeletesTransaction;
-use App\Classes\Modules\Transactions\Services\DeletesGroup;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-
-class DeletePaidGroupLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Delete Paid Group Transaction',
-            'message' => 'You have successfully deleted this Group Transaction'
-        ];
-    }
-
-    /** @var FetchesGroup */
-    private $fetchesGroup;
-
-    /** @var DeletesGroup */
-    private $deletesGroup;
-
-    /**
-     * DeleteGroupLogic constructor.
-     * @param updatesTransactionStatus $updatesTransactionStatus
-     * @param FetchesGroup $fetchesGroup
-     * @param DeletesTransaction $deletesTransaction
-     */
-    public function __construct(FetchesGroup $fetchesGroup, DeletesGroup $deletesGroup)
-    {
-        $this->fetchesGroup = $fetchesGroup;
-        $this->deletesGroup = $deletesGroup;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
-
-        foreach ($group->groupTransactions as $groupTransaction) {
-            $invoice = $groupTransaction->transaction;
-            $paymentTransaction = $invoice->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->first();
-
-            if ($paymentTransaction->payment_method == PaymentMethodType::WALLET) {
-                // Store the transaction ID before deleting
-                $transactionId = Transaction::where('bill_no', $paymentTransaction->payment_reference)->first()->id;
-
-                // Delete the transaction
-                Transaction::where('id', $transactionId)->first()->delete();
-
-                // Now you have the transaction ID available in $transactionId
-                Log::channel('deletePaidGroupOrder')->info("Deleted payment reference transaction ID: " . $transactionId);
-            } else {
-                Log::channel('deletePaidGroupOrder')->info("no transaction found. Invoice Id ->" . $invoice->id);
-            }
-
-            // Store the transaction ID before deleting
-            $transactionId = $paymentTransaction->id;
-
-            // Delete the payment transaction
-            $paymentTransaction->delete();
-            Log::channel('deletePaidGroupOrder')->info("Deleted payment transaction ID: " . $transactionId);
-        }
-
-        Log::channel('deletePaidGroupOrder')->info("Deleted Group -> " . $group->id);
-        $this->deletesGroup->execute($group);
-
-        return $this->response([]);
-    }
-}

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

@@ -6,13 +6,9 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Modules\Transactions\Services\FetchesGroup;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Transaction;
-use App\Models\Wallet;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 
 class DeletePaymentTransactionLogic extends AbstractControllerLogic
 {
@@ -27,9 +23,6 @@ class DeletePaymentTransactionLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var FetchesGroup */
-    private $fetchesGroup;
-
     /** @var FetchesTransaction */
     private $fetchesTransaction;
 
@@ -41,13 +34,11 @@ class DeletePaymentTransactionLogic extends AbstractControllerLogic
      * SuspendTransactionLogic constructor.
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param FetchesGroup $fetchesGroup
      */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchesGroup $fetchesGroup)
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->fetchesGroup = $fetchesGroup;
     }
 
 
@@ -55,23 +46,11 @@ class DeletePaymentTransactionLogic extends AbstractControllerLogic
     {
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
 
-        if($transaction->owner instanceof Wallet){
-            try{
-                $group = $this->fetchesGroup->execute(['reference' => $transaction->payment_reference]);
-                $group->status = ApprovalStatus::SUSPENDED;
-                $group->save();
-            }
-            catch(\Exception $excaption){
-                Log::info('No group associated with transaction with payment_reference - '.$transaction->payment_reference);
-            }
-        }
-
         $transaction->delete();
 
         $invoice = $transaction->owner;
-        if ($invoice instanceof Transaction) {
-            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::APPROVED);
-        }
+
+        $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::APPROVED);
 
         return $this->response([]);
     }

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

@@ -30,7 +30,7 @@ class DeleteTransactionLogic extends AbstractControllerLogic
 
 
     /**
-     * DeleteTransactionLogic constructor.
+     * SuspendTransactionLogic constructor.
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      */

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

@@ -5,7 +5,6 @@ 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\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -43,18 +42,15 @@ class ListTransactionsLogic extends AbstractControllerLogic
         $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
 
         if($request->input('storages')){
-            foreach ($query->items() as $item) {
+            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(TransactionWithStorageResource::collection($query));
         }
-        // else{
-        //     return $this->collectionResponse(TransactionResource::collection($query));
-        //
-        return $this->collectionResponse(TransactionWithStorageResource::collection($query));
+
+        return $this->collectionResponse(TransactionResource::collection($query));
     }
 }

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

@@ -1,67 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Processors\CreateStorageInvoiceDocTransactionFixProcessor;
-use App\Classes\Modules\Transactions\Standards\Rules\CanRegenerateStorageInvoice;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-class RegenerateSingleStorageInvoiceTransactionLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Regenerate Storage Invoice',
-            'message' => 'You have successfully regenerated storage invoice'
-        ];
-    }
-
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var CreateStorageInvoiceDocTransactionFixProcessor */
-    private $createStorageInvoiceDocTransactionProcessor;
-
-    /** @var CanRegenerateStorageInvoice */
-    private $canRegenerateStorageInvoice;
-
-    /**
-     * @param CreatesDocument $createsDocument
-     */
-    public function __construct(FetchesTransaction $fetchesTransaction, CreateStorageInvoiceDocTransactionFixProcessor $createStorageInvoiceDocTransactionProcessor, CanRegenerateStorageInvoice $canRegenerateStorageInvoice)
-    {
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->createStorageInvoiceDocTransactionProcessor = $createStorageInvoiceDocTransactionProcessor;
-        $this->canRegenerateStorageInvoice = $canRegenerateStorageInvoice;
-    }
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $this->canRegenerateStorageInvoice->passes();
-
-        $invoice = $this->fetchesTransaction->execute(['id' => $request->route('invoice_id')]);
-        $packingList = $invoice->owner;
-        $order = $packingList->owner;
-        $invoices = $order->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->get();
-        foreach ($invoices as $invoice){
-            $invoice->documents()->delete();
-        }
-
-        $this->createStorageInvoiceDocTransactionProcessor->execute($packingList, true);
-        Log::info(Auth::user()->email." regenerate storage invoice for transaction with id ".$request->route('invoice_id'));
-
-        return $this->response([]);
-    }
-
-}

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

@@ -1,65 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionIsWaived;
-use App\Classes\Modules\Transactions\Standards\Rules\CanWaiveTransaction;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-class WaiveTransactionLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Waive Transaction',
-            'message' => 'You have successfully waived the transaction'
-        ];
-    }
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var UpdatesTransactionIsWaived */
-    private $updatesTransactionIsWaived;
-
-    /** @var CanWaiveTransaction */
-    private $canWaiveTransaction;
-
-
-    /**
-     * WaiveTransactionLogic constructor.
-     * @param FetchesTransaction $fetchesTransaction
-     * @param UpdatesTransactionIsWaived $updatesTransactionIsWaived
-     * @param CanWaiveTransaction $canWaiveTransaction
-     */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionIsWaived $updatesTransactionIsWaived, CanWaiveTransaction $canWaiveTransaction)
-    {
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->updatesTransactionIsWaived = $updatesTransactionIsWaived;
-        $this->canWaiveTransaction = $canWaiveTransaction;
-    }
-
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
-
-        $object = new WaiveTransactionObject($transaction->id, $transaction->bill_no, $transaction->type, $transaction->status);
-        $this->canWaiveTransaction->passes($object);
-
-        $this->updatesTransactionIsWaived->execute($transaction);
-        Log::info(Auth::user()->email." waive storage invoice charges with bill_no: ".$transaction->bill_no);
-
-        return $this->response([]);
-    }
-}

app/Classes/Modules/Transactions/DataTransferObjects/WaiveTransactionObject.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class WaiveTransactionObject implements DataTransferObject
-{
-
-    /** @var int */
-    private $id;
-
-    /** @var string */
-    private $billNo;
-
-    /** @var int */
-    private $type;
-
-    /** @var int */
-    private $status;
-
-    public function __construct(int $id, string $billNo, int $type, int $status)
-    {
-        $this->id = $id;
-        $this->billNo = $billNo;
-        $this->type = $type;
-        $this->status = $status;
-    }
-
-    /**
-     * @return int
-     */
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBillNo(): string
-    {
-        return $this->billNo;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType(): int
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStatus(): int
-    {
-        return $this->status;
-    }
-}

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

@@ -24,7 +24,7 @@ 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\Http\Resources\TransactionResource;
 use App\Models\Order;
 use App\Models\PackingList;
 use App\Models\Transaction;
@@ -99,38 +99,33 @@ class CheckStorageInvoiceTransactionProcessor
         return $this->executeOrder($order);
     }
 
-    public function executeOrder(Order $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;
-        Log::channel('storage_invoices')->info('orderId: '.$order->id.', orderReference: '.$order->reference.', marking: '.$marking.', is_credit_term: '.$is_credit_term);
-        $packingLists = $order->destinationWarehousePackages;
+        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();
+            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 = null;
-                    if(!$is_credit_term){
-                        $result =  $this->processSingleTransactionOfTypeShippingInvoice($invoice_transaction, $packingList, $order->company_module_id, $eta);
-                    }
-                    else{
-                        $result =  $this->isPaidOrWaivedStorageInvoiceExist($invoice_transaction, $packingList, $eta);
-                    }
-                    if($result){
-                        $results[] = $result;
+                    /** @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;
     }
 
@@ -172,7 +167,7 @@ class CheckStorageInvoiceTransactionProcessor
         return null;
     }
 
-    private function processSingleTransactionOfTypeShippingInvoice($transaction, $destinationWarehousePackage, $company_module_id, $eta){
+    private function processSingleTransactionOfTypeShippingInvoice($transaction, $destinationWarehousePackage, $company_module_id, $eta, $isBackDoorCheck){
         $pricePerCBM = 3;
         $resultNumberOfDaysFree = 10;
         $dt1 = $eta->copy()->addDay()->startOfDay();
@@ -205,11 +200,6 @@ class CheckStorageInvoiceTransactionProcessor
             $this->createStorageInvoiceTransactionDetails($storageInvoice, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
         }
         else if($storageInvoice){
-            //Additional handling for giving selected storage invoice a waiver
-            if(isset($storageInvoice->is_waived) && $storageInvoice->is_waived){
-                $pricePerCBM = 0;
-                $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
-            }
 
             //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();
@@ -226,26 +216,19 @@ class CheckStorageInvoiceTransactionProcessor
             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));
-            Log::channel('storage_invoices')->info('amount: '.$amount);
-
-            $proceedToUpdate = false;
 
             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);
-                }
-                //}
 
-                $proceedToUpdate = true;
-            }
+                if(!$isBackDoorCheck){
+                    if(count($paymentTransactions) > 0){
+                        $this->updatePaymentTransactionViaNonGroupPayment($paymentTransactions);
+                    }
+                    else{
+                        $this->updatePaymentTransactionViaGroupPayment($storageInvoice);
+                    }
+                }
 
-            if($proceedToUpdate || ($pricePerCBM == 0 && $amount != 0)){
-                Log::channel('storage_invoices')->info('proceedToUpdate');
                 $storageInvoice = $this->updateStorageInvoiceTransaction($storageInvoice, $price_cbm);
                 $invoiceTransactionDetails = $storageInvoice->transactionDetails()->first();
                 $this->updateStorageInvoiceTransactionDetails($invoiceTransactionDetails, $destinationWarehousePackage, $cbm, $pricePerCBM, $resultNumberOfDaysExceeded);
@@ -264,71 +247,16 @@ class CheckStorageInvoiceTransactionProcessor
                 'currentDate' => $resultCurrentDate,
                 'cbm' => $cbm,
                 'pricePerCBM' => $pricePerCBM,
-                'storageInvoice' => new TransactionWithStorageResource($storageInvoice)
+                'storageInvoice' => new TransactionResource($storageInvoice)
             ];
             return $result;
         }
 
     }
 
-    private function isPaidOrWaivedStorageInvoiceExist($transaction, $packingList, $eta){
-        $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;
-        $paidStorageInvoice = $packingList->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->whereIn('transactions.status', [ApprovalStatus::COMPLETED])->first();
-        if($paidStorageInvoice){
-            $storageInvoice = $paidStorageInvoice;
-        }
-        else{
-            $waivedStorageInvoice = $packingList->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->where('transactions.is_waived', 1)->whereIn('transactions.status', [ApprovalStatus::APPROVED])->first();
-            $storageInvoice = $waivedStorageInvoice;
-        }
-
-        if($storageInvoice){
-            $storageInvoiceId = $storageInvoice->id;
-
-            if(isset($storageInvoice->is_waived) && $storageInvoice->is_waived){
-                $pricePerCBM = 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;
-            }
-
-            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;
-            }
-        }
-
-        return [];
-    }
-
     private function updatePaymentTransactionViaGroupPayment($storageInvoice){
         Log::channel('storage_invoices')->info('updatePaymentTransactionViaGroupPayment');
-        $groups = $storageInvoice->groups()->whereNotIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::SUSPENDED])->get();
+        $groups = $storageInvoice->groups()->get();
         foreach ($groups as $grp){
             $groupReference = $grp->reference;
             $walletTransaction = $this->fetchesTransaction->execute(['payment_reference' => $groupReference]);

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/Services/CreatesTransaction.php

@@ -5,10 +5,8 @@ namespace App\Classes\Modules\Transactions\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\PackingList;
 use App\Models\Transaction;
-use Carbon\Carbon;
 
 class CreatesTransaction extends AbstractUpdateRelationshipRecord
 {
@@ -35,11 +33,6 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
         $model->expires_on = $object->getExpiresOn();
         $model->status = $object->getStatus();
 
-        if((int)$object->getTransactionType() === TransactionType::SHIPPING_INVOICE){
-            $model->created_at = Carbon::now()->subDays(10);
-            $model->updated_at = Carbon::now()->subDays(10);
-        }
-
         return $this->handler($packing_list->transactions(), $model);
     }
-}
+}

app/Classes/Modules/Transactions/Services/UpdatesTransactionIsWaived.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\Transaction;
-
-class UpdatesTransactionIsWaived extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Transaction $model
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Transaction $model)
-    {
-        $model->is_waived = 1;
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Transactions/Standards/Rules/CanRegenerateStorageInvoice.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-
-class CanRegenerateStorageInvoice extends AbstractRule
-{
-
-    /**
-     * @return bool
-     */
-    protected function authorized($object): bool
-    {
-        $user = Auth()->user();
-        if($user){
-            $roleToCheck = Auth()->user()->type;
-            if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Transactions/Standards/Rules/CanWaiveTransaction.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
-use App\Classes\Modules\Transactions\Standards\Validators\WaiveTransactionValidation;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-
-class CanWaiveTransaction extends AbstractRule
-{
-
-    /** @var WaiveTransactionValidation */
-    private $waiveTransactionValidation;
-
-
-    public function __construct(WaiveTransactionValidation $waiveTransactionValidation)
-    {
-        $this->waiveTransactionValidation = $waiveTransactionValidation;
-    }
-
-      /**
-     * @return bool
-     */
-    protected function authorized($object): bool
-    {
-        $user = Auth()->user();
-        if($user){
-            $roleToCheck = Auth()->user()->type;
-            if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param WaiveTransactionObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->waiveTransactionValidation->validate($object);
-    }
-
-    /**
-     * @param $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Transactions/Standards/Validators/WaiveTransactionValidation.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Standards\Validators;
-
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-
-class WaiveTransactionValidation extends AbstractValidation
-{
-
-    /**
-     * @param WaiveTransactionObject $object
-     * @return array
-     */
-    protected function data($object): array {
-        return [
-            'id' => $object->getId(),
-            'billNo' => $object->getBillNo(),
-            'type' => $object->getType(),
-            'status' => $object->getStatus(),
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array {
-        return [
-            'id' => 'required',
-            'type' => ['required', 'numeric', 'in:'.TransactionType::STORAGE_INVOICE], //Only storage invoice (type 16) can be waived
-            'status' => ['required', 'numeric', 'in:'.ApprovalStatus::APPROVED], //Approve storage invoice only, paid invoice stricly forbidden
-            // 'billNo' => 'required',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array {
-        return [];
-    }
-
-}

app/Classes/Notifications/PermitsReminderEmail.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Notifications;
-
-
-use App\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class PermitsReminderEmail extends AbstractEmail
-{
-
-    /** @var User */
-    private $user;
-
-    private $reminders;
-
-    /**
-     * SendResetPasswordEmail constructor.
-     * @param User $user
-     * @param PasswordReset $attempt
-     */
-    public function __construct(User $user, $reminders)
-    {
-        $this->user = $user;
-        $this->reminders = $reminders;
-    }
-
-    public function toMail()
-    {
-        return (new MailMessage)
-            ->subject('Permits Renew Remidner Email')
-            ->view('emails.reminder.permits_reminder', ['user' => $this->user, 'reminders' => $this->reminders]);
-    }
-
-
-}

app/Console/Commands/FixGroupPaymentProblem.php

@@ -4,9 +4,7 @@ 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;
 
@@ -32,24 +30,17 @@ class FixGroupPaymentProblem extends Command
     /** @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)
+    public function __construct(FetchesGroup $fetchesGroup, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
     {
         parent::__construct();
         $this->fetchesGroup = $fetchesGroup;
         $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->createStorageInvoiceDocTransactionProcessor = $createStorageInvoiceDocTransactionProcessor;
     }
 
 
@@ -65,25 +56,22 @@ class FixGroupPaymentProblem extends Command
         $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);
+                //$paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+
+                //if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                    $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));
+            // $group->status = $status;
+            // $group->save();
         }
 
 

app/Console/Commands/OneTimeTransactionFixBillplzFailedCallback.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-
-use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Transaction;
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-
-class OneTimeTransactionFixBillplzFailedCallback extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'one-time-transaction-fix-billplz-failed-callback';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This is a one time fix billplz failed callback for transaction with id 15205';
-
-    protected $output = null;
-
-    protected $outputArray = [];
-
-     /** @var CallbackBillplzProcessor */
-     private $callbackBillplzProcessor;
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct(CallbackBillplzProcessor $callbackBillplzProcessor)
-    {
-        parent::__construct();
-        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        ini_set('memory_limit', '-1');
-
-        $this->outputArray = [];
-        $start   = new Carbon();
-
-        //This transaction, 15205 has approve payment but not its owner, shipping invoice
-        $transaction = Transaction::whereIn('id', [15205])->first();
-        $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 15205 cron started.');
-
-        if($transaction && $transaction->id == 15205){
-
-            $status = ApprovalStatus::APPROVED;
-            $this->callbackBillplzProcessor->execute($transaction, $status);
-        }
-
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-        $this->info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 15205 cron ended. ElapsedTime: ' . $elapsedTime);
-    }
-}

app/Console/Commands/SendPermitsReminderEmails.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Classes\Notifications\PermitsReminderEmail;
-use App\Models\PermitsReminder;
-use App\Models\User;
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
-
-class SendPermitsReminderEmails extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'permitsReminder:send';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Send Permits Reminders Email';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $currentDateTime = now();
-        $startRange = $currentDateTime->subDays(3)->startOfDay();
-        $endRange = $currentDateTime->copy()->addDays(6)->endOfDay();
-
-        $reminders = PermitsReminder::whereDate('reminder_date', '>=', $startRange)
-            ->whereDate('reminder_date', '<=', $endRange)
-            ->orWhere('reminder_date', '<', now())
-            ->pluck('model');
-
-        if ($reminders->isEmpty()) {
-            $this->info('No reminders expiring within the specified range.');
-            return;
-        }
-
-        $this->info($this->getTimeStamp() . 'Reminders: ' . $reminders->toJson());
-
-        $users = User::whereIn('email', $this->getEmailList())->get();
-
-        foreach ($users as $user) {
-            $this->info($this->getTimeStamp() . 'Reminder email sent to ' . $user->email);
-            if (app()->environment('production')) {
-                $user->notify(new PermitsReminderEmail($user, $reminders));
-            }
-        }
-    }
-
-    public function getTimeStamp()
-    {
-        return '[' . Carbon::now()->format('Y-m-d H:i:s') . '] - ';
-    }
-
-    protected function getEmailList(): array
-    {
-        return [
-            'edmond.wuiming2021@gmail.com',
-            'anithagurl96@gmail.com'
-        ];
-    }
-}

app/Console/Kernel.php

@@ -67,11 +67,6 @@ class Kernel extends ConsoleKernel
             ->dailyAt('0:01')
             ->withoutOverlapping()
             ->appendOutputTo(storage_path().'/logs/check_storage_invoices.log');
-
-        $schedule->command('permitsReminder:send')
-            ->dailyAt('09:30')
-            ->withoutOverlapping()
-            ->appendOutputTo(storage_path().'/logs/permits-reminder-send.log');
     }
 
     /**

app/Http/Controllers/Companies/UpdateCompanyCreditTermStatusController.php

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

app/Http/Controllers/Imports/ImportPermitsReminderController.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Imports;
-
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Imports\Services\GenericImport;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\PermitsReminder;
-use Carbon\Carbon;
-use DateTime;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
-use Maatwebsite\Excel\Facades\Excel;
-use PhpOffice\PhpSpreadsheet\Shared\Date;
-
-class ImportPermitsReminderController
-{
-    /**
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function import(Request $request)
-    {
-        $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
-        $file = json_decode($object->getFiles()[0])->file_info->original->file;
-        $file = storage_path('app/documents/' . $file);
-
-        $import = new GenericImport();
-        Excel::import($import, $file);
-        $excelRows = $import->rows->toArray();
-        $successRows = [];
-        $returnArray = []; // Initialize the return array
-
-        foreach ($excelRows as $row) {
-            if (is_null($row['expiry_date']) && is_null($row['reminder_date'])) {
-                continue;
-            }
-
-            $row['expiry_date'] = $this->changeExcelDate($row['expiry_date']);
-            $row['reminder_date'] = $this->changeExcelDate($row['reminder_date']);
-
-            $validator = Validator::make($row, [
-                'model' => 'required|unique:permits_reminders,model',
-                'expiry_date' => 'required|date|after_or_equal:today',
-                'reminder_date' => 'required|date|after_or_equal:today',
-            ]);
-
-            if ($validator->fails()) {
-                $row['status'] = 'failed';
-                $row['message'] = $validator->errors()->all();
-
-                $returnArray[] = $row;
-            } else {
-                $row['created_at'] = Carbon::now();
-                $row['updated_at'] = Carbon::now();
-                $successRows[] = $row;
-            }
-        }
-
-        if (!empty($successRows)) {
-            PermitsReminder::insert($successRows); // Insert only if there are successful rows
-        }
-
-        $successCount = count($successRows);
-
-        return response()->json([
-            'completedRows' => $successCount,
-            'failedRows' => count($returnArray),
-            'remark' => "Successful Imported {$successCount} data.",
-            'data' => $returnArray
-        ]);
-    }
-
-    public function changeExcelDate($date)
-    {
-        $formatedDate = DateTime::createFromFormat('d/m/Y', $date);
-        if ($formatedDate instanceof DateTime) {
-            return $formatedDate->format('Y-m-d');
-        }
-
-        $unixTime = (($date - 25569) * 86400);
-
-        return (new DateTime("@$unixTime"))->format('Y-m-d');
-    }
-}

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/Controllers/PermitsReminder/CreatePermitsReminderController.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\PermitsReminder;
-
-use App\Classes\Exceptions\RequestValidationException;
-use App\Models\PermitsReminder;
-use Carbon\Carbon;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
-
-class CreatePermitsReminderController
-{
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function create(Request $request): JsonResponse
-    {
-        // Define validation rules
-        $rules = [
-            'model' => 'required|unique:permits_reminders,model', 
-            'expiry_date' => 'required|date|after_or_equal:today',
-            'reminder_date' => 'required|date|after_or_equal:today',
-        ];
-
-        // Perform validation
-        $validator = Validator::make($request->all(), $rules);
-
-        if ($validator->fails()) {
-            $validationErrors = $validator->errors()->all();
-            $validationError = implode("<br>", $validationErrors);
-
-            // Return validation error response
-            return response()->json([
-                'title' => 'Create Permits Reminder Failed',
-                'message' => $validationError,
-                "payload" => []
-            ], 422); // 422 Unprocessable Entity status code for validation errors
-        }
-
-        // If validation passes, create the record
-        $record = PermitsReminder::create([
-            'expiry_date' => Carbon::parse($request->input('expiry_date'))->format('Y-m-d'),
-            'reminder_date' => Carbon::parse($request->input('reminder_date'))->format('Y-m-d'),
-            'model' => $request->input('model'),
-        ]);
-
-        $response = [
-            "title" => "Create Permits Reminder Successful",
-            "message" => "You have successfully created a Permits Reminder",
-            "payload" => [
-                "data" => $record
-            ]
-        ];
-
-        return response()->json($response);
-    }
-}

app/Http/Controllers/PermitsReminder/DeletePermitsReminderController.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\PermitsReminder;
-
-use App\Models\PermitsReminder;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeletePermitsReminderController
-{
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function delete(Request $request): JsonResponse
-    {
-        $record = PermitsReminder::find($request->route('id'));
-        $record->delete();
-
-        $response = [
-            "title" => "Delete Permits Reminder Successful",
-            "message" => "You have successfully deleted a Permits Reminder",
-            "payload" => []
-        ];
-
-        return response()->json($response);
-    }
-}

app/Http/Controllers/PermitsReminder/ListPermitsReminderController.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\PermitsReminder;
-
-use App\Models\PermitsReminder;
-use Carbon\Carbon;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListPermitsReminderController
-{
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function list(Request $request): JsonResponse
-    {
-        $perPage = 10; // Number of items per page
-        $page = $request->query('page', 1); // Get the current page from the request
-
-        // Paginate the PermitsReminder model
-        $paginator = PermitsReminder::orderBy('reminder_date')->paginate($perPage, ['*'], 'page', $page);
-
-        // Get current date and time
-        $currentDateTime = now();
-
-        // Define date range
-        $startRange = $currentDateTime->subDays(3)->startOfDay();
-        $endRange = $currentDateTime->copy()->addDays(6)->endOfDay();
-
-        // Process paginated items
-        $data = $paginator->items();
-        foreach ($data as &$item) {
-            // Check if the reminder_date is within the date range or after the current date
-            $reminderDate = Carbon::parse($item->reminder_date);
-            $item->show_remind = $reminderDate->between($startRange, $endRange) || $reminderDate->isBefore($currentDateTime);
-        }
-
-        // Create pagination links
-        $links = [
-            "first" => $paginator->url(1),
-            "last" => $paginator->url($paginator->lastPage()),
-            "prev" => $paginator->previousPageUrl(),
-            "next" => $paginator->nextPageUrl(),
-        ];
-
-        // Prepare response
-        $response = [
-            "title" => "List Permits Reminder",
-            "message" => "You have successfully retrieved a list of Permits Reminder",
-            "payload" => [
-                'data' => $data,
-                "links" => $links,
-                "meta" => [
-                    "current_page" => $paginator->currentPage(),
-                    "from" => $paginator->firstItem(),
-                    "last_page" => $paginator->lastPage(),
-                    "path" => $request->path(),
-                    "per_page" => $paginator->perPage(),
-                    "to" => $paginator->lastItem(),
-                    "total" => $paginator->total(),
-                ]
-            ]
-        ];
-
-        return response()->json($response);
-    }
-}

app/Http/Controllers/PermitsReminder/UpdatePermitsReminderController.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\PermitsReminder;
-
-use App\Models\PermitsReminder;
-use Carbon\Carbon;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
-
-class UpdatePermitsReminderController
-{
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function update(Request $request): JsonResponse
-    {
-        $rules = [
-            'model' => 'required|unique:permits_reminders,model,' . $request->route('id'),
-            'expiry_date' => 'required|date|after_or_equal:today',
-            'reminder_date' => 'required|date|after_or_equal:today',
-        ];
-
-        $validator = Validator::make($request->all(), $rules);
-
-        if ($validator->fails()) {
-            $validationErrors = $validator->errors()->all();
-            $validationError = implode("<br>", $validationErrors);
-
-            return response()->json([
-                'title' => 'Update Permits Reminder Failed',
-                'message' => $validationError,
-                "payload" => []
-            ], 422);
-        }
-
-        $record = PermitsReminder::findOrFail($request->route('id'));
-
-        $record->model = $request->input('model');
-        $record->expiry_date = Carbon::parse($request->input('expiry_date'))->format('Y-m-d');
-        $record->reminder_date = Carbon::parse($request->input('reminder_date'))->format('Y-m-d');
-        $record->save();
-
-        return response()->json([
-            'title' => 'Permits Reminder Updated',
-            'message' => 'The permits reminder has been successfully updated.',
-            "payload" => $record
-        ]);
-    }
-}

app/Http/Controllers/Transactions/DeletePaidGroupController.php

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

app/Http/Controllers/Transactions/RegenerateSingleStorageInvoiceTransactionController.php

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

app/Http/Controllers/Transactions/WaiveTransactionController.php

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

app/Http/Kernel.php

@@ -38,11 +38,13 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\WebResponseTimeLog::class,
         ],
 
         'api' => [
             'throttle:300,1',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\ApiResponseTimeLog::class,
         ],
 
         'apipub' => [
@@ -73,6 +75,5 @@ class Kernel extends HttpKernel
         '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,
-        'storage.invoice.check.bypackinglists' => \App\Http\Middleware\CheckForStorageInvoiceByPackingLists::class,
     ];
 }

app/Http/Middleware/ApiResponseTimeLog.php

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

app/Http/Middleware/CheckForStorageInvoiceByOrderId.php

@@ -29,12 +29,7 @@ class CheckForStorageInvoiceByOrderId
     public function handle(Request $request, Closure $next)
     {
         $orderId = $request->route('id');
-        $storages = [];
-        try{
-            $storages = $this->storageInvoiceTransactionProcessor->execute($orderId);
-        } catch (\Exception $exception) {
-            $storages = [];
-        }
+        $storages = $this->storageInvoiceTransactionProcessor->execute($orderId);
         $request->merge(['storages' => $storages]);
         return $next($request);
     }

app/Http/Middleware/CheckForStorageInvoiceByPackingLists.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\CompanyConnection;
-use App\Models\Order;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-
-class CheckForStorageInvoiceByPackingLists
-{
-
-    /** @var CheckStorageInvoiceTransactionProcessor */
-    private $storageInvoiceTransactionProcessor;
-
-    /** @var ListsPackingLists */
-    private $listsPackingLists;
-
-
-    public function __construct(CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor, ListsPackingLists $listsPackingLists)
-    {
-        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
-        $this->listsPackingLists = $listsPackingLists;
-    }
-
-
-    /**
-     * 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 = [];
-        $packinglists = null;
-
-        $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;
-        // }
-
-        if(isset($filters['check_for_storage_invoice'])){
-            unset($filters['order_by']);
-            $packinglists = $this->listsPackingLists->execute($filters);
-            foreach($packinglists as $packingList){
-                if($packingList){
-                    $order = $packingList->owner()->first();
-                    if($order instanceof Order){
-                        $storages = $this->storageInvoiceTransactionProcessor->executeOrder($order);
-                        if($storages){
-                            $results = array_merge($results, $storages);
-                        }
-                    }
-                }
-            }
-        }
-
-        $request->merge(['storages' => $results]);
-
-        return $next($request);
-    }
-}

app/Http/Middleware/WebResponseTimeLog.php

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

app/Http/Resources/CompanyResource.php

@@ -21,7 +21,7 @@ class CompanyResource extends JsonResource
     {
         $companyModule = $this->companyModules()->first();
         $companyTypeArray = CompanyType::COMPANY_TYPE_ID;
-
+        
         return [
             'id' => $this->id,
             'hash_id' => Crypt::encryptString($this->id),
@@ -33,7 +33,6 @@ class CompanyResource extends JsonResource
             'business_type' => (int) $this->business_type,
             'status' => (int) $this->status,
             'segments' => SegmentResource::collection($companyModule->connections()->first()->segments),
-            'is_credit_term' => $companyModule->connections()->first()->is_credit_term,
             'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
             'employee' => new UserResource($companyModule->employees()->first()),
             'company_module' => new CompanyModuleResource($companyModule),

app/Http/Resources/ContainerResource.php

@@ -23,25 +23,17 @@ class ContainerResource extends JsonResource
             'container_specification' => ContainerTypes::CONTAINER_SPECIFICATION[$this->container_type],
             'container_number' => $this->container_number,
             'seal_reference' => $this->seal_reference,
-            'loading_date' => optional($this->loading_date)->format('d-m-Y'),
+            'loading_date' => $this->loading_date ? $this->loading_date->format('d-m-Y') : $this->loading_date,
             'transport' => new TransportResource($this->transports()->first()),
             'packages_count' => $this->packages()->where('packages.type', '!=', 2)->sum('quantity'),
             'total_cbm' => $this->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity')),
             'remarks' => RemarkResource::collection($this->remarks),
             'status' => $this->status,
-            'packing_lists' => $this->shouldIncludePackingListData($request) ? $this->getSortedPackingLists() : null,
+            'packing_lists' =>  $this->whenLoaded('packingLists', PackingListResource::collection($this->whenLoaded('packingLists', function(){
+                return $this->packingLists()->get()->sortBy(function ($packingList) {
+                    return $packingList->owner->company_module_id;
+                });
+            })))
         ];
     }
-
-    protected function shouldIncludePackingListData($request)
-    {
-        return (isset($request->all()['with_packing_list_data']) && ($request->all()['with_packing_list_data'] == false)) ? false : true;
-    }
-
-    protected function getSortedPackingLists()
-    {
-        return $this->whenLoaded('packingLists', PackingListResource::collection(
-            $this->packingLists()->get()->sortBy(fn ($packingList) => $packingList->owner->company_module_id)
-        ));
-    }
 }

app/Http/Resources/GroupForOrderV2Resource.php

@@ -4,7 +4,6 @@ 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;
 
@@ -18,8 +17,6 @@ class GroupForOrderV2Resource extends JsonResource
      */
     public function toArray($request)
     {
-        $payment_transaction = Transaction::where('payment_reference', $this->reference)->first();
-
         return [
             'id' => $this->id,
             'original_amount' => (float) $this->original_amount,
@@ -36,14 +33,7 @@ class GroupForOrderV2Resource extends JsonResource
             '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],
-                'bill_no' => $payment_transaction->bill_no,
-                'updated_at' => Carbon::parse($payment_transaction->updated_at)->format('d-m-Y h:i:s A'),
-            ] : null
+            'transactions_ids' => GroupTransactionsForOrderV2Resource::collection($this->groupTransactions)
         ];
     }
 }

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/ListPackingListDetailsJobResource.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 ListPackingListDetailsJobResource 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/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/ListPackingListJobWithStorageResource.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Models\Order;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class ListPackingListJobWithStorageResource 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;
-        $shippingTransaction = $this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first();
-        $transactions = $this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
-        $storages = [];
-
-        if($this->storages){
-            $transactionId = $shippingTransaction->id;
-            $filteredStorages = array_filter($this->storages, function ($storage) use ($transactionId) {
-                return isset($storage['parentInvoiceId']) &&  $storage['parentInvoiceId'] == $transactionId;
-            });
-            $storages = $filteredStorages;
-        }
-
-        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' => count($storages) == 0 ? new TransactionWithStorageResource($shippingTransaction): null,
-            'storages' => $storages,
-            'invoices' =>  TransactionWithStorageResource::collection($transactions),
-            '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()),
-        ];
-    }
-}