Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into container-profile-ui

.env.example

@@ -10,9 +10,9 @@ LOG_LEVEL=debug
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=shpping_portal
+DB_DATABASE=laravel
 DB_USERNAME=root
-DB_PASSWORD=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -53,11 +53,3 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 UNITY_APP_URL="https://unity.izyim.com"
 EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
 MIX_EXCHANGE_URL="${EXCHANGE_URL}"
-
-YD_API_CODE=''
-
-JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h
-
-PERFEXCRM_BASE_URL=""
-PERFEXCRM_API_KEY=""
-PERFEXCRM_IS_ENABLED="false"

.env.testing

@@ -1,59 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=base64:rIar2fvNeRzQdvKOgLUg03detGDMx6ym2SYFRjawrAc=
-APP_DEBUG=true
-APP_URL=http://localhost
-
-LOG_CHANNEL=stack
-LOG_LEVEL=debug
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=shpping_portal
-DB_USERNAME=root
-DB_PASSWORD=P@ssw0rd
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-FILESYSTEM_DRIVER=local
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-MEMCACHED_HOST=127.0.0.1
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_MAILER=smtp
-MAIL_HOST=mailhog
-MAIL_PORT=1025
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
-MAIL_FROM_NAME="${APP_NAME}"
-
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-UNITY_APP_URL="https://unity.izyim.com"
-EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
-MIX_EXCHANGE_URL="${EXCHANGE_URL}"
-
-YD_API_CODE=''
-
-JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h

.gitignore

@@ -2,8 +2,6 @@
 /public/hot
 /public/storage
 /storage/*.key
-/tests/_output
-/tests/_support
 /vendor
 **/.idea/
 .env
@@ -23,10 +21,8 @@ gox.iml
 rebuild_docker.sh
 docker/*
 db/*
+docker-compose.yml
 package-lock.json
 public/*
 /public/*
 storage/framework/laravel-excel/*
-.vapor/
-.env.production
-.env.staging

.gitlab-ci.yml

@@ -1,48 +0,0 @@
-image: php:7.4
-stages:
-  - deploy
-
-#jobs
-#deploy
-deploy:
-  stage: deploy
-  before_script:
-    - apt-get update -yqq
-    - apt-get install -yqq
-    - apt-get install -y libonig-dev
-    - apt-get install -y libxml2-dev
-    - apt-get install -y libzip-dev
-    - apt-get install -y libgd-dev
-    - apt-get install -y libgd-dev
-
-    # Install PDO MySQL extension
-    - docker-php-ext-install pdo_mysql
-
-    # Install php dependencies
-    - docker-php-ext-install mbstring xml zip gd
-
-    # Install composer package manager
-    - curl --location --output /usr/local/bin/composer https://getcomposer.org/download/latest-stable/composer.phar
-    - chmod +x /usr/local/bin/composer
-
-    # Install node js
-    - apt-get update && apt-get install -y  nodejs npm
-
-    # Install docker
-    - apt-get update
-    - apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release software-properties-common
-    - curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
-    - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
-    - apt-get update
-    - apt-get install -y docker-ce docker-ce-cli containerd.io
-    - service docker start
-
-    # Install gulp Js
-    - npm install -g gulp-cli
-  script:
-    - composer install
-    - vendor/bin/vapor deploy production --message="$CI_COMMIT_MESSAGE"
-  only:
-    - test
-
-

README.md

@@ -1,39 +1,62 @@
-## Shipping portal documentation
+<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p>
 
-simple documentation on how to install, run, test, commit and deploy application
+<p align="center">
+<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
+<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
+<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
+<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
+</p>
 
-## creating and running unit tests
+## About Laravel
 
-Required Tools
+Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
 
-- Chromium Driver / selenium
-- add running and setting selenium  on all OS if possible
+- [Simple, fast routing engine](https://laravel.com/docs/routing).
+- [Powerful dependency injection container](https://laravel.com/docs/container).
+- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
+- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
+- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
+- [Robust background job processing](https://laravel.com/docs/queues).
+- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
 
-Required Packages :
+Laravel is accessible, powerful, and provides tools required for large, robust applications.
 
-- laravel/legacy-factories
+## Learning Laravel
 
-- codeception/codeception
+Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
 
-Or Simply Run
+If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
 
-``Composer install``
+## Laravel Sponsors
 
-To create a unit test
+We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
 
-``php artisan make test: Test Example --unit``
+### Premium Partners
 
-Running the tests :
+- **[Vehikl](https://vehikl.com/)**
+- **[Tighten Co.](https://tighten.co)**
+- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
+- **[64 Robots](https://64robots.com)**
+- **[Cubet Techno Labs](https://cubettech.com)**
+- **[Cyber-Duck](https://cyber-duck.co.uk)**
+- **[Many](https://www.many.co.uk)**
+- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
+- **[DevSquad](https://devsquad.com)**
+- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
+- **[OP.GG](https://op.gg)**
 
-Running a single Test
+## Contributing
 
-`` php artisan test --filter Example``
+Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
 
-Running Unit tests -
+## Code of Conduct
 
-`` php artisan test ``
+In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
 
-Running Codeception tests -
+## Security Vulnerabilities
 
-``vendor/bin/codecept run``
+If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
 
+## License
+
+The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

app/Classes/General/Abstracts/AbstractControllerLogic.php

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

app/Classes/General/Eloquent/AbstractListRecord.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,20 +0,0 @@
-<?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)
-    {
-        return $builder->where('owner_type', $value);
-    }
-
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/Classes/General/ExcelHandel.php

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

app/Classes/General/Helper.php

@@ -2,8 +2,8 @@
 
 namespace App\Classes\General;
 
+
 use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Log;
 
 class Helper
 {
@@ -24,21 +24,4 @@ class Helper
         return array_slice(get_class_methods($className), 1);
     }
 
-     /**
-     * @param $log
-     * @return none
-     */
-    static function debugLoggerForPerfexCRM($log){
-        if($log){
-            $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']);
-                }
-            }
-        }
-    }
-}
+}

