updated pakage remark - haziq

.env.example

@@ -51,5 +51,3 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 UNITY_APP_URL="https://unity.izyim.com"
-EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
-MIX_EXCHANGE_URL="${EXCHANGE_URL}"

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

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class HasPendingDelivery implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $value ? $builder->whereHas('packingLists', function (Builder $query) use($value) {
-            $query->whereDoesntHave('transports');
-        }) : $builder->whereDoesntHave('packingLists', function (Builder $query) use($value) {
-            $query->whereDoesntHave('transports');
-        });
-    }
-
-}

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

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

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

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

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

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\DB;
-
-class WithArrivalDate implements Filter
-{
-
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->leftJoin('transport_arrangements', function ($join) {
-            $join->on('packing_lists.id', '=', 'transport_arrangements.owner_id')->where('transport_arrangements.owner_type', 'App\Models\PackingList');
-        })->addSelect(['packing_lists.*', DB::raw('transport_arrangements.drop_date as arrival_date')]);
-    }
-}

app/Classes/General/Interfaces/Packable.php

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 interface Packable
 {
+
     public function packingLists(): morphMany;
 
 }

app/Classes/Modules/Accounts/ControllersLogic/CrossAuthenticateUserLogic.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\ControllersLogic;
-
-use App\Classes\Modules\Accounts\Processors\CrossAuthenticationProcessor;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CrossAuthenticateUserLogic extends AbstractControllerLogic
-{
-
-    protected function notification():array {
-        return [
-            'title' => 'Cross Authentication',
-            'message' => 'You have successfully logged in to your account'
-        ];
-    }
-
-    /** @var CrossAuthenticationProcessor */
-    private $crossAuthenticationProcessor;
-
-
-    /**
-     * CrossAuthenticateUserLogic constructor.
-     * @param CrossAuthenticationProcessor $authenticationProcessor
-     */
-    public function __construct(CrossAuthenticationProcessor $crossAuthenticationProcessor)
-    {
-        $this->crossAuthenticationProcessor = $crossAuthenticationProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    protected function logic(Request $request): JsonResponse {
-        return $this->response($this->crossAuthenticationProcessor->execute($request));
-    }
-
-}

app/Classes/Modules/Accounts/ControllersLogic/LogoutUserLogic.php

@@ -27,6 +27,7 @@ class LogoutUserLogic extends AbstractControllerLogic
      */
     public function __construct(InvalidatesAuthenticationToken $invalidatesAuthenticationToken)
     {
+        logger("logout user logic");
         $this->invalidatesAuthenticationToken = $invalidatesAuthenticationToken;
     }
 

app/Classes/Modules/Accounts/DataTransferObjects/CrossAuthenticationCredentialsObject.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\DataTransferObjects;
-
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CrossAuthenticationCredentialsObject implements DataTransferObject
-{
-
-    /** @var string */
-    private $access_token;
-
-    /** @var string */
-    private $platform;
-
-    /**
-     * CrossAuthenticationCredentialsObject constructor.
-     * @param string $access_token
-     * @param string $platform
-     */
-    public function __construct(string $access_token, int $platform)
-    {
-        $this->access_token = $access_token;
-        $this->platform = $platform;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAccessToken(): string
-    {
-        return $this->access_token;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPlatform(): int
-    {
-        return $this->platform;
-    }
-}

app/Classes/Modules/Accounts/DataTransferObjects/UserSocialAccountObject.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-use App\Models\User;
-
-class UserSocialAccountObject implements DataTransferObject
-{
-    /** @var String */
-    private $app_id;
-
-    /** @var User */
-    private $user;
-
-    /** @var integer */
-    private $platform;
-
-    /**
-     * UserSocialAccountObject constructor.
-     * @param String $token
-     * @param String $app_id
-     */
-    public function __construct(String $app_id, User $user, int $platform)
-    {
-        $this->app_id = $app_id;
-        $this->user = $user;
-        $this->platform = $platform;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAppId(): String
-    {
-        return $this->app_id;
-    }
-
-    /**
-     * @return User
-     */
-    public function getUser(): User
-    {
-        return $this->user;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPlatform(): int
-    {
-        return $this->platform;
-    }
-}

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

@@ -1,211 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Processors;
-
-use App\Classes\Modules\Accounts\DataTransferObjects\CrossAuthenticationCredentialsObject;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
-use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserSocialAccountObject;
-
-use App\Classes\Modules\Accounts\Services\CrossAuthenticatesUser;
-use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
-use App\Classes\Modules\Accounts\Services\FetchesUser;
-use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
-use App\Classes\Modules\Accounts\Standards\Rules\CanCrossAuthenticateUser;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-
-use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
-use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
-use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
-use App\Classes\General\Services\GeneratesInitials;
-use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
-use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
-use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
-use App\Classes\Modules\Accounts\Services\CreatesUserSocialAccount;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Classes\ValueObjects\Constants\CompanyType;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-
-use Illuminate\Http\Request;
-use App\Models\UserSocialAccount;
-
-class CrossAuthenticationProcessor
-{
-
-    /** @var CanCrossAuthenticateUser */
-    private $canCrossAuthenticateUser;
-
-    /** @var CrossAuthenticatesUser */
-    private $authenticatesUser;
-
-    /** @var GeneratesAuthenticationToken */
-    private $generatesAuthenticationToken;
-
-    /** @var FetchesUser */
-    private $fetchesUser;
-
-    /** @var AuthenticationRedirect */
-    private $authenticationRedirect;
-
-    /** @var CreateUserProcessor */
-    private $createUserProcessor;
-
-    /** @var CreateCompanyProcessor */
-    private $createCompanyProcessor;
-
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
-
-    /** @var CreateCompanyModuleProcessor */
-    private $createCompanyModuleProcessor;
-
-    /** @var CreatesCompanyConnection */
-    private $createsCompanyConnection;
-
-    /** @var ApprovesCompanyConnection */
-    private $approvesCompanyConnection;
-
-    /** @var AssignEmployeeProcessor */
-    private $assignEmployeeProcessor;
-
-    /** @var UploadIdentityDocumentProcessor */
-    private $uploadIdentityDocumentProcessor;
-
-    /** @var CreatesUserSocialAccount */
-    private $createsUserSocialAccount;
-
-    /**
-     * CrossAuthenticationProcessor constructor.
-     * @param CanCrossAuthenticateUser $canCrossAuthenticateUser
-     * @param CrossAuthenticatesUser $crossAuthenticatesUser
-     * @param GeneratesAuthenticationToken $generatesAuthenticationToken
-     * @param FetchesUser $fetchesUser
-     * @param AuthenticationRedirect $authenticationRedirect
-     * @param CreateUserProcessor $createUserProcessor
-     * @param CreateCompanyProcessor $createCompanyProcessor
-     * @param CreateContactProcessor $createContactProcessor
-     * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
-     * @param CreatesCompanyConnection $createsCompanyConnection
-     * @param ApprovesCompanyConnection $approvesCompanyConnection
-     * @param AssignEmployeeProcessor $assignEmployeeProcessor
-     * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
-     * @param CreatesUserSocialAccount $createsUserSocialAccount
-     */
-    public function __construct(
-        CanCrossAuthenticateUser $canCrossAuthenticateUser, 
-        CrossAuthenticatesUser $crossAuthenticatesUser, 
-        GeneratesAuthenticationToken $generatesAuthenticationToken, 
-        FetchesUser $fetchesUser, 
-        AuthenticationRedirect $authenticationRedirect,
-        CreateUserProcessor $createUserProcessor,
-        CreateCompanyProcessor $createCompanyProcessor,
-        CreateContactProcessor $createContactProcessor,
-        CreateCompanyModuleProcessor $createCompanyModuleProcessor,
-        CreatesCompanyConnection $createsCompanyConnection,
-        ApprovesCompanyConnection $approvesCompanyConnection,
-        AssignEmployeeProcessor $assignEmployeeProcessor,
-        UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor,
-        CreatesUserSocialAccount $createsUserSocialAccount
-    )
-    {
-        $this->canCrossAuthenticateUser = $canCrossAuthenticateUser;
-        $this->crossAuthenticatesUser = $crossAuthenticatesUser;
-        $this->generatesAuthenticationToken = $generatesAuthenticationToken;
-        $this->fetchesUser = $fetchesUser;
-        $this->authenticationRedirect = $authenticationRedirect;
-        $this->createUserProcessor = $createUserProcessor;
-        $this->createCompanyProcessor = $createCompanyProcessor;
-        $this->createContactProcessor = $createContactProcessor;
-        $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
-        $this->createsCompanyConnection = $createsCompanyConnection;
-        $this->createsCompanyConnection = $createsCompanyConnection;
-        $this->approvesCompanyConnection = $approvesCompanyConnection;
-        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
-        $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
-        $this->createsUserSocialAccount = $createsUserSocialAccount;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return array
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function execute(Request $request): array {
-
-        $object = new CrossAuthenticationCredentialsObject($request->input('access_token'), $request->input('platform'));
-
-        $this->canCrossAuthenticateUser->passes($object);
-
-        $cross = $this->crossAuthenticatesUser->execute($object);
-
-        $user_social_account = UserSocialAccount::where('app_id', $cross->token->user->id)->first();
-        if (!$user_social_account) {
-
-            $request->request->add([
-                'name' => $cross->token->user->name,
-                'email' => $cross->token->user->email,
-                'password' => 'pass123',
-                'password_confirmation' => 'pass123',
-            ]);
-
-            $user = $this->createUserProcessor->execute(
-                $request, 
-                RoleTypes::USER, 
-                env('APP_ENV') != 'production' ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION
-            );
-
-            $company = $this->createCompanyProcessor->execute(
-                $cross->payload->data->name,
-                CompanyType::COMPANY_BUSINESS, 
-                ApprovalStatus::PENDING_SUBMISSION
-            );
-
-            $contactObject = new ContactObject(
-                $cross->payload->data->contact->reference, 
-                $cross->payload->data->contact->phone, 
-                $cross->payload->data->contact->email, 
-                $cross->payload->data->contact->wechat_id
-            );
-            $contact = $this->createContactProcessor->execute($contactObject, $company);
-
-            $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
-
-            $connectionObject = new CompanyConnectionObject(
-                $companyModule, 'CIEF', 
-                mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate()
-            );
-            $connection = $this->createsCompanyConnection->execute($connectionObject);
-
-            $this->approvesCompanyConnection->execute($connection);
-
-            $object = new EmploymentObject($companyModule, $user);
-            $this->assignEmployeeProcessor->execute($object);
-
-            $request->request->add([
-                'files' => [$cross->document->src],
-                'identification_no' => $cross->payload->data->identification->reference,
-            ]);
-
-            $this->uploadIdentityDocumentProcessor->execute($request, $company);
-
-            $object = new UserSocialAccountObject(
-                $cross->token->user->id, 
-                $user,
-                $request->input('platform')
-            );
-            $this->createsUserSocialAccount->execute($object);
-        }
-        else {
-            $user = $user_social_account->user()->first();
-        }
-
-        return ['access_token' => $this->generatesAuthenticationToken->execute($user), 'redirect_url' => $this->authenticationRedirect->url($user)];
-    }
-}

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

@@ -56,4 +56,4 @@ class GenerateEmailVerificationAttemptProcessor
 
     }
 
-}
+}

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

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Accounts\DataTransferObjects\UserSocialAccountObject;
-use App\Models\UserSocialAccount;
-
-class CreatesUserSocialAccount extends AbstractUpdateRecord
-{
-    /**
-     * @param UserSocialAccountObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(UserSocialAccountObject $object) {
-        $model = new UserSocialAccount();
-        $model->user_id = $object->getUser()->id;
-        $model->app_id = $object->getAppId();
-        $model->platform = $object->getPlatform();
-        return $this->handler($model);
-
-    }
-}

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

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\AccessUnauthorisedException;
-use App\Classes\Modules\Accounts\DataTransferObjects\CrossAuthenticationCredentialsObject;
-use App\Classes\ValueObjects\Constants\PlatformType;
-
-class CrossAuthenticatesUser
-{
-
-    /**
-     * @param CrossAuthenticationCredentialsObject $object
-     * @return false|string
-     * @throws AccessUnauthorisedException
-     */
-
-    public function execute(CrossAuthenticationCredentialsObject $object){
-
-        if ($object->getPlatform() == PlatformType::EXCHANGE) {
-
-            $token = $object->getAccessToken();
-
-            $tokenParts = explode(".", $token);  
-            $tokenPayload = base64_decode($tokenParts[1]);
-            $jwtPayload = json_decode($tokenPayload);
-
-            $response = Http::withToken($object->getAccessToken())->get(env('EXCHANGE_URL') . 'api/v1/company/' .  $jwtPayload->user->company_id . '/show')->object();
-
-            $response_document = Http::withToken($object->getAccessToken())->get(env('EXCHANGE_URL') . 'api/v1/storage/' .  $response->payload->data->identification->files[0]->file->file_info[0]->original->file . '/fetch')->object();
-            $response->token = $jwtPayload;
-            $response->document = $response_document->payload;
-        }
-
-        return $response;
-
-    }
-
-}

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

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

app/Classes/Modules/Accounts/Standards/Rules/CanCrossAuthenticateUser.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Exceptions\RequestValidationException;
-use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
-use App\Classes\Modules\Accounts\Standards\Validators\UserCrossAuthenticationValidation;
-
-class CanCrossAuthenticateUser extends AbstractRule
-{
-
-    /** @var UserCrossAuthenticationValidation */
-    private $userCrossAuthenticationValidation;
-
-    /**
-     * CanCrossAuthenticateUser constructor.
-     * @param UserCrossAuthenticationValidation $userCrossAuthenticationValidation
-     */
-    public function __construct(UserCrossAuthenticationValidation $userCrossAuthenticationValidation)
-    {
-        $this->userCrossAuthenticationValidation = $userCrossAuthenticationValidation;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        return true;
-
-    }
-
-
-    /**
-     * @param AuthenticationCredentialsObject $object
-     * @return bool
-     * @throws RequestValidationException
-     */
-    protected function validators($object): bool
-    {
-        return $this->userCrossAuthenticationValidation->validate($object);
-    }
-
-    /**
-     * @param AuthenticationCredentialsObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}

app/Classes/Modules/Accounts/Standards/Validators/UserCrossAuthenticationValidation.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Accounts\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Accounts\DataTransferObjects\CrossAuthenticationCredentialsObject;
-
-class UserCrossAuthenticationValidation extends AbstractValidation
-{
-
-
-    /**
-     * @param CrossAuthenticationCredentialsObject $object
-     * @return array
-     */
-    protected function data($object): array {
-        return [
-            'access_token' => $object->getAccesstoken(),
-            'platform' => $object->getPlatform()
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array {
-        return [
-            'access_token' => 'required',
-            'platform' => 'required'
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array {
-        return [];
-    }
-
-
-
-
-}

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

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Processors\AssignConnectionSegmentProcessor;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
-use App\Http\Resources\CompanyResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Assign Company Connection To Connection Segment',
-            'message' => 'You have successfully assigned Company Connection to Connection segment'
-        ];
-    }
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var FetchesCompanyConnection */
-    private $fetchesCompanyConnection;
-
-    /** @var AssignConnectionSegmentProcessor */
-    private $assignCompanyConnectionToConnectionSegmentProcessor;
-
-    /**
-     * AssignCompanyToSegmentLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param FetchesCompanyConnection $fetchesCompanyConnection
-     * @param AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor
-     */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->fetchesCompanyConnection = $fetchesCompanyConnection;
-        $this->assignCompanyConnectionToConnectionSegmentProcessor = $assignCompanyConnectionToConnectionSegmentProcessor;
-    }
-
-    /**
-     * @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
-    {
-
-        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-
-        $companyConnection = $this->fetchesCompanyConnection->execute(['id' => $request->route('company_connection_id')]);
-
-        $this->assignCompanyConnectionToConnectionSegmentProcessor->execute($companyConnection, $request->input('segment_id'));
-
-        return $this->resourceResponse(new CompanyResource($company));
-    }
-}

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

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
-use App\Classes\Modules\Companies\Services\RemovesCompanyConnectionFromConnectionSegment;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Http\Resources\CompanyResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class RemoveCompanyConnectionFromConnectionSegmentLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Detach Company Connection From Connection Segment',
-            'message' => 'You have successfully detached Company Connection from Connection segment'
-        ];
-    }
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var FetchesCompanyConnection */
-    private $fetchesCompanyConnection;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var RemovesCompanyConnectionFromConnectionSegment */
-    private $removesCompanyConnectionFromConnectionSegment;
-
-    /**
-     * RemoveCompanyFromSegmentLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param FetchesCompanyConnection $fetchesCompanyConnection
-     * @param FetchesSegment $fetchesSegment
-     * @param RemovesCompanyConnectionFromConnectionSegment $removesCompanyConnectionFromConnectionSegment
-     */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, FetchesSegment $fetchesSegment, RemovesCompanyConnectionFromConnectionSegment $removesCompanyConnectionFromConnectionSegment)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->fetchesCompanyConnection = $fetchesCompanyConnection;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->removesCompanyConnectionFromConnectionSegment = $removesCompanyConnectionFromConnectionSegment;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $company = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-
-        $companyConnection = $this->fetchesCompanyConnection->execute(['id' => $request->route('company_connection_id')]);
-
-        $segment = $this->fetchesSegment->execute(['id' => $request->route('segment_id')]);
-
-        $this->removesCompanyConnectionFromConnectionSegment->execute($companyConnection, $segment);
-
-        return $this->resourceResponse(new CompanyResource($company));
-    }
-}

app/Classes/Modules/Companies/Processors/AssignConnectionSegmentProcessor.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Processors;
-
-use App\Classes\Modules\Companies\Services\AssignsCompanyConnectionToConnectionSegment;
-use App\Classes\Modules\Companies\Standards\Rules\CanAssignSegment;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Models\CompanyConnection;
-use Illuminate\Database\Eloquent\Model;
-
-class AssignConnectionSegmentProcessor
-{
-
-    /** @var CanAssignSegment */
-    private $canAssignSegment;
-
-    /** @var AssignsCompanyConnectionToConnectionSegment */
-    private $assignsCompanyConnectionToConnectionSegment;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /**
-     * AssignCompanyToSegmentProcessor constructor.
-     * @param CanAssignSegment $canAssignSegment
-     * @param AssignsCompanyConnectionToConnectionSegment $assignsCompanyConnectionToConnectionSegment
-     * @param FetchesSegment $fetchesSegment
-     */
-    public function __construct(CanAssignSegment $canAssignSegment, AssignsCompanyConnectionToConnectionSegment $assignsCompanyConnectionToConnectionSegment, FetchesSegment $fetchesSegment)
-    {
-        $this->canAssignSegment = $canAssignSegment;
-        $this->assignsCompanyConnectionToConnectionSegment = $assignsCompanyConnectionToConnectionSegment;
-        $this->fetchesSegment = $fetchesSegment;
-    }
-
-
-    /**
-     * @param CompanyConnection $companyConnection
-     * @param int|null $segmentId
-     * @return Model
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function execute(CompanyConnection $companyConnection, ?int $segmentId = SegmentConstants::STANDARD_SEGMENT): Model {
-
-        $segment = $this->fetchesSegment->execute(['id' => $segmentId]);
-
-        $this->canAssignSegment->passes();
-
-        return $this->assignsCompanyConnectionToConnectionSegment->execute($companyConnection, $segment);
-
-    }
-
-}

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

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\CompanyConnection;
-use App\Models\Segment;
-use Illuminate\Database\QueryException;
-
-class AssignsCompanyConnectionToConnectionSegment extends AbstractUpdateRecord
-{
-    /**
-     * @param CompanyConnection $companyConnection
-     * @param Segment $segment
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws MalformedRequestException
-     */
-    public function execute(CompanyConnection $companyConnection, Segment $segment)
-    {
-        try {
-
-            $companyConnection->segments()->attach($segment);
-
-            return $companyConnection;
-
-        } catch (QueryException $exception){
-            throw new MalformedRequestException($exception);
-        }
-
-
-    }
-}

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

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

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

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\CompanyConnection;
-use App\Models\Segment;
-use Illuminate\Database\QueryException;
-
-class RemovesCompanyConnectionFromConnectionSegment extends AbstractUpdateRecord
-{
-    /**
-     * @param CompanyConnection $companyConnection
-     * @param Segment $segment
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws MalformedRequestException
-     */
-    public function execute(CompanyConnection $companyConnection, Segment $segment)
-    {
-        try {
-
-            $companyConnection->segments()->detach($segment);
-
-            return $companyConnection;
-
-        } catch (QueryException $exception){
-            throw new MalformedRequestException($exception);
-        }
-
-
-    }
-}

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

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Orders\Services\CreatesOrderRemark;
-use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Http\Resources\RemarkResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class AssignOrderRemarkLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Order Remark',
-            'message' => 'You have successfully created a new Order Remark'
-        ];
-    }
-
-    /** @var CanCreateRemark */
-    private $canCreateRemark;
-
-    /** @var CreatesOrderRemark */
-    private $createsOrderRemark;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /**
-     * CreateRemarkLogic constructor.
-     * @param CanCreateRemark $canCreateRemark
-     * @param CreatesOrderRemark $createsOrderRemark
-     */
-    public function __construct(CanCreateRemark $canCreateRemark, CreatesOrderRemark $createsOrderRemark, FetchesOrder $fetchesOrder)
-    {
-        $this->canCreateRemark = $canCreateRemark;
-        $this->createsOrderRemark = $createsOrderRemark;
-        $this->fetchesOrder = $fetchesOrder;
-    }
-
-    /**
-     * @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
-    {
-        $object = new RemarkObject(
-            $request->input('content'), 
-            $request->route('id')
-        );
-
-        $this->canCreateRemark->passes($object);
-        $query = $this->createsOrderRemark->execute($this->fetchesOrder->execute(['id' => $request->route('id')]), $object);
-        return $this->resourceResponse( new RemarkResource($query));
-    }
-}

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

@@ -8,7 +8,6 @@ use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
-use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Http\Resources\OrderResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
@@ -64,13 +63,6 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        if($originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU){
-            $marking = $company->companyModules()->importers()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-            if(in_array($marking, ['2192KAA', '2353GFE', '6866DTR', '1905JYW', '1291NSC', '8288MIB'])){
-                $originWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::YD_GUANG_ZHOU]);
-            }
-        }
-
         $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());
 
         return $this->resourceResponse(new OrderResource($order));

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

@@ -19,7 +19,6 @@ use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransportType;
 
 use App\Http\Resources\PackingListResource;
-use App\Models\PackingList;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Carbon\Carbon;
@@ -81,9 +80,6 @@ class CreateShippingPackingListLogic extends AbstractControllerLogic
     /**
      * @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
     {
@@ -97,8 +93,6 @@ class CreateShippingPackingListLogic extends AbstractControllerLogic
             PackingListType::SHIPPING_PACKING_LIST, 
             ApprovalStatus::PENDING_SUBMISSION
         );
-
-        /** @var PackingList $packingList */
         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
         $packages = $request->input('packages');

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

