added isLoading to false and section for delete- packinglist-form-component, changed unclaimedpackinglist1 to section

Inserted logs for monitoring warehouse storage charges

See merge request CIEFWorldwideSdnBhd/shipping-portal!223

.env.example

@@ -55,3 +55,11 @@ EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
 MIX_EXCHANGE_URL="${EXCHANGE_URL}"
 
 YD_API_CODE=''
+
+PERFEXCRM_BASE_URL=""
+PERFEXCRM_API_KEY=""
+PERFEXCRM_IS_ENABLED="false"
+
+
+STORAGE_FEE_LAUNCH_DATE="2023-12-11 00:00:00"
+SST_START_DATE="2024-04-01 00:00:00"

.gitignore

@@ -21,7 +21,6 @@ gox.iml
 rebuild_docker.sh
 docker/*
 db/*
-docker-compose.yml
 package-lock.json
 public/*
 /public/*

app/Classes/Exceptions/ConnectionErrorException.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\Exceptions;
+
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use Illuminate\Support\Facades\Log;
+
+final class ConnectionErrorException extends ServiceApiException {
+    public function __construct(?string $message = null, ?string $exceptionMessage = null, ?string $payload = null, ?string $exceptionTrace = null) {
+        Log::error($message. ": ". $exceptionMessage);
+        if($payload){
+            Log::error('Payload: '.$payload);
+        }
+        if($exceptionTrace){
+            Log::error($exceptionTrace);
+        }
+        parent::__construct($message ?? 'A connection error has occurred. Please check application logs for more information.',
+            HttpStatus::SERVER_ERROR);
+    }
+}

app/Classes/Exceptions/JobResourceNotFoundException.php

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

app/Classes/General/Abstracts/Abstract2ControllerLogic.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Classes\General\Abstracts;
+
+
+use App\Classes\Exceptions\ErrorException;
+use App\Classes\Exceptions\InternalServerErrorException;
+use App\Classes\ValueObjects\Constants\Notifications;
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use App\Classes\ValueObjects\Response\ApiResponseObject;
+use ErrorException as GeneralExceptions;
+use TypeError;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Support\Facades\DB;
+
+abstract class Abstract2ControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    abstract protected function notification(): array;
+
+    /**
+     * @return string
+     */
+    private function getNotificationTitle():string {
+        return $this->notification()['title'] ? $this->notification()['title']: Notifications::UNDEFINED['title'];
+    }
+
+    /**
+     * @return string
+     */
+    private function getNotificationMessage():string {
+        return $this->notification()['message'] ? $this->notification()['message']: Notifications::UNDEFINED['message'];
+    }
+
+    /**
+     * @param Request $request
+     * @return BinaryFileResponse
+     * @throws ErrorException
+     */
+    abstract protected function logic(Request $request) : BinaryFileResponse;
+
+    /**
+     * @param Request $request
+     * @return BinaryFileResponse
+     */
+    public function execute(Request $request) : BinaryFileResponse  {
+
+        try {
+
+            DB::beginTransaction();
+
+            $response = $this->logic($request);
+
+            DB::commit();
+
+            return $response;
+
+        } catch (ErrorException|GeneralExceptions|TypeError  $exception){
+            abort(404, $exception->getMessage());
+        }
+    }
+
+    /**
+     * @param array|null $data
+     * @return JsonResponse
+     */
+    public function response(?array $data = []) : JsonResponse {
+
+        return (new ApiResponseObject($this->getNotificationTitle().' Successful',
+            $this->getNotificationMessage(),
+            HttpStatus::OK_WITH_MESSAGE, $data))->handler();
+    }
+
+    /**
+     * @param JsonResource $resource
+     * @return JsonResponse
+     */
+    public function resourceResponse(JsonResource $resource){
+        return $this->response(['data' => $resource]);
+    }
+
+    /**
+     * @param ResourceCollection $collection
+     * @return JsonResponse
+     */
+    public function collectionResponse(ResourceCollection $collection){
+        return $this->response(json_decode($collection->response()->getContent(), true));
+    }
+
+}

app/Classes/General/Abstracts/AbstractControllerLogic.php

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

app/Classes/General/Abstracts/AbstractRule.php

@@ -10,7 +10,7 @@ use App\Classes\General\Interfaces\DataTransferObject;
 abstract class AbstractRule
 {
 
-    abstract protected function authorized(): bool;
+    abstract protected function authorized($object): bool;
 
     abstract protected function validators($object): bool;
 
@@ -26,8 +26,8 @@ abstract class AbstractRule
      */
     public function passes(?DataTransferObject $object = null): bool {
         try {
-            if(!$this->authorized()){
+            if(!$this->authorized($object)){
-                throw new AccessForbiddenException('You don\'t have permission to preform this action');
+                throw new AccessForbiddenException('You don\'t have permission to perform this action');
             }
 
             $this->validators($object);
@@ -36,11 +36,11 @@ abstract class AbstractRule
             return true;
 
         } catch(AccessForbiddenException $exception){
-            throw new AccessForbiddenException('You don\'t have permission to preform this action');
+            throw new AccessForbiddenException('You don\'t have permission to perform this action');
         } catch(\Exception $exception){
             throw new RequestValidationException($exception->getMessage());
         }
 
     }
 
-}
+}

app/Classes/General/Eloquent/AbstractFetchRecord.php

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

app/Classes/General/Eloquent/AbstractGetRecord.php

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

