fix issue unable to generate invoice

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -95,4 +95,4 @@ abstract class AbstractControllerLogic
         return $this->response(json_decode($collection->response()->getContent(), true));
     }
 
-}
+}

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -39,11 +39,6 @@ abstract class AbstractListRecord extends AbstractGetRecord
             $query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
         }
 
-        if($filters->has('group_by')){
-            $query = $query->groupBy($filters->get('group_by')->column);
-        }
-
-        //dd($query->toSql());
         return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
 
     }

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

@@ -1,37 +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 Illuminate\Database\Eloquent\Builder;
-
-class CreditTerm implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder;
-
-        return $builder->whereHas('packingLists.owner', function($query) use($value) {
-             $query->whereHas('companyModule.connections', function($query) use($value){
-                if ($value) {
-                     $query->whereHas('segments', function($query) {
-                         $query->where('segments.id' , 3);
-                    });
-                }else{
-                     $query->whereDoesntHave('segments', function($query) {
-                         $query->where('segments.id' , 3);
-                    });
-                }
-            });
-        });
-    }
-
-}

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

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class DoesNotHaveTransactionType implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
-            $query->where('type', $value);
-        })->whereHas('containers', function ($query){
-            return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
-        });
-    }
-}

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

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

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

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

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

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class IsPublished implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereDate('starting_on', '<=', Carbon::now())
-            ->whereDate('ending_on', '>=', Carbon::now());
-    }
-}

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

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

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

@@ -1,29 +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 PackingListOrderedByInvoiceDate 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);
-        })->orderBy('transactions.updated_at', 'DESC');
-    }
-
-}

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

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-
-class PaymentDay implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->whereHas('transactions', function (Builder $query) use($value) {
-            $query->where('transactions.type', 1)->where('status', ApprovalStatus::APPROVED)->whereDate('updated_at', '<=', Carbon::now()->subdays($value));
-        });
-    }
-}

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

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

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

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

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

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

app/Classes/General/ExcelHandel.php

@@ -1,87 +0,0 @@
-<?php
-namespace App\Classes\General;
-
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Cache;
-
-class ExcelHandel
-{
-	function __construct()
-	{
-
-	}
-
-	public static function generateFolder($path = '')
-    {
-    	$folder = \Storage::disk('public')->makeDirectory($path);
-        return $folder;
-    }
-
-	public static function insertExcel($path = '', $base64Set = [])
-	{
-    	$file_info = [];
-        $folder_path = ExcelHandel::generateFolder('excels/' . $path);
-
-        foreach ($base64Set as $key => $row) {
-
-	    	$exceldata = $row;
-	        $filename = (string) Str::uuid();
-
-	        $f = finfo_open();
-	        $mime_type = finfo_file($f, $exceldata, FILEINFO_MIME_TYPE);
-
-	        $extension = 'xls';
-
-	        switch ($mime_type) {
-	            case 'application/vnd.ms-excel':
-	                $extension = 'xls';
-	                break;
-	            case 'application/zip':
-	                $extension = 'xlsx';
-	                break;
-	        }
-
-	        if (empty($extension)) {
-	            return false;
-	        }
-
-	        $exceldata = explode('base64,', $exceldata);
-	        $exceldata = base64_decode($exceldata[1]);
-
-	        $filename_with_ext = $filename . '.' . $extension;
-
-	        $file = ExcelHandel::generateExcel($path, $exceldata, $filename, $extension);
-
-	        $file_info[] = [
-	            'path' => $path,
-	            'filename' => $filename_with_ext,
-	            'mime_type' => $mime_type,
-	            'extension' => $extension,
-	            'file_info' => empty($file) ? [] : $file,
-	        ];
-    	}
-
-        return $file_info;
-	}
-
-	public static function generateExcel($path = '', $exceldata = '', $filename = '', $extension = '')
-    {
-        $file_info = [];
-        $file = \Storage::disk('public')->put('excels/' . $path . '/' . $filename . '.' . $extension, $exceldata);
-        $file_info['original']['file'] = storage_path('app/public/excels/' . $path . '/' . $filename . '.' . $extension);
-        
-        return $file_info;
-    }
-
-    public static function removeExcel($excel_info = [])
-    {
-        $excel_info = json_decode(json_encode($excel_info), true);
-        foreach ($excel_info as $key => $row) {
-        	if (!empty($row['path'])) {
-	            \File::delete([$row['file_info']['original']['file']]);
-           }
-        }
-        return true;
-    }
-
-}

app/Classes/General/Traits/LogData.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Classes\General\Traits;
-
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Support\Str;
-
-trait LogData
-{
-
-    public static function boot()
-    {
-        parent::boot();
-
-
-        static::updating(function($model)
-        {
-
-            $tableName = Str::singular($model->table).'_logs';
-            $relationshipColumn = Str::singular($model->table).'_id';
-
-            $originalData = $model->getRawOriginal();
-
-            $originalData[$relationshipColumn] = $originalData['id'];
-            unset($originalData['id']);
-
-            if (!Schema::hasTable($tableName)) {
-                DB::statement('CREATE TABLE '.$tableName.' LIKE '.$model->table);
-
-                $indexs = DB::select('SHOW INDEX FROM '.$tableName.';');
-
-                $removedIndexes = [];
-                foreach ($indexs as $index){
-                    if($index->Column_name === 'id' || in_array($index->Key_name, $removedIndexes)) continue;
-                    DB::statement('ALTER TABLE '.$tableName.' drop index '.$index->Key_name);
-                    $removedIndexes[] = $index->Key_name;
-                }
-
-                DB::statement('ALTER TABLE '.$tableName.' ADD COLUMN `'.$relationshipColumn.'` BIGINT NOT NULL AFTER `id`');
-            }
-
-            DB::table($tableName)->insert($originalData);
-
-        });
-    }
-}

app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php

@@ -67,4 +67,4 @@ class AuthenticationProcessor
 
     }
 
-}
+}

app/Classes/Modules/Accounts/Services/AuthenticatesUser.php

@@ -23,4 +23,4 @@ class AuthenticatesUser
 
     }
 
-}
+}

app/Classes/Modules/Announcements/Services/CreatesAnnouncement.php

@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Announcements\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
 use App\Models\Announcement;
-use DateTime;
 
 class CreatesAnnouncement extends AbstractUpdateRecord
 {
@@ -19,17 +18,9 @@ class CreatesAnnouncement extends AbstractUpdateRecord
         $model = new Announcement();
         $model->title = $object->getTitle();
         $model->description = $object->getDescription();
-        // $model->starting_on = $object->getStartingOn();
-        $model->starting_on = $this->convertDateFormat($object->getStartingOn());
-        // $model->ending_on = $object->getEndingOn();
-        $model->ending_on = $this->convertDateFormat($object->getEndingOn());
+        $model->starting_on = $object->getStartingOn();
+        $model->ending_on = $object->getEndingOn();
 
         return $this->handler($model);
     }
-
-    public function convertDateFormat($value) {
-        $value = DateTime::createFromFormat('d-m-Y', $value)->format('Y-m-d H:i:s');
-
-        return $value;
-    }
 }

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

@@ -2,8 +2,6 @@
 
 namespace App\Classes\Modules\Billplzs\ControllersLogic;
 
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
 use App\Classes\Modules\Wallets\Services\UpdatesWallet;
 
@@ -23,7 +21,6 @@ use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
@@ -38,27 +35,21 @@ class CallbackBillplzLogic
     /** @var UpdatesTransactionStatus */
     private $updatesTransactionStatus;
 
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor ;
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
 
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
-     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param UpdatesWalletBalance $updatesWalletBalance
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
-        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
     }
 
 
@@ -67,8 +58,6 @@ class CallbackBillplzLogic
      * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * @throws MalformedRequestException
      * @throws ResourceNotFoundException
-     * @throws \App\Classes\Exceptions\InternalServerErrorException
-     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function execute(Request $request)
     {
@@ -84,21 +73,10 @@ class CallbackBillplzLogic
 
         $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
 
-        $invoice = $transaction->owner;
-        $packingList = $invoice->owner;
-        $order = $packingList->owner;
-
-        $status = ApprovalStatus::PENDING_VERIFICATION;
-
         if($billPlz->state === 'paid') {
             $status = ApprovalStatus::APPROVED;
         }
 
-        if ($transaction->type == 'topUp') {
-            $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
-            $this->multipleInvoicesWithOnePaymentLogic->verifypayment($transaction->id, $transaction->amount);
-         }
-
         if($billPlz->state === 'due') {
             $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
         }
@@ -106,23 +84,8 @@ class CallbackBillplzLogic
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
+        $marking = $transaction->owner()->first()->owner()->first();
 
-        if(($invoice->amount - $transaction->amount) < 0.01) {
-            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
-            $packingList->status = ApprovalStatus::APPROVED;
-            $packingList->save();
-
-            if(app()->environment('production')){
-                $this->updateDoFromVTPortalProcessor->execute($packingList);
-                $this->updateDoFromYDPortalProcessor->execute($packingList);
-            }
-        }
-
-
-
-
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking->reference, 'transaction' => $transaction, 'status' => $status]);
     }
-}
+}

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

@@ -22,8 +22,8 @@ class CreatesBillplzBill
     public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null, ?bool $wallet = null) {
         try{
 //            config('billplz.maybank')
-            $requestBody = [
-                'collection_id' => config('billplz.collection_id'),
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
+                'collection_id' => $wallet ? config('billplz.wallet_collection_id') : config('billplz.collection_id'),
                 'name' => $name,
                 'email' => $email,
                 'description' => $description,
@@ -34,13 +34,7 @@ class CreatesBillplzBill
                 'reference_1' => $bankCode ? $bankCode : '',
                 'reference_2_label' => 'Bill Number',
                 'reference_2' => $billNumber
-            ];
-
-            if (in_array(app()->environment(), ['development', 'staging', 'production'])) {
-                $response = Http::withBasicAuth(config('billplz.api_key') . ':', '')->post(config('billplz.base_url') . '/api/v3/bills', $requestBody);
-            } else {
-                $response = Http::withoutVerifying()->withBasicAuth(config('billplz.api_key') . ':', '')->post(config('billplz.base_url') . '/api/v3/bills', $requestBody);
-            }
+            ]);
 
             if($response->successful()){
                 $data = $response->json();

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

@@ -97,15 +97,15 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic
 
         $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-//        $object = new NotificationObject(
-//            'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ),
-//            ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type ===  'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ),
-//            $document->owner,
-//            $document->owner->companyModules()->first()->employees()->first(),
-//            $document,
-//        );
-//
-//        $this->createNotificationProcessor->execute($object);
+        $object = new NotificationObject(
+            'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ), 
+            ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type ===  'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ), 
+            $document->owner,
+            $document->owner->companyModules()->first()->employees()->first(), 
+            $document, 
+        );
+
+        $this->createNotificationProcessor->execute($object);
 
         if($status === 'approve'){
             $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED);

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

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Http\Resources\TransactionResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListCompanyModuleInvoicesLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Retrieved Company Module Invoices',
-            'message' => 'You have successfully retrieved a list of Invoices'
-        ];
-    }
-
-    /** @var ListsTransactions */
-    private $listsTransactions;
-
-    /**
-     * ListCompanyModuleInvoicesLogic constructor.
-     * @param ListsTransactions $listsTransactions
-     */
-    public function __construct(ListsTransactions $listsTransactions)
-    {
-        $this->listsTransactions = $listsTransactions;
-    }
-
-
-    /**
-     * @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
-    {
-        $filterArray = [
-            "per_page" => 10,
-            "order_by" => (object)[
-                "column" => 'id',
-                "DESC" => true,
-            ],
-            "status_in" => [2],
-            "receiver" => intval($request->route('company_module_id')),
-            "type" => TransactionType::SHIPPING_INVOICE
-        ];
-
-        // $this->canListTransactions->passes();
-
-        $query = $this->listsTransactions->execute($filterArray);
-
-        return $this->collectionResponse(TransactionResource::collection($query));
-    }
-}

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

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Companies\Services;
 
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Models\Company;
 use App\Models\Segment;
 use Illuminate\Database\QueryException;
@@ -20,9 +19,8 @@ class AssignsCompanyToSegment extends AbstractUpdateRecord
     public function execute(Company $company, Segment $segment)
     {
         try {
-            $companyModule = $company->companyModules()->where('type', BusinessType::IMPORTER)->first();
-            $connection = $companyModule->connections()->where('inviter_reference', 'CIEF');
-            $connection->segments()->attach($segment);
+
+            $company->segments()->attach($segment);
 
             return $company;
 

app/Classes/Modules/Documents/DataTransferObjects/FileObject.php

@@ -28,7 +28,7 @@ class FileObject implements DataTransferObject
      */
     public function getData()
     {
-        return in_array($this->getExtension(), ['pdf', 'excel'])  ? $this->data : (new imageManager())->make($this->data);
+        return $this->getExtension() === 'pdf' ? $this->data : (new imageManager())->make($this->data);
     }
 
     /**
@@ -66,7 +66,7 @@ class FileObject implements DataTransferObject
      */
     public function getDecodedData(): string
     {
-        return in_array($this->getExtension(), ['pdf', 'excel']) ?
+        return $this->getExtension() === 'pdf' ?
             base64_decode((explode('base64,', $this->getData()))[1]):
             $this->getData()->encode('data-url')->encoded;
     }
@@ -78,4 +78,9 @@ class FileObject implements DataTransferObject
     {
         $this->data = $data;
     }
-}
+
+
+
+
+
+}

app/Classes/Modules/Documents/Services/ConvertsBase64ToFile.php

@@ -36,7 +36,7 @@ class ConvertsBase64ToFile
         foreach ($files as $file) {
 
             $object = new FileObject($file);
-            in_array($object->getExtension(), ['pdf', 'excel']) ? $this->generatePDF($object) : $this->generateImage($object);
+            $object->getExtension() === 'pdf' ? $this->generatePDF($object) : $this->generateImage($object);
 
         }
 
@@ -122,4 +122,4 @@ class ConvertsBase64ToFile
         ]);
     }
 
-}
+}

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

@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Exports\Services;
 
 use App\Models\Order;
 use App\Models\PackingList;
-use Carbon\Carbon;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;

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

@@ -1,97 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Company;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-
-class ExportsNullDebtors implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-
-    use Exportable;
-
-
-    public function headings(): array
-    {
-        return [
-            'Code',
-            'DebtorControlAcc',
-            'ControlAccount',
-            'CompanyName',
-            'Desc2',
-            'DebtorType',
-            'DisplayTerm',
-            'CurrencyCode',
-            'RegisterNo',
-            'Address1',
-            'Address2',
-            'Address3',
-            'PostCode',
-            'DeliverAddr1',
-            'DeliverAddr2',
-            'DeliverAddr3',
-            'DeliverPostCode',
-            'EmailAddress',
-            'Attention',
-            'Phone1',
-            'Phone2',
-            'Fax1'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        return Company::where(function($query){
-            $query->whereNull('debtor')->orWhere('debtor', '');
-        })->whereHas('companyModules', function($query){
-            $query->where('type', BusinessType::IMPORTER);
-        })->whereHas('parcels')->where('status', ApprovalStatus::APPROVED);
-    }
-
-    /**
-     * @param Company $company
-     *
-     * @return array
-     */
-    public function map($company): array
-    {
-        $marking = $company->companyModules()->where('type', BusinessType::IMPORTER)->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-
-        return [
-            '<<New>>',
-            '300-0000',
-            '300-0000',
-            $company->name.' (Shipping)',
-            $marking,
-            '',
-            'PIA',
-            'MYR',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',
-            '',//EmailAddress
-            '',
-            '',
-            '',
-            ''
-        ];
-    }
-}

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

@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Exports\Services;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Order;
 use App\Models\PackingList;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
