debug testing

export top order pdf

See merge request CIEFWorldwideSdnBhd/shipping-portal!138

.env.example

@@ -49,3 +49,9 @@ PUSHER_APP_CLUSTER=mt1
 
 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}"
+
+YD_API_CODE=''

.gitignore

@@ -22,4 +22,7 @@ rebuild_docker.sh
 docker/*
 db/*
 docker-compose.yml
-package-lock.json
+package-lock.json
+public/*
+/public/*
+storage/framework/laravel-excel/*

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -63,7 +63,7 @@ abstract class AbstractControllerLogic
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
-                $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
+                !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
         }
     }
@@ -95,4 +95,4 @@ abstract class AbstractControllerLogic
         return $this->response(json_decode($collection->response()->getContent(), true));
     }
 
-}
+}

app/Classes/General/Eloquent/AbstractListRecord.php

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

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

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

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

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

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

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

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

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreditTerm implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder;
+
+        return $builder->whereHas('packingLists.owner', function($query) use($value) {
+             $query->whereHas('companyModule.connections', function($query) use($value){
+                if ($value) {
+                     $query->whereHas('segments', function($query) {
+                         $query->where('segments.id' , 3);
+                    });
+                }else{
+                     $query->whereDoesntHave('segments', function($query) {
+                         $query->where('segments.id' , 3);
+                    });
+                }
+            });
+        });
+    }
+
+}

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class Delivered implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('container',
+            function($container) {
+                return $container->where('containers.status', ApprovalStatus::COMPLETED);
+            }
+        )->whereHas('deliverySchedules',
+            function($schedule) {
+                return $schedule->where('eta', '<', Carbon::now())->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class HasMorphCompanyModule implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHasMorph('owner', ['App\Models\CompanyModule'], function ($query) use($value) {
+                $query->where('id',$value);
+            });
+    }
+}

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

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

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

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class InDestinationWarehouse implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('container',
+            function($container) {
+                return $container->where('containers.status', ApprovalStatus::COMPLETED);
+            }
+        )->whereDoesntHave('deliverySchedules',
+            function($schedule) {
+                return $schedule->where('etd', '<', Carbon::now())->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}

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

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class InOriginWarehouse implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereDoesntHave('shippingSchedules',
+            function($schedule) {
+                return $schedule->where('etd', '<', Carbon::now())
+                    ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}

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

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+
+class InTransit implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('packingList', function($packingList){
+            return $packingList->where('type', PackingListType::SHIPPING_PACKING_LIST)->where('status', ApprovalStatus::APPROVED);
+        })->whereHas('container',
+            function($container) {
+                return $container->where('containers.status', ApprovalStatus::PENDING_VERIFICATION);
+            }
+        )->whereHas('shippingSchedules',
+            function($schedule) {
+                return $schedule->where('etd', '<', Carbon::now())
+                    ->whereIn('schedules.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            }
+        );
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Support\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class PackingListDeliveryStatus implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $value == 1 ? $builder->whereHas('containers', function ($query){
+            $query->where('containers.status', ApprovalStatus::COMPLETED);
+        })->whereDoesntHave('transports') : ($value == 2 ? $builder->whereHas('transports', function (Builder $query) use ($value) {
+            $query->whereDoesntHave('schedules', function (Builder $query) use ($value) {
+                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '<=',  Carbon::now());
+            });
+        }) : $builder->whereHas('transports', function (Builder $query) use ($value) {
+            $query->whereHas('schedules', function (Builder $query) use ($value) {
+                $query->where('status', '!=', ApprovalStatus::EXPIRED)->where('eta', '<=',  Carbon::now());
+            });
+        }));
+    }
+}

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

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\PackingList;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
+
+class PackingListOrderedByInvoiceDate implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->select('packing_lists.*')->join('transactions', function($join){
+            $join->on('transactions.owner_id', '=', 'packing_lists.id');
+            $join->where('transactions.owner_type', '=', PackingList::class);
+            $join->where('transactions.status', '=', ApprovalStatus::APPROVED);
+        })->orderBy('transactions.updated_at', 'DESC');
+    }
+
+}

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@ class Reference implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('Reference', '=', $value);
+        return $builder->where('reference', '=', $value);
     }
 
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+<?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/Eloquent/Filters/WithCompanyModuleType.php

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

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

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

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

@@ -5,7 +5,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
 
-class WithBookings implements Filter
+class WithOrders implements Filter
 {
 
     /**
@@ -15,6 +15,6 @@ class WithBookings implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->with('bookings');
+        return $builder->with('orders');
     }
 }

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

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

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

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

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

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

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

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

app/Classes/General/ExcelHandel.php

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

app/Classes/General/Interfaces/ContainerOwner.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface ContainerOwner
+{
+
+    public function containers(): morphMany;
+
+}

app/Classes/General/Interfaces/Notifiable.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+interface Notifiable
+{
+    public function subject(): MorphTo;
+
+    public function target(): MorphTo;
+
+    public function causer(): MorphTo;
+}

app/Classes/General/Interfaces/Packable.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Packable
+{
+    public function packingLists(): morphMany;
+
+}

app/Classes/General/Interfaces/Remarkable.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Remarkable
+{
+
+    public function remarks(): morphMany;
+
+}

app/Classes/General/Interfaces/Steppable.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Steppable
+{
+
+    public function steps(): morphMany;
+
+}

app/Classes/General/Interfaces/Transactionable.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Transactionable
+{
+
+    public function transactions(): morphMany;
+
+}

app/Classes/General/Interfaces/Transportable.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Transportable
+{
+
+    public function transports(): morphMany;
+
+}

app/Classes/General/Traits/LogData.php

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

app/Classes/Jobs/FetchContainersStatusUpdateFromVTPortalJob.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchContainersStatusUpdateFromVTPortalProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchContainersStatusUpdateFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 900;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+        (App()->make(FetchContainersStatusUpdateFromVTPortalProcessor::class))->execute();
+    }
+}

app/Classes/Jobs/FetchDeliveryListFromVTPortalJob.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchDeliveryListFromVTPortalProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchDeliveryListFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public $timeout = 900;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+
+        (App()->make(FetchDeliveryListFromVTPortalProcessor::class))->execute();
+    }
+}

app/Classes/Jobs/FetchLoadedContainersFromVTPortalJob.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor;
+use Carbon\Carbon;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchLoadedContainersFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public $timeout = 900;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+        (App()->make(FetchLoadedContainersFromVTPortalProcessor::class))->execute();
+    }
+}

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchOrdersFromYDPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public $timeout = 900;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+
+        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+    }
+
+}

app/Classes/Jobs/FetchPackingListFromVTPortalJob.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchPackingListFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public $timeout = 1800;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+        (App()->make(FetchPackingListFromVTPortalProcessor::class))->execute();
+    }
+}

app/Classes/Jobs/FetchWarehouseReceiveListFromVTPortalJob.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+
+use App\Classes\Modules\PackingLists\Processors\FetchWarehouseReceiveListFromVTPortalProcessor;
+use Carbon\Carbon;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class FetchWarehouseReceiveListFromVTPortalJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+
+    public $timeout = 900;
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    public function handle()
+    {
+        (App()->make(FetchWarehouseReceiveListFromVTPortalProcessor::class))->execute();
+    }
+}

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

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Exceptions\ResourceConflictException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\UserResource;
+use Illuminate\Database\QueryException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class AddNewMemberLogic extends AbstractControllerLogic
+{
+
+    public function notification(): array
+    {
+        return [
+            'title' => 'Updated Email',
+            'message' => 'Successfully updated email'
+        ];
+    }
+
+    /**
+     * @var AssignEmployeeProcessor
+     */
+    private $assignEmployeeProcessor;
+
+    /**
+     * @var GenerateEmailVerificationAttemptProcessor
+     */
+    private $generateEmailVerificationAttemptProcessor;
+
+    /**
+     * AddNewMemberLogic constructor.
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     */
+    public function __construct(AssignEmployeeProcessor $assignEmployeeProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor)
+    {
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ResourceConflictException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        try {
+            $user = Auth::user()->replicate();
+            $user->email = $request->input('email');
+            $user->status = ApprovalStatus::PENDING_VERIFICATION;
+            $user->save();
+        } catch (QueryException $exception){
+            throw new ResourceConflictException('Unable to change your email address as it already exists');
+        }
+
+        if($company = Auth::user()->companyModule()->first()){
+            $Object = new EmploymentObject($company, $user);
+            $this->assignEmployeeProcessor->execute($Object);
+        }
+
+        $this->generateEmailVerificationAttemptProcessor->execute($user);
+
+        return $this->resourceResponse(new UserResource($user));
+    }
+}

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