@@ -1,103 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Orders\Services\CalculatesCBM;
-use App\Classes\Modules\Orders\Services\CalculatesBaseRate;
-use App\Classes\Modules\Orders\Services\CalculatesSegmentRate;
-use App\Classes\Modules\Orders\Services\CalculatesStateRate;
-use App\Classes\Modules\Orders\Services\CalculatesWarehouseRate;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\Modules\Transactions\Processors\CreateShippingCostTransactionProcessor;
-
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Http\Resources\OrderResource;
-use App\Models\Order;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ShippingCostLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Order Shipping Cost',
-            'message' => 'Order shipping cost calculation done'
-        ];
-    }
-
-    /** @var CalculateCBM */
-    private $calculateCBM;
-
-    /** @var CalculatesBaseRate */
-    private $calculateBaseRate;
-
-    /** @var CalculatesSegmentRate */
-    private $calculateSegmentRate;
-
-    /** @var CalculatesStateRate */
-    private $calculateStateRate;
-
-    /** @var CalculatesWarehouse */
-    private $calculateWarehouseRate;
-
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /** @var ShippingCostTransactionProcessor */
-    private $shippingCostTransactionProcessor;
-
-    /**
-     * ShippingCostLogic constructor.
-     * @param CalculateCBM $calculateCBM
-     * @param FetchesOrder $fetchesOrder
-     */
-    public function __construct(FetchesOrder $fetchesOrder, CalculatesCBM $calculateCBM, CalculatesBaseRate $calculateBaseRate, CalculatesSegmentRate $calculateSegmentRate, CalculatesStateRate $calculateStateRate, CalculatesWarehouseRate $calculateWarehouseRate, CreateShippingCostTransactionProcessor $shippingCostTransactionProcessor)
-    {
-        $this->fetchesOrder = $fetchesOrder;
-        $this->calculateCBM = $calculateCBM;
-        $this->calculatesBaseRate = $calculateBaseRate;
-        $this->calculatesSegmentRate = $calculateSegmentRate;
-        $this->calculatesStateRate = $calculateStateRate;
-        $this->calculateWarehouseRate = $calculateWarehouseRate;
-        $this->shippingCostTransactionProcessor = $shippingCostTransactionProcessor;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $order = $this->fetchesOrder->getRepository()->where(['id' => $request->route('id')])->first();
-
-        $baseRate = $this->calculatesBaseRate->execute($order);
-        $segmentRate = $this->calculatesSegmentRate->execute($order, SegmentConstants::STANDARD_SEGMENT) + $this->calculatesSegmentRate->execute($order, SegmentConstants::CUSTOM_SEGMENT);
-        $stateRate = $this->calculatesStateRate->execute($order, false) + $this->calculatesStateRate->execute($order, true);
-        $warehouseRate = $this->calculateWarehouseRate->execute($order);
-
-        $totalShippingCost = 0;
-        $totalCBM = 0;
-        $quantity = 0;
-        foreach($order->parcels as $parcel){
-            $cbm = $this->calculateCBM->execute($order, $parcel);
-
-            if($cbm > 0){
-                $totalCBM += $cbm;
-                $quantity ++;
-                $totalShippingCost += (($segmentRate + $stateRate + $warehouseRate) * $cbm);
-            }
-        }
-
-        $this->shippingCostTransactionProcessor->execute($order, $quantity, round($totalCBM,2), round($totalShippingCost,2));
-        return $this->resourceResponse(new OrderResource($order));
-    }
-
-}

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