@@ -47,12 +46,11 @@ class ExportsOnHoldPackingList implements FromQuery, WithHeadings, WithHeadingRo
         $container = $packingList->containers()->first();
         $ContainerTransport = $container->transports()->first();
         $order = $packingList->owner;
-        if(!$order instanceof Order)return [];
         $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
 
         return [
             $container->reference,
-            $ContainerTransport ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first() ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : 'n/a' : 'n/a',
+            $ContainerTransport ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : 'n/a',
             $ContainerTransport ? $ContainerTransport->drop_date : 'n/a',
             $marking,
             $order->reference,

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

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\Modules\Exports\Sheets\ContainersSheet;
-use App\Classes\Modules\Exports\Sheets\PackingListsSheet;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\WithMultipleSheets;;
-
-class ExportsParcel implements WithMultipleSheets
-{
-    use Exportable;
-
-
-    /**
-     * @return array
-     */
-    public function sheets(): array
-    {
-        $sheets = [];
-
-        $sheets[] = new ContainersSheet();
-        $sheets[] = new PackingListsSheet();
-
-        return $sheets;
-    }
-
-}

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

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\Order;
-use App\Models\PackingList;
-use Carbon\Carbon;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-
-class ExportsParcelPostcodes implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
-{
-
-    use Exportable;
-
-    public function headings(): array
-    {
-        return [
-            'Order Number',
-            'Postcode'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        return PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereRaw('LENGTH(reference) > 8')->where('reference', 'not like', "%YW%")->where('owner_type', Order::class)->whereDate('created_at', '>=', Carbon::parse('20-09-2022'))->whereDoesntHave('containers');
-    }
-
-    /**
-     * @param $packingList
-     * @return array
-     */
-    public function map($packingList): array
-    {
-
-        $address = $packingList->owner->addresses()->where('status', ApprovalStatus::APPROVED)->first();
-        return [
-            $packingList->reference,
-            $address->postcode
-        ];
-    }
-}

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

@@ -1,135 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Transaction;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-    use Exportable;
-
-    private $request;
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-    public function headings(): array
-    {
-        return [
-            'DocNo',
-            'DocDate',
-            'DebtorCode',
-            'ShipInfo',
-            'AccNo',
-            'DetailDescription',
-            'FurtherDescription',
-            'ProjNo',
-            'DeptNo',
-            'Qty',
-            'UnitPrice'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        $start_date = $this->request->input('startDate', null);
-        if ($start_date) {
-            $start_date = Carbon::parse($this->request->input('startDate'))->format('Y-m-d');
-        }
-
-        $end_date = $this->request->input('endDate', null);
-        if ($end_date) {
-            $end_date = Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
-        }
-
-        $query = Transaction::query();
-
-        $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::COMPLETED]);
-
-        if($start_date && $end_date) {
-            $query->whereBetween('updated_at', [
-                Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
-                Carbon::parse($end_date)->format('Y-m-d 23:59:59')
-            ]);
-        }
-        elseif($start_date && !$end_date) {
-            $query->whereHas('transactions', function($transaction) use ($start_date) {
-                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($start_date)->format('Y-m-d 0:00:00'));
-            });
-
-        }
-        elseif(!$start_date && $end_date) {
-            $query->whereHas('transactions', function($transaction) use ($end_date) {
-                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($end_date)->format('Y-m-d 0:00:00'));
-            });
-        }
-
-        return $query;
-    }
-
-    public function map($transaction): array
-    {
-        $container = $transaction->owner->containers()->first();
-        $order = $transaction->owner->owner;
-        $company = $order->companyModule->company;
-        $shippingTransactionDetails = $transaction->transactionDetails()->where('reference', 'SHIPPING_FEE')->first();
-
-        $furtherDescription = '';
-
-        foreach ($transaction->transactionDetails as $item){
-
-            if($item->reference === 'SHIPPING_FEE')
-                $furtherDescription .= str_replace('X1 Freight Service Charge<br>', '', $item->name)."\n";
-            elseif($item->reference === 'OVER_WEIGHT_CHARGES')
-                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
-            elseif($item->reference === 'MIN_CBM_CHARGES')
-                $furtherDescription .= $item->name.' '.$item->quantity.' CBM'."\n";
-            else
-                $furtherDescription .= $item->name.' '.$item->quantity.' X '.$item->price."\n";
-        }
-
-        return [
-            '<<New>>',
-            $transaction->created_at->format('m/d/Y H:m'),
-            $company->debtor,
-            $order->reference,
-            '500-0000',
-            'X1 Freight Service Charge',
-            $furtherDescription,
-            $container->reference,
-            'CIEF',
-            $shippingTransactionDetails->quantity,
-            $shippingTransactionDetails->price
-        ];
-        return [
-            '<<New>>',
-            $transaction->updated_at->format('m/d/Y H:m'),
-            $company->debtor,
-            $container->reference,
-            '500-0000',
-            'X1 Freight Service Charge',
-            'FurtherDescription',
-            $container->reference,
-            'M3',
-            'CIEF',
-            $shippingTransactionDetails->quantity,
-            $shippingTransactionDetails->price,
-        ];
-    }
-}

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

@@ -43,7 +43,7 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
     public function query()
     {
         return PackingList::where('type', '=', 2)->whereHas('containers', function ($query){
-            $query->where('containers.status', ApprovalStatus::COMPLETED)->where('containers.created_at', '>',  Carbon::now()->subMonths(3));
+            $query->where('containers.status', ApprovalStatus::COMPLETED);
         });
     }
 
@@ -57,23 +57,21 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
         $container = $packingList->containers()->first();
         $ContainerTransport = $container->transports()->first();
         $order = $packingList->owner;
-        $inviter = $order->companyModule ? $order->companyModule->inviters()->withPivot('invitee_reference')->first() : null;
-        $marking = $inviter ? $inviter->pivot->invitee_reference : 'Unclaimed';
+        $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
         $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
         $contacts = $address->contacts->first() ? $address->contacts->first(): '';
         $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;
         $transport = $originalPackingList->containers()->first()->transports()->first();
         $deliveryTransport = $originalPackingList->transports()->first();
-        $schedule = $deliveryTransport ? $deliveryTransport->schedules()->first() : null;
 
         return [
             $container->reference,
-            $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first() ? $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta : '',
+            $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->eta,
             $ContainerTransport->drop_date,
             $marking,
             $order->reference,
-            $schedule ?  (Carbon::parse($schedule->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') :  'Pending Arrangement',
-            $schedule ?  $schedule->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
+            $deliveryTransport ? (Carbon::parse($deliveryTransport->schedules()->first()->eta) < Carbon::now() ? 'Delivered' : 'Pending Delivery') :  'Pending Arrangement',
+            $deliveryTransport ? $deliveryTransport->schedules()->first()->eta : ($transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : ''),
             $packingList->packages()->sum('quantity'),
             $address->state->name,
             $address->postcode,

app/Classes/Modules/Exports/Sheets/ContainersSheet.php

@@ -1,105 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Omair Saleh
- * Date: 20/9/2022
- * Time: 12:20 AM
- */
-
-namespace App\Classes\Modules\Exports\Sheets;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Container;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\WithTitle;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-
-
-class ContainersSheet implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery, WithTitle
-{
-
-    use Exportable;
-
-    public function headings(): array
-    {
-        return [
-            'Container No.',
-            'Loaded Date',
-            'ETD',
-            'ETA',
-            'Delay',
-            'Unstuffing date',
-            'Status',
-            'CTN',
-            'CBM'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function query()
-    {
-        return Container::query();
-    }
-
-    /**
-     * @param $container
-     * @return array
-     */
-    public function map($container): array
-    {
-
-        $transport = $container->transports()->first();
-        $currentSchedule = $transport ? $transport->schedules()->where('status', '!=', ApprovalStatus::EXPIRED)->first() : null;
-        $scheduleHistory = $transport ? $transport->schedules()->where('status', ApprovalStatus::EXPIRED)->get() : null;
-
-        $status = 'Loaded';
-
-        if($currentSchedule) {
-            if(Carbon::parse($currentSchedule->etd) >= Carbon::today()){
-                $status = 'Shipping';
-            }
-
-            if(Carbon::parse($currentSchedule->eta) >= Carbon::today()){
-                $status = 'Arrived?';
-            }
-
-            if($transport->drop_date){
-                $status = 'Pending deliveries';
-                if(!$container->packinglists()->whereDoesntHave('transports')->get()){
-                    $status = 'Complete';
-                }
-            }
-
-
-        }
-
-        return [
-            $container->reference,
-            $container->loading_date,
-            $currentSchedule ? $currentSchedule->etd : null,
-            $currentSchedule ? $currentSchedule->eta : null,
-            $scheduleHistory ? count($scheduleHistory) : 0,
-            $transport ? $transport->drop_date : null,
-            $status,
-            $container->packages()->sum('quantity'),
-            $container->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity')),
-
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    public function title(): string
-    {
-        return 'Containers';
-    }
-}

app/Classes/Modules/Exports/Sheets/PackingListsSheet.php

@@ -1,131 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Omair Saleh
- * Date: 20/9/2022
- * Time: 12:20 AM
- */
-
-namespace App\Classes\Modules\Exports\Sheets;
-
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackageType;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\Order;
-use App\Models\PackingList;
-use Illuminate\Support\Facades\DB;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\WithTitle;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-
-
-
-class PackingListsSheet implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection, WithTitle
-{
-
-    use Exportable;
-
-    public function headings(): array
-    {
-        return [
-            'Arrival Date',
-            'Marking',
-            'Order No.',
-            'Reference',
-            'Quantity',
-            'CBM',
-            'Overweight',
-            'Total CBM',
-            'Container No.',
-            'Delivery Date',
-            'Warehouse',
-            'Warehouse District',
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function collection()
-    {
-        $packingLists = PackingList::where('status', '=', 2)->whereIn('type', [PackingListType::WAREHOUSE_RECEIVE_LIST, PackingListType::SHIPPING_PACKING_LIST])->get();
-
-        return $packingLists->filter(function ($packingList) {
-
-            if($packingList->type === PackingListType::SHIPPING_PACKING_LIST){
-                $warehouseArrival = PackingList::where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->where('reference', $packingList->reference)->get();
-                return $warehouseArrival ? false : true;
-            }
-
-            return true;
-        });
-    }
-
-    /**
-     * @param $packingList
-     * @return array
-     */
-    public function map($packingList): array
-    {
-
-        $warehouseArrivalList = $packingList;
-        $shippingList = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->where('reference', $packingList->reference)->first();
-
-        if($packingList->type === PackingListType::SHIPPING_PACKING_LIST) {
-            $warehouseArrivalList = null;
-            $shippingList = $packingList;
-
-        }
-
-        $arrivalTransport = null;
-
-        if($warehouseArrivalList){
-            $arrivalTransport = $warehouseArrivalList->transports()->first();
-        }
-
-        $order = null;
-        if($packingList->owner instanceof Order){
-            $order = $packingList->owner;
-        }
-
-        $cbm = $packingList->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
-            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        });
-
-        $overWeight = $packingList->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
-            return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        });
-
-        $container = $shippingList ? $shippingList->container : null;
-
-        $delivery = $shippingList ? $shippingList->transport : null;
-
-        return [
-            $arrivalTransport ? $arrivalTransport->drop_date : null,
-            $order ? $order->reference : 'Unclaimed',
-            $order ? $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'Unclaimed',
-            $packingList->reference,
-            $packingList->packages()->sum('quantity'),
-            $cbm,
-            $overWeight ? $overWeight : 0,
-            $cbm + $overWeight,
-            $container ? $container->reference : null,
-            $delivery ? $delivery->drop_date : null,
-            strlen($packingList->reference) > 8 ? 'YD' : 'VT',
-            $order ? $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->name : null,
-        ];
-
-    }
-
-    /**
-     * @return string
-     */
-    public function title(): string
-    {
-        return 'Packing Lists';
-    }
-}

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

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Imports\Services;
-
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Models\Company;
-
-use Maatwebsite\Excel\Concerns\ToModel;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithBatchInserts;
-use Maatwebsite\Excel\Concerns\WithValidation;
-
-class ImportsDebtor implements ToModel, WithHeadingRow, WithBatchInserts, WithValidation
-{
-  public function __construct() {
-
-  }
-
-  public function model($row = [])
-  {
-      try {
-          preg_match_all('/([0-9]{3,4}[a-zA-Z]{3,4})/', $row['desc2'], $matches);
-
-          foreach ($matches[0] as $match){
-              $reference = $match;
-              $debtor =  $row['code'];
-              $company = Company::whereNull('debtor')->whereHas('companyModules', function($query) use ($reference) {
-                  $query->whereHas('connections', function($query) use ($reference) {
-                      $query->where('invitee_reference', $reference);
-                  });
-              })->first();
-
-              if ($company) {
-                  $company->debtor = $debtor;
-                  $company->update();
-              }
-
-          }
-
-      } catch (\Exception $exception){
-          dd($exception);
-      }
-  }
-
-  public function batchSize(): int
-  {
-    return 100;
-  }
-
-  public function rules(): array
-  {
-      return [
-
-      ];
-  }
-}

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

@@ -3,7 +3,6 @@
 namespace App\Classes\Modules\Orders\Processors;
 
 use App\Classes\Exceptions\InternalServerErrorException;
-use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 
@@ -55,7 +54,6 @@ class UpdateDoFromYDPortalProcessor
             $reference = $contact ? $contact->reference : null;
             $remark = $remark ? $remark->content :  'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
 
-            if(!$phone || !$reference) throw new MalformedRequestException('Can\'t release this packing list because it doesn\'t have the person in charge contact information');
             $this->fetchesDataFRomYDPortal->clientRequest(
                 'http://www.yd-wl.com/api/UpdateOrderAddress.ashx',
                 'POST',

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

@@ -2,7 +2,6 @@
 
 namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
-use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
@@ -135,25 +134,20 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic
 
         $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
 
-        try {
-            $packing_list = $this->fetchesPackingList->execute([
-                'reference' => $warehouse_packing_list->reference,
-                'type' => PackingListType::SHIPPING_PACKING_LIST
-            ]);
+        $packing_list = $this->fetchesPackingList->execute([
+            'reference' => $warehouse_packing_list->reference, 
+            'type' => PackingListType::SHIPPING_PACKING_LIST
+        ]);
 
-            $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order);
-
-            $this->updatesPackingListContractReference->execute($packing_list, $contractReference);
-
-            foreach($contractObligations as $obligation) {
-                $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
-                $this->createsStep->execute($packing_list, $stepObject);
-            }
-        } catch (ResourceNotFoundException $exception) {
+        $warehouse_packing_list = $this->updatesPackingListOwner->execute($packing_list, $order);
+        
+        $this->updatesPackingListContractReference->execute($packing_list, $contractReference);
 
+        foreach($contractObligations as $obligation) {
+            $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+            $this->createsStep->execute($packing_list, $stepObject);
         }
 
-
         return $this->resourceResponse(new PackingListResource($warehouse_packing_list));
     }
 }

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

@@ -7,8 +7,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\DeletesPackingList;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanDeletePackingList;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\PackingList;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -60,9 +58,9 @@ class DeletePackingListLogic extends AbstractControllerLogic
 
             $this->canDeletePackingList->passes();
 
-            $packingList = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            PackingList::where('reference', $packingList->reference)->delete();
+            $this->deletesPackingList->execute($query);
 
             return $this->response([]);
 

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

@@ -7,13 +7,9 @@ use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
 use App\Classes\Modules\Schedules\Services\CreatesSchedule;
 use App\Classes\Modules\Schedules\Services\UpdatesScheduleStatus;
 use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
-use App\Classes\ValueObjects\Constants\TransportType;
 use App\Http\Resources\PackingListResource;
-use App\Models\Transport;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -21,8 +17,6 @@ use Carbon\Carbon;
 
 class ReschedulePackingListLogic extends AbstractControllerLogic
 {
-
-
     /**
      * @return array
      */
@@ -39,31 +33,26 @@ class ReschedulePackingListLogic extends AbstractControllerLogic
     /** @var UpdatesScheduleStatus */
     private $updatesScheduleStatus;
 
-    /** @var CreatesTransport */
-    private $createsTransport;
-
     /** @var CreatesSchedule */
     private $createsSchedule;
 
     /**
-     * ReschedulePackingListLogic constructor.
+     * DeleteContainerControllersLogic constructor.
      * @param FetchesPackingList $fetchesPackingList
-     * @param UpdatesScheduleStatus $updatesScheduleStatus
-     * @param CreatesTransport $createsTransport
      * @param CreatesSchedule $createsSchedule
      */
-    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesScheduleStatus $updatesScheduleStatus, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
+    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesScheduleStatus $updatesScheduleStatus, CreatesSchedule $createsSchedule)
     {
         $this->fetchesPackingList = $fetchesPackingList;
         $this->updatesScheduleStatus = $updatesScheduleStatus;
-        $this->createsTransport = $createsTransport;
         $this->createsSchedule = $createsSchedule;
     }
 
+
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
@@ -71,15 +60,9 @@ class ReschedulePackingListLogic extends AbstractControllerLogic
 
         $transport = $packing_list->transports()->first();
 
-        if(!$transport) {
-            $object = new TransportObject(TransportType::LAND, null, '', Carbon::parse($request->input('etd')), Carbon::parse($request->input('eta')),ApprovalStatus::APPROVED);
-            /** @var Transport $transport */
-            $transport = $this->createsTransport->execute($object, $packing_list);
-        }
+        $old_sechedule = $transport->schedules()->first();
 
-        $transport->schedules()->update([
-            'status' => ApprovalStatus::REJECTED
-        ]);
+        $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
 
         $scheduleObject = new ScheduleObject(
             Carbon::parse($request->input('eta')), 

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

@@ -91,6 +91,7 @@ class FetchDeliveryListFromVTPortalProcessor
                     $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
 
                 } catch (GuzzleException $exception) {
+                    dd($exception);
                     continue;
                 }
 

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

@@ -7,15 +7,12 @@ use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
 use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
 use App\Classes\Modules\Schedules\Services\CreatesSchedule;
 use App\Classes\Modules\Steps\DataTransferObjects\StepsObject;
 use App\Classes\Modules\Steps\Services\CreatesStep;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
 use App\Classes\Modules\Transports\Services\CreatesTransport;
 use App\Classes\Modules\Unity\Processors\ActivateContractProcessor;
 use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
@@ -24,13 +21,10 @@ use App\Classes\Modules\Unity\Services\CreatesContract;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\ContainerTypes;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\Order;
 use App\Models\PackingList;
-use App\Models\Transport;
 use Carbon\Carbon;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\DB;
@@ -130,8 +124,9 @@ class FetchLoadedContainersFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
+        DB::beginTransaction();
         try {
-            $start = $start ? $start : Carbon::today()->subDays(5);
+            $start = $start ? $start : Carbon::now()->subDays(10);
 
             $startLimit = Carbon::parse('11-08-2021');
 
@@ -139,162 +134,80 @@ class FetchLoadedContainersFromVTPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::today()->addDay();
+            $end = $end ? $end : Carbon::now();
             $filter = '["LoadedTime:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
             $containersRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"LoadedTime asc","Filter":'.$filter.'}}'), '');
 
             $containers = $this->fetchesDataFRomVTPortal->getResponseBody($containersRequest);
+
             foreach ($containers->Rows as $container){
-                $filter = '["ContainerID:=%js%'.$container[12].'"]';
-                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"ParcelInContainer","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":null,"Filter":'.$filter.'}}'), '');
+                $filter = '["ContainerID:=%js%'.$container[11].'"]';
+                $containerDetailRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                 $containerDetail = $this->fetchesDataFRomVTPortal->getResponseBody($containerDetailRequest);
 
-                $containerObject = new ContainerObject($container[0], str_replace(' ', '', $container[24]), str_replace(' ', '', $container[16]), ContainerTypes::FORTY_FEET_DRY_CONTAINER, Carbon::parse($container[6]), ApprovalStatus::PENDING_VERIFICATION);
-                $containerInfo = $container;
+                $containerObject = new ContainerObject($container[0], str_replace(' ', '', $container[24]), str_replace(' ', '', $container[15]), ContainerTypes::FORTY_FEET_DRY_CONTAINER, Carbon::parse($container[5]), ApprovalStatus::PENDING_VERIFICATION);
 
                 try {
                     $container = $this->fetchesContainer->execute(['reference' => $containerObject->getReference()]);
                 } catch (ResourceNotFoundException $exception){
-                    $warehouseId = $container[13];
+                    $warehouseId = $container[12];
                     $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
                     $container = $this->createContainerProcessor->execute($containerObject, $originWarehouse);
                 }
 
-                $eta = Carbon::parse($containerInfo[4])->addDays(2);
-                $etd = Carbon::parse($eta)->subDays(7);
-
-                $delayDate = $containerInfo[7];
-
-                $containerStatus = $containerInfo[10];
-
-                $unstuffingDate = $containerInfo[8];
-
-                $transport = $container->transports()->first();
-
-                if(!$transport || $eta !== $transport->eta){
-                    $container->transports()->delete();
-
-                    $transportObject = new TransportObject(TransportType::SEA, null, null,  $etd, null, ApprovalStatus::APPROVED);
-                    /** @var Transport $transport */
-                    $transport = $this->createsTransport->execute($transportObject, $container);
-                    $this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
-                }
-
-                if($delayDate){
-                    $delayDate = Carbon::parse($delayDate)->addDays(2);
-                    $transport = $container->transports()->first();
-
-                    if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
-                        $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
-                        $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
-                        $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
-                    }
-
-                }
-
-                if($containerStatus === 'Unstuffing'){
-                    $container->update(['status' => ApprovalStatus::COMPLETED]);
-                    $container->transports()->first()->update(['drop_date' => Carbon::parse($unstuffingDate)->subDay(), 'status' => ApprovalStatus::COMPLETED]);
-
-                    /** @var PackingList $packingList */
-                    foreach($container->packingLists as $packingList){
-
-                        if($packingList->status === ApprovalStatus::PENDING_VERIFICATION){
-                            $packingList->status = ApprovalStatus::APPROVED;
-                            $packingList->save();
-                        }
-
-                    }
-                }
-
                 foreach($containerDetail->Rows as $packingList){
-                    $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[39]));
+                    $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $packingList[13]));
 
                     $orderNumber = $marking[array_key_last($marking)];
 