app/Classes/General/Eloquent/AbstractListRecord.php

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

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

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

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

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

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

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

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class CompanySegmentsIn implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('companyModules', function ($module) use ($value) {
+            $module->whereHas('connections', function ($connection) use ($value) {
+                $connection->whereHas('connectionSegments', function ($segment) use ($value) {
+                    $segment->whereIn('segment_id', $value);
+                });
+            });
+        });
+    }
+}

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

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreatedAfterOrEqual implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $table = $builder->getModel()->getTable();
+        $startDate = Carbon::createFromFormat('d-m-Y', $value)->startOfDay();
+        return $builder->where("{$table}.created_at", '>=', $startDate);
+    }
+}

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreatedBefore 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/CreatedBeforeOrEqual.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class CreatedBeforeOrEqual implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $table = $builder->getModel()->getTable();
+        $endDate = Carbon::createFromFormat('d-m-Y', $value)->endOfDay();    
+        return $builder->where("{$table}.created_at", '<=', $endDate);
+    }
+}

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

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

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

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class DoesNotHavePaymentStatusIn 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', TransactionType::PAYMENT)->whereIn('status', $value);
+        });
+    }
+}

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

@@ -15,7 +15,7 @@ class DoesNotHaveTransactionType implements Filter
     public static function apply(Builder $builder, $value)
     {
         return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
-            $query->where('type', $value);
+            $query->where('type', $value)->whereIn('status', [0,1,2,3,5]);
         })->whereHas('containers', function ($query){
             return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
         });

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

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

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

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

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

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class HavePaymentStatusNotIn 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', TransactionType::PAYMENT)->whereNotIn('status', $value);
+        });
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,8 @@ class OwnerId implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('owner_id', $value);
+        $table = $builder->getModel()->getTable();
+        return $builder->where("{$table}.owner_id", $value);
     }
 
 }

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OwnerType implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $table = $builder->getModel()->getTable();
+        return $builder->where("{$table}.owner_type", $value);
+    }
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,8 @@ class StatusIn implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->whereIn('status', $value);
+        $table = $builder->getModel()->getTable();
+        return $builder->whereIn("{$table}.status", $value);
     }
 
 }

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

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

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Eloquent\Builder;
+
+class WithAgingColumn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $today = Carbon::now();
+        return $builder->select('packing_lists.*')
+        ->addSelect(DB::raw("DATEDIFF('$today', transactions.updated_at) as days_over_duedate"))
+        ->addSelect(DB::raw("CASE
+        WHEN DATEDIFF('$today', transactions.updated_at) <= 0 THEN 0
+        WHEN DATEDIFF('$today', transactions.updated_at) > 0 AND DATEDIFF('$today', transactions.updated_at) <= 30 THEN 1
+        WHEN DATEDIFF('$today', transactions.updated_at) > 30 AND DATEDIFF('$today', transactions.updated_at) <= 60 THEN 2
+        WHEN DATEDIFF('$today', transactions.updated_at) > 60 AND DATEDIFF('$today', transactions.updated_at) <= 90 THEN 3
+        ELSE 4
+        END AS due_date_number"));
+    }
+}

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

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

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

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithOrderReferenceLike implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->join('transactions as t2', 't2.payment_reference', '=', 'transactions.bill_no')
+            ->join('transactions as t3', 't3.id', '=', 't2.owner_id')
+            ->join('packing_lists', 'packing_lists.id', '=', 't3.owner_id')
+            ->join('orders', function ($join) use ($value) {
+                $join->on('orders.id', '=', 'packing_lists.owner_id')
+                    ->where('orders.reference', 'LIKE', '%'.$value.'%');
+            })
+            ->addSelect(['transactions.*', 't2.id as paymentTransactionId', 't3.id as invoiceTransactionId', 'packing_lists.id as packingListId', 'orders.reference as orderReference']);
+    }
+}

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

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

app/Classes/General/Helper.php

@@ -2,8 +2,9 @@
 
 namespace App\Classes\General;
 
-
+use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Log;
 
 class Helper
 {
@@ -24,4 +25,28 @@ class Helper
         return array_slice(get_class_methods($className), 1);
     }
 