@@ -35,7 +35,6 @@ class AuthenticateUserLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\AccessUnauthorisedException
-     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     protected function logic(Request $request): JsonResponse {

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

@@ -4,21 +4,29 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 
+use App\Classes\General\Services\GeneratesInitials;
 use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
 use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
 use App\Classes\Modules\Accounts\Processors\GenerateEmailVerificationAttemptProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
 use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
-use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyModuleProcessor;
 use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
+use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
 
 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 App\Models\Company;
+use App\Models\CompanyModule;
 use App\Models\User;
 
 use Illuminate\Http\JsonResponse;
@@ -51,44 +59,54 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var CreateContactProcessor */
     private $createContactProcessor;
 
+    /** @var CreatesCompanyConnection */
+    private $createsCompanyConnection;
+
+    /** @var ApprovesCompanyConnection */
+    private $approvesCompanyConnection;
+
     /** @var AssignEmployeeProcessor */
     private $assignEmployeeProcessor;
 
     /** @var UploadIdentityDocumentProcessor */
     private $uploadIdentityDocumentProcessor;
 
-    /** @var AssignSegmentProcessor */
-    private $assignSegmentProcessor;
-
     /** @var AuthenticationProcessor */
     private $authenticationProcessor;
 
     /** @var GenerateEmailVerificationAttemptProcessor */
     private $generateEmailVerificationAttemptProcessor;
 
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
      * @param CreateCompanyProcessor $createCompanyProcessor
      * @param CreateCompanyModuleProcessor $createCompanyModuleProcessor
      * @param CreateContactProcessor $createContactProcessor
+     * @param CreatesCompanyConnection $createsCompanyConnection
+     * @param ApprovesCompanyConnection $approvesCompanyConnection
      * @param AssignEmployeeProcessor $assignEmployeeProcessor
-     * @param AssignSegmentProcessor $assignSegmentProcessor
      * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
+     * @param FetchesCompanyModule $fetchesCompanyModule
      */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, AssignEmployeeProcessor $assignEmployeeProcessor, AssignSegmentProcessor $assignSegmentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor)
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
         $this->createCompanyModuleProcessor = $createCompanyModuleProcessor;
         $this->createContactProcessor = $createContactProcessor;