app/Classes/General/Interfaces/Notifiable.php

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

app/Classes/General/Interfaces/Transactionable.php

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

app/Classes/General/Traits/LogData.php

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

app/Classes/Jobs/CreatePerfexCRMCustomer.php

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

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

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

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use Carbon\Carbon;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CurlContainerListJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+
+    private $page;
+
+    public function __construct($page = 1)
+    {
+        $this->page = $page;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function handle()
+    {
+        $cookies = $this->getCookie();
+
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Cookie' => $cookies,
+        ];
+
+        $last_two_month = Carbon::now()->subMonth(2)->format('Y-m-d');
+
+        $client = new \GuzzleHttp\Client(['headers' => $headers]);
+        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/GetPage', [\GuzzleHttp\RequestOptions::JSON => json_decode('{"controller":"VCustomercontainer","view":"grid1","request":{"PageIndex":' . $this->page . ',"PageSize":10,"PageOffset":0,"SortExpression":"CreatedOn DESC","GroupExpression":"","Filter":["LoadedTime:<=%js%\"' . $last_two_month . 'T00:00:00.000\"\u0000"],"ContextKey":"view1","FilterIsExternal":false,"LookupContextFieldName":null,"LookupContextController":null,"LookupContextView":null,"LookupContext":null,"Inserting":false,"LastCommandName":null,"ExternalFilter":[],"DoesNotRequireData":false,"LastView":"grid1","Tag":null,"RequiresFirstLetters":false,"ViewType":"Grid","SupportsCaching":true,"SystemFilter":null,"RequiresRowCount":true,"QuickFindHint":null,"RequiresPivot":false,"PivotDefinitions":null,"RequiresMetaData":true}}')]);
+
+        $data = json_decode($res->getBody()->getContents());
+
+        if (!empty($data->d->Rows)) {
+            // insert data here
+
+            // next page
+            $this->page = $this->page > 0 ? $this->page + 1 : 1;
+            CurlContainerListJob::dispatch($this->page + 1)
+                ->delay(Carbon::now()->addSeconds(10));
+        }
+    }
+
+    public function getCookie()
+    {
+        // get latest cookies
+        $client = new \GuzzleHttp\Client(['cookies' => true]);
+        $r = $client->request('GET', 'http://portal.vtnation.com.my');
+        $call_cookie = $client->getConfig('cookies');
+        $call_cookie = $call_cookie->toArray();
+        $latest_cookie = [];
+
+        foreach ($call_cookie as $key => $row) {
+            $latest_cookie[] = $row['Name'] . '=' . $row['Value'];
+        }
+        $latest_cookie = implode(';', $latest_cookie);
+
+        // get access token
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Cookie' => $latest_cookie,
+        ];
+        $client = new \GuzzleHttp\Client(['headers' => $headers]);
+        $res = $client->post('http://portal.vtnation.com.my/Services/DataControllerService.asmx/Login', [\GuzzleHttp\RequestOptions::JSON => [
+            "username" => "CIEF",
+            "password" => "0122120880",
+            "createPersistentCookie" => true,
+        ]]);
+
+        $token = json_decode($res->getBody()->getContents());
+        $token = $token->d->AccessToken;
+
+        $latest_cookie = $latest_cookie . ';AppVTCC=' . $token;
+        return $latest_cookie;
+    }
+}

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -1,40 +0,0 @@
-<?php
-
-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;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class FetchOrdersFromYDPortalJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
-    public $timeout = 900;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
-     */
-    public function handle()
-    {
-        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
-        (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
-
-//        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
-    }
-
-}

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
-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;
-
-class UpdatePerfexCRM implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var UpdatePerfexCRMObject */
-    private $updatePerfexCRMObject;
-
-    /** @var UpdatePerfexCRMInvoice */
-    private $nextJob;
-
-    /** @var */
-    private $transaction;
-
-    /**
-     * UpdatePerfexCRM constructor.
-     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param UpdatePerfexCRMInvoice $nextJob
-     * @param $transaction
-     */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, $nextJob)
-    {
-        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->nextJob = $nextJob;
-        $this->transaction = $transaction;
-    }
-
-    public function handle()
-    {
-        $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
-        if($this->nextJob != null && $this->transaction != null){
-            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
-                $this->updatePerfexCRMObject->getContactEmail(),
-                $result->projectId,
-                $this->transaction,
-                true
-            );
-            /** @var UpdatePerfexCRMInvoice $nextJob */
-            $this->nextJob::dispatch($updatePerfexCRMInvoiceOject);
-        }
-    }
-}

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -1,98 +0,0 @@
-<?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\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;
-use Carbon\Carbon;
-
-use App\Classes\General\Helper;
-
-class UpdatePerfexCRMInvoice implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var UpdatePerfexCRMInvoiceObject */
-    private $updatePerfexCRMInvoiceObject;
-
-    /**
-     * CreatePerfexCRMSingleTask constructor.
-     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
-     */
-    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::error(json_encode('UpdatePerfexCRMInvoice debug $transaction->owner->bill_no: '.$transaction->owner->bill_no));
-
-        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'));
-                Helper::debugLoggerForPerfexCRM('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){
-                Log::error(json_encode('UpdatePerfexCRMInvoice debug $this->updatePerfexCRMInvoiceObject->getProjectId(): '.$this->updatePerfexCRMInvoiceObject->getProjectId()));
-                //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

@@ -1,96 +0,0 @@
-<?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 UpdatePerfexCRM */
-    private $nextJob1;
-
-    /** @var UpdatePerfexCRMInvoice */
-    private $nextJob2;
-
-    /**
-     * UpdatePerfexCRMPrelude constructor.
-     * @param $packingList
-     * @param $transaction
-     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param UpdatePerfexCRM $nextJob1
-     * @param UpdatePerfexCRMInvoice $nextJob2
-     */
-    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob1, $nextJob2)
-    {
-        $this->packingList = $packingList;
-        $this->transaction = $transaction;
-        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->nextJob1 = $nextJob1;
-        $this->nextJob2 = $nextJob2;
-    }
-
-    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);
-        /** @var UpdatePerfexCRM $nextJob1 */
-        /** @var UpdatePerfexCRMInvoice $nextJob2 */
-        $this->nextJob1::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->nextJob2);
-    }
-
-    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/AddNewMemberLogic.php

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

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