-}
+    /**
+     * @param $log
+     */
+    static function debugLogger($log){
+        if($log && isset($log['message'])){
+            $message = $log['message'];
+            $substring = 'No data were found';
+            if (isset($message)) {
+                if (strpos($message, $substring) !== false) {
+                    // Log::info('Message exist');
+                } else {
+                    Log::info($log['message']);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param ResourceCollection $collection
+     * @return array
+     */
+    static function collectionResponse(ResourceCollection $collection){
+        return json_decode($collection->response()->getContent(), true);
+    }
+}

app/Classes/Jobs/CreatePerfexCRMCustomer.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMLead;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
+
+class CreatePerfexCRMCustomer implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var CreateLeadPerfexCRMObject */
+    private $createLeadPerfexCRMObject;
+
+    /**
+     * CreatePerfexCRMCustomer constructor.
+     * @param CreateLeadPerfexCRMObject $createLeadPerfexCRMObject
+     */
+    public function __construct(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject)
+    {
+        $this->createLeadPerfexCRMObject = $createLeadPerfexCRMObject;
+    }
+
+    public function handle()
+    {
+        $lead = (App()->make(FetchesPerfexCRMLead::class))->execute($this->createLeadPerfexCRMObject->getEmail());
+        if(!is_null($lead)){
+            (App()->make(UpdatesPerfexCRMLead::class))->execute($lead, $this->createLeadPerfexCRMObject->getCompanyReference());
+        }
+        else{
+            (App()->make(CreatePerfexCRMLeadProcessor::class))->execute($this->createLeadPerfexCRMObject);
+        }
+    }
+}

app/Classes/Jobs/CreatePerfexCRMInvoice.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\Transaction;
+
+class CreatePerfexCRMInvoice implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var Transaction $transaction*/
+    private $transaction;
+
+    /**
+     * CreatePerfexCRMInvoice constructor.
+     * @param Transaction $transaction
+     */
+    public function __construct(Transaction $transaction)
+    {
+        $this->transaction = $transaction;
+    }
+
+    public function handle()
+    {
+        (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($this->transaction);
+    }
+}

app/Classes/Jobs/CreatePerfexCRMSingleTask.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMTaskProcessor;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CreatePerfexCRMSingleTask implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var FetchesPerfexCRMLead  */
+    private $fetchesPerfexCRMLead;
+
+    /** @var CreateTaskPerfexCRMObject */
+    private $createTaskPerfexCRMObject;
+
+    /**
+     * CreatePerfexCRMSingleTask constructor.
+     * @param CreateTaskPerfexCRMObject $createTaskPerfexCRMObject
+     */
+    public function __construct(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject)
+    {
+        $this->createTaskPerfexCRMObject = $createTaskPerfexCRMObject;
+    }
+
+    public function handle()
+    {
+        $lead = (App()->make(FetchesPerfexCRMLead::class))->execute($this->createTaskPerfexCRMObject->getEmail());
+        if(!is_null($lead))
+        {
+            $this->createTaskPerfexCRMObject->setLeadId($lead->id);
+            (App()->make(CreatePerfexCRMTaskProcessor::class))->execute($this->createTaskPerfexCRMObject);
+        }
+    }
+}

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -2,8 +2,12 @@
 
 namespace App\Classes\Jobs;
 
+use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProcessor;
+use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
+use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
 
+use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -25,8 +29,12 @@ class FetchOrdersFromYDPortalJob implements ShouldQueue
      */
     public function handle()
     {
+        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute();
+        (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
+        (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
+        (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
 
-        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+//        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
     }
 
 }

app/Classes/Jobs/ListPackingListsJob.php

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

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
+use App\Classes\Modules\PerfexCRM\Processors\FetchPerfexCRMInvoiceProcessor;
+use App\Models\Transaction;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\FetchPerfexCRMInvoiceObject;
+
+
+class UpdatePerfexCRM implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var UpdatePerfexCRMObject */
+    private $updatePerfexCRMObject;
+
+    /** @var */
+    private $transaction;
+
+    /** @var bool|null */
+    private $shouldCreateInvoice;
+
+    /**
+     * UpdatePerfexCRM constructor.
+     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
+     * @param Transaction $transaction
+     * @param bool|null $shouldCreateInvoice
+     */
+    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, ?bool $shouldCreateInvoice = false)
+    {
+        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
+        $this->transaction = $transaction;
+        $this->shouldCreateInvoice = $shouldCreateInvoice;
+    }
+
+    public function handle()
+    {
+        //To use invoice as a reference to decide whether more tasks should be created
+        $this->updatePerfexCRMObject->setInvoiceId($this->getInvoiceIdOrCreateInvoice());
+
+        $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
+        if($this->transaction != null && $this->shouldCreateInvoice){
+            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
+                $this->updatePerfexCRMObject->getContactEmail(),
+                $result->projectId,
+                $this->transaction,
+                true
+            );
+            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject);
+        }
+    }
+
+    private function getInvoiceIdOrCreateInvoice(){
+        if($this->transaction != null){
+            $fetchPerfexCRMInvoiceObject = new FetchPerfexCRMInvoiceObject(
+                $this->updatePerfexCRMObject->getContactEmail(),
+                $this->transaction
+            );
+            $invoiceId = (App()->make(FetchPerfexCRMInvoiceProcessor::class))->execute($fetchPerfexCRMInvoiceObject);
+            return $invoiceId;
+        }
+        return 0;
+    }
+}

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
+use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
+use App\Classes\ValueObjects\Constants\PerfexCRMInvoiceStatus;
+use App\Models\Transaction;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+use App\Classes\General\Helper;
+
+class UpdatePerfexCRMInvoice implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var UpdatePerfexCRMInvoiceObject */
+    private $updatePerfexCRMInvoiceObject;
+
+    /**
+     * CreatePerfexCRMSingleTask constructor.
+     * @param UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject
+     */
+    public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
+    {
+        $this->updatePerfexCRMInvoiceObject = $updatePerfexCRMInvoiceObject;
+    }
+
+    public function handle()
+    {
+        //get the client id
+        $customer = (App()->make(FetchesPerfexCRMCustomer::class))->execute($this->updatePerfexCRMInvoiceObject->getEmail());
+        $transaction = $this->updatePerfexCRMInvoiceObject->getTransaction();
+
+        //get the invoice id
+        $invoiceId = 0;
+        $invoiceStatus = 0;
+        $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
+        Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());
+
+        if(is_null($invoice)){
+            $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
+            if ($result) {
+                $invoiceId = $result->payload['id'];
+            } else {
+                // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
+                Log::channel('perfex_crm')->info('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+            }
+        }
+        else{
+            $invoiceId = $invoice->id;
+            $invoiceStatus = $invoice->status;
+
+            //This only run when invoice already exist and the invoice does not have a PAID status
+            if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
+                //update invoice
+                (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $this->updatePerfexCRMInvoiceObject->getProjectId());
+            }
+        }
+
+        //create invoice payment
+        if($invoiceId != 0 && $invoiceStatus != PerfexCRMInvoiceStatus::PAID){
+
+            $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
+
+            $invoicePaymentPerfexCRMObject = new InvoicePaymentPerfexCRMObject(
+                $invoiceId,
+                "$transaction->amount",
+                $date,
+                1,
+                "",
+                ""
+            );
+            (App()->make(CreatesPerfexCRMInvoicePayment::class))->execute($invoicePaymentPerfexCRMObject);
+        }
+    }
+
+    public function delay($delay)
+    {
+        // Add delay in seconds to the job
+        $this->delay = $delay;
+        return $this;
+    }
+}