+        $this->createsCompanyConnection = $createsCompanyConnection;
+        $this->approvesCompanyConnection = $approvesCompanyConnection;
         $this->assignEmployeeProcessor = $assignEmployeeProcessor;
-        $this->assignSegmentProcessor = $assignSegmentProcessor;
         $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
     }
 
     /**
@@ -96,30 +114,39 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws \App\Classes\Exceptions\AccessForbiddenException
      * @throws \App\Classes\Exceptions\AccessUnauthorisedException
-     * @throws \App\Classes\Exceptions\InternalServerErrorException
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request): JsonResponse
     {
         /** @var User $user */
-        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, App::environment(['local']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
 
         /** @var Company $company */
-        $company = $this->createCompanyProcessor->execute($request, $request->input('type'), ApprovalStatus::PENDING_SUBMISSION);
+        $company = $this->createCompanyProcessor->execute($request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'), $request->input('type'), ApprovalStatus::PENDING_SUBMISSION);
 
-        $this->createContactProcessor->execute($request, $company);
+        $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
 
-        $companyModule = $this->createCompanyModuleProcessor->execute($company);
+        $this->createContactProcessor->execute($contactObject, $company);
+
+        /** @var CompanyModule $companyModule */
+        $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
+
+        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
+
+        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'CIEF');
+
+        $connection = $this->createsCompanyConnection->execute($connectionObject);
+
+        $this->approvesCompanyConnection->execute($connection);
 
         $Object = new EmploymentObject($companyModule, $user);
-        $this->assignEmployeeProcessor->execute($Object);
 
-        //$this->assignSegmentProcessor->execute($company);
+        $this->assignEmployeeProcessor->execute($Object);
 
         $this->uploadIdentityDocumentProcessor->execute($request, $company);
 
-        $this->generateEmailVerificationAttemptProcessor->execute($user);
+//        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));
     }

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

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Accounts\Processors\AuthenticationProcessor;
+use App\Classes\Modules\Accounts\Processors\CreateUserProcessor;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Company;
+use App\Models\CompanyModule;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+
+class CreateInvitedCustomerLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created User',
+            'message' => 'You have successfully created a new User'
+        ];
+    }
+
+    /** @var CreateUserProcessor */
+    private $createUserProcessor;
+
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /** @var AuthenticationProcessor */
+    private $authenticationProcessor;
+
+
+    /**
+     * CreateInvitedCustomerLogic constructor.
+     * @param CreateUserProcessor $createUserProcessor
+     * @param CreateContactProcessor $createContactProcessor
+     * @param FetchesCompany $fetchesCompany
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param AuthenticationProcessor $authenticationProcessor
+     */
+    public function __construct(CreateUserProcessor $createUserProcessor, CreateContactProcessor $createContactProcessor, FetchesCompany $fetchesCompany, AssignEmployeeProcessor $assignEmployeeProcessor, AuthenticationProcessor $authenticationProcessor)
+    {
+        $this->createUserProcessor = $createUserProcessor;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->authenticationProcessor = $authenticationProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\AccessUnauthorisedException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        /** @var Company $company */
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+
+        /** @var CompanyModule $companyModule */
+        $companyModule = $company->companyModules()->first();
+
+        if($companyModule->employees()->exists()){
+            throw new AccessForbiddenException('This company\'s account has been claimed by another user already!');
+        }
+
+        /** @var User $user */
+        $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
+
+        $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id'));
+
+        $this->createContactProcessor->execute($contactObject, $company);
+
+        $Object = new EmploymentObject($companyModule, $user);
+
+        $this->assignEmployeeProcessor->execute($Object);
+
+        return $this->response($this->authenticationProcessor->execute($request));
+    }
+}

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

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

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Standards\Rules\CanFetchUser;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Http\Resources\UserCompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchUserByEmailLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Fetch Users',
+            'message' => 'You have successfully retrieved the user by email'
+        ];
+    }
+
+    /** @var CanFetchUser */
+    private $canFetchUser;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /**
+     * FetchUserByEmailLogic constructor.
+     * @param CanFetchUser $canFetchUser
+     * @param FetchesUser $fetchessUser
+     */
+    public function __construct(CanFetchUser $canFetchUser, FetchesUser $fetchesUser)
+    {
+        $this->canFetchUser = $canFetchUser;
+        $this->fetchesUser = $fetchesUser;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        try {
+
+            $this->canFetchUser->passes();
+
+            $query = $this->fetchesUser->execute(['email' => $request->route('email')]);
+
+            return $this->resourceResponse(new UserCompanyResource($query));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
+}

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

@@ -12,6 +12,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\ValueObjects\Constants\Notifications;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 class GeneratePasswordResetLogic extends AbstractControllerLogic
 {

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

@@ -27,7 +27,6 @@ class LogoutUserLogic extends AbstractControllerLogic
      */
     public function __construct(InvalidatesAuthenticationToken $invalidatesAuthenticationToken)
     {
-        logger("logout user logic");
         $this->invalidatesAuthenticationToken = $invalidatesAuthenticationToken;
     }
 
@@ -37,7 +36,6 @@ class LogoutUserLogic extends AbstractControllerLogic
      */
     protected function logic(Request $request): JsonResponse {
 
-        logger("logout");
         $this->invalidatesAuthenticationToken->execute();
 
         return $this->response();

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

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

@@ -4,19 +4,14 @@ namespace App\Classes\Modules\Accounts\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
 
-class FullnameObject implements DataTransferObject
+class FullNameObject implements DataTransferObject
 {
     /** @var string */
     private $name;
 
     /**
-     * UserObject constructor.
+     * FullNameObject constructor.
      * @param string $name
-     * @param string $email
-     * @param string $password
-     * @param string $passwordConfirmation
-     * @param int|null $type
-     * @param int|null $status
      */
     public function __construct(string $name)
     {

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

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

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

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

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

@@ -2,9 +2,9 @@
 
 namespace App\Classes\Modules\Accounts\Services;
 
-
 use App\Classes\Exceptions\AccessUnauthorisedException;
 use App\Classes\Modules\Accounts\DataTransferObjects\AuthenticationCredentialsObject;
+
 class AuthenticatesUser
 {
 
@@ -23,4 +23,4 @@ class AuthenticatesUser
 
     }
 
-}
+}

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

@@ -2,6 +2,7 @@
 
 namespace App\Classes\Modules\Accounts\Services;
 
+use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Models\User;
 
@@ -11,6 +12,11 @@ class AuthenticationRedirect
     public function url(User $user){
 
         if($user->type === RoleTypes::USER){
+
+            if (in_array($user->companyModule()->first()->type, [BusinessType::ONLINE_SELLER, BusinessType::LAST_MILE_DELIVERY_AGENT])) {
+                return route('last_mile_delivery.dashboard');
+            }
+
             return route('dashboard');
         }
 

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

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

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

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

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

@@ -0,0 +1,33 @@
+<?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/Services/GeneratesAuthenticationToken.php

@@ -3,6 +3,7 @@
 namespace App\Classes\Modules\Accounts\Services;
 
 use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Models\Company;
 use App\Models\Role;
@@ -53,9 +54,6 @@ class GeneratesAuthenticationToken {
      */
     private function setTokenClaims(User $user): void {
 
-        /** @var Company $companyModule */
-        $companyModule = $user->companyModule()->first();
-
         $claims = [
             'id' => $user->id,
             'name' => $user->name,
@@ -65,8 +63,16 @@ class GeneratesAuthenticationToken {
         ];
 
         if($user->type === RoleTypes::USER) {
+
+            /** @var Company $companyModule */
+            $companyModule = $user->companyModule()->first();
+
             $claims = array_merge($claims, [
-                'company_id' => $companyModule->company_id
+                'company_id' => $companyModule->company_id,
+                'company_module_id' => $companyModule->id,
+                'company_module_type' => $companyModule->type,
+                'company_name' => $companyModule->name,
+                'company_marking' => $companyModule->type !== 8 ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'HWT',
             ]);
         }
 

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

@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\Accounts\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Accounts\DataTransferObjects\FullnameObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
 use App\Models\User;
 
 class UpdatesUser extends AbstractUpdateRecord
@@ -11,7 +11,7 @@ class UpdatesUser extends AbstractUpdateRecord
 
     /**
      * @param User $model
-     * @param UserObject $object
+     * @param FullNameObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */

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

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

@@ -0,0 +1,43 @@
+<?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/Addresses/ControllersLogic/CreateAddressLogic.php

@@ -4,12 +4,19 @@ namespace App\Classes\Modules\Addresses\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\General\Interfaces\Contactable;
 use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
+use App\Models\Address;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -33,25 +40,35 @@ class CreateAddressLogic extends AbstractControllerLogic
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
-    /** @var FetchesCompany */
-    private $fetchesCompany;
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
 
     /** @var CreatesAddress */
     private $createsAddress;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * CreateAddressLogic constructor.
      * @param CanCreateAddress $canCreateAddress
      * @param FetchesDistrict $fetchesDistrict
-     * @param FetchesCompany $fetchesCompany
+     * @param FetchesCompanyModule $fetchesCompanyModule
      * @param CreatesAddress $createsAddress
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesAddress $createsAddress)
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
     {
         $this->canCreateAddress = $canCreateAddress;
         $this->fetchesDistrict = $fetchesDistrict;
-        $this->fetchesCompany = $fetchesCompany;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createsAddress = $createsAddress;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
     /**
@@ -66,13 +83,24 @@ class CreateAddressLogic extends AbstractControllerLogic
 
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('type'), ApprovalStatus::APPROVED, $request->input('reference'));
 
         $this->canCreateAddress->passes($object);
 
-        $query = $this->createsAddress->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
+        /** @var Address $address */
+        $address = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
 
-        return $this->resourceResponse(new AddressResource($query));
+        if($request->input('phone')){
+            $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
+            $this->createContactProcessor->execute($contactObject, $address);
+        }
+
+        if($request->input('remark')){
+            $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
+            $this->createRemarkProcessor->execute($address, $remarkObject);
+        }
+
+        return $this->resourceResponse(new AddressResource($address));
 
     }
 

app/Classes/Modules/Addresses/ControllersLogic/DeleteAddressLogic.php

@@ -50,23 +50,20 @@ class DeleteAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
 
-            $this->canDeleteAddress->passes();
+        $this->canDeleteAddress->passes();
 
-            $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
+        $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-            $this->deletesAddress->execute($query);
+        $this->deletesAddress->execute($query);
 
-            return $this->response([]);
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->response([]);
 
     }
 

app/Classes/Modules/Addresses/ControllersLogic/FetchAddressLogic.php

@@ -45,21 +45,16 @@ class FetchAddressLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $this->canFetchAddress->passes();
 
-            $this->canFetchAddress->passes();
+        $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-            $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
-
-            return $this->resourceResponse(new AddressResource($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->resourceResponse(new AddressResource($query));
 
     }
 

app/Classes/Modules/Addresses/ControllersLogic/ListAddressesLogic.php

@@ -45,21 +45,18 @@ class ListAddressesLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
 
-            $this->canListAddresses->passes();
+        $this->canListAddresses->passes();
 
-            $query = $this->listsAddresses->execute($this->listsAddresses->deserializeFilters($request->input('filters')));
+        $query = $this->listsAddresses->execute($this->listsAddresses->deserializeFilters($request->input('filters')));
 
-            return $this->collectionResponse(AddressResource::collection($query));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        return $this->collectionResponse(AddressResource::collection($query));
 
     }
 

app/Classes/Modules/Addresses/ControllersLogic/ListStatesLogic.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\ListsAddresses;
+use App\Classes\Modules\Addresses\Services\ListsStates;
+use App\Classes\Modules\Addresses\Standards\Rules\CanListAddresses;
+use App\Http\Resources\AddressResource;
+use App\Http\Resources\StateResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListStatesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Addresses',
+            'message' => 'You have successfully retrieved a list of Addresses'
+        ];
+    }
+
+    /** @var ListsStates */
+    private $listStates;
+
+    /**
+     * ListStatesLogic constructor.
+     * @param ListsStates $listStates
+     */
+    public function __construct(ListsStates $listStates)
+    {
+        $this->listStates = $listStates;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listStates->execute($this->listStates->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(StateResource::collection($query));
+
+    }
+
+}

app/Classes/Modules/Addresses/ControllersLogic/SetAddressToDefaultLogic.php

@@ -2,15 +2,13 @@
 
 namespace App\Classes\Modules\Addresses\ControllersLogic;
 
+use App\Classes\General\Interfaces\Addressable;
 use App\Http\Resources\AddressResource;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
-use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
 use App\Classes\Modules\Addresses\Services\ResetsAddressesDefault;
 use App\Classes\Modules\Addresses\Services\SetsAddressToDefault;
-
 use App\Models\Address;
-use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -29,25 +27,26 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var ResetsAddressesDefault */
-    private $resetsAddressesDefault;
-
     /** @var FetchesAddress */
     private $fetchesAddress;
 
+    /** @var ResetsAddressesDefault */
+    private $resetsAddressesDefault;
+
     /** @var SetsAddressToDefault*/
     private $setsAddressToDefault;
 
+
     /**
      * SetAddressToDefaultLogic constructor.
-     * @param ResetsAddressesDefault $resetsAddressesDefault
      * @param FetchesAddress $fetchesAddress
+     * @param ResetsAddressesDefault $resetsAddressesDefault
      * @param SetsAddressToDefault $setsAddressToDefault
      */
-    public function __construct(ResetsAddressesDefault $resetsAddressesDefault, FetchesAddress $fetchesAddress, SetsAddressToDefault $setsAddressToDefault)
+    public function __construct(FetchesAddress $fetchesAddress, ResetsAddressesDefault $resetsAddressesDefault, SetsAddressToDefault $setsAddressToDefault)
     {
-        $this->resetsAddressesDefault = $resetsAddressesDefault;
         $this->fetchesAddress = $fetchesAddress;
+        $this->resetsAddressesDefault = $resetsAddressesDefault;
         $this->setsAddressToDefault = $setsAddressToDefault;
     }
 
@@ -63,8 +62,9 @@ class SetAddressToDefaultLogic extends AbstractControllerLogic
 
         $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-        $this->resetsAddressesDefault->execute($address);
+        $this->resetsAddressesDefault->execute($address->owner, $address->type);
 
         return $this->resourceResponse(new AddressResource($this->setsAddressToDefault->execute($address)));
+
     }
 }

app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php

@@ -9,8 +9,14 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
-use ErrorException;
+use App\Models\Address;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -39,48 +45,65 @@ class UpdateAddressLogic extends AbstractControllerLogic
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateAddress $canUpdateAddress
      * @param UpdatesAddress $updatesAddress
      * @param FetchesAddress $fetchesAddress
      * @param FetchesDistrict $fetchesDistrict
+     * @param CreateContactProcessor $createContactProcessor
+     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
     {
         $this->canUpdateAddress = $canUpdateAddress;
         $this->updatesAddress = $updatesAddress;
         $this->fetchesAddress = $fetchesAddress;
         $this->fetchesDistrict = $fetchesDistrict;
+        $this->createContactProcessor = $createContactProcessor;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
-
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
+        $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-            $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
-            $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
-            //$object = new AddressObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), AddressType::DELIVERY, ApprovalStatus::APPROVED, $request->input('reference'));
 
-            $this->canUpdateAddress->passes($object);
+        $this->canUpdateAddress->passes($object);
 
-            $query = $this->fetchesAddress->execute(['id' => $request->route('id')]);
+        $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-            $query = $this->updatesAddress->execute($query, $object);
+        /** @var Address $address */
+        $address = $this->updatesAddress->execute($address, $object);
 
-            return $this->resourceResponse(new AddressResource($query));
+        $address->contacts()->delete(); $address->remarks()->delete();
 
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        if($request->input('phone')){
+            $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
+            $this->createContactProcessor->execute($contactObject, $address);
         }
 
+        if($request->input('remark')){
+            $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
+            $this->createRemarkProcessor->execute($address, $remarkObject);
+        }
+
+        return $this->resourceResponse(new AddressResource($address));
+
     }
 
 }