@@ -53,7 +53,7 @@ class CreateOrderRolesProcessor
         $importer = $order->companyModule;
 
         /** @var CompanyModule $destinationWarehouse */
-        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => $originWarehouse->reference === WarehouseReferences::YD_GUANG_ZHOU ? WarehouseReferences::YD_DESTINATION_WAREHOUSE : WarehouseReferences::VT_DESTINATION_WAREHOUSE[$address->state_id]]);
+        $destinationWarehouse = $this->fetchesCompanyModule->execute(['reference' => WarehouseReferences::DESTINATION_WAREHOUSE[$address->state_id ]]);
 
         /** @var CompanyModule $freightForwarder */
         $freightForwarder = $originWarehouse->company->companyModules()->freightForwarders()->first();
@@ -84,5 +84,28 @@ class CreateOrderRolesProcessor
         $this->createsOrderRole->execute($roleObject);
 
         return true;
+
+        $companies = $this->fetchesCompany->getRepository()->whereIn('id',[1, $request->get('warehouse_id')])->get();
+
+        $cief_company = $companies[0]->id == 1 ?  $companies[0] :  $companies[1];
+        $warehouse_company =  $companies[0]->id != 1 ?  $companies[0] :  $companies[1];
+
+        $cief_company_module = $cief_company->companyModule()->first();
+        $contractEntities[] = $this->unityCreateContractEntity->execute( $contract_reference_no, [$cief_company_module->unity_hash_id]);
+        $contractEntities[0]->{"company_module_id"} = $cief_company_module->id;
+
+        $warehouse_company_module = $warehouse_company->companyModule()->first();
+        $contractEntities[] = $this->unityCreateContractEntity->execute( $contract_reference_no, [$warehouse_company_module->unity_hash_id]);
+        $contractEntities[1]->{"company_module_id"} = $warehouse_company_module->id;
+
+        foreach($contractEntities as $entity){
+            $order_role_object = new OrderRoleObject($orderId, $entity->company_module_id, $entity->hash_id, $entity->entity_signature_hash_id);
+
+            $this->canCreateOrderRole->passes($order_role_object);
+
+            $this->createsOrderRole->execute($order_role_object);
+        }
+
+        return $contractEntities;
     }
 }