app/Classes/Jobs/UpdatePerfexCRMPrelude.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Models\PackingList;
+use App\Models\Transaction;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+
+class UpdatePerfexCRMPrelude implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var */
+    private $packingList;
+
+    /** @var */
+    private $transaction;
+
+    /** @var UpdatePerfexCRMObject */
+    private $updatePerfexCRMObject;
+
+    /** @var bool|null */
+    private $shouldCreateInvoice;
+
+    /**
+     * UpdatePerfexCRMPrelude constructor.
+     * @param $packingList
+     * @param Transaction $transaction
+     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
+     * @param bool|null $shouldCreateInvoice
+     */
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, ?bool $shouldCreateInvoice = false)
+    {
+        $this->packingList = $packingList;
+        $this->transaction = $transaction;
+        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
+        $this->shouldCreateInvoice = $shouldCreateInvoice;
+    }
+
+    public function handle()
+    {
+        if(is_null($this->packingList)){
+            $this->packingList = $this->transaction->owner->owner;
+        }
+        $amount = 0.00;
+        if(!is_null($this->transaction)){
+            $amount = $this->transaction->amount;
+        }
+        $data = [
+            'amount' => number_format($amount, 2, '.', ''),
+            'link_order' => config('app.url').'/order/show/'.$this->packingList->owner->reference,
+            'link_autocount_or' => 'https://docs.google.com/spreadsheets/d/1Q3rJBGQ9Bo04HZp5WR9zbLp7pIW2kfDYsabxG7JON-4/edit#gid=2013983170',
+            'link_perfex' => 'https://perfex.cief-malaysia.com/admin/projects/view/89',
+        ];
+
+
+        $result = $this->replacePlaceholders($this->updatePerfexCRMObject->getTasks(), $data);
+        $this->updatePerfexCRMObject->setTasks($result);
+        UpdatePerfexCRM::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->shouldCreateInvoice);
+    }
+
+    function replacePlaceholders($template, $data, $prefix = '')
+    {
+        foreach ($template as $key => $value) {
+            foreach ($data as $dataKey => $dataValue) {
+                if (is_array($dataValue)) {
+                    $template[$key] = $this->replacePlaceholders($template[$key], $dataValue, $dataKey);
+                } else {
+                    if ($prefix != '') {
+                        $template[$key] = str_replace('{' .$prefix. "." .$dataKey . '}', $dataValue, $template[$key]);
+                    } else {
+                        $template[$key] = str_replace('{' . $dataKey . '}', $dataValue, $template[$key]);
+                    }
+                }
+            }
+        }
+
+        return $template;
+    }
+
+}

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

@@ -8,23 +8,27 @@ 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\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\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
 use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
 
 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\Classes\Jobs\CreatePerfexCRMCustomer;
+
 use App\Models\Company;
 use App\Models\CompanyModule;
 use App\Models\User;
@@ -80,6 +84,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var FetchesCompanyModule */
     private $fetchesCompanyModule;
 
+    /** @var CreatePerfexCRMLeadProcessor */
+    private $createPerfexCRMLeadProcessor;
+
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -93,8 +100,9 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor
      */
-    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)
+    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, CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -107,6 +115,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
     }
 
     /**
@@ -146,6 +155,18 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->uploadIdentityDocumentProcessor->execute($request, $company);
 
+        if(config('perfexcrm.is_enabled') == 'true'){
+            // $this->createPerfexCRMLeadProcessor->execute($request);
+            $createLeadPerfexCRMObject = new CreateLeadPerfexCRMObject(
+                $request->input('name'),
+                $request->input('email'),
+                $request->input('phone'),
+                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'),
+                $connection->invitee_reference
+            );
+            CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
+        }
+
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));

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

@@ -4,7 +4,7 @@ namespace App\Classes\Modules\Accounts\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounts\Services\UpdatesUser;
+use App\Classes\Modules\Accounts\Services\UpdatesUserFullName;
 use App\Classes\Modules\Accounts\Services\FetchesUser;
 use App\Classes\Modules\Accounts\Standards\Rules\CanUpdateUser;
 use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
@@ -29,8 +29,8 @@ class UpdateUserLogic extends AbstractControllerLogic
     /** @var CanUpdateUser */
     private $canUpdateUser;
 
-    /** @var UpdatesUser */
+    /** @var UpdatesUserFullName */
-    private $updatesUser;
+    private $updatesUserFullName;
 
     /** @var FetchesUser */
     private $fetchesUser;
@@ -38,13 +38,13 @@ class UpdateUserLogic extends AbstractControllerLogic
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateUser $canUpdateUser
-     * @param UpdatesUser $updatesUser
+     * @param UpdatesUserFullName $updatesUserFullName
      * @param FetchesUser $fetchesUSer
      */