-                    if(!$packingList[11]){
+                    if(!$packingList[22]){
                         continue;
                     }
 
-                    $allow_contract = true;
-
                     try {
-                        $warehousePackingList = $this->fetchesPackingList->execute(['reference' => $packingList[3]]);
-                        if(!$warehousePackingList->owner instanceof Order) throw new ResourceNotFoundException;
-                        $order = $warehousePackingList->owner;
-                    } catch (ResourceNotFoundException $exception) {
-                        try {
-                            $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
-                        } catch (ResourceNotFoundException $exception) {
-                            try {
-                                $order = $this->fetchesOrder->execute(['reference' => substr($orderNumber, -9)]);
-                            } catch (ResourceNotFoundException $exception) {
-                                $order = $this->fetchesCompanyModule->execute(['id' => 1]);
-                                $allow_contract = false;
-                            }
-
-                        }
+                        /** @var Order $order */
+                        $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
+                    } catch (ResourceNotFoundException $exception){
+                        continue;
                     }
 
+                    $packingListReference = $packingList[16];
 
-                    $packingListReference = $packingList[3];
-                    $package = $packingList;
-                    $deliveryDate = $package[1] ? Carbon::parse($package[1]) : null;
-
-                    try {
-                        $packingList = $this->fetchesPackingList->execute(['reference' => $packingListReference, 'type' => PackingListType::SHIPPING_PACKING_LIST]);
+                    try{
+                        $this->fetchesPackingList->execute(['reference' => $packingListReference]);
                     } catch (ResourceNotFoundException $exception){
-                        if ($allow_contract) {
-                            $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
-//                            $contract = $this->unityCreateContract->execute();
-//                            $contractReference = $contract->hash_id;
-//                            $contractObligations = $contract->contract_obligation_list;
-//
-//                            $this->unityActivateContract->execute($contractReference);
-//
-//                            $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
-//
-//                            $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
-//                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
-//
-//                            $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
-//                            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
-//
-//                            $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
-                        } else {
-                            $appointee_id = 2037;
-                        }
+                        $contract = $this->unityCreateContract->execute();
+                        $contractReference = $contract->hash_id;
+                        $contractObligations = $contract->contract_obligation_list;
 
-                        $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, null);
+                        $this->unityActivateContract->execute($contractReference);
+
+                        $supervisorHashId = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->unity_hash_id;
+
+                        $supervisorContractEntity = $this->unityCreateContractEntity->execute($contractReference, $supervisorHashId);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->update(['entity_hash_id' => $supervisorContractEntity->hash_id, 'entity_signature' => $supervisorContractEntity->entity_signature_hash_id]);
+
+                        $importerContractEntity = $this->unityCreateContractEntity->execute($contractReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->appointee->unity_hash_id);
+                        $order->orderRoles()->where('role_id', '=', OrderRoleTypes::IMPORTER)->first()->update(['entity_hash_id' => $importerContractEntity->hash_id, 'entity_signature' => $importerContractEntity->entity_signature_hash_id]);
+
+                        $this->unityAssignContractEntity->execute($supervisorContractEntity->hash_id, $contractObligations);
+
+                        $connection = $order->companyModule->connections()->first();
+                        $marking = $connection->invitee_reference;
+
+                        $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id, PackingListType::SHIPPING_PACKING_LIST, ApprovalStatus::SUSPENDED, $contractReference);
 
                         /** @var PackingList $packingList */
                         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
-                    }
+                        $container->packingLists()->attach($packingList);
 
-                    $container->packingLists()->detach($packingList);
-                    $container->packingLists()->attach($packingList);
-                    $packingList->packages()->delete();
-
-                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-                    if($replica) $replica->packages()->delete();
-
-                    $packageObject = new PackageObject(PackageType::CARTON, $package[8], $package[21], $package[22], $package[20], 0, $package[11], ApprovalStatus::APPROVED);
-                    $this->createPackageProcessor->execute($packageObject, $packingList);
-                    if($containerStatus === 'Unstuffing'){
-                        $packingList->transports()->delete();
-
-                        if($deliveryDate) {
-//                            && !$packingList->transports()->exists()
-                            $packingList->status = ApprovalStatus::COMPLETED;
-                            $packingList->save();
-
-                            $transportObject = new TransportObject(TransportType::LAND, null, null, $deliveryDate, $deliveryDate, ApprovalStatus::APPROVED);
-                            /** @var Transport $transport */
-                            $transport = $this->createsTransport->execute($transportObject, $packingList);
-                            $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
+                        foreach($contractObligations as $obligation) {
+                            $stepObject = new StepsObject($order->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->id, $obligation->reference, $obligation->sequence, $obligation->hash_id);
+                            $this->createsStep->execute($packingList, $stepObject);
                         }
+
                     }
 
                 }
@@ -304,6 +217,8 @@ class FetchLoadedContainersFromVTPortalProcessor
             Log::error($exception);
         }
 
+
+        DB::commit();
         return [];
 
     }

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

@@ -2,7 +2,6 @@
 
 namespace App\Classes\Modules\PackingLists\Processors;
 
-use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
@@ -24,8 +23,6 @@ use App\Classes\Modules\Unity\Processors\AssignContractEntityProcessor;
 use App\Classes\Modules\Unity\Processors\CreateContractEntityProcessor;
 use App\Classes\Modules\Unity\Services\CreatesContract;
 use App\Classes\Modules\Unity\Services\UpdatesContractObligation;
-use App\Classes\Notifications\ShipmentDepartureEmail;
-use App\Classes\Notifications\ShipmentRescheduleEmail;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\ContainerTypes;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
@@ -135,12 +132,11 @@ class FetchOrderListsFromYdPortalProcessor
      * @param Carbon|null $start
      * @param Carbon|null $end
      * @return void
-     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null)
     {
         try {
-            $start = $start ? $start : Carbon::today()->subDays(30);
+            $start = $start ? $start : Carbon::now()->subMonths(2);
 
             $startLimit = Carbon::parse('01-12-2021');
 
@@ -148,7 +144,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::today()->addDay();
+            $end = $end ? $end : Carbon::now();
 
             $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [
                 'begintime' => $start->timestamp,
@@ -158,7 +154,6 @@ class FetchOrderListsFromYdPortalProcessor
             $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest);
 
             foreach($rows->data as $row){
-
                 $containerReference = null;
                 $loadingDate = null;
                 $unstuffingDate = null;
@@ -174,6 +169,7 @@ class FetchOrderListsFromYdPortalProcessor
                 $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest);
 
                 if(!$rows){
+                    Log::debug($row->expressno);
                     continue;
                 }
 
@@ -187,7 +183,7 @@ class FetchOrderListsFromYdPortalProcessor
                         $containerReference = explode('预计到港时间', $tracking[1])[0];
                         $loadingDate = Carbon::parse($trackingRow->trackingtime);
                         $etd = Carbon::parse($tracking[2])->subDays(5);
-                        $eta = Carbon::parse($tracking[2])->addDays(2);
+                        $eta = Carbon::parse($tracking[2]);
                     }
 
                     $rescheduleETD = strpos($trackingRow->remark, '开') || strpos($trackingRow->remark, '到港');
@@ -206,7 +202,6 @@ class FetchOrderListsFromYdPortalProcessor
                         }
 
                         $rescheduleDate = $dates->sortDesc()->first();
-
                         if(!$delayDate || $rescheduleDate > $delayDate){
                             /** @var Carbon $delayDate */
                             $delayDate = $rescheduleDate;
@@ -218,42 +213,20 @@ class FetchOrderListsFromYdPortalProcessor
 
                     }
 
-                    if ($trackingRow->tracking === '到港') {
-                        $delayDate = Carbon::parse($trackingRow->trackingtime);
-                    }
-
                     if ($trackingRow->tracking === '已开船') {
                         $delayDate = Carbon::parse($trackingRow->trackingtime)->addDays('5');
                     }
 
+
                     if ($trackingRow->tracking === '货物已进目的港仓库') {
                         $unstuffingDate = Carbon::parse($trackingRow->trackingtime);
                     }
 
-                    if (Str::contains($trackingRow->tracking, ['派送中', '已签收', '签收完成', ' 第三方提货', '货物已派送完成', '派送', 'delivery', 'delivered'])) {
+                    if (Str::contains($trackingRow->tracking, ['派送中'])) {
                         $deliveryDate = Carbon::parse($trackingRow->trackingtime);
                     }
                 }
 
-                $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
-
-                try {
-                    $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$row->expressno.'&sOrgId=sti');
-                    $deliveryTracking = json_decode($request->getBody()->getContents());
-                    foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
-                        $trackingDate = Carbon::createFromFormat('d/m/y H:i', $trackingRow->LocalDateTime);
-                        if (Str::contains($trackingRow->PublicDescription, ['accepted/picked'])){
-                            $unstuffingDate = $trackingDate;
-                        }
-
-                        if (Str::contains($trackingRow->PublicDescription, ['delivered'])) {
-                            $deliveryDate = $trackingDate;
-                        }
-                    }
-                } catch (\Exception $exception){
-                    Log::debug('failed to fetch delivery tracking');
-                }
-
                 $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
 
                 $orderNumber = $customerno[array_key_last($customerno)];
@@ -271,6 +244,8 @@ class FetchOrderListsFromYdPortalProcessor
 
                 }
 