app/Classes/Modules/Orders/Services/CalculatesBaseRate.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Services;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
-use Carbon\Carbon;
-
-class CalculatesBaseRate
-{
-
-    public function execute(Order $order){
-        return 300;
-    }
-
-}

app/Classes/Modules/Orders/Services/CalculatesCBM.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Services;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
-use App\Models\Package;
-use Carbon\Carbon;
-
-class CalculatesCBM
-{
-
-    public function execute(Order $order, Package $parcel){
-        return $parcel->length * $parcel->width * $parcel->height;
-    }
-
-}

app/Classes/Modules/Orders/Services/CalculatesSegmentRate.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Services;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Models\Order;
-use Carbon\Carbon;
-
-class CalculatesSegmentRate
-{
-
-    public function execute(Order $order, int $segmentRates){
-        return ($segmentRates == SegmentConstants::STANDARD_SEGMENT) ? 300 : (
-            (($segmentRates == SegmentConstants::CUSTOM_SEGMENT) ? -20 : 0)
-        );
-    }
-
-}

app/Classes/Modules/Orders/Services/CalculatesStateRate.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Services;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
-use Carbon\Carbon;
-
-class CalculatesStateRate
-{
-
-    public function execute(Order $order, $isOutskirt=false){
-        return ($isOutskirt) ? 20 : 40;
-    }
-
-}

app/Classes/Modules/Orders/Services/CalculatesWarehouseRate.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Services;
-
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Order;
-use Carbon\Carbon;
-
-class CalculatesWarehouseRate
-{
-
-    public function execute(Order $order){
-        return 0;
-    }
-
-}

app/Classes/Modules/Orders/Services/CreatesOrderRemark.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Orders\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Models\Remark;
-use App\Models\Order;
-
-class CreatesOrderRemark extends AbstractUpdateRelationshipRecord
-{
-
-    /**
-     * @param Company $company
-     * @param RemarkObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Order $order, RemarkObject $object) {
-        $model = new Remark();
-
-        $model->commenter_id = $object->getCommenterId();
-        $model->content = $object->getContent();
-
-        return $this->handler($order->remarks(), $model);
-
-    }
-}

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

@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\CreatesPackingListRemark;
-use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Http\Resources\RemarkResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class AssignPackingListRemarkLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Packing List Remark',
-            'message' => 'You have successfully created a new Packing List Remark'
-        ];
-    }
-
-    /** @var CanCreateRemark */
-    private $canCreateRemark;
-
-    /** @var CreatesPackingListRemark */
-    private $createsPackingListRemark;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /**
-     * CreateRemarkLogic constructor.
-     * @param CanCreateRemark $canCreateRemark
-     * @param CreatesPackingListRemark $createsPackingListRemark
-     */
-    public function __construct(CanCreateRemark $canCreateRemark, CreatesPackingListRemark $createsPackingListRemark, FetchesPackingList $fetchesPackingList)
-    {
-        $this->canCreateRemark = $canCreateRemark;
-        $this->createsPackingListRemark = $createsPackingListRemark;
-        $this->fetchesPackingList = $fetchesPackingList;
-    }
-
-    /**
-     * @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
-    {
-        $object = new RemarkObject(
-            $request->input('content'), 
-            $request->route('id')
-        );
-
-        $this->canCreateRemark->passes($object);
-        $query = $this->createsPackingListRemark->execute($this->fetchesPackingList->execute(['id' => $request->route('id')]), $object);
-        return $this->resourceResponse( new RemarkResource($query));
-    }
-}

app/Classes/Modules/PackingLists/ControllersLogic/Containers/AssignContainerRemarkLogic.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Containers\CreatesContainerRemark;
-use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-
-use App\Http\Resources\RemarkResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class AssignContainerRemarkLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Order Remark',
-            'message' => 'You have successfully created a new Order Remark'
-        ];
-    }
-
-    /** @var CanCreateRemark */
-    private $canCreateRemark;
-
-    /** @var CreatesContainerRemark */
-    private $createsContainerRemark;
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /**
-     * CreateRemarkLogic constructor.
-     * @param CanCreateRemark $canCreateRemark
-     * @param CreatesContainerRemark $createsContainerRemark
-     */
-    public function __construct(CanCreateRemark $canCreateRemark, CreatesContainerRemark $createsContainerRemark, FetchesContainer $fetchesContainer)
-    {
-        $this->canCreateRemark = $canCreateRemark;
-        $this->createsContainerRemark = $createsContainerRemark;
-        $this->fetchesContainer = $fetchesContainer;
-    }
-
-    /**
-     * @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
-    {
-        $object = new RemarkObject(
-            $request->input('content'), 
-            $request->route('id')
-        );
-
-        $this->canCreateRemark->passes($object);
-        $query = $this->createsContainerRemark->execute($this->fetchesContainer->execute(['id' => $request->route('id')]), $object);
-        return $this->resourceResponse( new RemarkResource($query));
-    }
-}

app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerRemarkLogic.php

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
-use App\Http\Resources\ContainerResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateContainerRemarkLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Container',
-            'message' => 'You have successfully created a new Container'
-        ];
-    }
-
-
-    /** @var FetchesContainer */
-    private $fetchesContainer;
-
-    /** @var CreateRemarkProcessor */
-    private $createRemarkProcessor;
-
-    /**
-     * CreateContainerRemarkLogic constructor.
-     * @param FetchesContainer $fetchesContainer
-     * @param CreateRemarkProcessor $createRemarkProcessor
-     */
-    public function __construct(FetchesContainer $fetchesContainer, CreateRemarkProcessor $createRemarkProcessor)
-    {
-        $this->fetchesContainer = $fetchesContainer;
-        $this->createRemarkProcessor = $createRemarkProcessor;
-    }
-
-    /**
-     * @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
-    {
-
-        $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-
-        $object = new RemarkObject($request->input('content'), auth()->user()->id);
-
-        $this->createRemarkProcessor->execute($container, $object);
-
-        return $this->resourceResponse(new ContainerResource($container));
-
-    }
-
-}

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

@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
-use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
-use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
-use App\Classes\ValueObjects\Constants\OrderRoleTypes;
-use App\Classes\ValueObjects\Constants\PackingListType;
-
-use App\Http\Resources\DeliverPackingListResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateDeliverPackingListLogic extends AbstractControllerLogic
-{
-
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Deliver PackingList',
-            'message' => 'You have successfully created a new Deliver PackingList'
-        ];
-    }
-
-    /** @var CreatePackingListProcessor */
-    private $createPackingListProcessor;
-
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /** @var GeneratesPackingListReferenceNumber */
-    private $generatesPackingListReferenceNumber;
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /**
-     * CreateDeliverPackingListLogic constructor.
-     * @param CreatePackingListProcessor $createPackingListProcessor
-     * @param FetchesCompanyModule $fetchesCompanyModule
-     */
-    public function __construct(CreatePackingListProcessor $createPackingListProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber, FetchesPackingList $fetchesPackingList)
-    {
-        $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
-        $this->fetchesPackingList = $fetchesPackingList;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $company_module = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
-        $packing_list_id = $request->input('packing_list_id');
-
-        $reference_number = $this->generatesPackingListReferenceNumber->execute();
-
-        $packingListObject = new PackingListObject(
-            $reference_number, 
-            null, 
-            PackingListType::DELIVERY_PACKING_LIST, 
-            ApprovalStatus::PENDING_SUBMISSION
-        );
-
-        $deliverPackingList = $this->createPackingListProcessor->execute($packingListObject, $company_module);
-
-        foreach ($packing_list_id as $key => $row) {
-            $this->fetchesPackingList->execute(['id' => $row]);
-        }
-
-        $deliverPackingList->packing_list_owner()->sync($packing_list_id);
-
-        return $this->resourceResponse(new DeliverPackingListResource($deliverPackingList));
-    }
-
-}

app/Classes/Modules/PackingLists/ControllersLogic/Packages/CreatePackageRemarkLogic.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic\Packages;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Services\CreatesRemark;
+use App\Http\Resources\ContactResource;
+use App\Http\Resources\OrderResource;
+use App\Models\Package;
+use App\Models\Remark;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreatePackageRemarkLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Package',
+            'message' => 'You have successfully created a new Package'
+        ];
+    }
+
+    /** @var CreatesRemark */
+    private $createsRemark;
+
+    /**
+     * CreateContainerRemarkLogic constructor.
+     * @param CreatesRemark $createsRemark
+     */
+    public function __construct(CreatesRemark $createsRemark, FetchesOrder $fetchesOrder)
+    {
+        $this->createsRemark = $createsRemark;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $order = $this->fetchesOrder->execute(['id' => $request->route('id')]);
+        $object = new RemarkObject($request->input('content'), auth()->user()->id);
+
+        $remark = $this->createsRemark->execute($order ,$object);
+
+        return $this->resourceResponse(new OrderResource($order));
+    }
+
+}

app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php

@@ -30,7 +30,7 @@ class PackingListObject implements DataTransferObject
      * @param int $status
      * @param null|string $contractReference
      */