@@ -8,27 +8,22 @@ 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\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\Modules\Contacts\Processors\CreateContactProcessor;
+use App\Classes\Modules\Documents\Processors\UploadIdentityDocumentProcessor;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 
-use App\Classes\Jobs\CreatePerfexCRMCustomer;
-
 use App\Models\Company;
 use App\Models\CompanyModule;
 use App\Models\User;
@@ -81,12 +76,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var GenerateEmailVerificationAttemptProcessor */
     private $generateEmailVerificationAttemptProcessor;
 
-    /** @var FetchesCompanyModule */
-    private $fetchesCompanyModule;
-
-    /** @var CreatePerfexCRMLeadProcessor */
-    private $createPerfexCRMLeadProcessor;
-
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -99,10 +88,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor
      * @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, 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)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -114,8 +101,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->uploadIdentityDocumentProcessor = $uploadIdentityDocumentProcessor;
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
-        $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
     }
 
     /**
@@ -141,9 +126,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
         /** @var CompanyModule $companyModule */
         $companyModule = $this->createCompanyModuleProcessor->execute($company, BusinessType::IMPORTER);
 
-        $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
-
-        $connectionObject = new CompanyConnectionObject($companyModule, $inviter, mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate(), 'CIEF');
+        $connectionObject = new CompanyConnectionObject($companyModule, 'CIEF', mt_rand(1000, 9999).(new GeneratesInitials())->name($company->name)->length(3)->generate());
 
         $connection = $this->createsCompanyConnection->execute($connectionObject);
 