+                DB::beginTransaction();
+
                 $packingListReference = $row->expressno;
 
                 try{
@@ -358,7 +333,7 @@ class FetchOrderListsFromYdPortalProcessor
 
                 if($order instanceof Order){
                     $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-                    if(!in_array($marking, ['1290CSW', '8997ITB', '3992WHE', '962LOW', '1152AAT'])){
+                    if(!in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '153DSR', '1291NSC', '8288MIB'])){
                         $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/confirmsendorder.ashx', 'GET', [
                             'expressno' => $row->expressno
                         ]);
@@ -400,20 +375,13 @@ class FetchOrderListsFromYdPortalProcessor
                     }
 
                     if($delayDate){
-                        $delayDate = $delayDate->addDays(2);
+
                         $transport = $container->transports()->first();
 
                         if(!$transport->schedules()->whereDate('eta', '>=', $delayDate)->first()) {
                             $etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
                             $transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
                             $this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
-                            foreach ($container->packingLists as $packingList){
-                                if(!($packingList->owner instanceof Order)) continue;
-                                $user = $packingList->owner->companyModule->employees()->first();
-                                if(app()->environment(['production'])) {
-                                    $user->notify(new ShipmentRescheduleEmail($user, $packingList));
-                                }
-                            }
                         }
 
                     }
@@ -430,14 +398,11 @@ class FetchOrderListsFromYdPortalProcessor
                                 $packingList->save();
                             }
 
-                            if ($allow_contract) {
-                                $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                                foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
-                                    $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
-                                    $step->update(['status' => ApprovalStatus::COMPLETED]);
-                                }
+                            $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                            foreach($packingList->steps()->where('reference', '!=', 'DELIVERY')->get() as $step){
+                                $this->updatesContractObligations->execute($signature, $step->obligation_hash_id);
+                                $step->update(['status' => ApprovalStatus::COMPLETED]);
                             }
-
                         }
                     }
                 }
@@ -452,16 +417,13 @@ class FetchOrderListsFromYdPortalProcessor
                     $transport = $this->createsTransport->execute($transportObject, $packingList);
                     $this->createsSchedule->execute($transport, new ScheduleObject($deliveryDate, $deliveryDate, ApprovalStatus::APPROVED));
 
-
-                    if ($allow_contract) {
-                        $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
-                        $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
-                        $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
-                        $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
-                    }
-
+                    $deliveryStep = $packingList->steps()->where('reference', '=', 'LAST_MILE_DELIVERY')->first();
+                    $signature = $packingList->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::SUPERVISOR)->first()->appointee->entity_sigiture;
+                    $this->updatesContractObligations->execute($signature, $deliveryStep->obligation_hash_id);
+                    $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
                 }
 
+                DB::commit();
                 echo 'successful';
 
             }

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

@@ -46,32 +46,42 @@ class FetchPackingListFromVTPortalProcessor
      */
     public function execute(){
 
-        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->where('reference', 'not like', '%PO%')->whereIn('claimant_id', [2])->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
+        $packingLists = PackingList::where('type', '=', PackingListType::SHIPPING_PACKING_LIST)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::SUSPENDED])->whereDoesntHave('containers', function($query){
             $query->where('status', '=', ApprovalStatus::COMPLETED);
-        })->limit(10)->get();
+        })->get();
 
+        DB::beginTransaction();
         foreach($packingLists as $packingList){
             try {
 
-                $filter = '["PoID:=%js%'.$packingList->reference.'"]';
 
-                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Po","view":"grid1","request":{"PageIndex":-1,"PageSize":1000,"Filter":'.$filter.'}}'), '');
+                $filter = '["PoNumber:=%js%\"'.$packingList->reference.'\"\u0000"]';
+
+                $shippingPackingListsRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"VPodetailparcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"CreatedOn asc","Filter":'.$filter.'}}'), '');
 
                 $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
-
                 if(count($shippingPackingLists->Rows)) {
+                    $packingList->packages()->delete();
 
-                } else {
-                    dump($packingList->reference);
+                    $replica = $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+                    if($replica) $replica->packages()->delete();
+
+                    foreach($shippingPackingLists->Rows as $shippingPackingList){
+                        if(!$shippingPackingList[22]) {
+                            continue;
+                        }
+
+                        $packageObject = new PackageObject(PackageType::CARTON, $shippingPackingList[19], $shippingPackingList[31], $shippingPackingList[30], $shippingPackingList[29], 0, $shippingPackingList[22], ApprovalStatus::APPROVED);
+                        $this->createPackageProcessor->execute($packageObject, $packingList);
+                    }
                 }
 
             } catch (GuzzleException $exception) {
-                dd($exception);
-                Log::error($exception);
                 continue;
             }
 
         }
+        DB::commit();
 
         return [];
 

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

@@ -116,7 +116,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
 
         try {
 
-            $start = $start ? $start : Carbon::today()->subDays(10);
+            $start = $start ? $start : Carbon::now()->subMonth();
 
             $startLimit = Carbon::parse('11-08-2021');
 
@@ -124,44 +124,76 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 $start = $startLimit;
             }
 
-            $end = $end ? $end : Carbon::today()->addDay();
+            $end = $end ? $end : Carbon::now();
 
             $filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
 
-            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"Parcel","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
+            $warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ParcelDate asc","Filter":'.$filter.'}}'), '');
 
             $response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
 
             foreach ($response->Rows as $parcel){
 
-                $allow_contract = true;
-                $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[11]));
+                $marking = preg_split('(-|\(|\)|\/)', str_replace("/YW","", $parcel[5]));
                 $orderNumber = $marking[array_key_last($marking)];
 
-                $quantity = $parcel[16];
-
-                if(!$quantity){
+                if(!$parcel[9]){
                     continue;
                 }
 
-                if(!$parcel[23] || !$parcel[22] || !$parcel[21]) continue;
-
                 try {
                     $order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
-                    $appointee_id = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id;
                 } catch (ResourceNotFoundException $exception) {
-                    $allow_contract = false;
-                    $order = $this->fetchesCompanyModule->execute(['id' => 1]);
-                    $appointee_id = 2037;
+
+                    $oldOrder = OldOrders::where('marking', '=', $orderNumber)->first();
+
+                    if(!$oldOrder){
+                        continue;
+                    }
+
+
+                    $customerMarking = str_replace('/', '', str_replace(' ', '', explode('CIEF/', $oldOrder->company->marking)[1]));
+
+                    $companyModule = CompanyModule::whereHas('inviters', function($query) use ($customerMarking) {
+                        return $query->where('invitee_reference', '=', $customerMarking);
+                    })->first();
+
+
+                    if(!$companyModule){
+                        log::error('unknown customer: '.$customerMarking);
+                        continue;
+                    }
+
+                    if(!$oldOrder->address) {
+                        continue;
+                    }
+
+                    /** @var Address $address */
+                    $address = $this->createAddressFromOldAddressProcessor->execute($oldOrder->address, $companyModule);
+
+                    if(!$address){
+                        continue;
+                    }
+
+
+                    $warehouseId = $parcel[0];
+                    $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
+
+                    $order = $this->createOrderProcessor->execute($companyModule->company, $originWarehouse, $address, $orderNumber);
+
+                    $order->created_at = Carbon::parse($parcel[1]);
+                    $order->save();
+
                 }
 
-                $packingListReference = $parcel[0];
-//                $measurement = round(($parcel[26]/$quantity) ** (1/3) * 100, 2);
-                $description = $parcel[13];
-                $tracking = $parcel[37];
+                $packingListReference = $parcel[17];
+                $quantity = $parcel[9];
+                $measurement = round(($parcel[10]/$quantity) ** (1/3) * 100, 2);
+                $description = $parcel[7];
+                $tracking = $parcel[6];
                 $receiveDate = $parcel[1];
 
-                $packingListObject = new PackingListObject($packingListReference, $appointee_id, PackingListType::WAREHOUSE_RECEIVE_LIST, $allow_contract ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
+                $packingListObject = new PackingListObject($packingListReference, $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::APPROVED);
 
                 /** @var PackingList $packingList */
                 $packingList = $order->packingLists()->where('reference', '=', $packingListReference)->first();
@@ -184,7 +216,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
                 $packingList->packages()->delete();
                 if($replica) $replica->packages()->delete();
 
-                $packageObject = new PackageObject(PackageType::CARTON, $description, $parcel[23], $parcel[22], $parcel[21], 0, $quantity, ApprovalStatus::APPROVED);
+                $packageObject = new PackageObject(PackageType::CARTON, $description, $measurement, $measurement, $measurement, 0, $quantity, ApprovalStatus::APPROVED);
                 $this->createPackageProcessor->execute($packageObject, $packingList);
             }
         } catch (\Exception $exception){

app/Classes/Modules/Segments/ControllersLogic/ListAirShipmentPriceLogic.php

@@ -1,178 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\Services\ListsSegments;
-use App\Http\Resources\AirShipmentItemPriceResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListAirShipmentPriceLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Air Shipment Price List',
-            'message' => 'You have successfully retrieved a list of Air Shipment Price'
-        ];
-    }
-
-
-    /** @var ListsSegments */
-    private $listsSegments;
-
-    /**
-     * ListSegmentLogic constructor.
-     * @param ListsSegments $listsSegments
-     */
-    public function __construct(ListsSegments $listsSegments)
-    {
-        $this->listsSegments = $listsSegments;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        // $query = $this->listsSegments->execute($this->listsSegments->deserializeFilters($request->input('filters')));
-
-        // category - Dimension / perKg
-        $price = array(
-
-            [
-                'details' => json_encode([
-                    'name' => 'Sound system speakers - MINI',
-                    'pricePerKg' => '',
-                    'pricePerPcs' => '',
-                    'isProhibited' => '',
-                    'hasGram' => '',
-                    'hasDimensionCharges' => '',
-                    'tax' => '50',
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'Sound system speakers - SMALL',
-                    'pricePerKg' => '',
-                    'pricePerPcs' => '',
-                    'isProhibited' => '',
-                    'hasGram' => '',
-                    'hasDimensionCharges' => '',
-                    'tax' => '200',
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'Sound system speakers - LARGE',
-                    'pricePerKg' => '',
-                    'pricePerPcs' => '',
-                    'isProhibited' => '',
-                    'hasGram' => '',
-                    'hasDimensionCharges' => '',
-                    'tax' => '400',
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'Washing Machine - Dimension',
-                    'pricePerKg' => '',
-                    'pricePerPcs' => '',
-                    'isProhibited' => '',
-                    'hasGram' => '',
-                    'hasDimensionCharges' => 'true',
-                    'tax' => '',
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'Oven, Balnder - perPcs',
-                    'pricePerKg' => '',
-                    'pricePerPcs' => '20',
-                    'isProhibited' => '',
-                    'hasGram' => '',
-                    'hasDimensionCharges' => '',
-                    'tax' => '',
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'Perfume - perKg',
-                    'pricePerKg' => '33',
-                    'pricePerPcs' => '',
-                    'isProhibited' => '',
-                    'hasGram' => '',
-                    'hasDimensionCharges' => '',
-                    'tax' => '',
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'Gold - Prohibited',
-                    'pricePerKg' => '',
-                    'pricePerPcs' => '',
-                    'isProhibited' => 'true',
-                    'hasGram' => '',
-                    'hasDimensionCharges' => '',
-                    'tax' => '',
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'Food - hasGram',
-                    'pricePerKg' => '',
-                    'pricePerPcs' => '',
-                    'isProhibited' => '',
-                    'hasGram' => 'true',
-                    'hasDimensionCharges' => '',
-                    'tax' => '',
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'TV 30" - 36"',
-                    'pricePerKg' => 28,
-                    'pricePerPcs' => '',
-                    'isProhibited' => '',
-                    'hasGram' => 'true',
-                    'hasDimensionCharges' => "true",
-                    'tax' => 500,
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'TV 37" - 42"',
-                    'pricePerKg' => 28,
-                    'pricePerPcs' => '',
-                    'isProhibited' => '',
-                    'hasGram' => 'true',
-                    'hasDimensionCharges' => "true",
-                    'tax' => 1000,
-                ])
-            ],
-            [
-                'details' => json_encode([
-                    'name' => 'TV 43"+"',
-                    'pricePerKg' => 28,
-                    'pricePerPcs' => '',
-                    'isProhibited' => '',
-                    'hasGram' => 'true',
-                    'hasDimensionCharges' => "true",
-                    'tax' => 1500,
-                ])
-            ]
-        );
-
-        return $this->collectionResponse(AirShipmentItemPriceResource::collection($price));
-
-    }
-
-}

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantLogic.php

@@ -112,7 +112,7 @@ class UpdateConstantLogic  extends AbstractControllerLogic
 
             $constantObject = [];
 
-            $constantObject[$request->input('id')] = $request->input('value');
+            $constantObject[$request->input('id')] = $request->input('rate');
 
             $object = new ConstantObject(
                 $request->input('reference'),

app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php

@@ -25,8 +25,8 @@ class UpdateConstantPostcodeLogic  extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Updated Postcode Constant',
-            'message' => 'You have successfully updated the Postcode Constant'
+            'title' => 'Updated Segment Constant',
+            'message' => 'You have successfully updated the Segment Constant'
         ];
     }
 

app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentLogic.php

@@ -70,8 +70,7 @@ class UpdateSegmentLogic extends AbstractControllerLogic
             $segment_query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
 
             $segment_object = new SegmentObject(
-                $request->input('name'),
-                $segment_query->company_module_id
+                $request->input('name', $segment_query->name)
             );
             $this->canUpdateSegment->passes($segment_object);
             $segment_query = $this->updatesSegment->execute($segment_query, $segment_object);

app/Classes/Modules/Segments/ControllersLogic/UpdateSegmentPriceLogic.php