-    public function __construct(string $reference, ?int $claimantId, int $type, int $status, ?string $contractReference = null)
+    public function __construct(string $reference, int $claimantId, int $type, int $status, ?string $contractReference = null)
     {
         $this->reference = $reference;
         $this->claimantId = $claimantId;
@@ -50,7 +50,7 @@ class PackingListObject implements DataTransferObject
     /**
      * @return int
      */
-    public function getClaimantId(): ?int
+    public function getClaimantId(): int
     {
         return $this->claimantId;
     }

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

@@ -66,10 +66,6 @@ class FetchDeliveryListFromVTPortalProcessor
 
                     $shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
 
-                    if(!array_key_exists(0, $shippingPackingLists->Rows)){
-                        continue;
-                    }
-
                     $shippingPackingList = $shippingPackingLists->Rows[0];
 
                     if(!$shippingPackingList[9] && !$shippingPackingList[10]) {
@@ -91,7 +87,6 @@ class FetchDeliveryListFromVTPortalProcessor
                     $deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
 
                 } catch (GuzzleException $exception) {
-                    dd($exception);
                     continue;
                 }
 

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

@@ -9,7 +9,7 @@ use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\FetchesDataFromVTPortal;
 use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\PackingLists\ControllersLogic\Packages\CreatePackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\CreatePackageRemarkLogic;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
@@ -60,7 +60,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
     /** @var CreatePackingListProcessor */
     private $createPackingListProcessor;
 
-    /** @var CreatePackageLogic */
+    /** @var CreatePackageRemarkLogic */
     private $createPackage;
 
     /** @var CreatePackageProcessor */
@@ -82,12 +82,12 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
      * @param CreateOrderProcessor $createOrderProcessor
      * @param FetchesPackingList $fetchesPakcingList
      * @param CreatePackingListProcessor $createPackingListProcessor
-     * @param CreatePackageLogic $createPackage
+     * @param CreatePackageRemarkLogic $createPackage
      * @param CreatePackageProcessor $createPackageProcessor
      * @param CreatesTransport $createsTransport
      * @param CreatesSchedule $createsSchedule
      */
-    public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, CleansOldAddress $cleansOldAddress, CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor, FetchesCompanyModule $fetchesCompanyModule, FetchesOrder $fetchesOrder, CreateOrderProcessor $createOrderProcessor, FetchesPackingList $fetchesPakcingList, CreatePackingListProcessor $createPackingListProcessor, CreatePackageLogic $createPackage, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
+    public function __construct(FetchesDataFromVTPortal $fetchesDataFRomVTPortal, CleansOldAddress $cleansOldAddress, CreateAddressFromOldAddressProcessor $createAddressFromOldAddressProcessor, FetchesCompanyModule $fetchesCompanyModule, FetchesOrder $fetchesOrder, CreateOrderProcessor $createOrderProcessor, FetchesPackingList $fetchesPakcingList, CreatePackingListProcessor $createPackingListProcessor, CreatePackageRemarkLogic $createPackage, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule)
     {
         $this->fetchesDataFRomVTPortal = $fetchesDataFRomVTPortal;
         $this->cleansOldAddress = $cleansOldAddress;

app/Classes/Modules/PackingLists/Services/Containers/CreatesContainerRemark.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Services\Containers;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Models\Remark;
-use App\Models\Container;
-
-class CreatesContainerRemark extends AbstractUpdateRelationshipRecord
-{
-
-    /**
-     * @param Company $company
-     * @param RemarkObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Container $container, RemarkObject $object) {
-        $model = new Remark();
-
-        $model->commenter_id = $object->getCommenterId();
-        $model->content = $object->getContent();
-
-        return $this->handler($container->remarks(), $model);
-
-    }
-}

app/Classes/Modules/PackingLists/Services/CreatesPackingList.php

@@ -23,7 +23,6 @@ class CreatesPackingList extends AbstractUpdateRelationshipRecord
         $model->claimant_id = $object->getClaimantId();
         $model->type = $object->getType();
         $model->status = $object->getStatus();
-        $model->reference_contract = $object->getContractReference();
 
         return $this->handler($packable->packingLists(), $model);
     }

app/Classes/Modules/PackingLists/Services/CreatesPackingListRemark.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Models\Remark;
-use App\Models\PackingList;
-
-class CreatesPackingListRemark extends AbstractUpdateRelationshipRecord
-{
-
-    /**
-     * @param Company $company
-     * @param RemarkObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(PackingList $packingList, RemarkObject $object) {
-        $model = new Remark();
-
-        $model->commenter_id = $object->getCommenterId();
-        $model->content = $object->getContent();
-
-        return $this->handler($packingList->remarks(), $model);
-
-    }
-}

app/Classes/Modules/Remarks/ControllersLogic/UpdateRemarkLogic.php

@@ -51,13 +51,11 @@ class UpdateRemarkLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
-        $object = new RemarkObject($request->input('content'), auth()->user()->id);
+        $object = new RemarkObject($request->input('content'), $request->input('commenter_id'));
 
         $this->canUpdateRemark->passes($object);
 

app/Classes/Modules/Remarks/Processors/CreateRemarkProcessor.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Remarks\Processors;
-
-
-use App\Classes\General\Interfaces\Remarkable;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Services\CreatesRemark;
-use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
-
-class CreateRemarkProcessor
-{
-
-    /** @var CreatesRemark */
-    private $createsRemark;
-
-    /** @var CanCreateRemark */
-    private $canCreateRemark;
-
-    /**
-     * CreateRemarkProcessor constructor.
-     * @param CreatesRemark $createsRemark
-     * @param CanCreateRemark $canCreateRemark
-     */
-    public function __construct(CreatesRemark $createsRemark, CanCreateRemark $canCreateRemark)
-    {
-        $this->createsRemark = $createsRemark;
-        $this->canCreateRemark = $canCreateRemark;
-    }
-
-
-    /**
-     * @param Remarkable $remarkable
-     * @param RemarkObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function execute(Remarkable $remarkable, RemarkObject $object){
-
-        $this->canCreateRemark->passes($object);
-        return $this->createsRemark->execute($remarkable, $object);
-
-    }
-
-}

app/Classes/Modules/Remarks/Services/CreatesRemark.php

@@ -4,9 +4,7 @@ namespace App\Classes\Modules\Remarks\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\General\Interfaces\Remarkable;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Models\Container;
 use App\Models\Remark;
 use App\Models\User;
 
@@ -14,18 +12,18 @@ class CreatesRemark extends AbstractUpdateRelationshipRecord
 {
 
     /**
-     * @param Remarkable $remarkable
+     * @param Company $company
      * @param RemarkObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Remarkable $remarkable, RemarkObject $object) {
+    public function execute(User $user, RemarkObject $object) {
         $model = new Remark();
 
         $model->commenter_id = $object->getCommenterId();
         $model->content = $object->getContent();
 
-        return $this->handler($remarkable->remarks(), $model);
+        return $this->handler($user->remarks(), $model);
 
     }
 }

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

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\Processors\CreateSegmentProcessor;
-use App\Http\Resources\SegmentResource;
-use App\Models\Segment;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateSegmentLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Created Segment',
-            'message' => 'You have successfully created a new Segment'
-        ];
-    }
-
-
-    /** @var CreateSegmentProcessor  */
-    private $createSegmentProcessor;
-
-    /**
-     * CreateSegmentLogic constructor.
-     * @param CreateSegmentProcessor $createSegmentProcessor
-     */
-    public function __construct(CreateSegmentProcessor $createSegmentProcessor)
-    {
-        $this->createSegmentProcessor = $createSegmentProcessor;
-    }
-
-    /**
-     * @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
-    {
-        /** @var Segment $segment */
-        $segment = $this->createSegmentProcessor->execute($request->input('name'));
-
-        return $this->resourceResponse(new SegmentResource($segment));
-    }
-
-}

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

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Segments\Services\DeletesSegment;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Classes\Modules\Segments\Standards\Rules\CanDeleteSegment;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DeleteSegmentLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Deleted Segment',
-            'message' => 'You have successfully deleted a Segment'
-        ];
-    }
-
-
-    /** @var CanDeleteSegment */
-    private $canDeleteSegment;
-
-    /** @var DeletesSegment */
-    private $deletesSegment;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /**
-     * DeleteSegmentLogic constructor.
-     * @param CanDeleteSegment $canDeleteSegment
-     * @param DeletesSegment $deletesSegment
-     * @param FetchesSegment $fetchesSegment
-     */
-    public function __construct(CanDeleteSegment $canDeleteSegment, DeletesSegment $deletesSegment, FetchesSegment $fetchesSegment)
-    {
-        $this->canDeleteSegment = $canDeleteSegment;
-        $this->deletesSegment = $deletesSegment;
-        $this->fetchesSegment = $fetchesSegment;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-
-        $this->canDeleteSegment->passes();
-
-        $query = $this->fetchesSegment->execute(['id' => $request->route('id')]);
-
-        $this->deletesSegment->execute($query);
-
-        return $this->response([]);
-
-    }
-
-}