app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php

@@ -3,6 +3,7 @@
 namespace App\Classes\Modules\Addresses\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 class AddressObject implements DataTransferObject
 {
@@ -25,6 +26,15 @@ class AddressObject implements DataTransferObject
     /** @var int */
     private $postCode;
 
+    /** @var int */
+    private $type;
+
+    /** @var int */
+    private $status;
+
+    /** @var string|null */
+    private $reference;
+
     /**
      * AddressObject constructor.
      * @param string $streetOne
@@ -33,8 +43,11 @@ class AddressObject implements DataTransferObject
      * @param int $stateId
      * @param int $districtId
      * @param int $postCode
+     * @param int $type
+     * @param int $status
+     * @param null|string $reference
      */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, int $type, int $status, ?string $reference = null)
     {
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
@@ -42,6 +55,9 @@ class AddressObject implements DataTransferObject
         $this->stateId = $stateId;
         $this->districtId = $districtId;
         $this->postCode = $postCode;
+        $this->type = $type;
+        $this->status = $status;
+        $this->reference = $reference;
     }
 
     /**
@@ -92,5 +108,29 @@ class AddressObject implements DataTransferObject
         return $this->postCode;
     }
 
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getReference(): ?string
+    {
+        return $this->reference;
+    }
+
 
 }

app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Processors;
+
+use App\Classes\General\Interfaces\Addressable;
+use App\Classes\Modules\Addresses\Services\CleansOldAddress;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Models\OldAddress;
+use App\Models\Order;
+use Illuminate\Database\Eloquent\Model;
+
+class CreateAddressFromOldAddressProcessor
+{
+
+    /** @var CleansOldAddress */
+    private $cleansOldAddress;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+
+    /**
+     * CreateAddressFromOldAddressProcessor constructor.
+     * @param CleansOldAddress $cleansOldAddress
+     * @param CreatesAddress $createsAddress
+     */
+    public function __construct(CleansOldAddress $cleansOldAddress, CreatesAddress $createsAddress)
+    {
+        $this->cleansOldAddress = $cleansOldAddress;
+        $this->createsAddress = $createsAddress;
+    }
+
+
+    /**
+     * @param OldAddress $address
+     * @param Addressable $addressable
+     * @return Model|null
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(OldAddress $address, Addressable $addressable): ?Model {
+
+        if(!$object = $this->cleansOldAddress->execute($address)){
+            return null;
+        }
+
+
+        if(!$addressable instanceof Order && $address = $addressable->addresses()->where('street_one', $object->getStreetOne())->first()) {
+            return $address;
+        }
+
+        return $this->createsAddress->execute($addressable, $object);
+
+    }
+
+}

app/Classes/Modules/Addresses/Processors/CreateOrderAddressProcessor.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Processors;
+
+use App\Classes\Modules\Addresses\Services\CreatesOrderAddress;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
+use Illuminate\Database\Eloquent\Model;
+use App\Models\Order;
+
+class CreateOrderAddressProcessor
+{
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
+    /** @var CreatesAddress */
+    private $createsOrderAddress;
+
+    private $fetchesAddress;
+
+    /**
+     * CreateAddressProcessor constructor.
+     * @param CanCreateAddress $canCreateAddress
+     * @param CreatesOrderAddress $createsOrderAddress
+     * @param FetchesAddress $fetchesAddress
+     */
+    public function __construct(CanCreateAddress $canCreateAddress, CreatesOrderAddress $createsOrderAddress, FetchesAddress $fetchesAddress)
+    {
+        $this->fetchesAddress = $fetchesAddress;
+        $this->canCreateAddress = $canCreateAddress;
+        $this->createsOrderAddress = $createsOrderAddress;
+    }
+
+    /**
+     * @param EmploymentObject $object
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(int $address, Order $order): Model {
+
+        $address = $this->fetchesAddress->execute(['id' => $address_id]);
+
+
+       // $this->canCreateAddress->passes($object);
+
+        //Fetches Address  & duplicate
+
+        return $this->createsOrderAddress->execute($address, $order);
+    }
+
+}

app/Classes/Modules/Addresses/Services/CleansOldAddress.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Omair Saleh
+ * Date: 20/8/2021
+ * Time: 1:05 AM
+ */
+
+namespace App\Classes\Modules\Addresses\Services;
+
+
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\District;
+use App\Models\OldAddress;
+
+class CleansOldAddress
+{
+
+    public function execute(OldAddress $address){
+        if($address->street_one === '' && $address->street_two === ''){
+            return null;
+        }
+
+        if(!$address->post_code){
+            return null;
+        }
+
+        $district = District::where('postcode', 'like', '%'. $address->post_code .'%')->first();
+
+        if(!$district) {
+            return null;
+        }
+
+        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, AddressType::DELIVERY, ApprovalStatus::APPROVED, 'Delivery Address');
+
+    }
+
+    public function cleanAddress($address, $district, $postcode){
+        $address = str_replace('Malaysia', '', str_replace('malaysia', '', str_replace('MALAYSIA', '', $address)));
+        $address = str_replace($district->state->name, '',str_replace($district->name, '', $address));
+        $address = str_replace(strtolower($district->state->name), '',str_replace(strtolower($district->name), '', $address));
+        $address = str_replace(strtoupper($district->state->name), '',str_replace(strtoupper($district->name), '', $address));
+        $address = str_replace($postcode, '', $address);
+        $address = str_replace(', ,', ',', str_replace(', ,', ',', str_replace(', ,', ',', $address)));
+        $address = str_replace(',', ', ', $address);
+        $address = preg_replace('!\s+!', ' ', $address);
+        $address = preg_replace("/,+/", ",", $address);
+        return rtrim(rtrim(rtrim(rtrim($address, '.')), ','));
+
+    }
+
+}