-    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUser $updatesUser, FetchesUser $fetchesUser)
+    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUserFullName $updatesUserFullName, FetchesUser $fetchesUser)
     {
         $this->canUpdateUser = $canUpdateUser;
-        $this->updatesUser = $updatesUser;
+        $this->updatesUserFullName = $updatesUserFullName;
         $this->fetchesUser = $fetchesUser;
     }
 
@@ -64,7 +64,7 @@ class UpdateUserLogic extends AbstractControllerLogic
 
             $query = $this->fetchesUser->execute(['id' => $request->route('id')]);
 
-            $query = $this->updatesUser->execute($query, $object);
+            $query = $this->updatesUserFullName->execute($query, $object);
 
             return $this->resourceResponse(new UserResource($query));
 

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

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\Services\UpdatesUser;
+use App\Classes\Modules\Accounts\Services\FetchesUser;
+use App\Classes\Modules\Accounts\Standards\Rules\CanUpdateUser;
+use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
+use App\Classes\Modules\Accounts\DataTransferObjects\UserObject;
+use App\Http\Resources\UserResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateUserRoleLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Admin Role',
+            'message' => 'You have successfully updated the Admin Role'
+        ];
+    }
+
+    /** @var CanUpdateUser */
+    private $canUpdateUser;
+
+    /** @var UpdatesUser */
+    private $updatesUser;
+
+    /** @var FetchesUser */
+    private $fetchesUser;
+
+    /**
+     * UpdateAddressLogic constructor.
+     * @param CanUpdateUser $canUpdateUser
+     * @param UpdatesUser $updatesUser
+     * @param FetchesUser $fetchesUSer
+     */
+    public function __construct(CanUpdateUser $canUpdateUser, UpdatesUser $updatesUser, FetchesUser $fetchesUser)
+    {
+        $this->canUpdateUser = $canUpdateUser;
+        $this->updatesUser = $updatesUser;
+        $this->fetchesUser = $fetchesUser;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->fetchesUser->execute(['id' => $request->route('id')]);
+
+        $object = new UserObject($query->name, $request->input('type'));
+
+        $this->canUpdateUser->passes($object);
+
+        $query = $this->updatesUser->execute($query, $object);
+
+        return $this->resourceResponse(new UserResource($query));
+    }
+
+}

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

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class UserObject implements DataTransferObject
+{
+    /** @var string */
+    private $name;
+
+    /** @var int */
+    private $type;
+
+    /**
+     * FullNameObject constructor.
+     * @param string $name
+     */
+    public function __construct(string $name, int $type)
+    {
+        $this->name = $name;
+        $this->type = $type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+}

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\UserObject;
 use App\Models\User;
 
 class UpdatesUser extends AbstractUpdateRecord
@@ -11,13 +11,14 @@ class UpdatesUser extends AbstractUpdateRecord
 
     /**
      * @param User $model
-     * @param FullNameObject $object
+     * @param UserObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(User $model, FullNameObject $object) {
+    public function execute(User $model, UserObject $object) {
 
         $model->name = $object->getName();
+        $model->type = $object->getType();
         return $this->handler($model);
 
     }

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Accounts\DataTransferObjects\FullNameObject;
+use App\Models\User;
+
+class UpdatesUserFullName extends AbstractUpdateRecord
+{
+
+    /**
+     * @param User $model
+     * @param FullNameObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(User $model, FullNameObject $object) {
+
+        $model->name = $object->getName();
+        return $this->handler($model);
+
+    }
+}

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

@@ -26,7 +26,7 @@ class CanAuthenticateUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
 
@@ -54,4 +54,4 @@ class CanAuthenticateUser extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -26,7 +26,7 @@ class CanCreateUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -54,4 +54,4 @@ class CanCreateUser extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -26,7 +26,7 @@ class CanCrossAuthenticateUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
 
@@ -51,4 +51,4 @@ class CanCrossAuthenticateUser extends AbstractRule
     {
         return true;
     }
-}
+}

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

@@ -10,7 +10,7 @@ class CanDeleteUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanDeleteUser extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -12,7 +12,7 @@ class CanFetchUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
 
@@ -39,4 +39,4 @@ class CanFetchUser extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -33,7 +33,7 @@ class CanGeneratePasswordReset extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
 
@@ -62,4 +62,4 @@ class CanGeneratePasswordReset extends AbstractRule
     }
 
 
-}
+}

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

@@ -13,7 +13,7 @@ class CanListUsers extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
 
@@ -39,4 +39,4 @@ class CanListUsers extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -24,7 +24,7 @@ class CanRegisterUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -48,4 +48,4 @@ class CanRegisterUser extends AbstractRule
     {
         return true;
     }
-}
+}

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

@@ -34,7 +34,7 @@ class CanResetPassword extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
 
@@ -62,4 +62,4 @@ class CanResetPassword extends AbstractRule
         return $this->passwordResetTokenExists->execute($object->getToken());
     }
 
-}
+}

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

@@ -26,7 +26,7 @@ class CanUpdateUser extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -54,4 +54,4 @@ class CanUpdateUser extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Addresses\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Services\FetchesAddress;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\AddressResource;
+use App\Models\Address;
+use App\Models\CompanyModule;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBillingAddressLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Billing Address',
+            'message' => 'You have successfully created a new Billing Address'
+        ];
+    }
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var FetchesAddress */
+    private $fetchesAddress;
+
+    /**
+     * CreateAddressLogic constructor.
+     * @param CanCreateAddress $canCreateAddress
+     * @param FetchesCompanyModule $fetchesCompanyModule
+     * @param CreatesAddress $createsAddress
+     * @param FetchesAddress $fetchesAddress
+     */
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress, FetchesAddress $fetchesAddress)
+    {
+        $this->canCreateAddress = $canCreateAddress;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
+        $this->createsAddress = $createsAddress;
+        $this->fetchesAddress = $fetchesAddress;
+    }
+
+    /**
+     * @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
+    {
+        $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
+        
+        $address = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
+
+        if ($address->type !== AddressType::BILLING || $address->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
+            // delete all current billing address
+            Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
+
+            // create addrress
+            $billingAddress = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $address->reference);
+            $this->canCreateAddress->passes($billingAddress);
+            $this->createsAddress->execute($companyModule, $billingAddress);
+        }
+
+        return $this->resourceResponse(new AddressResource($address));
+    }
+
+}

app/Classes/Modules/Addresses/Standards/Rules/CanCreateAddress.php

@@ -26,7 +26,7 @@ class CanCreateAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -54,4 +54,4 @@ class CanCreateAddress extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Addresses/Standards/Rules/CanDeleteAddress.php

@@ -13,7 +13,7 @@ class CanDeleteAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -40,4 +40,4 @@ class CanDeleteAddress extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Addresses/Standards/Rules/CanFetchAddress.php

@@ -13,7 +13,7 @@ class CanFetchAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -40,4 +40,4 @@ class CanFetchAddress extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Addresses/Standards/Rules/CanListAddresses.php

@@ -13,7 +13,7 @@ class CanListAddresses extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -40,4 +40,4 @@ class CanListAddresses extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Addresses/Standards/Rules/CanUpdateAddress.php

@@ -26,7 +26,7 @@ class CanUpdateAddress extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -54,4 +54,4 @@ class CanUpdateAddress extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -10,7 +10,7 @@ use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
 use App\Classes\Modules\Announcements\Services\UpdatesAnnouncement;
 
 use App\Http\Resources\AnnouncementResource;
-
+use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -66,8 +66,8 @@ class UpdateAnnouncementLogic extends AbstractControllerLogic
         $annoucement_object = new AnnouncementObject(
             $request->input('title'),
             $request->input('description'),
-            $request->input('starting_on'),
+            Carbon::createFromFormat('d-m-Y', $request->input('starting_on'))->format('Y-m-d H:i:s'),
-            $request->input('ending_on')
+            Carbon::createFromFormat('d-m-Y', $request->input('ending_on'))->format('Y-m-d H:i:s')
         );
 
         $this->canUpdateAnnouncement->passes($annoucement_object);

app/Classes/Modules/Announcements/Standards/Rules/CanAssignSegment.php

@@ -13,7 +13,7 @@ class CanAssignSegment extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanAssignSegment extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Announcements/Standards/Rules/CanCreateAnnouncement.php

@@ -24,7 +24,7 @@ class CanCreateAnnouncement extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
     }
@@ -47,4 +47,4 @@ class CanCreateAnnouncement extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Announcements/Standards/Rules/CanDeleteAnnouncement.php

@@ -10,7 +10,7 @@ class CanDeleteAnnouncement extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanDeleteAnnouncement extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Announcements/Standards/Rules/CanListAnnouncements.php

@@ -11,7 +11,7 @@ class CanListAnnouncements extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
     }

app/Classes/Modules/Announcements/Standards/Rules/CanUpdateAnnouncement.php

@@ -26,7 +26,7 @@ class CanUpdateAnnouncement extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -51,4 +51,4 @@ class CanUpdateAnnouncement extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Banks/Standards/Rules/CanCreateBank.php

@@ -24,7 +24,7 @@ class CanCreateBank extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
     }
@@ -47,4 +47,4 @@ class CanCreateBank extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Banks/Standards/Rules/CanDeleteBank.php

@@ -10,7 +10,7 @@ class CanDeleteBank extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -37,4 +37,4 @@ class CanDeleteBank extends AbstractRule
         return true;
     }
 
-}
+}

app/Classes/Modules/Banks/Standards/Rules/CanListBanks.php

@@ -12,7 +12,7 @@ class CanListBanks extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         return true;
     }
@@ -34,4 +34,4 @@ class CanListBanks extends AbstractRule
     {
         return true;
     }
-}
+}

app/Classes/Modules/Banks/Standards/Rules/CanUpdateBank.php

@@ -26,7 +26,7 @@ class CanUpdateBank extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -51,4 +51,4 @@ class CanUpdateBank extends AbstractRule
         return true;
     }
 
-}
+}

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

@@ -4,25 +4,24 @@ namespace App\Classes\Modules\Billplzs\ControllersLogic;
 
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
-use App\Classes\Modules\Wallets\Services\UpdatesWallet;
 
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Http\Resources\TransactionResource;
-use App\Models\Booking;
 use App\Models\User;
 use App\Models\Wallet;
 use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\Modules\Billplzs\Services\GetBillplzBill;
 use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Group;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -44,6 +43,18 @@ class CallbackBillplzLogic
     /** @var UpdateDoFromYDPortalProcessor */
     private $updateDoFromYDPortalProcessor ;
 
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
+    /** @var CallbackBillplzProcessor */
+    private $callbackBillplzProcessor;
+
+    /** @var CheckStorageInvoiceTransactionProcessor */
+    private $storageInvoiceTransactionProcessor;
+
     /**
      * CallbackBillplzLogic constructor.
      * @param GetBillplzBill $getBillplzBill
@@ -51,14 +62,21 @@ class CallbackBillplzLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
      * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+     * @param CallbackBillplzProcessor $callbackBillplzProcessor
+     * @param CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor
      */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor)