@@ -155,18 +138,6 @@ 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/FetchUserByEmailLogic.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -68,11 +68,7 @@ class GeneratesAuthenticationToken {
             $companyModule = $user->companyModule()->first();
 
             $claims = array_merge($claims, [
-                'company_id' => $companyModule->company_id,
-                'company_module_id' => $companyModule->id,
-                'company_module_type' => $companyModule->type,
-                'company_name' => $companyModule->name,
-                'company_marking' => $companyModule->type !== 8 ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : 'HWT',
+                'company_id' => $companyModule->company_id
             ]);
         }
 

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

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

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

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

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

@@ -1,86 +0,0 @@
-<?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')]);
-        
-        $billingAddressInputed = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
-
-        if ($billingAddressInputed->type !== AddressType::BILLING || $billingAddressInputed->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 new billing addrress
-            $billingAddress = new AddressObject($billingAddressInputed->street_one, $billingAddressInputed->street_two, $billingAddressInputed->country_id, $billingAddressInputed->state_id, $billingAddressInputed->district_id, $billingAddressInputed->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $billingAddressInputed->reference);
-            $this->canCreateAddress->passes($billingAddress);
-            $this->createsAddress->execute($companyModule, $billingAddress);
-        }
-
-        return $this->resourceResponse(new AddressResource($billingAddressInputed));
-    }
-
-}

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

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

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

@@ -9,14 +9,7 @@ use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanUpdateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
-use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
-use App\Classes\ValueObjects\Constants\AddressType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Http\Resources\AddressResource;
-use App\Models\Address;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -45,31 +38,22 @@ class UpdateAddressLogic extends AbstractControllerLogic
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
-    /** @var CreateContactProcessor */
-    private $createContactProcessor;
-
-    /** @var CreateRemarkProcessor */
-    private $createRemarkProcessor;
-
     /**
      * UpdateAddressLogic constructor.
      * @param CanUpdateAddress $canUpdateAddress
      * @param UpdatesAddress $updatesAddress
      * @param FetchesAddress $fetchesAddress
      * @param FetchesDistrict $fetchesDistrict
-     * @param CreateContactProcessor $createContactProcessor
-     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict, CreateContactProcessor $createContactProcessor, CreateRemarkProcessor $createRemarkProcessor)
+    public function __construct(CanUpdateAddress $canUpdateAddress, UpdatesAddress $updatesAddress, FetchesAddress $fetchesAddress, FetchesDistrict $fetchesDistrict)
     {
         $this->canUpdateAddress = $canUpdateAddress;
         $this->updatesAddress = $updatesAddress;
         $this->fetchesAddress = $fetchesAddress;
         $this->fetchesDistrict = $fetchesDistrict;
-        $this->createContactProcessor = $createContactProcessor;
-        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
+
     /**
      * @param Request $request
      * @return JsonResponse
@@ -81,27 +65,14 @@ class UpdateAddressLogic extends AbstractControllerLogic
     {
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), AddressType::DELIVERY, ApprovalStatus::APPROVED, $request->input('reference'));
+        $object = new AddressObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'), $request->input('reference'));
 
         $this->canUpdateAddress->passes($object);
 
         $address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
 
-        /** @var Address $address */
         $address = $this->updatesAddress->execute($address, $object);
 