@@ -1,124 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\ControllersLogic;
-
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\DataTransferObjects\ConstantObject;
-use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
-use App\Classes\Modules\Segments\Services\CreatesConstant;
-use App\Classes\Modules\Segments\Services\CreatesSegment;
-use App\Classes\Modules\Segments\Services\FetchesConstant;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Classes\Modules\Segments\Standards\Rules\CanCreateConstant;
-use App\Classes\Modules\Segments\Standards\Rules\CanUpdateConstant;
-use App\Classes\Modules\Segments\Services\UpdatesConstant;
-use App\Http\Resources\ConstantResource;
-use App\Models\SegmentConstant;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Classes\Modules\Segments\Services\UpdatesConstantValue;
-
-class UpdateSegmentPriceLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Segment Price',
-            'message' => 'You have successfully updated the Segment Price'
-        ];
-    }
-
-    /** @var CanUpdateConstant */
-    private $canUpdateConstant;
-
-    /** @var UpdatesConstant */
-    private $updatesConstant;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var FetchesConstant */
-    private $fetchesConstant;
-
-    /** @var CanCreateConstant */
-    private $canCreateConstant;
-
-    /** @var CreatesConstant */
-    private $createsConstant;
-
-    /** @var CreatesSegment */
-    private $createsSegment;
-
-    /** @var UpdatesConstantValue */
-    private $updatesConstantValue;
-
-    /**
-     * UpdateConstantLogic constructor.
-     * @param CanUpdateConstant $canUpdateConstant
-     * @param UpdatesConstant $updatesConstant
-     * @param FetchesSegment $fetchesSegment
-     * @param FetchesConstant $fetchesConstant
-     * @param CanCreateConstant $canCreateConstant
-     * @param CreatesConstant $createsConstant
-     * @param UpdatesConstantValueByState $updatesConstantValueByState
-     * @param CreatesSegment $createsSegment
-     */
-    public function __construct(
-        CanUpdateConstant $canUpdateConstant, 
-        UpdatesConstant $updatesConstant, 
-        FetchesSegment $fetchesSegment, 
-        FetchesConstant $fetchesConstant, 
-        CanCreateConstant $canCreateConstant, 
-        CreatesConstant $createsConstant,
-        UpdatesConstantValue $updatesConstantValue,
-        CreatesSegment $createsSegment
-    )
-    {
-        $this->canUpdateConstant = $canUpdateConstant;
-        $this->updatesConstant = $updatesConstant;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->fetchesConstant = $fetchesConstant;
-        $this->canCreateConstant = $canCreateConstant;
-        $this->createsConstant = $createsConstant;
-        $this->updatesConstantValue = $updatesConstantValue;
-        $this->createsSegment = $createsSegment;
-    }
-    /**
-     * @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
-    {
-        $segment = $this->fetchesSegment->execute(['id' => $request->route('id')]);
-
-        try {
-
-            $constant = $this->fetchesConstant->execute(['segment_id' => $segment->id, 'reference' => $request->input('reference')]);
-
-            $object = new ConstantObject($request->input('reference'), [$request->input('value')]);
-
-            $this->canUpdateConstant->passes($object);
-
-        } catch (ResourceNotFoundException $exception){
-
-            $object = new ConstantObject(
-                $request->input('reference'),
-                [$request->input('value')]
-            );
-
-            $constant = $this->createsConstant->execute($segment, $object);
-        }
-        
-        $constant = $this->updatesConstant->execute($constant, $object);
-
-        return $this->resourceResponse(new ConstantResource($constant));
-    }
-
-}

app/Classes/Modules/Segments/Services/UpdatesConstantValue.php

@@ -7,9 +7,9 @@ class UpdatesConstantValue
 
     /**
      * @param $json
-     * @param int $state_id
-     * @param array $rate
-     * @return array
+     * @param int $status_id
+     * @param Array $rate
+     * @return Array
      */
     public function execute($json, int $state_id, Array $rate) {
 

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

@@ -9,8 +9,6 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 use App\Classes\Modules\Documents\Services\RejectsDocument;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 
@@ -22,22 +20,20 @@ use Illuminate\Http\Request;
 class ApprovePaymentTransactionLogic extends AbstractControllerLogic
 {
     /**
-     * ApprovePaymentTransactionLogic constructor.
+     * ApprovePaymentVerificationLogic constructor.
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param ApprovesDocument $approvesDocument
      * @param RejectsDocument $rejectsDocument
-     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
-     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param FetchesDocument $fetchesDocument
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
      */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument)
     {
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->approvesDocument = $approvesDocument;
         $this->rejectsDocument = $rejectsDocument;
-        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
-        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
     }
 
     /**
@@ -62,18 +58,10 @@ class ApprovePaymentTransactionLogic extends AbstractControllerLogic
     /** @var RejectsDocument */
     private $rejectsDocument;
 
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor ;
-
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function logic(Request $request) : JsonResponse
     {
@@ -81,31 +69,13 @@ class ApprovePaymentTransactionLogic extends AbstractControllerLogic
         $status = $request->route('status');
 
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('transaction_id')]);
-
+        
         $status === 'approve' ? $this->approvesDocument->execute($transaction->documents()->first()) : $this->rejectsDocument->execute($transaction->documents()->first());
 
         $this->updatesTransactionStatus->execute($transaction, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-        if($transaction->status === ApprovalStatus::APPROVED){
-            $invoice = $transaction->owner;
-            $packingList = $invoice->owner;
-
-            if(($invoice->amount - $transaction->amount) < 0.01) {
-                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
-
-                if(app()->environment('production')){
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                    $this->updateDoFromYDPortalProcessor->execute($packingList);
-                }
-            }
-
-        }
-
-
+        // $this->createInvoiceTransactionProcessor->execute($transaction->booking);
         return $this->response([]);
     }
 
-}
+}

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

@@ -1,98 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-
-use App\Classes\Notifications\InvoiceIssuedEmail;
-use Illuminate\Http\Request;
-
-
-use Illuminate\Http\JsonResponse;
-use Meneses\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\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Modules\Transactions\ControllersLogic\Document;
-
-class ApproveShippingInvoiceTransactionLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Shipping Invoice Status',
-            'message' => 'You have successfully updated the shipping invoice status'
-        ];
-    }
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFiles;
-
-    /**
-     * ApprovePaymentVerificationLogic constructor.
-     * @param FetchesPackingList $fetchesPackingList
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFiles
-     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
-     */
-    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
-    {
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->createsDocument = $createsDocument;
-        $this->createsFiles = $createsFiles;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $packing_list = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
-
-        $invoice_transaction = $packing_list->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->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::SHIPPING_INVOICE,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
-            '',
-            ApprovalStatus::COMPLETED,
-            'shipping_invoice'
-        );
-
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($invoice_transaction, $document_object);
-
-        $this->createsFiles->execute($document, $document_object);
-        $user = $packing_list->owner->companyModule->employees()->first();
-        if(app()->environment(['production'])) {
-            $user->notify(new InvoiceIssuedEmail($user, $packing_list));
-        }
-        return $this->response([]);
-    }
-
-}

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

@@ -18,7 +18,6 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
-use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
@@ -84,12 +83,9 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
             $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
             $billPlzBill = $this->createsBillplzBill->execute(
                 $company_module->name, 
-                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
-                'This payment is for the invoice number . ' . $invoice_transaction->bill_no,
-                $amount,
-                $billNumber, 
-                $request->input('bank_code'), 
-                true
+                $company_module->employees()->first()->email, 
+                'This payment is credit topup for company ref. ' . $company_module->reference, $amount, $billNumber, 
+                $request->input('bank_code'), true
             );
 
             $payment_reference = $billPlzBill->id;
@@ -120,6 +116,6 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
 
         $payment_transaction = $this->createsPaymentTransaction->execute($invoice_transaction, $object);
 
-        return $this->resourceResponse(new TransactionResource($payment_transaction));
+        return $this->response([]);
     }
 }

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

@@ -16,7 +16,6 @@ use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
@@ -25,9 +24,7 @@ use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
 use App\Classes\ValueObjects\Constants\TransactionDetailType;
 
-use App\Models\CompanyModule;
 use App\Models\Document;
-use App\Models\PackingList;
 use App\Models\Transaction;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
@@ -70,11 +67,11 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 
     /** @var CreatesFiles */
     private $createsFile;
-
+    
     public function __construct(
-        FetchesPackingList $fetchesPackingList,
-        FetchesSegmentConstant $fetchesSegmentConstant,
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
+        FetchesPackingList $fetchesPackingList, 
+        FetchesSegmentConstant $fetchesSegmentConstant, 
+        GeneratesTransactionBillNumber $generatesTransactionBillNumber, 
         CreatesTransaction $createsTransaction,
         CreatesTransactionDetail $createsTransactionDetail,
         CreatesDocument $createsDocument,
@@ -94,23 +91,16 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
         $packing_list = $this->fetchesPackingList->execute(['id' => $request->input('packing_list_id')]);
-        $packing_list = PackingList::where('reference', $packing_list->reference)->where('type', PackingListType::SHIPPING_PACKING_LIST)->first();
 
-        $billable_packing_list = $packing_list->packingLists()->first();
-
-        $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packing_list;
-
-        $cbm = round($billable_packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
+        $cbm = $packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum(function($package) {
             return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        }), 3);
+        });
 
-        $over_weight_cbm = round($billable_packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
+        $over_weight_cbm = $packing_list->packages->where('type', PackageType::OVER_WEIGHT)->sum(function($package) {
             return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-        }), 3);
+        });
 
         $order =  $packing_list->owner;
-        $companyModule = $order->companyModule;
-        $connection = $companyModule->connections()->first();
         $address = $order->addresses()->first();
 
         $base_price_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::BASE_PRICE]);
@@ -119,20 +109,12 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         $center_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::CENTER_POSTCODE]);
         $outstation_postcode_constant = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => SegmentConstants::OUTSTATION_POSTCODE]);
 
-        $noMinimumCharge = $connection->segments()->where('segments.id', 2)->first();
-
-        $minimum_cbm = 0.3;
+        $base_price = 0;
+        $warehouse_rate = 0;
+        $state_rate = 0;
         $state_select = '';
 
-        $segment_price = $connection->segments()->whereHas('constants', function($query){
-            return $query->where('reference', SegmentConstants::CUSTOM_PRICE);
-        })->get()->map(function($segment){
-            return (float) $segment->constants()->first()->value[0];
-        })->sort()->first();
-        $segment_price = $segment_price ? $segment_price : 0;
-
-        $packing_list_drop_date = PackingList::where('reference', $packing_list->reference)->where('type', 1)->first()->transports->first()->drop_date->format('Y-m-d');
-        $base_price = $this->getConstantByKey($base_price_constant, $packing_list_drop_date);
+        $base_price = $this->getConstantByKey($base_price_constant, date('Y-m-d'));
 
         $warehouseId = $order->orderRoles()->where('role_id', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->company_module_id;
         $selected_warehouse_rate = $this->getConstantByKey($warehouse_rate_constant, $warehouseId);
@@ -148,64 +130,27 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         $state_rate_constant = (array)$state_rate_constant;
         $state_rate = $state_select == '' ? 0 : $state_rate_constant[$state_select];
 
-        $container = $packing_list->containers()->first();
-        $containerPackingLists = collect();
-        $hasMinimumCharge = null;
-
-        foreach ($container->packingLists as $packingList){
-            if($packingList->owner instanceof CompanyModule) continue;
-            if($packingList->owner->companyModule->id !== $companyModule->id) continue;
-            $containerPackingLists->push($packingList);
-
-            if(!$hasMinimumCharge) {
-                $hasMinimumCharge = $packingList->transactions()->whereHas('transactionDetails', function ($query){
-                    $query->where('reference', 'MIN_CBM_CHARGES');
-                })->first();
-            }
-
-        }
-
-        $totalContainerCbm = $containerPackingLists->sum(function($packingList){
-            $billable_packing_list = $packingList->packingLists()->first();
-            $billable_packing_list = $billable_packing_list ? $billable_packing_list : $packingList;
-            return $billable_packing_list->packages->sum(function($package) {
-                return ($package->width / 100) * ($package->height / 100) *($package->length / 100) * ($package->quantity);
-            });
-        });
-
-        $minimum_charge = $minimum_cbm - $totalContainerCbm;
-        $minimum_charge = ($minimum_charge < 0) ? 0 : $minimum_charge;
-        $minimum_charge = $noMinimumCharge ? 0 : $minimum_charge;
-
-        $minimum_charge = $noMinimumCharge ? 0 : round($minimum_charge, 3);
-
-
-        if($hasMinimumCharge) {
-            $minimum_charge = 0;
-        }
-
-        $price_cbm = $base_price + $segment_price + $warehouse_rate + $state_rate;
-
-        $total_cbm = $price_cbm * ($cbm + $minimum_charge + $over_weight_cbm);
+        $price_cbm = $base_price + $warehouse_rate + $state_rate;
+        $total_cbm = $price_cbm * ($cbm + $over_weight_cbm);
 
         $billNumber = $this->generatesTransactionBillNumber->execute('SHIP-');
 
         $object = new TransactionObject(
-            $billNumber,
-            TransactionType::SHIPPING_INVOICE,
-            1,
+            $billNumber, 
+            TransactionType::SHIPPING_INVOICE, 
+            1, 
             $order->company_module_id,
-            1,
+            1, 
             PaymentMethodType::CASH,
             $total_cbm,
             $total_cbm,
             1,
-            1,
+            1, 
+            0, 
+            0, 
             0,
-            0,
-            0,
-            null,
-            ApprovalStatus::PENDING_SUBMISSION
+            null, 
+            ApprovalStatus::PENDING_VERIFICATION
         );
 
         /** @var Transaction $invoice_transaction */
@@ -213,13 +158,13 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
 
         $object_detail = new TransactionDetailObject(
             'SHIPPING_FEE',
-            TransactionDetailType::SHIPPING_FEE.'<br>'.round($packing_list->packages->where('type', '!=', PackageType::OVER_WEIGHT)->sum('quantity'), 3).' CTNS - '.round($cbm, 3).' CBM',
+            TransactionDetailType::SHIPPING_FEE,
             $cbm,
             $price_cbm
         );
 
         $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
-
+        
         if ($over_weight_cbm > 0) {
             $object_detail = new TransactionDetailObject(
                 'OVER_WEIGHT_CHARGES',
@@ -231,16 +176,20 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
             $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
         }
 
-        if ($minimum_charge > 0) {
-            $object_detail = new TransactionDetailObject(
-                'MIN_CBM_CHARGES',
-                TransactionDetailType::MIN_CBM_CHARGES,
-                $minimum_charge,
-                $price_cbm
-            );
+        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice_transaction]);
 
-            $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
-        }
+        $document_object = new DocumentObject(
+            DocumentType::SHIPPING_INVOICE,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'shipping_invoice'
+        );
+
+        /** @var Document $document */
+        $document = $this->createsDocument->execute($invoice_transaction, $document_object);
+
+        $this->createsFile->execute($document, $document_object);
 
         return $this->response([]);
     }
@@ -249,7 +198,6 @@ class CreateShippingInvoiceTransactionLogic extends AbstractControllerLogic
         if ($segmentConstantObject) {
             $base_rate = (array) $segmentConstantObject->value;
             $base_rate = array_key_exists($key, $base_rate) === true ? $base_rate[$key] : 0;
-
             return $base_rate;
         }
     }

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

@@ -1,92 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\SegmentConstants\Services\FetchesSegmentConstant;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-
-use App\Models\District;
-use Carbon\Carbon;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Classes\General\Helper;
-
-class ShippingEstimationCalculatorLogic extends AbstractControllerLogic
-{
-
-    /** @var FetchesSegmentConstant */
-    private $fetchesSegmentConstant;
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Shipping estimation',
-            'message' => 'You have successfully calculate the Shipping Estimation'
-        ];
-    }
-
-    public function __construct(
-        FetchesSegmentConstant $fetchesSegmentConstant
-    ){
-        $this->fetchesSegmentConstant = $fetchesSegmentConstant;
-    }
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $base_price =  $warehouse_rate =  $state_rate = 0;
-
-        $width = $request->input('width') / 100;    // metre
-        $length = $request->input('length') / 100;  // metre
-        $height = $request->input('height') / 100;  // metre
-
-        $cbm = (float) ($width * $length * $height);
-
-        // calculate base price
-        $base_prices = $this->getSegmentConstantData(SegmentConstants::BASE_PRICE);
-        $base_price  = $this->getConstantDataUsingKey($base_prices, date('Y-m-d'));  
-
-        // calculate warehouse rate
-        $warehouse_prices = $this->getSegmentConstantData(SegmentConstants::WAREHOUSE_RATE);
-        $warehouse_rate  = $this->getConstantDataUsingKey($warehouse_prices, $request->input('warehouse_id'), 'amount'); 
-
-        // calculate applied state rate
-        $state_prices = $this->getSegmentConstantData(SegmentConstants::STATE_RATE);
-        $outstation_postcodes = $this->getSegmentConstantData(SegmentConstants::OUTSTATION_POSTCODE);
-
-        $district = District::where('postcode','LIKE','%'.$request->input('postcode').'%')->first();
-        if(array_search($request->input('postcode'), $outstation_postcodes)!==false){
-            $state_rate = $this->getConstantDataUsingKey($state_prices, $district->state_id, 'outstation'); 
-        }
-
-        $price_cbm = $base_price + $warehouse_rate + $state_rate;
-        $total_price_cbm = $price_cbm * $cbm;
-
-        return $this->response([
-            'cbm' => $cbm,  'base_price' => $base_price, 'warehouse_rate' => $warehouse_rate,
-            'state_rate' => $state_rate, 'total_price_cbm' => $total_price_cbm
-        ]);
-    }
-
-    private function getConstantDataUsingKey($data, $search_key, $field='')
-    {
-        if(array_key_exists($search_key, $data) !== true) {
-            return 0;
-        } else {
-            if($field!=''){
-                return $data[$search_key]->$field;
-            } else {
-                return $data[$search_key];
-            }
-        }
-    }
-
-    private function getSegmentConstantData($reference)
-    {
-        $data = $this->fetchesSegmentConstant->execute(['segment_id' => 1, 'reference' => $reference]);
-        return (array) $data->value;
-    }
-
-}

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