+    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, CallbackBillplzProcessor $callbackBillplzProcessor, CheckStorageInvoiceTransactionProcessor $storageInvoiceTransactionProcessor)
     {
         $this->getBillplzBill = $getBillplzBill;
         $this->fetchesTransaction = $fetchesTransaction;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
         $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
+        $this->storageInvoiceTransactionProcessor = $storageInvoiceTransactionProcessor;
     }
 
 
@@ -98,26 +116,39 @@ class CallbackBillplzLogic
             $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
         }
 
+        Log::info('Debug billPlz status: '.$status);
+
         $token = Auth::fromUser(User::find(1));
         $request->headers->set('Authorization', 'Bearer '.$token);
 
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
+        $this->storageInvoiceBackDoorPreventionCheck($transaction, $status);
+        $result = $this->callbackBillplzProcessor->execute($transaction, $status);
 
-        if(($invoice->amount - $transaction->amount) < 0.01) {
+        $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
-            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
 
-            $packingList->status = ApprovalStatus::APPROVED;
+        if ($transaction->owner instanceof Wallet) {
-            $packingList->save();
+            $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
+        } else {
 
-            if(app()->environment('production')){
+            $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
-                $this->updateDoFromVTPortalProcessor->execute($packingList);
-                $this->updateDoFromYDPortalProcessor->execute($packingList);
-            }
         }
 
+        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status, 'result' => $result]);
+    }
 