-        $address->contacts()->delete(); $address->remarks()->delete();
-
-        if($request->input('phone')){
-            $contactObject = new ContactObject($request->input('person_in_charge'), $request->input('phone'), '', '');
-            $this->createContactProcessor->execute($contactObject, $address);
-        }
-
-        if($request->input('remark')){
-            $remarkObject = new RemarkObject($request->input('remark'), Auth()->user()->id);
-            $this->createRemarkProcessor->execute($address, $remarkObject);
-        }
-
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -26,12 +26,6 @@ class AddressObject implements DataTransferObject
     /** @var int */
     private $postCode;
 
-    /** @var int */
-    private $type;
-
-    /** @var int */
-    private $status;
-
     /** @var string|null */
     private $reference;
 
@@ -43,11 +37,9 @@ class AddressObject implements DataTransferObject
      * @param int $stateId
      * @param int $districtId
      * @param int $postCode
-     * @param int $type
-     * @param int $status
      * @param null|string $reference
      */
-    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, int $type, int $status, ?string $reference = null)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, ?string $reference = null, ?int $status = ApprovalStatus::APPROVED)
     {
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
@@ -55,9 +47,8 @@ class AddressObject implements DataTransferObject
         $this->stateId = $stateId;
         $this->districtId = $districtId;
         $this->postCode = $postCode;
-        $this->type = $type;
-        $this->status = $status;
         $this->reference = $reference;
+        $this->status = $status;
     }
 
     /**
@@ -109,11 +100,11 @@ class AddressObject implements DataTransferObject
     }
 
     /**
-     * @return int
+     * @return null|string
      */
-    public function getType(): int
+    public function getReference(): ?string
     {
-        return $this->type;
+        return $this->reference;
     }
 
     /**
@@ -124,13 +115,5 @@ class AddressObject implements DataTransferObject
         return $this->status;
     }
 
-    /**
-     * @return null|string
-     */
-    public function getReference(): ?string
-    {
-        return $this->reference;
-    }
-
 
 }

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

@@ -10,8 +10,6 @@ namespace App\Classes\Modules\Addresses\Services;
 
 
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\ValueObjects\Constants\AddressType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Models\District;
 use App\Models\OldAddress;
 
@@ -33,7 +31,7 @@ class CleansOldAddress
             return null;
         }
 
-        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, AddressType::DELIVERY, ApprovalStatus::APPROVED, 'Delivery Address');
+        return new AddressObject($this->cleanAddress($address->street_one, $district, $address->post_code), $this->cleanAddress($address->street_two, $district, $address->post_code), $district->country_id, $district->state_id, $district->id, $address->post_code, 'Delivery Address');
 
     }
 

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

@@ -29,7 +29,6 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
         $model->status = $object->getStatus();