@@ -50,10 +50,10 @@ class SuspendTransactionLogic extends AbstractControllerLogic
 
         $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
 
-        $transaction = $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::SUSPENDED);
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::SUSPENDED);
+
+        return $this->response([]);
 
-        return $this->resourceResponse(new TransactionResource($transaction));
-        
     }
 
 

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

@@ -1,147 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Models\Transaction;
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Storage;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\ValueObjects\Constants\TransactionDetailType;
-use App\Classes\Modules\Documents\DataTransferObjects\FileObject;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Transactions\Services\UpdatesTransaction;
-
-use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
-use App\Classes\Modules\Transactions\Services\FetchesTransactionDetail;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionDetail;
-use App\Classes\Modules\Transactions\Services\DeletesTransactionDetails;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-
-class UpdateShippingInvoiceTransactionLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Update Shipping Invoice Transaction',
-            'message' => 'You have successfully update shipping invoice transaction'
-        ];
-    }
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var UpdatesTransaction */
-    private $updatesTransaction;
-
-    /** @var FetchesTransactionDetail */
-    private $fetchesTransactionDetail;
-
-    /** @var CreatesTransactionDetail */
-    private $createsTransactionDetail;
-
-    /** @var UpdatesTransactionDetail */
-    private $updatesTransactionDetail;
-
-    /** @var DeletesTransactionDetails */
-    private $deletesTransactionDetails;
-    
-    public function __construct(
-        FetchesPackingList $fetchesPackingList,  
-        FetchesTransaction $fetchesTransaction,
-        UpdatesTransaction $updatesTransaction,
-        FetchesTransactionDetail $fetchesTransactionDetail,
-        CreatesTransactionDetail $createsTransactionDetail,
-        UpdatesTransactionDetail $updatesTransactionDetail,
-        DeletesTransactionDetails $deletesTransactionDetails
-    )
-    {
-
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->updatesTransaction = $updatesTransaction;
-        $this->fetchesTransactionDetail = $fetchesTransactionDetail;
-        $this->createsTransactionDetail = $createsTransactionDetail;
-        $this->updatesTransactionDetail = $updatesTransactionDetail;
-        $this->deletesTransactionDetails = $deletesTransactionDetails;
-    }
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $invoice_transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
-
-        $old_transaction_details = $invoice_transaction->transactionDetails->whereNotIn('reference', ['SHIPPING_FEE', 'OVER_WEIGHT_CHARGES', 'MIN_CBM_CHARGES'])->pluck('id')->toArray();
-
-        $new_transaction_details = collect($request->input('transaction_details'));
-
-        $total_cbm = $invoice_transaction->amount;
-
-        foreach($old_transaction_details as $old_transaction_detail_id){
-            $old_transaction_detail = $this->fetchesTransactionDetail->execute(['id' => $old_transaction_detail_id]);
-
-            $total_cbm -= $old_transaction_detail->price;
-
-            if(!$new_transaction_details->contains('id', $old_transaction_detail_id)){
-                $this->deletesTransactionDetails->execute($old_transaction_detail);
-            }
-        }
-
-        foreach($new_transaction_details as $transaction_detail){
-            $transaction_detail = (object) $transaction_detail;
-
-            if(!in_array($transaction_detail->reference, ['SHIPPING_FEE', 'OVER_WEIGHT_CHARGES', 'MIN_CBM_CHARGES'])){
-                $object_detail = new TransactionDetailObject(
-                    'CUSTOM_CHARGES',
-                    isset($transaction_detail->name) ? $transaction_detail->name : TransactionDetailType::CUSTOM_CHARGES,
-                    $transaction_detail->quantity,
-                    $transaction_detail->price
-                );
-
-                if(isset($transaction_detail->id)){
-                    $new_transaction_detail = $this->updatesTransactionDetail->execute($this->fetchesTransactionDetail->execute(['id' => $transaction_detail->id]), $object_detail);
-                }else{
-                    $new_transaction_detail = $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
-                }
-            }
-        }
-
-        $object = new TransactionObject(
-            $invoice_transaction->bill_no, 
-            TransactionType::SHIPPING_INVOICE, 
-            1, 
-            $invoice_transaction->issuer,
-            1, 
-            PaymentMethodType::CASH,
-            $invoice_transaction->transactionDetails()->sum('amount'),
-            $invoice_transaction->transactionDetails()->sum('amount'),
-            1,
-            1, 
-            0, 
-            0, 
-            0,
-            null, 
-            ApprovalStatus::PENDING_VERIFICATION
-        );
-
-        /** @var Transaction $invoice_transaction */
-        $invoice_transaction = $this->updatesTransaction->execute($invoice_transaction, $object);
-
-        return $this->response([]);
-    }
-
-}

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

@@ -1,71 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\BookingResource;
-use App\Http\Resources\TransactionResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateTransactionStatusLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Update Transaction Status',
-            'message' => 'You have successfully updated the Transaction Status'
-        ];
-    }
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-
-    /**
-     * SuspendTransactionLogic constructor.
-     * @param FetchesTransaction $fetchesTransaction
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     */
-    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus)
-    {
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-    }
-
-
-    public function logic(Request $request) : JsonResponse
-    {
-        $approvalArray = [
-            'approve' => ApprovalStatus::APPROVED,
-            'expire' => ApprovalStatus::EXPIRED,
-            'reject' => ApprovalStatus::REJECTED,
-        ];
-
-        $approvalStatus = $approvalArray[$request->route('status')];
-
-        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
-
-        if ($request->route('status') === 'reject') {
-            $transaction->delete();
-        } else {
-            $transaction = $this->updatesTransactionStatus->execute($transaction, $approvalStatus);
-        }
-
-        return $this->resourceResponse(new TransactionResource($transaction));
-    }
-
-
-
-}

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

@@ -1,204 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransaction;
-use App\Classes\Modules\Transactions\Standards\Rules\CanCreateTransactionDetail;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Transactions\Services\CreatesTransactionDetail;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Http\Resources\TransactionResource;
-use App\Http\Resources\TransactionDetailResource;
-
-use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceipt;
-use App\Classes\Modules\Receipts\Standards\Rules\CanCreateReceiptDetail;
-use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptObject;
-use App\Classes\Modules\Receipts\DataTransferObjects\ReceiptDetailObject;
-use App\Classes\Modules\Receipts\Services\CreatesReceipt;
-use App\Classes\Modules\Receipts\Services\CreatesReceiptDetail;
-use App\Classes\Modules\Receipts\Services\GeneratesReceiptBillNo;
-
-use App\Classes\Modules\Currencies\Services\FetchesCurrency;
-use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
-
-use App\Classes\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Services\FetchesTransactionDetail;
-
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-
-
-use App\Models\Transaction;
-use App\Models\multipleInvoicesWithOnePayment;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use APP\models\PackingList;
-
-
-
-class multipleInvoicesWithOnePaymentLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Transaction',
-            'message' => 'You have successfully created a transaction'
-        ];
-    }
-
-    
-    /** @var GeneratesTransactionBillNumber */
-    private $generatesTransactionBillNo;
-
-    /** @var CanCreateTransaction */
-    private $canCreateTransaction;
-    
-    private $fetchesCurrency;
-   
-    private $rateCalculatesCurrency;
-    
-    private $fetchesCompany;
-
-    private $createsTransaction;
-    
-    private $canCreateTransactionDetail;
-    
-    private $createsTransactionDetail;
-    
-    private $fetchesTransaction;
-    
-    private $fetchesTransactionDetail;
-    
-    private $generatesReceiptBillNo;
-
-    /** @var CanCreateReceipt */
-    private $canCreateReceipt;
-    
-    private $createsReceipt;
-    
-    private $canCreateReceiptDetail;
-    
-    private $createsReceiptDetail;
-
-   
-    public function __construct(
-        GeneratesTransactionBillNumber $generatesTransactionBillNo, CanCreateTransaction $canCreateTransaction,
-        FetchesCurrency $fetchesCurrency, RateCalculatesCurrency $rateCalculatesCurrency, FetchesCompany $fetchesCompany,
-        CreatesTransaction $createsTransaction,
-        CanCreateTransactionDetail $canCreateTransactionDetail, CreatesTransactionDetail $createsTransactionDetail,
-        FetchesTransaction $fetchesTransaction , FetchesTransactionDetail $fetchesTransactionDetail,
-        GeneratesReceiptBillNo $generatesReceiptBillNo, CanCreateReceipt $canCreateReceipt,
-        CreatesReceipt $createsReceipt,
-        CanCreateReceiptDetail $canCreateReceiptDetail, CreatesReceiptDetail $createsReceiptDetail
-    ){
-        $this->generatesTransactionBillNo = $generatesTransactionBillNo;
-        $this->canCreateTransaction = $canCreateTransaction;
-        $this->fetchesCurrency = $fetchesCurrency;
-        $this->rateCalculatesCurrency = $rateCalculatesCurrency;
-        $this->fetchesCompany = $fetchesCompany;
-        $this->createsTransaction =$createsTransaction;
-        $this->canCreateTransactionDetail =$canCreateTransactionDetail;
-        $this->createsTransactionDetail = $createsTransactionDetail;
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->fetchesTransactionDetail = $fetchesTransactionDetail;
-        
-        $this->generatesReceiptBillNo = $generatesReceiptBillNo;
-        $this->canCreateReceipt = $canCreateReceipt;
-        $this->createsReceipt =$createsReceipt;
-        $this->canCreateReceiptDetail =$canCreateReceiptDetail;
-        $this->createsReceiptDetail = $createsReceiptDetail;
-        
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-
-    
-    public function logic( $transactionsArray) : JsonResponse
-    {
-   
-        try {
-
-        $transactions = Transaction::whereIn('id', json_decode($transactionsArray))->where('type', TransactionType::SHIPPING_INVOICE)->get();
-        $total = $transactions->sum('amount');
-        $packingList =$transactions[1]->owner;
-        $order = $packingList->owner;
-        $companyModule = $order->companyModule;
-        $company = $companyModule->company;
-        $wallet = $company->wallets()->first();
-        
-        if (!$wallet) {
-            $object = new WalletObject($company->id, 1, (App()->make(GeneratesWalletCode::class))->execute());
-            /** @var Wallet $wallet */
-            $wallet = (App()->make(CreatesWallet::class))->execute($object, $company);
-        }
-
-        $billNumber = (App()->make(GeneratesTransactionBillNumber::class))->execute('TOPUP-');
-
-        if($total < 0) {
-            throw new MalformedRequestException('Top up credit value must be greater than zero.');
-        }
-        $billPlzBill = (App()->make(CreatesBillplzBill::class))->execute($company->name, 'example@gmail.com', 'This payment is credit topup for company ref. ' . $company->reference, $total, $billNumber, 'bank code', true);
-
-        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $total, $total, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], 'test');
-        
-    
-        $transaction = (App()->make(CreatesTransaction::class))->execute($wallet, $transaction_object);
-        $result= (App()->make(UpdatesWalletBalance::class))->execute($wallet, $total);
-
-      foreach ($transactions as $key => $value) {
-        multipleInvoicesWithOnePayment::create([ 'topUp_request_id' => $transaction->id, 'transaction_id' => $value->id  ]);
-            
-            }
-
-            // payment gateway api call
-
-            return $this->response([]); ;
-            
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-    public function verifypayment( $topUp_transaction_id, $amount) : JsonResponse
-    {
-        $totalamount =0;
-       $topup = multipleInvoicesWithOnePayment::where('topUp_request_id',$topUp_transaction_id)->get();
-       
-       foreach ($topup as $key => $value) {
-           $transaction =  Transaction::where('id',$value->transaction_id)->frist();
-           $totalamount += $transaction->amount;  
-           (App()->make(updatesTransactionStatus::class))->execute($transaction, ApprovalStatus::APPROVED);
-           
-        $transaction_object = new TransactionObject($transaction->bill_no, TransactionType::PAYMENT, 1, $topUp_transaction_id, 1, PaymentMethodType::PAYMENT_GATEWAY, $transaction->amount, $transaction->amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], 'test');
-        $transaction = (App()->make(CreatesTransaction::class))->execute($transaction, $transaction_object);
-           
-        }
-        $amount = $amount - $totalamount;
-        Transaction::where('id', $topUp_transaction_id)->update(['amount'=> $amount]);  
-
-    }
-}

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

@@ -22,7 +22,6 @@ class CreatesPaymentTransaction extends AbstractUpdateRelationshipRecord
         $model->receiver = $object->getReceiver();
         $model->recipient_bank_account_id = $object->getRecipientBankAccountId();
         $model->payment_method = $object->getPaymentMethod();
-        $model->payment_reference = $object->getPaymentReference();
         $model->amount = $object->getAmount();
         $model->original_amount = $object->getOriginalAmount();
         $model->currency_id = $object->getCurrencyId();

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