-
+    private function storageInvoiceBackDoorPreventionCheck($transaction, $status){
-
+        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference, 'transaction' => $transaction, 'status' => $status]);
+            $group = Group::where('reference', $transaction->payment_reference)->first();
+            if ($group) {
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+                    $pL = $invoice->owner;
+                    $order = $pL->owner;
+                    if($order){
+                        $this->storageInvoiceTransactionProcessor->executeOrder($order);
+                    }
+                }
+            }
+        }
     }
 }

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

@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Processors;
+
+use Illuminate\Http\Request;
+use App\Models\Wallet;
+use App\Models\Group;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
+use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
+use Illuminate\Support\Facades\Log;
+
+class CallbackBillplzProcessor
+{
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var UpdateDoFromVTPortalProcessor */
+    private $updateDoFromVTPortalProcessor;
+
+    /** @var UpdateDoFromYDPortalProcessor */
+    private $updateDoFromYDPortalProcessor;
+
+    /** @var UpdatesWalletBalance */
+    private $updatesWalletBalance;
+
+    /** @var CreatePaymentTransactionProcessor */
+    private $createPaymentTransactionProcessor;
+
+    /** @var ReleaseGoodsToCustomerProcessor */
+    private $releaseGoodsToCustomerProcessor;
+
+    /**
+     * CreateUserProcessor constructor.
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
+     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
+     * @param UpdatesWalletBalance $updatesWalletBalance
+     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
+     * @param ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor
+     */
+    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
+    {
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
+        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
+        $this->updatesWalletBalance = $updatesWalletBalance;
+        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
+        $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
+    }
+
+
+    /**
+     * @param Request $request
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute($transaction, $status)
+    {
+        $invoice = $transaction->owner;
+        $packingList = $invoice->owner;
+
+        $proceed = $this->checkForGroupPayment($transaction);
+        if(!$proceed) return false;
+
+        $this->updatesTransactionStatus->execute($transaction, $status);
+
+        // check if is wallet top up
+        if ($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
+
+            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
+
+            $group = Group::where('reference', $transaction->payment_reference)->first();
+
+            // check if is group payment
+            if ($group) {
+                foreach ($group->groupTransactions as $groupTransaction) {
+                    $invoice = $groupTransaction->transaction;
+                    if($invoice->status !== ApprovalStatus::COMPLETED){
+                        $paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null, false);
+
+                        if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                            $pL = $invoice->owner;
+                            $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                        }
+                    }
+                }
+
+                $group->status = $status;
+                $group->save();
+            }
+        }
+
+        if (!$transaction->owner instanceof Wallet) {
+            $this->releaseGoodsToCustomerProcessor->execute($packingList, $invoice);
+        }
+
+        return true;
+    }
+
+    private function checkForGroupPayment($transaction){
+        //This check is targetting group payment that expired and soft deleted
+        //command:check-storage-invoices must already run for this part of the code to work properly
+        $group = Group::withTrashed()->where('reference', $transaction->payment_reference)->first();
+        if ($group) {
+            $totalAmountToBePaid = 0;
+            $actualAmountPaid = $transaction->amount;
+
+            foreach ($group->groupTransactions as $groupTransaction) {
+                $invoice = $groupTransaction->transaction;
+                if($invoice->status !== ApprovalStatus::COMPLETED){
+                    $totalAmountToBePaid += $invoice->amount;
+                }
+            }
+
+            if(($totalAmountToBePaid - $actualAmountPaid) < 0.01){
+
+            }
+            else{
+                Log::channel('storage_invoices')->info('Total amount from current transaction: '.$totalAmountToBePaid); //cief todo: to be removed
+                Log::channel('storage_invoices')->info('Total amount from paid transaction: '.$transaction->amount); //cief todo: to be removed
+                return false;
+            }
+        }
+        return true;
+    }
+}

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

@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Billplzs\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\App;
 
 class CreatesBillplzBill
 {
@@ -25,7 +26,7 @@ class CreatesBillplzBill
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
                 'collection_id' => config('billplz.collection_id'),
                 'name' => $name,
-                'email' => $email,
+                'email' => App::environment('production') ? $email : 'development@cief-malaysia.com',
                 'description' => $description,
                 'amount' => $this->finalizeAmount($amount),
                 'redirect_url' => route('online_payment.redirect'),

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

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Billplzs\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class DeletesBillplzBill
+{
+
+    /**
+     * @param string $billID
+     * @throws MalformedRequestException
+     */
+    public function execute(string $billID) {
+        try{
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->delete(config('billplz.base_url').'/api/v3/bills/'.$billID);
+            Log::channel('storage_invoices')->info('DeletesBillplzBill response: '.json_encode($response));
+
+            if($response->successful()){
+                $data = $response->json();
+
+                // $data['url'] = $data['url'].'?auto_submit=true';
+
+                return (object) $data;
+            }else{
+                return null;
+            }
+        }catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from billplz server: ' . $exception->getMessage());
+        }
+    }
+}

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