app/Classes/Modules/Addresses/Services/CreatesAddress.php

@@ -2,31 +2,36 @@
 
 namespace App\Classes\Modules\Addresses\Services;
 
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\General\Interfaces\Addressable;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Models\Address;
-use App\Models\Company;
+use App\Models\CompanyModule;
 
 class CreatesAddress extends AbstractUpdateRelationshipRecord
 {
 
     /**
-     * @param Company $company
+     * @param Addressable $addressable
      * @param AddressObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Company $company, AddressObject $object) {
+    public function execute(Addressable $addressable, AddressObject $object) {
+
         $model = new Address();
+
+        $model->reference = $object->getReference();
         $model->street_one = $object->getStreetOne();
         $model->street_two = $object->getStreetTwo();
         $model->country_id = $object->getCountryId();
         $model->state_id = $object->getStateId();
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
+        $model->status = $object->getStatus();
+        $model->type = $object->getType();
 
-        return $this->handler($company->addresses(), $model);
+        return $this->handler($addressable->addresses(), $model);
 
     }
 }

app/Classes/Modules/Addresses/Services/CreatesOrderAddress.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Models\Order;
+use App\Models\Address;
+
+class CreatesOrderAddress extends AbstractUpdateRelationshipRecord
+{
+
+    public function execute(Address $address, Order $order) {
+
+        $model = new Address();
+        $model->street_one = $address->street_one;
+        $model->street_two = $address->street_two;
+        $model->country_id = $address->country_id;
+        $model->state_id = $address->state_id;
+        $model->district_id = $address->district_id;
+        $model->postcode = $address->postcode;
+
+        return $this->handler($order->addresses(), $model);
+
+    }
+}

app/Classes/Modules/Addresses/Services/ListsStates.php

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

app/Classes/Modules/Addresses/Services/ResetsAddressesDefault.php

@@ -3,17 +3,20 @@
 namespace App\Classes\Modules\Addresses\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\General\Interfaces\Addressable;
 use App\Models\Address;
+use App\Models\CompanyModule;
 
 class ResetsAddressesDefault extends AbstractUpdateRecord
 {
 
     /**
-     * @param Address $address
+     * @param Addressable $addressable
+     * @param int $type
      * @return void
      */
-    public function execute(Address $address)
+    public function execute(Addressable $addressable, int $type)
     {
-        $address->company->addresses()->update(['billing' => false]);
+        $addressable->addresses()->where('type', $type)->update(['default' => false]);
     }
 }