@@ -15,7 +15,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute( $packing_list, TransactionObject $object) {
+    public function execute(PackingList $packing_list, TransactionObject $object) {
         $model = new Transaction();
         $model->bill_no = $object->getBillNo();
         $model->type = $object->getTransactionType();

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

@@ -3,17 +3,17 @@
 namespace App\Classes\Modules\Transactions\Services;
 
 use App\Classes\General\Eloquent\AbstractDeleteRecord;
-use App\Models\TransactionDetail;
+use App\Models\Transaction;
 
 class DeletesTransactionDetails extends AbstractDeleteRecord
 {
 
     /**
-     * @param TransactionDetail $model
+     * @param Transaction $model
      * @return mixed
      */
-    public function execute(TransactionDetail $model) {
-        return $model->delete();
+    public function execute(Transaction $model) {
+        return $model->transactionDetails()->delete();
     }
 
 }

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

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-use App\Models\TransactionDetail;
-
-class UpdatesTransactionDetail extends AbstractUpdateRecord
-{
-    /**
-     * @param TransactionDetail $transactionDetail
-     * @param TransactionDetailObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(TransactionDetail $transactionDetail, TransactionDetailObject $object) {
-        $transactionDetail->reference = $object->getReference();
-        $transactionDetail->name = $object->getName();
-        $transactionDetail->quantity = $object->getQuantity();
-        $transactionDetail->price = $object->getPrice();
-        $transactionDetail->amount = $object->getAmount();
-
-        return $this->handler($transactionDetail);
-
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-use App\Classes\Modules\Wallets\Standards\Rules\CanCreateCompanyWallet;
-use App\Http\Resources\WalletResource;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class CreateWalletLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Company Wallet',
-            'message' => 'You have successfully created a company wallet'
-        ];
-    }
-
-    /** @var CreatesWallet  */
-   private $createsWallet;
-
-   /** @var GeneratesWalletCode */
-   private $generatesWalletCode;
-
-   /** @var CanCreateCompanyWallet */
-   private $canCreateCompanyWallet;
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CanCreateCompanyWallet $canCreateCompanyWallet
-     */
-    public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet, FetchesCompany $fetchesCompany)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->createsWallet = $createsWallet;
-        $this->generatesWalletCode = $generatesWalletCode;
-        $this->canCreateCompanyWallet = $canCreateCompanyWallet;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $object = new WalletObject($request->input('company_id'), $request->input('currency_id'), $this->generatesWalletCode->execute());
-
-        $this->canCreateCompanyWallet->passes($object);
-
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
-        $wallet = $this->createsWallet->execute($object, $company);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/CreateWalletTransactionLogic.php

@@ -1,132 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\Standards\Rules\CanCreateWalletTransaction;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
-use App\Classes\Modules\Wallets\Services\CreatesWalletTransaction;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletTransactionBillNo;
-use App\Http\Resources\WalletTransactionResource;
-use App\Classes\Modules\Wallets\Services\FetchesWallet;
-
-use App\Classes\Modules\Currencies\Services\FetchesCurrency;
-use App\Classes\Modules\Currencies\Services\RateCalculatesCurrency;
-/*
-use App\Classes\Modules\Accounts\Standards\Rules\CanCreateUser;
-use App\Classes\Modules\Accounts\Services\CreatesUser;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
-use App\Http\Resources\UserResource;
-
-use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompany;
-use App\Classes\Modules\Companies\Services\CreatesCompany;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-
-use App\Classes\Modules\Contacts\Standards\Rules\CanCreateContact;
-use App\Classes\Modules\Contacts\Services\CreatesContact;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-
-use App\Classes\Modules\Companies\Standards\Rules\CanCreateCompanyEmployee;
-use App\Classes\Modules\Companies\Services\CreatesCompanyEmployee;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyEmployeeObject;
-
-use App\Classes\Modules\SegmentCompanies\Standards\Rules\CanCreateSegmentCompany;
-use App\Classes\Modules\SegmentCompanies\Services\CreatesSegmentCompany;
-use App\Classes\Modules\SegmentCompanies\DataTransferObjects\SegmentCompanyObject;
-*/
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class CreateWalletTransactionLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Wallet Transaction',
-            'message' => 'You have successfully created a wallet transaction'
-        ];
-    }
-
-    /** @var CreatesWalletTransaction  */
-   private $createsWalletTransaction;
-
-   /** @var GeneratesWalletTransactionBillNo */
-   private $generatesWalletTransactionBillNo;
-
-   /** @var CanCreateWalletTransaction */
-   private $canCreateWalletTransaction;
-   
-   private $fetchesCurrency;
-   
-   private $rateCalculatesCurrency;
-   
-   private $fetchesWallet;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWalletTransaction $createsWalletTransaction
-     * @param GeneratesWalletTransactionBillNo $generatesWalletTransactionBillNo
-     * @param CanCreateWalletTransaction $canCreateWalletTransaction
-     * @param FetchesCurrency $fetchesCurrency
-     * @param RateCalculatesCurrency $rateCalculatesCurrency
-     * @param FetchesWallet $fetchesWallet
-     */
-    public function __construct(
-            CreatesWalletTransaction $createsWalletTransaction, GeneratesWalletTransactionBillNo $generatesWalletTransactionBillNo, CanCreateWalletTransaction $canCreateWalletTransaction,
-            FetchesCurrency $fetchesCurrency,RateCalculatesCurrency $rateCalculatesCurrency, FetchesWallet $fetchesWallet
-        )
-    {
-        $this->createsWalletTransaction = $createsWalletTransaction;
-        $this->generatesWalletTransactionBillNo = $generatesWalletTransactionBillNo;
-        $this->canCreateWalletTransaction = $canCreateWalletTransaction;
-        $this->fetchesCurrency = $fetchesCurrency;
-        $this->rateCalculatesCurrency = $rateCalculatesCurrency;
-        $this->fetchesWallet = $fetchesWallet;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        try {
-
-            DB::beginTransaction();
-            
-            $wallet =  $this->fetchesWallet->execute(['id' => $request->route('id')]);
-            $conversion_currency = $this->fetchesCurrency->execute(['id' => $request->input('currency_id')]);
-            $convertable_currency = $this->fetchesCurrency->execute(['id' => $wallet->currency_id]);//MYR
-            
-            $convert_amount = $this->rateCalculatesCurrency->execute($conversion_currency, $convertable_currency, $request->input('amount'));
-            $convert_rate = $this->rateCalculatesCurrency->execute_rate($conversion_currency, $convertable_currency);
-            
-
-            $object = new WalletTransactionObject(
-                $wallet->id, $this->generatesWalletTransactionBillNo->execute(),$request->input('trans_type'),
-                number_format( (float) $convert_amount, 5, '.', ''), $wallet->currency_id , number_format( (float) $request->input('amount'), 5, '.', ''),
-                $request->input('currency_id'),number_format( (float) $convert_rate, 5, '.', '')
-            );
-
-            $this->canCreateWalletTransaction->passes($object);
-
-            $wallet_transaction = $this->createsWalletTransaction->execute($object);
-
-            DB::commit();
-
-            return $this->resourceResponse(new WalletTransactionResource($wallet_transaction));
-
-        } catch (\Exception $exception) {
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/CreditWalletLogic.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use App\Http\Resources\WalletResource;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Wallets\Processors\CreditWalletProcessor;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-
-class CreditWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Credit into Company Wallet',
-            'message' => 'You have successfully credit company wallet'
-        ];
-    }
-
-
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var GeneratesWalletCode */
-    private $generatesWalletCode;
-
-    /** @var CreatesWallet  */
-    private $createsWallet;
-
-    /** @var GeneratesTransactionBillNumber  */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesTransaction */
-    private $createsTransaction;
-
-    /** @var UpdatesWallet */
-    private $updatesWallet;
-
-    /** @var CreditWalletProcessor */
-    private $creditWalletProcessor;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
-     * @param CreatesTransaction $createsTransaction
-     * @param UpdatesWallet $updatesWallet
-     * @param CreditWalletProcessor $creditWalletProcessor
-     */
-    public function __construct(
-        FetchesCompany $fetchesCompany,
-        GeneratesWalletCode $generatesWalletCode,
-        CreatesWallet $createsWallet,
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
-        CreatesTransaction $createsTransaction,
-        UpdatesWallet $updatesWallet,
-        CreditWalletProcessor $creditWalletProcessor
-    )
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->generatesWalletCode = $generatesWalletCode;
-        $this->createsWallet = $createsWallet;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsTransaction = $createsTransaction;
-        $this->updatesWallet = $updatesWallet;
-        $this->creditWalletProcessor = $creditWalletProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $amount = floatval(str_replace(',', '', $request->input('amount')));
-
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
-        $reference = $request->input('reference');
-
-        $type = $request->input('transaction_type');
-
-        $wallet = $this->creditWalletProcessor->execute($company, $type, $amount, $reference);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/DebitWalletLogic.php

@@ -1,117 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
-
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\WalletResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class DebitWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Debit into Company Wallet',
-            'message' => 'You have successfully debit company wallet'
-        ];
-    }
-
-
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var GeneratesTransactionBillNumber  */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesTransaction */
-    private $createsTransaction;
-
-    /** @var UpdatesWallet */
-    private $updatesWallet;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
-     * @param CreatesTransaction $createsTransaction
-     * @param UpdatesWallet $updatesWallet
-     */
-    public function __construct(
-        FetchesCompany $fetchesCompany,
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
-        CreatesTransaction $createsTransaction,
-        UpdatesWallet $updatesWallet
-    )
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsTransaction = $createsTransaction;
-        $this->updatesWallet = $updatesWallet;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $amount = floatval(str_replace(',', '', $request->input('amount')));
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-        $reference = $request->input('reference');
-
-        if (!$company->wallets()->first()) {
-            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
-            $wallet = $this->createsWallet->execute($object, $company);
-        }
-
-        $wallet = $company->wallets()->first();
-
-        $billNumber = $this->generatesTransactionBillNumber->execute('DEBIT-NOTE-');
-        
-        $transaction_object = new TransactionObject(
-            $billNumber, 
-            TransactionType::DEBIT_NOTE, 
-            1, 
-            $wallet->company->id,
-            1, 
-            PaymentMethodType::CASH,
-            $amount, 
-            $amount, 
-            1,
-            1, 
-            1,
-            0, 
-            0, 
-            null, 
-            ApprovalStatus::APPROVED,
-            [],
-            $reference
-        );
-
-        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
-        $updateWalletAmount = $wallet->amount - $transaction->amount;
-
-        $walletOject = new WalletObject($wallet->company->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
-
-        $wallet = $this->updatesWallet->execute($wallet, $walletOject);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\ListsWallet;
-use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
-use App\Http\Resources\WalletResource;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class ListWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'List Company Wallet',
-            'message' => 'You have successfully list company wallet'
-        ];
-    }
-
-    /** @var ListWallet  */
-   private $listsWallet;
-
-   /** @var CanCreateCompanyWallet */
-   private $canListWallet;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CanCreateCompanyWallet $canCreateCompanyWallet
-     */
-    public function __construct(CanListWallet $canListWallet, ListsWallet $listsWallet)
-    {
-        $this->canListWallet = $canListWallet;
-        $this->listsWallet = $listsWallet;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        //$this->canListWallet->passes();
-
-        $query = $this->listsWallet->execute($this->listsWallet->deserializeFilters($request->input('filters')));
-
-        return $this->collectionResponse(WalletResource::collection($query));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php

@@ -1,113 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use App\Classes\Modules\Wallets\Services\CreatesWalletTransaction;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\WalletResource;
-use App\Http\Resources\WalletTransactionResource;
-use App\Models\Wallet;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class TopUpWalletLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'TopUp into Company Wallet',
-            'message' => 'You have successfully created a topup request for company\'s wallet'
-        ];
-    }
-
-
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var GeneratesWalletCode */
-    private $generatesWalletCode;
-
-    /** @var CreatesWallet  */
-    private $createsWallet;
-
-    /** @var GeneratesTransactionBillNumber  */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesBillplzBill */
-    private $createsBillplzBill;
-
-    /** @var CreatesTransaction */
-    private $createsTransaction;
-
-
-    /**
-     * TopUpWalletLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
-     * @param CreatesBillplzBill $createsBillplzBill
-     * @param CreatesTransaction $createsTransaction
-     */
-    public function __construct(FetchesCompany $fetchesCompany, GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesBillplzBill $createsBillplzBill, CreatesTransaction $createsTransaction)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->generatesWalletCode = $generatesWalletCode;
-        $this->createsWallet = $createsWallet;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsBillplzBill = $createsBillplzBill;
-        $this->createsTransaction = $createsTransaction;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $amount = floatval(str_replace(',', '', $request->input('amount')));
-        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-
-        /** @var Wallet $wallet */
-        $wallet = $company->wallets()->first();
-
-        if (!$wallet) {
-            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
-            /** @var Wallet $wallet */
-            $wallet = $this->createsWallet->execute($object, $company);
-        }
-
-        $user = $company->employees()->first();
-        $billNumber = $this->generatesTransactionBillNumber->execute('TOPUP-');
-
-        if($amount < 0) {
-            throw new MalformedRequestException('Top up credit value must be greater than zero.');
-        }
-
-        $billPlzBill = $this->createsBillplzBill->execute($company->name, $user->email, 'This payment is credit topup for company ref. ' . $company->reference, $amount, $billNumber, $request->input('bank_code'), true);
-
-        $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
-
-        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
-
-        return $this->resourceResponse(new WalletTransactionResource($transaction));
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\ListsWallet;
-use App\Classes\Modules\Wallets\Services\FetchesWallet;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-
-use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet;
-use App\Http\Resources\WalletResource;
-use App\Classes\Modules\Transactions\Processors\UpdateWalletTransactionProcessor;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UpdateStatusWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Update Status Transaction Company Wallet',
-            'message' => 'You have successfully status transaction company wallet'
-        ];
-    }
-
-    /** @var ListWallet  */
-   private $fetchesWallet;
-
-   /** @var CanCreateCompanyWallet */
-   private $canListWallet;
-
-    /** @var UpdateWalletTransactionProcessor */
-    private $updateWalletTransactionProcessor;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CanCreateCompanyWallet $canCreateCompanyWallet
-     */
-    public function __construct(FetchesWallet $fetchesWallet, UpdateWalletTransactionProcessor $updateWalletTransactionProcessor)
-    {
-        $this->fetchesWallet = $fetchesWallet;
-        $this->updateWalletTransactionProcessor = $updateWalletTransactionProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $status = ($request->route('status')=='approve') ? 2 : 4;
-
-        $wallet = $this->updateWalletTransactionProcessor->execute($request->route('transaction_id'), $status);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-
-    }
-}

app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\ListsWallet;
-use App\Classes\Modules\Wallets\Services\FetchesWallet;
-use App\Classes\ValueObjects\Constants\TransactionType;
-
-use App\Classes\Modules\Wallets\Standards\Rules\CanWithdrawWallet;
-use App\Http\Resources\WalletResource;
-use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor;
-
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class WithdrawWalletLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Withdraw from Company Wallet',
-            'message' => 'You have successfully withdraw company wallet'
-        ];
-    }
-
-    /** @var FetchesWallet  */
-   private $fetchesWallet;
-
-   /** @var CanWithdrawWallet */
-   private $canWithdrawWallet;
-
-    /** @var CreateWalletTransactionProcessor */
-    private $createWalletTransactionProcessor;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CanCreateCompanyWallet $canCreateCompanyWallet
-     */
-    public function __construct(CanWithdrawWallet $canWithdrawWallet, FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor)
-    {
-        $this->canWithdrawWallet = $canWithdrawWallet;
-        $this->fetchesWallet = $fetchesWallet;
-        $this->createWalletTransactionProcessor = $createWalletTransactionProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]);
-
-        $walletOject = new WalletObject( $wallet->company->id,  $wallet->currency_id,  $wallet->code, $request->input('amount'));
-
-        $this->canWithdrawWallet->passes($walletOject);
-
-        $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::WITHDRAW);
-
-        return $this->resourceResponse(new WalletResource($wallet));
-    }
-}