-        $model->type = $object->getType();
 
         return $this->handler($addressable->addresses(), $model);
 

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

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

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

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

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

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

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

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

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

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Announcements\Services\ListsAnnouncements;
-use App\Classes\Modules\Announcements\Standards\Rules\CanListAnnouncements;
-use App\Http\Resources\AnnouncementResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class ListAnnouncementsLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Retrieve Announcements',
-            'message' => 'You have successfully retrieved a list of Announcements'
-        ];
-    }
-
-    /** @var CanListAnnouncements */
-    private $canListAnnouncements;
-
-    /** @var ListsAnnouncements */
-    private $listsAnnouncements;
-
-    /**
-     * ListAnnouncementsLogic constructor.
-     * @param CanListAnnouncements $canListAnnouncements
-     * @param ListsAnnouncements $listsAnnouncements
-     */
-    public function __construct(CanListAnnouncements $canListAnnouncements, ListsAnnouncements $listsAnnouncements)
-    {
-        $this->canListAnnouncements = $canListAnnouncements;
-        $this->listsAnnouncements = $listsAnnouncements;
-    }
-
-
-    /**
-     * @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->canListAnnouncements->passes();
-
-        $annoucements = $this->listsAnnouncements->execute($this->listsAnnouncements->deserializeFilters($request->input('filters')));
-
-        return $this->collectionResponse(AnnouncementResource::collection($annoucements));
-    }
-}

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

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
-use App\Classes\Modules\Segments\Services\FetchesSegment;
-use App\Classes\Modules\Announcements\Services\RemovesAnnouncementFromSegment;
-
-use App\Http\Resources\AnnouncementResource;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class RemoveSegmentFromAnnouncementLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Detach Announcement From Segment',
-            'message' => 'You have successfully detached Announcement from segment'
-        ];
-    }
-
-    /** @var FetchesAnnouncement */
-    private $fetchesAnnnouncement;
-
-    /** @var FetchesSegment */
-    private $fetchesSegment;
-
-    /** @var RemovesAnnouncementFromSegment */
-    private $removesAnnouncementFromSegment;
-
-    /**
-     * RemoveSegmentFromAnnouncementLogic constructor.
-     * @param FetchesAnnouncement $fetchesAnnnouncement
-     * @param FetchesSegment $fetchesSegment
-     * @param RemovesAnnouncementFromSegment $removesAnnouncementFromSegment
-     */
-    public function __construct(FetchesAnnouncement $fetchesAnnnouncement, FetchesSegment $fetchesSegment, RemovesAnnouncementFromSegment $removesAnnouncementFromSegment)
-    {
-        $this->fetchesAnnnouncement = $fetchesAnnnouncement;
-        $this->fetchesSegment = $fetchesSegment;
-        $this->removesAnnouncementFromSegment = $removesAnnouncementFromSegment;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-
-        $announcement = $this->fetchesAnnnouncement->execute(['id' => $request->route('id')]);
-
-        $segment = $this->fetchesSegment->execute(['id' => $request->route('segment_id')]);
-
-        $this->removesAnnouncementFromSegment->execute($announcement, $segment);
-
-        return $this->resourceResponse(new AnnouncementResource($announcement));
-    }
-}

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

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-use App\Classes\Modules\Announcements\Standards\Rules\CanUpdateAnnouncement;
-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;
-
-
-class UpdateAnnouncementLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification(): array
-    {
-        return [
-            'title' => 'Update Announcement',
-            'message' => 'You have successfully updated the Announcement'
-        ];
-    }
-
-    /** @var CanUpdateAnnouncement */
-    private $canUpdateAnnouncement;
-
-    /** @var FetchesAnnouncement */
-    private $fetchesAnnouncement;
-
-    /** @var UpdatesAnnouncement */
-    private $updatesAnnouncement;
-
-    /**
-     * UpdateAnnouncementLogic constructor.
-     * @param CanUpdateAnnouncement $canUpdateAnnouncement
-     * @param FetchesAnnouncement $fetchesAnnouncement
-     * @param UpdatesAnnouncement $updatesAnnouncement     
-     */
-    public function __construct(
-        CanUpdateAnnouncement $canUpdateAnnouncement,
-        FetchesAnnouncement $fetchesAnnouncement,
-        UpdatesAnnouncement $updatesAnnouncement        
-    ) {
-        $this->canUpdateAnnouncement = $canUpdateAnnouncement;
-        $this->fetchesAnnouncement = $fetchesAnnouncement;
-        $this->updatesAnnouncement = $updatesAnnouncement;        
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request): JsonResponse
-    {
-        $annoucement_object = new AnnouncementObject(
-            $request->input('title'),
-            $request->input('description'),
-            Carbon::createFromFormat('d-m-Y', $request->input('starting_on'))->format('Y-m-d H:i:s'),
-            Carbon::createFromFormat('d-m-Y', $request->input('ending_on'))->format('Y-m-d H:i:s')
-        );
-
-        $this->canUpdateAnnouncement->passes($annoucement_object);
-
-        $annoucement = $this->fetchesAnnouncement->execute(['id' => $request->route('id')]);
-
-        $announcement_query = $this->updatesAnnouncement->execute($annoucement, $annoucement_object);
-
-        //$announcement_query->segments()->sync($request->input('segment_id'));
-
-        return $this->resourceResponse(new AnnouncementResource($announcement_query));
-    }
-}