@@ -7,6 +7,8 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\AssignConnectionSegmentProcessor;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Http\Resources\CompanyResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -33,17 +35,22 @@ class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractController
     /** @var AssignConnectionSegmentProcessor */
     private $assignCompanyConnectionToConnectionSegmentProcessor;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
     /**
      * AssignCompanyToSegmentLogic constructor.
      * @param FetchesCompany $fetchesCompany
      * @param FetchesCompanyConnection $fetchesCompanyConnection
      * @param AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor
+     * @param CreateContactProcessor $createContactProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor, CreateContactProcessor $createContactProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesCompanyConnection = $fetchesCompanyConnection;
         $this->assignCompanyConnectionToConnectionSegmentProcessor = $assignCompanyConnectionToConnectionSegmentProcessor;
+        $this->createContactProcessor = $createContactProcessor;
     }
 
     /**
@@ -62,6 +69,11 @@ class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractController
 
         $this->assignCompanyConnectionToConnectionSegmentProcessor->execute($companyConnection, $request->input('segment_id'));
 
+        if ($request->input('segment_id') == 10 || $request->input('segment_id') == 11) {
+            $contactObject = new ContactObject('Whatsapp: ' . $request->input('name'), $request->input('phone'), null, null);
+            $this->createContactProcessor->execute($contactObject, $company);
+        }
+
         return $this->resourceResponse(new CompanyResource($company));
     }
 }

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

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

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

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyDebtor;
+use App\Http\Resources\CompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Company Name and Debtor',
+            'message' => 'You have successfully updated the Company'
+        ];
+    }
+
+    /** @var CanUpdateCompany */
+    private $canUpdateCompany;
+ 
+    /** @var UpdatesCompany */
+    private $updatesCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var UpdatesCompanyDebtor */
+    private $updatesCompanyDebtor;
+
+    /** @var UpdatesCompanyModuleName */
+    private $updatesCompanyModuleName;
+
+    /**
+     * UpdateCompanyControllersLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyDebtor $updatesCompanyDebtor
+     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
+     */
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany, UpdatesCompanyDebtor $updatesCompanyDebtor, UpdatesCompanyModuleName $updatesCompanyModuleName)
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyDebtor = $updatesCompanyDebtor;
+        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $object = new CompanyObject($request->input('name'), $request->input('reference'), $request->input('type'));
+
+        $this->canUpdateCompany->passes($object);
+
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
+
+        $query = $this->updatesCompany->execute($query, $object);
+
+        if ($request->input('debtor') || $query->first()->debtor !== null) {
+            $this->updatesCompanyDebtor->execute($query, $request->input('debtor'));
+        }
+
+        return $this->resourceResponse(new CompanyResource($query));
+    }
+
+}

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Http\Resources\CompanyResource;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyTypeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Updated Company Type',
+            'message' => 'You have successfully updated the Company Tyoe'
+        ];
+    }
+
+    /** @var CanUpdateCompany */
+    private $canUpdateCompany;
+ 
+    /** @var UpdatesCompany */
+    private $updatesCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /**
+     * UpdateCompanyControllersLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     */
+    public function __construct(CanUpdateCompany $canUpdateCompany, UpdatesCompany $updatesCompany, FetchesCompany $fetchesCompany)
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
+
+        $object = new CompanyObject($query->name, $query->reference, $request->input('type'));
+
+        $this->canUpdateCompany->passes($object);
+
+        $query = $this->updatesCompany->execute($query, $object);
+
+        return $this->resourceResponse(new CompanyResource($query));
+    }
+
+}

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Companies\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Models\Company;
+
+class UpdatesCompanyDebtor extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Company $model
+     * @param CompanyObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Company $model, ?string $debtor) 
+    {
+        $model->debtor = $debtor;
+
+        return $this->handler($model);
+    }
+}

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

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

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

@@ -26,7 +26,7 @@ class CanAssignEmployee extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized(): bool
+    protected function authorized($object): bool
     {
         // TODO  Set Authorization rules
         return true;
@@ -51,4 +51,4 @@ class CanAssignEmployee extends AbstractRule
         return true;
     }
 
-}
+}