app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class WalletObject implements DataTransferObject
-{
-
-    /** @var int */
-    private $company_id;
-
-    /** @var int */
-	private $currency_id;
-
-	/** @var int */
-	private $code;
-
-    private $amount;
-
-    /**
-     * WalletObject constructor.
-     * @param int $company_id
-     * @param int $currency
-     * @param int $code
-     */
-    public function __construct(int $company_id, int $currency, int $code, float $amount=0)
-    {
-        $this->company_id = $company_id;
-        $this->currency_id = $currency;
-        $this->code = $code;
-        $this->amount = $amount;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCompanyId(): int
-    {
-        return $this->company_id;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCurrency(): int
-    {
-        return $this->currency_id;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCode(): int
-    {
-        return $this->code;
-    }
-
-    public function getAmount(): float
-    {
-        return $this->amount;
-    }
-
-
-}

app/Classes/Modules/Wallets/DataTransferObjects/WalletTransactionObject.php

@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class WalletTransactionObject implements DataTransferObject
-{
-
-    private $wallet_id;
-
-    private $bill_no;
-    
-    private $trans_type;
-    
-    private $amount;
-    
-    private $currency_id;
-    
-    private $original_amount;
-    
-    private $original_currency_id;
-
-    private $currency_rate;
-    
-    public function __construct(
-        int $wallet_id, int $bill_no,int $trans_type,
-        float $amount, int $currency_id, int $original_amount,
-        int $original_currency_id, float $currency_rate
-    ){
-        $this->wallet_id = $wallet_id;
-        $this->bill_no = $bill_no;
-        $this->trans_type = $trans_type;
-        $this->amount= $amount;
-        $this->currency_id = $currency_id;
-        $this->original_amount = $original_amount;
-        $this->original_currency_id = $original_currency_id;
-        $this->currency_rate = $currency_rate;
-    }
-
-    /**
-     * @return int
-     */
-    public function getWalletId(): int
-    {
-        return $this->wallet_id;
-    }
-    
-    /**
-     * @return int
-     */
-    public function getBillNo(): int
-    {
-        return $this->bill_no;
-    }
-    
-    /**
-     * @return int
-     */
-    public function getTransType(): int
-    {
-        return $this->trans_type;
-    }
-    
-    
-    public function getAmount(): float
-    {
-        return $this->amount;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCurrency(): int
-    {
-        return $this->currency_id;
-    }
-    
-    
-    public function getOriginalAmount(): float
-    {
-        return $this->original_amount;
-    }
-    
-    public function getOriginalCurrency(): int
-    {
-        return $this->original_currency_id;
-    }
-    
-    public function getCurrencyRate(): float
-    {
-        return $this->currency_rate;
-    }
-}

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

@@ -1,90 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Processors;
-
-use App\Models\Wallet;
-use App\Models\Company;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Modules\Wallets\Services\CreatesWallet;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
-use App\Classes\Modules\Transactions\Services\CreatesTransaction;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-
-class CreditWalletProcessor
-{
-    /** @var GeneratesWalletCode */
-    private $generatesWalletCode;
-
-    /** @var CreatesWallet  */
-    private $createsWallet;
-
-    /** @var GeneratesTransactionBillNumber  */
-    private $generatesTransactionBillNumber;
-
-    /** @var CreatesTransaction */
-    private $createsTransaction;
-
-    /** @var UpdatesWallet */
-    private $updatesWallet;
-
-    /**
-     * CreateWalletLogic constructor.
-     * @param GeneratesWalletCode $generatesWalletCode
-     * @param CreatesWallet $createsWallet
-     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
-     * @param CreatesTransaction $createsTransaction
-     * @param UpdatesWallet $updatesWallet
-     */
-    public function __construct(
-        GeneratesWalletCode $generatesWalletCode,
-        CreatesWallet $createsWallet,
-        GeneratesTransactionBillNumber $generatesTransactionBillNumber,
-        CreatesTransaction $createsTransaction,
-        UpdatesWallet $updatesWallet
-    )
-    {
-        $this->generatesWalletCode = $generatesWalletCode;
-        $this->createsWallet = $createsWallet;
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsTransaction = $createsTransaction;
-        $this->updatesWallet = $updatesWallet;
-    }
-
-
-    /**
-     * @param Company $company
-     * @param int $transactionType
-     * @param float $amount
-     * @param string $reference
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Company $company, int $transactionType, float $amount, string $reference)
-    {
-        if (!$company->wallets()->first()) {
-            $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
-            $this->createsWallet->execute($object, $company);
-        }
-
-        /** @var Wallet $wallet */
-        $wallet = $company->wallets()->first();
-
-        $billNumber = $this->generatesTransactionBillNumber->execute($transactionType === 2 ? 'DEBIT-NOTE-' : 'CREDIT-NOTE-');
-        
-        $transaction_object = new TransactionObject($billNumber, $transactionType === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1,  $wallet->owner->id,  1, PaymentMethodType::CASH,  $amount,  $amount,  1,  1,  1,  0,  0,  null,  ApprovalStatus::APPROVED,  [], $reference);
-        $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
-        
-        $updateWalletAmount = $transactionType === 2 ? ($wallet->amount - $transaction->amount) : ($wallet->amount + $transaction->amount);
-
-        $walletObject = new WalletObject($wallet->owner->id, $wallet->currency_id, $wallet->code, $updateWalletAmount);
-
-        $wallet = $this->updatesWallet->execute($wallet, $walletObject);
-
-        return $wallet;
-    }
-}

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

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-
-use App\Models\Wallet;
-
-class ChecksIfWalletCodeExists
-{
-
-    /** @var wallet */
-    private $repository;
-
-
-    /**
-     * ChecksIfWalletCodeExists constructor.
-     * @param Wallet $repository
-     */
-    public function __construct(wallet $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    public function execute(int $code): bool {
-        return $this->repository->where('code', $code)->exists();
-    }
-
-}

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

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-
-use App\Models\WalletTransaction;
-
-class ChecksIfWalletTransactionBillNoExists
-{
-
-    private $repository;
-
-    public function __construct(WalletTransaction $repository)
-    {
-        $this->repository = $repository;
-    }
-
-    public function execute(int $bill_no): bool {
-        return $this->repository->where('bill_no', $bill_no)->exists();
-    }
-
-}

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

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Models\Wallet;
-use App\Models\Company;
-
-class CreatesWallet extends AbstractUpdateRelationshipRecord
-{
-    /**
-     * @param WalletObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(WalletObject $object, Company $company) {
-        $model = new Wallet();
-        //$model->company_id = $object->getCompanyId();
-        $model->code = $object->getCode();
-        $model->currency_id = $object->getCurrency();
-
-        return $this->handler($company->wallets(), $model);
-    }
-}

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

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
-use App\Models\WalletTransaction;
-
-class CreatesWalletTransaction extends AbstractUpdateRecord
-{
-    /**
-     * @param WalletTransactionObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(WalletTransactionObject $object) {
-        $model = new WalletTransaction();
-        $model->wallet_id = $object->getWalletId();
-        $model->bill_no = $object->getBillNo();
-        $model->trans_type = $object->getTransType();
-        $model->amount = $object->getAmount();
-        $model->currency_id = $object->getCurrency();
-        $model->original_amount = $object->getOriginalAmount();
-        $model->original_currency_id = $object->getOriginalCurrency();
-        $model->currency_rate = $object->getCurrencyRate();
-
-        return $this->handler($model);
-
-    }
-}

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

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

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

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-
-class GeneratesWalletCode
-{
-
-    /** @var ChecksIfWalletCodeExists */
-    private $walletCodeExists;
-
-    /**
-     * GeneratesWalletCode constructor.
-     * @param ChecksIfWalletCodeExists $walletCodeExists
-     */
-    public function __construct(ChecksIfWalletCodeExists $walletCodeExists)
-    {
-        $this->walletCodeExists = $walletCodeExists;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function execute(): int {
-
-        $code = mt_rand(100000001, 999999999);
-        return !$this->walletCodeExists->execute($code) ? $code : self::execute();
-
-    }
-
-}

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

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-
-class GeneratesWalletTransactionBillNo
-{
-
-    
-    private $walletTransationBillNoExists;
-
-   
-    public function __construct(ChecksIfWalletTransactionBillNoExists $walletTransationBillNoExists)
-    {
-        $this->walletTransationBillNoExists = $walletTransationBillNoExists;
-    }
-
-
-   
-    public function execute(): int {
-
-        $code = mt_rand(100000001, 999999999);
-        return !$this->walletTransationBillNoExists->execute($code) ? $code : self::execute();
-
-    }
-
-}

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

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

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

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Models\Wallet;
-use App\Models\Company;
-
-class UpdatesWallet extends AbstractUpdateRecord
-{
-    /**
-     * @param WalletObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Wallet $model, WalletObject  $object) {
-        $model->amount = $object->getAmount();
-        $model->code = $object->getCode();
-        $model->currency_id = $object->getCurrency();
-
-
-        return $this->handler($model);
-
-    }
-}

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

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Models\Wallet;
-use App\Models\Company;
-
-class UpdatesWalletBalance extends AbstractUpdateRecord
-{
-    /**
-     * @param Wallet $model
-     * @param $amount
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Wallet $model, $amount) {
-
-        $model->amount = $model->amount + $amount;
-        return $this->handler($model);
-
-    }
-}

app/Classes/Modules/Wallets/Standards/Rules/CanCreateCompanyWallet.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Standards\Validators\CompanyWalletValidation;
-
-class CanCreateCompanyWallet extends AbstractRule
-{
-
-    /** @var CompanyWalletValidation */
-    private $companyWalletValidation;
-
-    /**
-     * CanCreateCompanyWallet constructor.
-     * @param CompanyWalletValidation $companyWalletValidation
-     */
-    public function __construct(CompanyWalletValidation $companyWalletValidation)
-    {
-        $this->companyWalletValidation = $companyWalletValidation;
-    }
-
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-    }
-
-    /**
-     * @param WalletObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->companyWalletValidation->validate($object);
-    }
-
-
-    /**
-     * @param WalletObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Wallets/Standards/Rules/CanCreateWalletTransaction.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletTransactionObject;
-use App\Classes\Modules\Wallets\Standards\Validators\WalletTransactionValidation;
-
-class CanCreateWalletTransaction extends AbstractRule
-{
-
-    /** @var WalletTransactionValidation */
-    private $walletTransactionValidation;
-
-  
-    public function __construct(WalletTransactionValidation $walletTransactionValidation)
-    {
-        $this->walletTransactionValidation = $walletTransactionValidation;
-    }
-
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-    }
-
-    /**
-     * @param WalletTransactionObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->walletTransactionValidation->validate($object);
-    }
-
-    /**
-     * @param WalletTransactionObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Standards\Validators\ListWalletValidation;
-
-class CanListWallet extends AbstractRule
-{
-
-    /** @var ListWalletValidation */
-    private $listWalletValidation;
-
-
-    public function __construct(ListWalletValidation $listWalletValidation)
-    {
-        $this->listWalletValidation = $listWalletValidation;
-    }
-
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-    }
-
-    /**
-     * @param WalletObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->listWalletValidation->validate($object);
-    }
-
-    /**
-     * @param WalletTransactionObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Standards\Validators\TopUpWalletValidation;
-
-class CanTopUpWallet extends AbstractRule
-{
-
-    /** @var TopUpWalletValidation */
-    private $topUpWalletValidation;
-
-
-    public function __construct(TopUpWalletValidation $topUpWalletValidation)
-    {
-        $this->topUpWalletValidation = $topUpWalletValidation;
-    }
-
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-    }
-
-    /**
-     * @param WalletObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->topUpWalletValidation->validate($object);
-    }
-
-    /**
-     * @param WalletTransactionObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Standards\Validators\WithdrawWalletValidation;
-
-class CanWithdrawWallet extends AbstractRule
-{
-
-    /** @var WithdrawWalletValidation */
-    private $witdrawWalletValidation;
-
-
-    public function __construct(WithdrawWalletValidation $witdrawWalletValidation)
-    {
-        $this->witdrawWalletValidation = $witdrawWalletValidation;
-    }
-
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-    }
-
-    /**
-     * @param WalletObject $object
-     * @return bool
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->witdrawWalletValidation->validate($object);
-    }
-
-    /**
-     * @param WalletTransactionObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Wallets/Standards/Validators/CompanyWalletValidation.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-
-class CompanyWalletValidation extends AbstractValidation
-{
-    /**
-     * @param WalletObject $object
-     * @return array
-     */
-    protected function data($object): array 
-    {
-        return [
-            'company_id' => $object->getCompanyId(),
-            'currency_id' => $object->getCurrency(),
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array 
-    {
-        return [
-            'company_id' => 'required',
-            'currency_id' => 'required',
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array 
-    {
-        return [];
-    }
-}

app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-
-class ListWalletValidation extends AbstractValidation
-{
-
-    protected function data($object): array
-    {
-        return [];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array
-    {
-        return [];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array
-    {
-        return [];
-    }
-}

app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-
-class TopUpWalletValidation extends AbstractValidation
-{
-
-    protected function data($object): array
-    {
-        return [];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array
-    {
-        return [];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array
-    {
-        return [];
-    }
-}

app/Classes/Modules/Wallets/Standards/Validators/WalletTransactionValidation.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-
-class WalletTransactionValidation extends AbstractValidation
-{
-    
-    protected function data($object): array 
-    {
-        return [
-            'wallet_id' => $object->getWalletId(),
-            'currency_id' => $object->getCurrency(),
-            'amount' => $object->getAmount(),
-            'trans_type'=>$object->getTransType()
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array 
-    {
-        return [
-            'wallet_id' => 'required',
-            'currency_id' => 'required',
-            'amount' => 'required',
-            'trans_type'=>'required'
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array 
-    {
-        return [];
-    }
-}

app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Wallets\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-
-class WithdrawWalletValidation extends AbstractValidation
-{
-
-    protected function data($object): array
-    {
-        return [];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array
-    {
-        return [];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array
-    {
-        return [];
-    }
-}

app/Classes/Notifications/AbstractEmail.php

@@ -2,17 +2,14 @@
 
 namespace App\Classes\Notifications;
 
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Notification;
 
-class AbstractEmail extends Notification implements ShouldQueue
+class AbstractEmail extends Notification
 {
-    use Queueable;
 
     public function via()
     {
         return 'mail';
     }
 
-}
+}

app/Classes/Notifications/InvoiceIssuedEmail.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Classes\Notifications;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\PackingList;
-use App\Models\PasswordReset;
-use App\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Support\Facades\Storage;
-
-class InvoiceIssuedEmail extends AbstractEmail
-{
-
-    /** @var User */
-    private $user;
-
-    /** @var PackingList */
-    private $packingList;
-
-    /**
-     * @param User $user
-     * @param PackingList $packingList
-     */
-    public function __construct(User $user, PackingList $packingList)
-    {
-        $this->user = $user;
-        $this->packingList = $packingList;
-    }
-
-
-    public function toMail()
-    {
-        $invoice = $this->packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::APPROVED)->first();
-        $invoiceDocument = $invoice->documents()->first()->files;
-
-
-        return (new MailMessage)
-            ->subject('Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->file->file_info->original->file), [
-                'as' => 'name.pdf',
-                'mime' => 'application/pdf',
-            ])->view('emails.shipment.invoice', ['user' => $this->user, 'packingList' => $this->packingList]);
-    }
-
-
-}

app/Classes/Notifications/ShipmentDepartureEmail.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Notifications;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\PackingList;
-use App\Models\PasswordReset;
-use App\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class ShipmentDepartureEmail extends AbstractEmail
-{
-
-    /** @var User */
-    private $user;
-
-    /** @var PackingList */
-    private $packingList;
-
-    /**
-     * @param User $user
-     * @param PackingList $packingList
-     */
-    public function __construct(User $user, PackingList $packingList)
-    {
-        $this->user = $user;
-        $this->packingList = $packingList;
-    }
-
-
-
-    public function toMail()
-    {
-        $invoice = $this->packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::APPROVED)->first();
-
-        if(!$invoice) return false;
-
-        $invoiceDocument = $invoice->documents()->first()->files;
-
-
-        return (new MailMessage)
-            ->subject('Your packages are on the way to malaysia - Invoice pending payment for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->file->file_info->original->file), [
-                'as' => 'name.pdf',
-                'mime' => 'application/pdf',
-            ])->bcc(['email_test@cief-malaysia.com'])->view('emails.shipment.ETD', ['user' => $this->user, 'packingList' => $this->packingList]);
-    }
-
-
-}

app/Classes/Notifications/ShipmentRescheduleEmail.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Classes\Notifications;
-
-
-use App\Models\PackingList;
-use App\Models\PasswordReset;
-use App\Models\User;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class ShipmentRescheduleEmail extends AbstractEmail
-{
-
-    /** @var User */
-    private $user;
-
-    /** @var PackingList */
-    private $packingList;
-
-    /**
-     * @param User $user
-     * @param PackingList $packingList
-     */
-    public function __construct(User $user, PackingList $packingList)
-    {
-        $this->user = $user;
-        $this->packingList = $packingList;
-    }
-
-
-    public function toMail()
-    {
-        return (new MailMessage)
-            ->subject('Update on your recent shipment(s)')
-            ->bcc(['email_test@cief-malaysia.com'])->view('emails.shipment.reschedule', ['user' => $this->user, 'packingList' => $this->packingList]);
-    }
-
-
-}

app/Classes/Notifications/UserVerificationEmail.php

@@ -32,7 +32,7 @@ class UserVerificationEmail extends AbstractEmail
     {
         return (new MailMessage)
             ->subject('Email Verification')
-            ->bcc(['email_test@cief-malaysia.com'])->view('emails.accounts.user_verification', ['user' => $this->user, 'attempt' => $this->attempt]);
+            ->view('emails.accounts.user_verification', ['user' => $this->user, 'attempt' => $this->attempt]);
     }
 
 

app/Classes/ValueObjects/Constants/FileType.php

@@ -14,16 +14,12 @@ class FileType
 
     public const PDF = 'application/pdf';
 
-    public const EXCEL = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-
     public const EXTENSION = [
         'image/gif' => 'gif',
         'image/png' => 'png',
         'image/jpeg' => 'jpeg',
         'application/pdf' => 'pdf',
         'application/octet-stream' => 'pdf',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'excel',
-        'application/vnd.ms-excel' => 'excel',
     ];
 
-}
+}