app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-class AnnouncementObject implements DataTransferObject
-{
-
-    /** @var string */
-    private $title;
-
-    /** @var string */
-    private $description;
-
-    /** @var string */
-    private $starting_on;
-
-    /** @var string */
-    private $ending_on;
-
-
-    /**
-     * AnnouncementObject constructor.
-     * @param string $title
-     * @param string $description
-     * @param string $start_date
-     * @param string $end_date
-     */
-
-    public function __construct(string $title, string $description, string $starting_on, string $ending_on)
-    {
-        $this->title = $title;
-        $this->description = $description;
-        $this->starting_on = $starting_on;
-        $this->ending_on = $ending_on;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTitle(): string
-    {
-        return $this->title;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStartingOn(): string
-    {
-        return $this->starting_on;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEndingOn(): string
-    {
-        return $this->ending_on;
-    }
-}

app/Classes/Modules/Announcements/Processors/AssignAnnouncementToSegmentProcessor.php

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

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

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

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

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-use App\Models\Announcement;
-use DateTime;
-
-class CreatesAnnouncement extends AbstractUpdateRecord
-{
-    /**
-     * @param AnnouncementObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(AnnouncementObject $object)
-    {
-        $model = new Announcement();
-        $model->title = $object->getTitle();
-        $model->description = $object->getDescription();
-        // $model->starting_on = $object->getStartingOn();
-        $model->starting_on = $this->convertDateFormat($object->getStartingOn());
-        // $model->ending_on = $object->getEndingOn();
-        $model->ending_on = $this->convertDateFormat($object->getEndingOn());
-
-        return $this->handler($model);
-    }
-
-    public function convertDateFormat($value) {
-        $value = DateTime::createFromFormat('d-m-Y', $value)->format('Y-m-d H:i:s');
-
-        return $value;
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-use App\Models\Announcement;
-
-class UpdatesAnnouncement extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Announcement $model
-     * @param AnnouncementObject $object
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Announcement $model, AnnouncementObject $object)
-    {
-        $model->title = $object->getTitle();
-        $model->description = $object->getDescription();
-        $model->starting_on = $object->getStartingOn();
-        $model->ending_on = $object->getEndingOn();
-
-        return $this->handler($model);
-    }
-}

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

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

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

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

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

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

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

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\Standards\Rules;
-
-use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-
-class CanListAnnouncements extends AbstractRule
-{
-
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param AnnouncementObject $object
-     * @return bool
-     */
-    protected function validators($object): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param AnnouncementObject $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-}

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

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

app/Classes/Modules/Announcements/Standards/Validators/AnnouncementValidation.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Announcements\Standards\Validators;
-
-use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Announcements\DataTransferObjects\AnnouncementObject;
-
-class AnnouncementValidation extends AbstractValidation
-{
-    /**
-     * @param AnnouncementObject $object
-     * @return array
-     */
-    protected function data($object): array 
-    {
-        return [
-            'title' => $object->getTitle(),
-            'description' => $object->getDescription(),
-            'starting_on' => $object->getStartingOn(),
-            'ending_on' => $object->getEndingOn()
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function rules(): array 
-    {
-        return [
-            'title' => 'required',
-            'description' => 'required',
-            'starting_on' => 'required',
-            'ending_on' => 'required'
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function messages(): array 
-    {
-        return [];
-    }
-}

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

@@ -1,156 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Billplzs\ControllersLogic;
-
-use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
-use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
-
-use App\Classes\Exceptions\ResourceNotFoundException;
-use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
-use App\Models\User;
-use App\Models\Wallet;
-use Illuminate\Http\Request;
-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\Modules\Transactions\Services\FetchesTransaction;
-use App\Classes\Modules\Transactions\Processors\CreatePaymentTransactionProcessor;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-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;
-
-class CallbackBillplzLogic
-{
-    /** @var GetBillplzBill */
-    private $getBillplzBill;
-
-    /** @var FetchesTransaction */
-    private $fetchesTransaction;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var UpdateDoFromVTPortalProcessor */
-    private $updateDoFromVTPortalProcessor;
-
-    /** @var UpdateDoFromYDPortalProcessor */
-    private $updateDoFromYDPortalProcessor ;
-
-    /** @var UpdatesWalletBalance */
-    private $updatesWalletBalance;
-
-    /** @var CreatePaymentTransactionProcessor */
-    private $createPaymentTransactionProcessor;
-
-    /**
-     * CallbackBillplzLogic constructor.
-     * @param GetBillplzBill $getBillplzBill
-     * @param FetchesTransaction $fetchesTransaction
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor
-     * @param UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor
-     * @param CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
-     */
-    public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor, UpdatesWalletBalance $updatesWalletBalance, CreatePaymentTransactionProcessor $createPaymentTransactionProcessor)
-    {
-        $this->getBillplzBill = $getBillplzBill;
-        $this->fetchesTransaction = $fetchesTransaction;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->updateDoFromVTPortalProcessor = $updateDoFromVTPortalProcessor;
-        $this->updateDoFromYDPortalProcessor = $updateDoFromYDPortalProcessor;
-        $this->updatesWalletBalance = $updatesWalletBalance;
-        $this->createPaymentTransactionProcessor = $createPaymentTransactionProcessor;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     * @throws MalformedRequestException
-     * @throws ResourceNotFoundException
-     * @throws \App\Classes\Exceptions\InternalServerErrorException
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    public function execute(Request $request)
-    {
-        $billplzXSignatureObject = new BillplzXSignatureObject($request);
-
-        if(!$billplzXSignatureObject->isValidSignature()){
-            throw new MalformedRequestException('Billplz Payment validation failed.');
-        }
-
-        $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId());
-
-        if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
-
-        $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
-
-        $invoice = $transaction->owner;
-        $packingList = $invoice->owner;
-        $order = $packingList->owner;
-
-        $status = ApprovalStatus::PENDING_VERIFICATION;
-
-        if($billPlz->state === 'paid') {
-            $status = ApprovalStatus::APPROVED;
-        }
-
-        if($billPlz->state === 'due') {
-            $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
-        }
-
-        $token = Auth::fromUser(User::find(1));
-        $request->headers->set('Authorization', 'Bearer '.$token);
-
-        // check if is wallet top up
-        if($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
-            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
-        }
-
-        // group payment
-        if ($transaction->type == TransactionType::GROUP_PAYMENT && $status === ApprovalStatus::APPROVED &&!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
-            $group = Group::where('reference', $billplzXSignatureObject->getBillPlzId())->first();
-
-            foreach($group->groupTransactions as $groupTransaction) {
-                $invoice = $groupTransaction->transaction;
-                $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
-            }
-
-            $group->status = $status;
-            $group->save();
-        }
-
-        $this->updatesTransactionStatus->execute($transaction, $status);
-
-        if (!$transaction->owner instanceof Wallet) {
-            $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
-
-            if(($invoice->amount - $totalPaidAmount) < 0.01) {
-                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
-                $packingList->status = ApprovalStatus::APPROVED;
-                $packingList->save();
-
-                if(app()->environment('production')){
-                    $this->updateDoFromVTPortalProcessor->execute($packingList);
-                    $this->updateDoFromYDPortalProcessor->execute($packingList);
-                }
-            }
-        }
-
-        $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
-
-        if ($transaction->owner instanceof Wallet) {
-            $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;
-        } else {
-
-            $company_module_marking = $order->companyModule->connections? $order->companyModule->connections->first()->invitee_reference: null;
-        }
-
-        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
-    }
-}