app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class SegmentObject implements DataTransferObject
-{
-
-    /** @var string */
-    private $name;
-
-    /** @var int */
-    private $company_module_id;
-
-    /**
-     * ConstantObject constructor.
-     * @param string $name
-     * @param string $reference
-     * @param array $detail
-     */
-    public function __construct(string $name, int $company_module_id)
-    {
-        $this->name = $name;
-        $this->company_module_id = $company_module_id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyModuleId(): string
-    {
-        return $this->company_module_id;
-    }
-
-}

app/Classes/Modules/Segments/Processors/CreateSegmentProcessor.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\Processors;
-
-use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
-use App\Classes\Modules\Segments\Services\CreatesSegment;
-use App\Classes\Modules\Segments\Standards\Rules\CanCreateSegment;
-use Illuminate\Database\Eloquent\Model;
-
-class CreateSegmentProcessor
-{
-
-    /** @var CanCreateSegment */
-    private $canCreateSegment;
-
-    /** @var CreatesSegment */
-    private $createsSegment;
-
-    /**
-     * CreateSegmentProcessor constructor.
-     * @param CanCreateSegment $canCreateSegment
-     * @param CreatesSegment $createsSegment
-     * @param GeneratesUniqueAccountNumber $generatesUniqueAccountNumber
-     */
-    public function __construct(CanCreateSegment $canCreateSegment, CreatesSegment $createsSegment)
-    {
-        $this->canCreateSegment = $canCreateSegment;
-        $this->createsSegment = $createsSegment;
-    }
-
-
-    /**
-     * @param string $name
-     * @param int $companyModuleId
-     * @return Model
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function execute(string $name, int $companyModuleId =1): Model {
-
-        $segement_object = new SegmentObject($name, $companyModuleId);
-
-        $this->canCreateSegment->passes($segement_object);
-
-        return $this->createsSegment->execute($segement_object);
-
-    }
-
-}

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

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
-use App\Models\Segment;
-
-class CreatesSegment extends AbstractUpdateRecord
-{
-
-    /**
-     * @param SegmentObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(SegmentObject $object)
-    {
-        $model = new Segment();
-        $model->name = $object->getName();
-        $model->company_module_id = $object->getCompanyModuleId();
-
-        return $this->handler($model);
-    }
-}

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

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\Services;
-
-use App\Classes\General\Eloquent\AbstractDeleteRecord;
-use App\Models\Segment;
-
-class DeletesSegment extends AbstractDeleteRecord
-{
-
-    /**
-     * @param Segment $model
-     * @return mixed
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Segment $model) {
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php

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

app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
-
-class CanDeleteSegment extends AbstractRule
-{
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-
-    }
-
-    /**
-     * @param BankObject $object
-     * @return bool
-     */
-    protected function validators($object): bool
-    {
-        return true;
-
-    }
-
-
-    /**
-     * @param BankObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}

app/Classes/Modules/Segments/Standards/Validators/SegmentValidation.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Segments\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Segments\DataTransferObjects\SegmentObject;
-
-class SegmentValidation extends AbstractValidation
-{
-    /**
-     * @param SegmentObject $object
-     * @return array
-     */
-    protected function data($object): array
-    {
-        return [
-            'name' => $object->getName(),
-            'company_module_id' => $object->getCompanyModuleId()
-        ];
-    }
-
-    /**
-     * @param string $type
-     * @return array
-     */
-    protected function rules(?string $type = 'POST'): array
-    {
-        if ($type == 'POST') {
-            return [
-                'name' => 'required',
-                'company_module_id' => 'required',
-            ];
-        } elseif ($type == 'PUT') {
-            return [
-            ];
-        }
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array
-    {
-        return [];
-    }
-}

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

@@ -7,7 +7,7 @@ use App\Classes\General\Interfaces\DataTransferObject;
 class TransactionDetailObject implements DataTransferObject
 {
     /** @var string|null */
-    private $reference;
+    private $code;
 
     /** @var string|null */
     private $name;
@@ -20,14 +20,14 @@ class TransactionDetailObject implements DataTransferObject
 
     /**
      * TransactionDetailObject constructor.
-     * @param string $reference
+     * @param string $code
      * @param string $name
      * @param int $quantity
      * @param float $price
      */
-    public function __construct(?string $reference, ?string $name , ?int $quantity, ?float $price)
+    public function __construct(?string $code, ?string $name , ?int $quantity, ?float $price)
     {
-        $this->reference = $reference;
+        $this->code = $code;
         $this->name = $name;
         $this->quantity = $quantity;
         $this->price = $price;
@@ -36,9 +36,9 @@ class TransactionDetailObject implements DataTransferObject
     /**
      * @return string
      */
-    public function getReference(): ?string
+    public function getCode(): ?string
     {
-        return $this->reference;
+        return $this->code;
     }
 
     /**
@@ -70,4 +70,4 @@ class TransactionDetailObject implements DataTransferObject
         return $this->getQuantity() * $this->getPrice();
     }
 
-}
+}

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

@@ -1,66 +0,0 @@
-<?php
-namespace App\Classes\Modules\Transactions\Processors;
-
-use App\Classes\Modules\Transactions\Services\CreatesShippingCostTransaction;
-use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\SegmentConstants;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Models\Order;
-
-class CreateShippingCostTransactionProcessor
-{
-    /** @var CreatesShippingCostTransaction */
-    private $createsShippingCostTransaction;
-
-    /** @var GeneratesTransactionBillNumber */
-    private $generatesTransactionBillNumber;
-
-    public function __construct(CreatesShippingCostTransaction $createsShippingCostTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber)
-    {
-        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
-        $this->createsShippingCostTransaction = $createsShippingCostTransaction;
-    }
-
-
-    /**
-     * @param Order $order
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Order $order,  int $quantity, float $totalCBM, float $totalShippingCost)
-    {
-        $billNumber = $this->generatesTransactionBillNumber->execute('SHP-');
-
-        $transactionObject = new TransactionObject(
-            $billNumber,
-            TransactionType::SHIPPING_COST,
-            1,
-            $order->companyModule->company_id,
-            1,
-            PaymentMethodType::BA,
-            $totalShippingCost,
-            $totalShippingCost,
-            1,
-            1,
-            0,
-            0,
-            0,
-            null,
-            ApprovalStatus::PENDING_SUBMISSION
-        );
-
-        $transactionDetailObject = new TransactionDetailObject(
-            TransactionType::SHIPPING_COST,
-            'Shipping Cost',
-            $quantity,
-            $totalShippingCost/$totalCBM
-        );
-
-        $shippingCostTransaction = $this->createsShippingCostTransaction->execute($order, $transactionObject, $transactionDetailObject);
-
-    }
-}

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

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
-use App\Classes\Modules\Transactions\DataTransferObjects\TransactionDetailObject;
-use App\Models\Order;
-use App\Models\Transaction;
-use App\Models\TransactionDetail;
-
-class CreatesShippingCostTransaction extends AbstractUpdateRelationshipRecord
-{
-    /**
-     * @param TransactionObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Order $order, TransactionObject $object, TransactionDetailObject $transactionDetailObject) {
-        $model = new Transaction();
-        $model->bill_no = $object->getBillNo();
-        $model->type = $object->getTransactionType();
-        $model->issuer = $object->getIssuer();
-        $model->receiver = $object->getReceiver();
-        $model->recipient_bank_account_id = $object->getRecipientBankAccountId();
-        $model->payment_method = $object->getPaymentMethod();
-        $model->amount = $object->getAmount();
-        $model->original_amount = $object->getOriginalAmount();
-        $model->currency_id = $object->getCurrencyId();
-        $model->original_currency_id = $object->getOriginalCurrencyId();
-        $model->currency_rate = $object->getCurrencyRate();
-        $model->tax = $object->getTax();
-        $model->service_charge = $object->getServiceCharge();
-        $model->expires_on = $object->getExpiresOn();
-        $model->status = $object->getStatus();
-
-        $transaction = $this->handler($order->transactions(), $model);
-
-
-        $model = new TransactionDetail();
-        $model->reference = $transactionDetailObject->getReference();
-        $model->name = $transactionDetailObject->getName();
-        $model->quantity = $transactionDetailObject->getQuantity();
-        $model->price = $transactionDetailObject->getPrice();
-        $model->amount = $transactionDetailObject->getAmount();
-
-        return $this->handler($transaction->transactionDetails(), $model);
-
-
-    }
-}

app/Classes/Modules/Unity/Services/UpdatesContractObligation.php

@@ -22,7 +22,7 @@ class UpdatesContractObligation
 
         $accessToken=$this->getAccessToken->execute();
 
-        $this->updateContractStatusEndpoint = str_replace('{hash}', $obligation_hash_id, $this->updateContractStatusEndpoint);
+        $this->updateContractStatusEndpoint = str_replace('{hash}',$obligation_hash_id,$this->updateContractStatusEndpoint);
 
         $response = Http::withToken($accessToken)->put($this->updateContractStatusEndpoint,['entity_signature_id'=>$contract_entity_signature])->object();
 

app/Classes/ValueObjects/Constants/BusinessType.php

@@ -16,6 +16,6 @@ final class BusinessType {
 
     public const DRIVER = 5;
 
-    public const CURRENCY_VENDOR = 6;
+    public const CURRENCY_VENDOR = 5;
 
 }

app/Classes/ValueObjects/Constants/PlatformType.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class PlatformType {
-
-    public const EXCHANGE = 1;
-
-}

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -22,6 +22,4 @@ final class TransactionType {
 
     public const SUPPLIER_DELIVER = 8;
 
-    public const SHIPPING_COST = 9;
-
 }

app/Classes/ValueObjects/Constants/WarehouseReferences.php

@@ -4,40 +4,34 @@ namespace App\Classes\ValueObjects\Constants;
 
 final class WarehouseReferences {
 
-    public const VT_GUANG_ZHOU = 'GZ-V01';
+    public const GUANG_ZHOU = 'GZ-V01';
 
-    public const YD_GUANG_ZHOU = 'GZ-V02';
+    public const YIWU = 'YW-V01';
 
-    public const VT_YIWU = 'YW-V01';
+    public const KLANG = 'KL-V01';
 
-    public const VT_KLANG = 'KL-V01';
+    public const SABAH = 'SB-V01';
 
-    public const YD_KLANG = 'KL-V02';
+    public const SARAWAK = 'SRW-V01';
 
-    public const VT_SABAH = 'SB-V01';
-
-    public const VT_SARAWAK = 'SRW-V01';
-
-    public const VT_DESTINATION_WAREHOUSE = [
-        1 => self::VT_KLANG,
-        2 => self::VT_KLANG,
-        3 => self::VT_KLANG,
-        4 => self::VT_KLANG,
-        5 => self::VT_SABAH,
-        6 => self::VT_KLANG,
-        7 => self::VT_KLANG,
-        8 => self::VT_KLANG,
-        9 => self::VT_KLANG,
-        10 => self::VT_KLANG,
-        11 => self::VT_KLANG,
-        12 => self::VT_KLANG,
-        13 => self::VT_SABAH,
-        14 => self::VT_SARAWAK,
-        15 => self::VT_KLANG,
-        16 => self::VT_KLANG,
+    public const DESTINATION_WAREHOUSE = [
+        1 => self::KLANG,
+        2 => self::KLANG,
+        3 => self::KLANG,
+        4 => self::KLANG,
+        5 => self::SABAH,
+        6 => self::KLANG,
+        7 => self::KLANG,
+        8 => self::KLANG,
+        9 => self::KLANG,
+        10 => self::KLANG,
+        11 => self::KLANG,
+        12 => self::KLANG,
+        13 => self::SABAH,
+        14 => self::KLANG,
+        15 => self::KLANG,
+        16 => self::KLANG,
     ];
 
-    public const YD_DESTINATION_WAREHOUSE = self::YD_KLANG;
-
 
 }

app/Http/Controllers/Accounts/UserAuthenticationLogoutController.php

@@ -15,6 +15,7 @@ class UserAuthenticationLogoutController
      * @return JsonResponse
      */
     public function logout(Request $request, LogoutUserLogic $logic): JsonResponse {
+        logger("logout controller");
         return $logic->execute($request);
     }
 

app/Http/Controllers/Accounts/UserCrossAuthenticationController.php

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

app/Http/Controllers/Companies/AssignCompanyConnectionToConnectionSegmentController.php

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

app/Http/Controllers/Companies/RemoveCompanyConnectionFromConnectionSegmentController.php

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

app/Http/Controllers/Orders/AssignOrderRemarkController.php

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

app/Http/Controllers/Orders/ShippingCostController.php

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

app/Http/Controllers/PackingLists/AssignPackingListRemarkController.php

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

app/Http/Controllers/PackingLists/Containers/AssignContainerRemarkController.php

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

app/Http/Controllers/PackingLists/Containers/CreateContainerRemarkController.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\PackingLists\Containers;
-
-use App\Classes\Modules\PackingLists\ControllersLogic\Containers\CreateContainerRemarkLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateContainerRemarkController
-{
-
-    public function create(Request $request, CreateContainerRemarkLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}

app/Http/Controllers/PackingLists/CreateDeliverPackingListController.php

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

app/Http/Controllers/PackingLists/Packages/CreatePackageController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\PackingLists\Packages;
 
-use App\Classes\Modules\PackingLists\ControllersLogic\Packages\CreatePackageLogic;
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\CreatePackageRemarkLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -10,10 +10,10 @@ class CreatePackageController
 {
     /**
      * @param Request $request
-     * @param CreatePackageLogic $logic
+     * @param CreatePackageRemarkLogic $logic
      * @return JsonResponse
      */
-    public function create(Request $request, CreatePackageLogic $logic): JsonResponse {
+    public function create(Request $request, CreatePackageRemarkLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 

app/Http/Controllers/PackingLists/Packages/CreatePackageRemarkController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists\Packages;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\Packages\CreatePackageRemarkLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreatePackageRemarkController
+{
+    public function create(Request $request, CreatePackageRemarkLogic $logic) : JsonResponse{
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Reports/MonthlyReportController.php

@@ -5,15 +5,18 @@ namespace App\Http\Controllers\Reports;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\HttpStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Response\ApiResponseObject;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
 use App\Models\Container;
 use App\Models\Order;
 use App\Models\Package;
+use App\Models\PackingList;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class MonthlyReportController
 {
@@ -74,50 +77,6 @@ class MonthlyReportController
             ]]))->handler();
     }
 
-    public function profitModelReport(Request $request): JsonResponse {
-        $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::now()->startOfMonth();
-        $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now()->endOfMonth();
-        $model = (int) $request->route('model');
-        $value = (float) $request->route('value');
-
-
-        $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
-
-        $packages = $containers->flatMap(function ($container) {
-            return $container->packages;
-        });
-
-        $totalCbm = $packages->sum(function($package){
-            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
-        });
-
-        $projectedCbm = $packages->sum(function($package) use ($value, $model) {
-
-            if($model === 2){
-                return (( (float) ($package->width + ($package->width * ($value/100))) / 100) * ( (float) ($package->length + ($package->length * ($value/100))) / 100) * ( (float) ($package->height + ($package->height * ($value/100))) / 100)) * $package->quantity;
-            }
-
-            if($model === 3){
-                return ((( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) + $value) * $package->quantity;
-            }
-
-            if($model === 4){
-                $packageCbm = (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100));
-                return ( $packageCbm + ($packageCbm * ($value/100))) * $package->quantity;
-            }
-
-            return (( (float) ($package->width + $value) / 100) * ( (float) ($package->length + $value) / 100) * ( (float) ($package->height + $value) / 100)) * $package->quantity;
-
-        });
-
-        return (new ApiResponseObject('fetch monthly report Successful',
-            '',
-            HttpStatus::OK_WITH_MESSAGE, ['data' => [
-                'total_cbm' => $totalCbm,
-                'projected_cbm' => $projectedCbm,
-            ]]))->handler();
-    }
-
     public function customerReport(Request $request): JsonResponse {
 
         $connection = CompanyConnection::where('invitee_reference', $request->route('marking'))->firstOrFail();

app/Http/Controllers/Segments/CreateSegmentController.php

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

app/Http/Controllers/Segments/DeleteSegmentController.php

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

app/Http/Resources/CompanyModuleResource.php

@@ -35,8 +35,6 @@ class CompanyModuleResource extends JsonResource
         return [
             'id' => $this->id,
             'type' => $this->type,
-            'name' => $this->name,
-            'reference' => $this->reference,
             'address' => new AddressResource($defaultAddress),
             'company' => new CompanyResource($this->whenLoaded('company')),
             'marking' => $marking

app/Http/Resources/ContainerResource.php

@@ -3,7 +3,6 @@
 namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ContainerTypes;
-use App\Models\Remark;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class ContainerResource extends JsonResource
@@ -27,7 +26,6 @@ class ContainerResource extends JsonResource
             'packing_lists' => PackingListResource::collection($this->whenLoaded('packingLists', function(){
                 return $this->packingLists()->whereHas('packages')->get();
             })),
-            'remarks' => RemarkResource::collection($this->remarks),
             'status' => $this->status
         ];
     }

app/Http/Resources/DeliverPackingListResource.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class DeliverPackingListResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'claimant_id' => $this->claimant_id,
-            'reference' => $this->reference,
-            'status' => $this->status,
-            'transport' => new TransportResource($this->transports()->first()),
-            'packing_list' => PackingListResource::collection($this->packing_list_owner),
-            'company' => New CompanyModuleResource($this->owner)
-        ];
-    }
-}

app/Http/Resources/OrderResource.php

@@ -29,20 +29,24 @@ class OrderResource extends JsonResource
             'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
             'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
             'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
-            'parcels' =>  $this->whenLoaded('packingLists', function() {
+            'parcels' =>  $this->whenLoaded('packingLists', function(){
                 return [
-                    'origin_warehouse_packages' => PackageResource::collection(
-                        $this->originWarehousePackages()->get()
-                    ),
-                    'in_transit_packages' => PackageResource::collection(
-                        $this->inTransitPackages()->get()
-                    ),
-                    'destination_warehouse_packages' => PackageResource::collection(
-                        $this->destinationWarehousePackages()->get()
-                    ),
-                    'delivered_packages' => PackageResource::collection(
-                        $this->deliveredPackages()->get()
-                    ),
+                    'origin_warehouse_packages' => PackageResource::collection($this->parcels()->shippingList()->whereDoesntHave('shippingSchedules', function($schedule){
+                        return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                    })->get()),
+                    'in_transit_packages' => PackageResource::collection($this->parcels()->shippingList()->Shipping()->whereHas('shippingSchedules', function($schedule){
+                        return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                    })->whereDoesntHave('container', function($container){
+                        return $container->where('containers.status', ApprovalStatus::COMPLETED);
+                    })->get()),
+                    'destination_warehouse_packages' => PackageResource::collection($this->parcels()->shippingList()->whereHas('container', function($container){
+                        return $container->where('containers.status', ApprovalStatus::COMPLETED);
+                    })->whereDoesntHave('deliverySchedules', function($schedule){
+                        return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                    })->get()),
+                    'delivered_packages' => PackageResource::collection($this->parcels()->shippingList()->whereHas('deliverySchedules', function($schedule){
+                        return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                    })->get()),
                     'received_packages' => PackageResource::collection($this->parcels()->warehouseReceiveList()->get()),
                 ];
             }),

app/Http/Resources/RemarkResource.php

@@ -16,11 +16,8 @@ class RemarkResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'commenter' => new UserResource($this->commenter),
-            'owner_id' => $this->owner_id,
+            'commenter_id' => $this->commenter_id,
             'content' => $this->content,
-            'created_at' => $this->created_at->format('d-m-Y H:i'),
-            'long_ago' => $this->created_at->diffForHumans()
         ];
     }
 }

app/Http/Resources/SegmentResource.php

@@ -18,10 +18,10 @@ class SegmentResource extends JsonResource
         return [
             'id' => $this->id,
             'name' => $this->name,
-            // 'time_limit' => $this->when($this->whereHas('constants', function($query){
-            //     $query->where('reference', SegmentConstants::PAYMENT_ATTEMPT_DURATION_LIMIT);
-            // }), $this->constants->where('reference', SegmentConstants::PAYMENT_ATTEMPT_DURATION_LIMIT)->first()),
-            // 'services' => CustomServiceTypeResource::collection($this->constants->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE))
+            'time_limit' => $this->when($this->whereHas('constants', function($query){
+                $query->where('reference', SegmentConstants::PAYMENT_ATTEMPT_DURATION_LIMIT);
+            }), $this->constants->where('reference', SegmentConstants::PAYMENT_ATTEMPT_DURATION_LIMIT)->first()),
+            'services' => CustomServiceTypeResource::collection($this->constants->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE))
         ];
     }
 }