app/Classes/Modules/Addresses/Services/SetsAddressToDefault.php

@@ -15,7 +15,7 @@ class SetsAddressToDefault extends AbstractUpdateRecord
      */
     public function execute(Address $model)
     {
-        $model->billing = true;
+        $model->default = true;
 
         return $this->handler($model);
     }

app/Classes/Modules/Addresses/Services/UpdatesAddress.php

@@ -17,15 +17,13 @@ class UpdatesAddress extends AbstractUpdateRecord
      */
     public function execute(Address $model, AddressObject $object) {
 
-        //$model->company_id = $object->getCompanyId();
+        $model->reference = $object->getReference();
         $model->street_one = $object->getStreetOne();
         $model->street_two = $object->getStreetTwo();
         $model->district_id = $object->getDistrictId();
         $model->state_id = $object->getStateId();
         $model->postcode = $object->getPostCode();
         $model->country_id = $object->getCountryId();
-        //$model->default = $object->getDefault();
-        //$model->billing = $object->getBilling();
 
         return $this->handler($model);
 

app/Classes/Modules/Announcements/ControllersLogic/AssignAnnouncementToSegmentLogic.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
+use App\Classes\Modules\Announcements\Processors\AssignAnnouncementToSegmentProcessor;
+
+use App\Http\Resources\AnnouncementResource;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class AssignAnnouncementToSegmentLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Assign Announcement To Segment',
+            'message' => 'You have successfully assigned Announcement to segment'
+        ];
+    }
+
+    /** @var FetchesAnnouncement */
+    private $fetchesAnnouncement;
+
+    /** @var AssignAnnouncementToSegmentProcessor */
+    private $assignAnnouncementToSegmentProcessor;
+
+    /**
+     * AssignAnnouncementToSegmentLogic constructor.
+     * @param FetchesAnnouncement $fetchesAnnouncement
+     * @param AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor
+     */
+    public function __construct(FetchesAnnouncement $fetchesAnnouncement, AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor)
+    {
+        $this->fetchesAnnouncement = $fetchesAnnouncement;
+        $this->assignAnnouncementToSegmentProcessor = $assignAnnouncementToSegmentProcessor;
+    }
+
+    /**
+     * @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
+    {
+        $announcement = $this->fetchesAnnouncement->execute(['id' => $request->route('id')]);
+
+        $this->assignAnnouncementToSegmentProcessor->execute($announcement, $request->input('segment_id'));
+
+        return $this->resourceResponse(new AnnouncementResource($announcement));
+    }
+}

app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
+use App\Classes\Modules\Announcements\Standards\Rules\CanCreateAnnouncement;
+use App\Classes\Modules\Announcements\Services\CreatesAnnouncement;
+use App\Classes\Modules\Announcements\Processors\AssignAnnouncementToSegmentProcessor;
+
+use App\Http\Resources\AnnouncementResource;
+
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateAnnouncementLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created Annoucement',
+            'message' => 'You have successfully created a new Annoucements'
+        ];
+    }
+
+    /** @var CanCreateAnnouncement */
+    private $canCreateAnnouncement;
+
+    /** @var CreatesAnnoucement */
+    private $createsAnnoucement;
+
+    /** @var AssignAnnouncementToSegmentProcessor */
+    private $assignAnnouncementToSegmentProcessor;
+
+
+    /**
+     * CreateAnnouncementLogic constructor.
+     * @param CanCreateAnnoucement $canCreateAnnoucement
+     * @param CreatesAnnoucement $createsAnnoucement
+     * @param AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor
+     */
+    public function __construct(
+        CanCreateAnnouncement $canCreateAnnouncement,
+        CreatesAnnouncement $createsAnnoucement,
+        AssignAnnouncementToSegmentProcessor $assignAnnouncementToSegmentProcessor
+    ) {
+        $this->canCreateAnnouncement = $canCreateAnnouncement;
+        $this->createsAnnoucement = $createsAnnoucement;
+        $this->assignAnnouncementToSegmentProcessor = $assignAnnouncementToSegmentProcessor;
+    }
+
+    /**
+     * @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
+    {
+        $annoucement_object = new AnnouncementObject(
+            $request->input('title'),
+            $request->input('description'),
+            $request->input('starting_on'),
+            $request->input('ending_on')
+        );
+
+        $this->canCreateAnnouncement->passes($annoucement_object);
+
+        $announcement = $this->createsAnnoucement->execute($annoucement_object);
+
+        $this->assignAnnouncementToSegmentProcessor->execute($announcement);
+
+        return $this->resourceResponse(new AnnouncementResource($announcement));
+    }
+}

app/Classes/Modules/Announcements/ControllersLogic/DeleteAnnouncementLogic.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Announcements\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Announcements\Standards\Rules\CanDeleteAnnouncement;
+use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
+use App\Classes\Modules\Announcements\Services\DeletesAnnouncement;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteAnnouncementLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Delete Announcement',
+            'message' => 'You have successfully deleted the Announcement'
+        ];
+    }
+
+    /** @var CanDeleteAnnouncement */
+    private $canDeleteAnnouncement;
+
+    /** @var FetchesAnnouncement */
+    private $fetchesAnnouncement;
+
+    /** @var DeletesAnnouncement */
+    private $deletesAnnouncement;
+
+    /**
+     * DeleteAnnouncementLogic constructor.
+     * @param CanDeleteAnnouncement $canDeleteAnnouncement
+     * @param FetchesAnnouncement $fetchesAnnouncement
+     * @param DeletesAnnouncement $deletesAnnouncement
+     */
+    public function __construct(
+        CanDeleteAnnouncement $canDeleteAnnoucement,
+        FetchesAnnouncement $fetchesAnnoucement,
+        DeletesAnnouncement $deletesAnnoucement
+    ) {
+        $this->canDeleteAnnoucement = $canDeleteAnnoucement;
+        $this->fetchesAnnoucement = $fetchesAnnoucement;
+        $this->deletesAnnoucement = $deletesAnnoucement;
+    }
+
+    /**
+     * @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->canDeleteAnnoucement->passes();
+
+        $annoucement = $this->fetchesAnnoucement->execute(['id' => $request->route('id')]);
+
+        $this->deletesAnnoucement->execute($annoucement);
+
+        return $this->response([]);
+    }
+}