app/Models/Company.php

@@ -4,11 +4,18 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Documentable;
 use App\Classes\General\Interfaces\Contactable;
+use App\Classes\Modules\ServiceTypes\DataTransferObjects\ServiceConfigurationsObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Collection;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 

app/Models/CompanyConnection.php

@@ -60,13 +60,4 @@ class CompanyConnection extends AbstractModel
         return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
     }
 
-
-    /**
-     * @return belongsToMany
-     */
-    public function segments(): belongsToMany
-    {
-        return $this->belongsToMany(Segment::class, (new ConnectionSegment())->getTable(), 'company_connection_id', 'segment_id');
-    }
-
 }

app/Models/CompanyModule.php

@@ -6,8 +6,6 @@ use App\Classes\General\Interfaces\Addressable;
 use App\Classes\General\Interfaces\Contactable;
 use App\Classes\General\Interfaces\ContainerOwner;
 use App\Classes\General\Interfaces\Documentable;
-use App\Classes\General\Interfaces\Packable;
-
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use Illuminate\Database\Eloquent\Builder;
@@ -30,7 +28,7 @@ use PhpParser\Node\Expr\AssignOp\Mod;
  * @property integer type
  * @property integer status
  */
-class CompanyModule extends AbstractModel implements Addressable, Documentable, Contactable, ContainerOwner, Packable
+class CompanyModule extends AbstractModel implements Addressable, Documentable, Contactable, ContainerOwner
 {
     use SoftDeletes;
 
@@ -62,14 +60,6 @@ class CompanyModule extends AbstractModel implements Addressable, Documentable,
         return $this->morphMany(Address::class, 'owner');
     }
 
-    /**
-     * @return MorphMany
-     */
-    public function packingLists(): morphMany
-    {
-        return $this->morphMany(PackingList::class, 'owner');
-    }
-
     /**
      * @return belongsToMany
      */

app/Models/ConnectionSegment.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-/**
- * Class Segment
- * @package App\Models
- *
- * @property string name
- * @property string reference
- */
-class ConnectionSegment extends AbstractModel
-{
-    use SoftDeletes;
-
-    protected $table = 'connection_segments';
-
-    protected $dates = ['deleted_at'];
-
-    /**
-     * @return HasMany
-     */
-    public function segments(): HasMany
-    {
-        return $this->HasMany(Segment::class, 'segment_id', 'id');
-    }
-
-    /**
-     * @return HasMany
-     */
-    public function companyConnections(): HasMany
-    {
-        return $this->HasMany(CompanyConnection::class, 'company_connection_id', 'id');
-    }
-}

app/Models/Container.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Classes\General\Interfaces\Remarkable;
 use App\Classes\General\Interfaces\Transportable;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -10,7 +9,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
-class Container extends AbstractModel implements Transportable, Remarkable
+class Container extends AbstractModel implements Transportable
 {
     use HasRelationships;
     use SoftDeletes;
@@ -57,12 +56,4 @@ class Container extends AbstractModel implements Transportable, Remarkable
     {
         return $this->morphMany(Transport::class, 'owner');
     }
-
-    /**
-     * @return MorphMany
-     */
-    public function remarks(): morphMany
-    {
-        return $this->morphMany(Remark::class, 'owner');
-    }
 }

app/Models/Order.php

@@ -55,14 +55,6 @@ class Order extends AbstractModel implements Addressable, Packable
         return $this->morphMany(PackingList::class, 'owner');
     }
 
-    /**
-     * @return MorphMany
-     */
-    public function remarks(): morphMany
-    {
-        return $this->morphMany(Remark::class, 'owner');
-    }
-
     /**
      * @return HasManyThrough
      */
@@ -96,63 +88,4 @@ class Order extends AbstractModel implements Addressable, Packable
     {
         return $this->addresses()->where('status','=',ApprovalStatus::APPROVED);
     }
-
-    public function originWarehousePackages()
-    {
-        return $this->parcels()->shippingList()
-            ->whereDoesntHave('shippingSchedules',
-                function($schedule) {
-                    return $schedule->dispatched()
-                        ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                }
-            );
-    }
-
-    public function inTransitPackages()
-    {
-        return $this->parcels()->shippingList()->Shipping()
-            ->whereHas('shippingSchedules',
-                function($schedule) {
-                    return $schedule->dispatched()
-                        ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                }
-            )
-            ->whereDoesntHave('container', function($container) {
-                return $container->where('containers.status', ApprovalStatus::COMPLETED);
-            }
-        );
-    }
-
-    public function destinationWarehousePackages()
-    {
-        return $this->parcels()->shippingList()
-            ->whereHas('container',
-                function($container) {
-                    return $container->where('containers.status', ApprovalStatus::COMPLETED);
-                }
-            )
-            ->whereDoesntHave('deliverySchedules',
-                function($schedule) {
-                    return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                }
-            );
-    }
-
-    public function deliveredPackages()
-    {
-        return $this->parcels()->shippingList()
-            ->whereHas('deliverySchedules',
-                function($schedule) {
-                    return $schedule->dispatched()->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                }
-            );
-    }
-
-    /**
-     * @return morphMany
-     */
-    public function transactions(): morphMany
-    {
-        return $this->morphMany(Transaction::class, 'owner');
-    }
 }

app/Models/Package.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Classes\General\Interfaces\Remarkable;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use Carbon\Carbon;
@@ -12,8 +13,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasOneDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 
-class Package extends AbstractModel
+class Package extends AbstractModel implements Remarkable
 {
     use HasRelationships;
     use SoftDeletes;
@@ -93,6 +95,14 @@ class Package extends AbstractModel
         return $this->hasOneDeep(Transport::class, [PackingList::class], ['id', ['owner_type', 'owner_id']], ['packing_list_id', null]);
     }
 
+    /**
+     * @return MorphMany
+     */
+    public function remarks(): morphMany
+    {
+        return $this->morphMany(Remark::class, 'owner');
+    }
+
     /**
      * @param $query
      * @return mixed

app/Models/PackingList.php

@@ -56,19 +56,4 @@ class PackingList extends AbstractModel implements Transportable, Steppable
         return $this->morphMany(Transport::class, 'owner');
     }
 
-    /**
-     * @return MorphMany
-     */
-    public function remarks(): morphMany
-    {
-        return $this->morphMany(Remark::class, 'owner');
-    }
-
-    /**
-     * @return belongsToMany
-     */
-    public function packing_list_owner()
-    {
-        return $this->BelongsToMany(PackingList::class, 'packing_list_owner', 'owner_packing_list_id', 'packing_list_id');
-    }
 }

app/Models/PackingListOwner.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class PackingListOwner extends Model
-{
-    use HasFactory;
-}

app/Models/Remark.php

@@ -4,7 +4,6 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Remark extends AbstractModel
 {
@@ -16,12 +15,4 @@ class Remark extends AbstractModel
     {
         return $this->morphTo();
     }
-
-    /**
-     * @return BelongsTo
-     */
-    public function commenter(): BelongsTo
-    {
-        return $this->BelongsTo(User::class, 'commenter_id', 'id');
-    }
 }

app/Models/Segment.php

@@ -27,12 +27,4 @@ class Segment extends AbstractModel
     {
         return $this->HasMany(SegmentConstant::class, 'segment_id', 'id');
     }
-    
-    /**
-     * @return belongsToMany
-     */
-    public function companyConnections(): belongsToMany
-    {
-        return $this->belongsToMany(CompanyConnection::class, (new ConnectionSegment())->getTable(), 'segment_id', 'company_connection_id');
-    }
 }

app/Models/Transaction.php

@@ -16,17 +16,12 @@ class Transaction extends AbstractModel implements Documentable
 {
     protected $table = 'transactions';
 
-    public function owner(): morphTo
-    {
-        return $this->morphTo();
-    }
-
     /**
-     * @return MorphMany
+     * @return BelongsTo
      */
-    public function order(): morphMany
+    public function booking(): BelongsTo
     {
-        return $this->morphMany(Order::class, 'owner');
+        return $this->BelongsTo( Booking::class, 'booking_id', 'id');
     }
 
     /**

app/Models/TransactionDetail.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class TransactionDetail extends AbstractModel
 {
-    protected $table = 'transaction_details';
+    protected $table = 'transaction_detail';
 
     /**
      * @return BelongsTo

app/Models/UserSocialAccount.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-/**
- * Class District
- * @package App\Models
- *
- * @property \App\Models\User user_id
- * @property string app_id
- * @property int platform
- */
-class UserSocialAccount extends AbstractModel
-{
-    use SoftDeletes;
-
-    protected $table = 'user_social_accounts';
-
-    protected $dates = ['deleted_at'];
-
-    /**
-     * @return BelongsTo
-     */
-    public function user(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'user_id', 'id');
-    }
-}