Working for replicate support as like exchage 2.0

.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
@@ -55,5 +55,3 @@ EXCHANGE_URL=https://dev.exchange.cief-malaysia.com/
 MIX_EXCHANGE_URL="${EXCHANGE_URL}"
 
 YD_API_CODE=''
-
-JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h

.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,6 +21,7 @@ gox.iml
 rebuild_docker.sh
 docker/*
 db/*
+docker-compose.yml
 package-lock.json
 public/*
 /public/*

.gitlab-ci.yml

@@ -1,149 +0,0 @@
-image: php:7.4
-stages:
-  - service_build
-  - node
-  - building_assets
-  - database
-  - unit_test
-  - acceptance_test
-  - code_quality
-
-# Variables
-variables:
-  MYSQL_ROOT_PASSWORD: root
-  MYSQL_USER: mysql_password
-  MYSQL_PASSWORD: mysql_password
-  MYSQL_DATABASE: shpping_portal
-  DB_HOST: mysql
-
-
-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 MySQL client
-  - apt-get install -y default-mysql-client
-
-  #install node js
-  - apt-get update && apt-get install -y  nodejs npm
-
-  #install gulp Js
-  - npm install -g gulp-cli
-
-
-#jobs
-
-#buld the backend
-composer_php:
-  stage: service_build
-  script:
-    - composer install
-    - cp .env.example .env
-    - php artisan key:generate
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-#build the UI
-#node installation
-npm:
-  stage: node
-  script:
-    - npm install # Install npm dependencies
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-#building assets
-building_assets:
-  stage: building_assets
-  # dependencies:
-  # - npm
-  script:
-    - npm install # Install npm dependencies
-    - gulp build # Build assets
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-#mysql
-database:
-  stage: database
-  services:
-    - name: mysql:8.0
-      command: [ "--default-authentication-plugin=mysql_native_password" ]
-    #dependencies:
-    # - composer_php
-  script:
-    - composer install
-    - cp .env.example .env
-    - php artisan key:generate
-    - php artisan migrate:fresh
-    - php artisan db:seed
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-#unit test
-unit_test:
-  stage: unit_test
-  services:
-    - name: mysql:8.0
-      command: [ "--default-authentication-plugin=mysql_native_password" ]
-  #dependencies:
-  #  - database
-  script:
-    - npm install # Install npm dependencies
-    - gulp build # Build assets
-    - composer install
-    - cp .env.example .env
-    - php artisan key:generate
-    - php artisan migrate:fresh
-    - php artisan db:seed
-    - php artisan test
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-
-
-#acceptance tests
-acceptance_test:
-  stage: acceptance_test
-  services:
-    - name: mysql:8.0
-      command: [ "--default-authentication-plugin=mysql_native_password" ]
-    - selenium/standalone-chrome:latest
-  #dependencies:
-  #  - database
-  script:
-    - npm install # Install npm dependencies
-    - gulp build # Build assets
-    - composer install
-    - cp .env.example .env
-    - php artisan key:generate
-    - php artisan migrate:fresh
-    - php artisan db:seed
-    - php artisan serve &
-    - vendor/bin/codecept run
-  artifacts:
-    when: always
-    paths:
-      - tests/_output
-  rules:
-    - if: '$CI_COMMIT_BRANCH =~ /.*/'
-
-
-
-
-

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
+- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- add running and setting selenium  on all OS if possible
+- [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/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/Jobs/CreatePerfexCRMCustomer.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
-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()
-    {
-        (App()->make(CreatePerfexCRMLeadProcessor::class))->execute($this->createLeadPerfexCRMObject);
-    }
-}

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 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\CreateTaskPerfexCRMObject;
-
-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/InitializePerfexCRM.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PerfexCRM\Processors\InitializePerfexCRMProcessor;
-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\InitialPerfexCRMObject;
-
-class InitializePerfexCRM implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var InitialPerfexCRMObject */
-    private $initialPerfexCRMObject;
-
-    /**
-     * InitializePerfexCRM constructor.
-     * @param InitialPerfexCRMObject $initialPerfexCRMObject
-     */
-    public function __construct(InitialPerfexCRMObject $initialPerfexCRMObject)
-    {
-        $this->initialPerfexCRMObject = $initialPerfexCRMObject;
-    }
-
-    public function handle()
-    {
-        (App()->make(InitializePerfexCRMProcessor::class))->execute($this->initialPerfexCRMObject);
-    }
-}

app/Classes/Jobs/UpdatePerfexCRM.php

@@ -1,33 +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;
-
-class UpdatePerfexCRM implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /** @var UpdatePerfexCRMObject */
-    private $updatePerfexCRMObject;
-
-    /**
-     * UpdatePerfexCRM constructor.
-     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject)
-    {
-        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-    }
-
-    public function handle()
-    {
-        (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
-    }
-}

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

@@ -8,27 +8,23 @@ 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;
@@ -84,9 +80,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var FetchesCompanyModule */
     private $fetchesCompanyModule;
 
-    /** @var CreatePerfexCRMLeadProcessor */
-    private $createPerfexCRMLeadProcessor;
-
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -100,9 +93,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
-     * @param CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor
      */
-    public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateCompanyModuleProcessor $createCompanyModuleProcessor, CreateContactProcessor $createContactProcessor, CreatesCompanyConnection $createsCompanyConnection, ApprovesCompanyConnection $approvesCompanyConnection, AssignEmployeeProcessor $assignEmployeeProcessor, UploadIdentityDocumentProcessor $uploadIdentityDocumentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor, FetchesCompanyModule $fetchesCompanyModule, 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)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -115,7 +107,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
-        $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
     }
 
     /**
@@ -155,17 +146,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')
-            );
-            CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
-        }
-
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));

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/Exports/Services/ExportsWarehousePackingList.php

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Exports\Services;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Models\Order;
+use App\Models\State;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
@@ -31,8 +32,10 @@ class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadin
      */
     public function query()
     {
-        return Order::whereHas('addresses', function($address) {
+        $johor_state_id = State::where('name', 'johor')->first()->id;
-            $address->where('status', ApprovalStatus::APPROVED);
+
+        return Order::whereHas('addresses', function($address) use ($johor_state_id){
+            $address->where('status', ApprovalStatus::APPROVED)->where('state_id', $johor_state_id);
         })->whereHas('packingLists', function($packingLists) {
             $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports');
         });

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

@@ -4,19 +4,13 @@ namespace App\Classes\Modules\Orders\ControllersLogic;
 
 use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
-use App\Classes\ValueObjects\Constants\AddressType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Http\Resources\OrderResource;
-use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
-use App\Models\Address;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
@@ -45,12 +39,6 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
-    /** @var CreatesAddress */
-    private $createsAddress;
-
-    /** @var CanCreateAddress */
-    private $canCreateAddress;
-
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -58,18 +46,14 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param CreateOrderProcessor $createOrderProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
-     * @param CreatesAddress $createsAddress
-     * @param CanCreateAddress $canCreateAddress
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber, CreatesAddress $createsAddress, CanCreateAddress $canCreateAddress)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesAddress = $fetchesAddress;
         $this->createOrderProcessor = $createOrderProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesOrderNumber = $generatesOrderNumber;
-        $this->createsAddress = $createsAddress;
-        $this->canCreateAddress = $canCreateAddress;
     }
 
 
@@ -82,21 +66,6 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
-        if ($request->input('billing_address_id')) {
-            $companyModule = $company->companyModules->first();
-            $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);
-            }
-        }
-
         if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
             $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
         }

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

@@ -2,9 +2,7 @@
 
 namespace App\Classes\Modules\PackingLists\Processors;
 
-use App\Classes\Exceptions\AccessForbiddenException;
 use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\Exceptions\ResourceNotFoundException;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Services\FetchesDataFromYDPortal;
@@ -40,7 +38,6 @@ use App\Models\Order;
 use App\Models\PackingList;
 use App\Models\Transport;
 use Carbon\Carbon;
-use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
@@ -50,6 +47,18 @@ class FetchContainersFromYdPortalProcessor
     /** @var FetchesDataFromYDPortal */
     private $fetchesDataFRomYDPortal;
 
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /** @var UpdatesContractObligation */
+    private $updatesContractObligations;
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
     /** @var CreatesTransport */
     private $createsTransport;
 
@@ -59,31 +68,75 @@ class FetchContainersFromYdPortalProcessor
     /** @var FetchesContainer */
     private $fetchesContainer;
 
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var FetchesCompanyModule */
+    private $fetchesCompanyModule;
+
     /** @var CreateContainerProcessor */
     private $createContainerProcessor;
 
+    /** @var CreatesContract */
+    private $unityCreateContract;
+
+    /** @var AssignContractEntityProcessor */
+    private $unityAssignContractEntity;
+
+    /** @var CreateContractEntityProcessor */
+    private $unityCreateContractEntity;
+
+    /** @var CreatesStep */
+    private $createsStep;
+
+    /** @var ActivateContractProcessor */
+    private $unityActivateContract;
+
     /**
+     * FetchOrderListsFromYdPortalProcessor constructor.
      * @param FetchesDataFromYDPortal $fetchesDataFRomYDPortal
+     * @param FetchesOrder $fetchesOrder
+     * @param UpdatesContractObligation $updatesContractObligations
+     * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param CreatePackageProcessor $createPackageProcessor
      * @param CreatesTransport $createsTransport
      * @param CreatesSchedule $createsSchedule
      * @param FetchesContainer $fetchesContainer
+     * @param FetchesPackingList $fetchesPackingList
+     * @param FetchesCompanyModule $fetchesCompanyModule
      * @param CreateContainerProcessor $createContainerProcessor
+     * @param CreatesContract $unityCreateContract
+     * @param AssignContractEntityProcessor $unityAssignContractEntity
+     * @param CreateContractEntityProcessor $unityCreateContractEntity
+     * @param CreatesStep $createsStep
+     * @param ActivateContractProcessor $unityActivateContract
      */
-    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, CreateContainerProcessor $createContainerProcessor)
+    public function __construct(FetchesDataFromYDPortal $fetchesDataFRomYDPortal, FetchesOrder $fetchesOrder, UpdatesContractObligation $updatesContractObligations, CreatePackingListProcessor $createPackingListProcessor, CreatePackageProcessor $createPackageProcessor, CreatesTransport $createsTransport, CreatesSchedule $createsSchedule, FetchesContainer $fetchesContainer, FetchesPackingList $fetchesPackingList, FetchesCompanyModule $fetchesCompanyModule, CreateContainerProcessor $createContainerProcessor, CreatesContract $unityCreateContract, AssignContractEntityProcessor $unityAssignContractEntity, CreateContractEntityProcessor $unityCreateContractEntity, CreatesStep $createsStep, ActivateContractProcessor $unityActivateContract)
     {
         $this->fetchesDataFRomYDPortal = $fetchesDataFRomYDPortal;
+        $this->fetchesOrder = $fetchesOrder;
+        $this->updatesContractObligations = $updatesContractObligations;
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->createPackageProcessor = $createPackageProcessor;
         $this->createsTransport = $createsTransport;
         $this->createsSchedule = $createsSchedule;
         $this->fetchesContainer = $fetchesContainer;
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->createContainerProcessor = $createContainerProcessor;
+        $this->unityCreateContract = $unityCreateContract;
+        $this->unityAssignContractEntity = $unityAssignContractEntity;
+        $this->unityCreateContractEntity = $unityCreateContractEntity;
+        $this->createsStep = $createsStep;
+        $this->unityActivateContract = $unityActivateContract;
     }
 
 
     /**
+     * @param Carbon|null $start
+     * @param Carbon|null $end
      * @return void
-     * @throws MalformedRequestException
+     * @throws \GuzzleHttp\Exception\GuzzleException
-     * @throws AccessForbiddenException
-     * @throws RequestValidationException
      */
     public function execute()
     {

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

@@ -51,7 +51,7 @@ class FetchContainersUpdatesFromYdPortalProcessor
         foreach ($containers as $container) {
             $time_start = microtime(true);
 
-            $packingList = $container->packingLists()->random();
+            $packingList = $container->packingLists()->first();
 
             $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
                 'trakingno' => $packingList->reference

app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateLeadPerfexCRMObject.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CreateLeadPerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $name;
-
-    /** @var string */
-    private $email;
-
-    /** @var string */
-    private $phone;
-
-    /** @var string */
-    private $companyName;
-
-    public function __construct(string $name, string $email, string $phone, string $companyName)
-    {
-
-        $this->name = $name;
-        $this->email = $email;
-        $this->phone = $phone;
-        $this->companyName = $companyName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail(): string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPhone(): string
-    {
-        return $this->phone;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyName(): string
-    {
-        return $this->companyName;
-    }
-
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/CreateTaskPerfexCRMObject.php

@@ -1,127 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CreateTaskPerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $email;
-
-    /** @var string */
-    private $name;
-
-    /** @var string */
-    private $description;
-
-    /** @var string */
-    private $leadId;
-
-    /** @var string */
-    private $milestoneId;
-
-    /** @var string */
-    private $projectId;
-
-    /** @var string */
-    private $reference;
-
-    /** @var string */
-    private $onTaskCompletion;
-
-    /** @var string */
-    private $status;
-
-
-    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status)
-    {
-        $this->email = $email;
-        $this->name = $name;
-        $this->description = $description;
-        $this->leadId = $leadId;
-        $this->projectId = $projectId;
-        $this->milestoneId = $milestoneId;
-        $this->reference = $reference;
-        $this->onTaskCompletion = $onTaskCompletion;
-        $this->status = $status;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail(): string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLeadId(): string
-    {
-        return $this->leadId;
-    }
-
-    public function setLeadId(string $leadId)
-    {
-        $this->leadId = $leadId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectId(): string
-    {
-        return $this->projectId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMilestoneId(): string
-    {
-        return $this->milestoneId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getReference(): string
-    {
-        return $this->reference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getOnTaskCompletion(): string
-    {
-        return $this->onTaskCompletion;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStatus(): string
-    {
-        return $this->status;
-    }
-
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/CustomerContactObject.php

@@ -1,99 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class CustomerContactObject implements DataTransferObject
-{
-    /** @var int */
-    private $customerId;
-
-    /** @var string */
-    private $firstname;
-
-    /** @var string */
-    private $lastname;
-
-    /** @var string  */
-    private $email;
-
-    /** @var string */
-    private $password;
-
-    /** @var string */
-    private $isPrimary;
-
-    /** @var string */
-    private $sendSetPasswordEmail;
-
-
-    public function __construct(string $customerId, string $firstname, string $lastname, string $email, string $password, string $isPrimary, string $sendSetPasswordEmail)
-    {
-
-        $this->customerId = $customerId;
-        $this->firstname = $firstname;
-        $this->lastname = $lastname;
-        $this->email = $email;
-        $this->password = $password;
-        $this->isPrimary = $isPrimary;
-        $this->sendSetPasswordEmail = $sendSetPasswordEmail;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCustomerId(): int
-    {
-        return $this->customerId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFirstName(): string
-    {
-        return $this->firstname;
-    }
-
-     /**
-     * @return string
-     */
-    public function getLastName(): string
-    {
-        return $this->lastname;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEmail(): string
-    {
-        return $this->email;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPassword(): string
-    {
-        return $this->password;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIsPrimary(): string
-    {
-        return $this->isPrimary;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSendSetPasswordEmail(): string
-    {
-        return $this->sendSetPasswordEmail;
-    }
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/InitialPerfexCRMObject.php

@@ -1,112 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class InitialPerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $companyName;
-
-    /** @var string */
-    private $companyReference;
-
-    /** @var string */
-    private $contactName;
-
-    /** @var string */
-    private $contactEmail;
-
-    /** @var string */
-    private $bookingMarking;
-
-    /** @var string */
-    private $projectName;
-
-    /** @var array */
-    private $milestoneNames;
-
-    /** @var array */
-    private $taskNames;
-
-
-    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, array $milestoneNames, array $taskNames)
-    {
-
-        $this->companyName = $companyName;
-        $this->companyReference = $companyReference;
-        $this->contactName = $contactName;
-        $this->contactEmail = $contactEmail;
-        $this->bookingMarking = $bookingMarking;
-        $this->projectName = $projectName;
-        $this->milestoneNames = $milestoneNames;
-        $this->taskNames = $taskNames;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyName(): string
-    {
-        return $this->companyName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyReference(): string
-    {
-        return $this->companyReference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContactName(): string
-    {
-        return $this->contactName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContactEmail(): string
-    {
-        return $this->contactEmail;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBookingMarking(): string
-    {
-        return $this->bookingMarking;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectName(): string
-    {
-        return $this->projectName;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMilestoneNames(): array
-    {
-        return $this->milestoneNames;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTaskNames(): array
-    {
-        return $this->taskNames;
-    }
-
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/InvoicePaymentPerfexCRMObject.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class InvoicePaymentPerfexCRMObject implements DataTransferObject
-{
-    /** @var int */
-    private $invoiceId;
-
-    /** @var float */
-    private $amount;
-
-    /** @var string */
-    private $date;
-
-    /** @var int */
-    private $paymentMode;
-
-    /** @var string */
-    private $transactionId;
-
-    /** @var string */
-    private $note;
-
-
-    public function __construct(int $invoiceId, float $amount, string $date, int $paymentMode, string $transactionId, string $note)
-    {
-        $this->invoiceId = $invoiceId;
-        $this->amount = $amount;
-        $this->date = $date;
-        $this->paymentMode = $paymentMode;
-        $this->transactionId = $transactionId;
-        $this->note = $note;
-    }
-
-    /**
-     * @return int
-     */
-    public function getInvoiceId(): int
-    {
-        return $this->invoiceId;
-    }
-
-    /**
-     * @return float
-     */
-    public function getAmount(): float
-    {
-        return $this->amount;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDate(): string
-    {
-        return $this->date;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPaymentMode(): int
-    {
-        return $this->paymentMode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTransactionId(): string
-    {
-        return $this->transactionId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNote(): string
-    {
-        return $this->note;
-    }
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/InvoicePerfexCRMObject.php

@@ -1,145 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class InvoicePerfexCRMObject implements DataTransferObject
-{
-    /** @var int */
-    private $clientId;
-
-    /** @var string */
-    private $number;
-
-    /** @var string */
-    private $date;
-
-    /** @var string */
-    private $dueDate;
-
-    /** @var string */
-    private $currency;
-
-    /** @var float */
-    private $subTotal;
-
-    /** @var float */
-    private $total;
-
-    /** @var string */
-    private $billingStreet;
-
-    /** @var string */
-    private $projectId;
-
-    /** @var array */
-    private $allowedPaymentModes;
-
-    /** @var array */
-    private $invoiceItems;
-
-    public function __construct(string $clientId, string $number, string $date, string $dueDate, string $currency, float $subTotal, float $total, string $billingStreet, string $projectId, array $allowedPaymentModes, array $invoiceItems)
-    {
-        $this->clientId = $clientId;
-        $this->number = $number;
-        $this->date = $date;
-        $this->dueDate = $dueDate;
-        $this->currency = $currency;
-        $this->subTotal = $subTotal;
-        $this->total = $total;
-        $this->billingStreet = $billingStreet;
-        $this->projectId = $projectId;
-        $this->allowedPaymentModes = $allowedPaymentModes;
-        $this->invoiceItems = $invoiceItems;
-    }
-
-    /**
-     * @return int
-     */
-    public function getClientId(): int
-    {
-        return $this->clientId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNumber(): string
-    {
-        return $this->number;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDate(): string
-    {
-        return $this->date;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDueDate(): string
-    {
-        return $this->dueDate;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCurrency(): string
-    {
-        return $this->currency;
-    }
-
-    /**
-     * @return float
-     */
-    public function getSubTotal(): float
-    {
-        return $this->subTotal;
-    }
-
-    /**
-     * @return float
-     */
-    public function getTotal(): float
-    {
-        return $this->total;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBillingStreet(): string
-    {
-        return $this->billingStreet;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectId(): string
-    {
-        return $this->projectId;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAllowedPaymentModes(): array
-    {
-        return $this->allowedPaymentModes;
-    }
-
-    /**
-     * @return array
-     */
-    public function getInvoiceItems(): array
-    {
-        return $this->invoiceItems;
-    }
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/InvoiceSingleItemPerfexCRMObject.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
-{
-
-    /** @var string */
-    public $description;
-
-    /** @var string */
-    public $longDescription;
-
-    /** @var int */
-    public $qty;
-
-    /** @var float */
-    public $rate;
-
-    /** @var int */
-    public $order;
-
-    /** @var string */
-    public $unit;
-
-    public function __construct(string $description, string $longDescription, int $qty, float $rate, int $order, string $unit)
-    {
-        $this->description = $description;
-        $this->longDescription = $longDescription;
-        $this->qty = $qty;
-        $this->rate = $rate;
-        $this->order = $order;
-        $this->unit = $unit;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLongDescription(): string
-    {
-        return $this->longDescription;
-    }
-
-    /**
-     * @return int
-     */
-    public function getQty(): int
-    {
-        return $this->qty;
-    }
-
-    /**
-     * @return float
-     */
-    public function getRate(): float
-    {
-        return $this->rate;
-    }
-
-    /**
-     * @return int
-     */
-    public function getOrder(): int
-    {
-        return $this->order;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUnit(): string
-    {
-        return $this->unit;
-    }
-}

app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
-
-use Illuminate\Http\Request;
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class UpdatePerfexCRMObject implements DataTransferObject
-{
-    /** @var string */
-    private $companyName;
-
-    /** @var string */
-    private $companyReference;
-
-    /** @var string */
-    private $contactEmail;
-
-    /** @var string */
-    private $bookingMarking;
-
-    /** @var string */
-    private $projectName;
-
-    /** @var string */
-    private $milestoneName;
-
-    /** @var string */
-    private $taskName;
-
-
-    public function __construct(string $companyName, string $companyReference, string $contactEmail, string $bookingMarking, string $projectName, string $milestoneName, string $taskName)
-    {
-
-        $this->companyName = $companyName;
-        $this->companyReference = $companyReference;
-        $this->contactEmail = $contactEmail;
-        $this->bookingMarking = $bookingMarking;
-        $this->projectName = $projectName;
-        $this->milestoneName = $milestoneName;
-        $this->taskName = $taskName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyName(): string
-    {
-        return $this->companyName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompanyReference(): string
-    {
-        return $this->companyReference;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContactEmail(): string
-    {
-        return $this->contactEmail;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBookingMarking(): string
-    {
-        return $this->bookingMarking;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProjectName(): string
-    {
-        return $this->projectName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMilestoneName(): string
-    {
-        return $this->milestoneName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTaskName(): string
-    {
-        return $this->taskName;
-    }
-
-}

app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php

@@ -1,159 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-// use App\Classes\Modules\PerfexCRM\DataTransferObjects\ContactObject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoice;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoiceSingleItemPerfexCRMObject;
-use Carbon\Carbon;
-
-class CreatePerfexCRMInvoiceProcessor
-{
-
-    /** @var CreatesPerfexCRMInvoice */
-    private $createsPerfexCRMInvoice;
-
-    /** @var CreatesPerfexCRMInvoicePayment */
-    private $createsPerfexCRMInvoicePayment;
-
-    /** @var ConvertsPerfexCRMLeadToCustomer */
-    private $convertsPerfexCRMLeadToCustomer;
-
-    /**
-     * CreatePerfexCRMInvoiceProcessor constructor.
-     * @param CreatesPerfexCRMInvoice $createsPerfexCRMInvoice
-     */
-    public function __construct(CreatesPerfexCRMInvoice $createsPerfexCRMInvoice,
-    CreatesPerfexCRMInvoicePayment $createsPerfexCRMInvoicePayment,
-    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer)
-    {
-        $this->createsPerfexCRMInvoice = $createsPerfexCRMInvoice;
-        $this->createsPerfexCRMInvoicePayment = $createsPerfexCRMInvoicePayment;
-        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
-    }
-
-    /**
-     * @param $transaction
-     * @param $purchaseOrder
-     * @param $supplier
-     * @return null|object
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute($transaction, $purchaseOrder, $supplier) {
-        $clientId = "";
-        $number = $transaction->bill_no;
-        $prefix = "INV-";
-        if (substr($number, 0, strlen($prefix)) == $prefix) {
-            $number = substr($number, strlen($prefix));
-        }
-
-        $date = Carbon::parse($transaction->booking->created_at)->format('Y-m-d');
-        $dueDate = Carbon::parse($transaction->booking->created_at)->format('Y-m-d');
-        $currency = 1; //cief TODO: To look into Malaysia and Chinese currency
-        $subTotal = 0.00;
-        $total = 0.00;
-
-        $billingStreet = "";
-        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
-
-        $billingStreet = $billingStreet.$addresses->street_one;
-        $billingStreet = $billingStreet.$addresses->street_two.',';
-        $billingStreet = $billingStreet.$addresses->district()->first()->name.',';
-        $billingStreet = $billingStreet.$addresses->postcode;
-        $billingStreet = $billingStreet.$addresses->state()->first()->name.',';
-        $billingStreet = $billingStreet.$addresses->country()->first()->name;
-
-        $projectId = "";
-        $allowedPaymentModes = [];
-        $invoiceItems = [];
-
-        $email = $supplier->employees()->first()->email;
-        $email = 'dillon37@yahoo.com'; //cief TODO: To be updated to user actual email address
-        $result = $this->convertsPerfexCRMLeadToCustomer->execute($email);
-        if(isset($result->payload)){
-            $clientId = $result->payload['client_id'];
-        }
-
-        //newitems
-        foreach ($purchaseOrder->transactionDetails as $key => $transaction_detail){
-            $order = $key + 1;
-            $stockCode = $transaction_detail->product_code;
-            $description = $transaction_detail->product_name;
-            $quantity = $transaction_detail->quantity;
-            $unitPrice = 0.00;
-            if($transaction->booking()->first()->fix_currency_id !== 1)
-                $unitPrice = (1/$transaction->currency_rate) * $transaction_detail->price;
-            else
-                $unitPrice = $transaction_detail->price;
-
-            //$totalAmount = 0.00;
-            if($transaction->booking()->first()->fix_currency_id !== 1){
-
-                //$totalAmount = (float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity;
-                $subTotal += (1/$transaction->currency_rate) * $transaction_detail->price * $transaction_detail->quantity;
-            }
-            else
-            {
-                //$totalAmount = (float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity;
-                $subTotal += $transaction_detail->price * $transaction_detail->quantity;
-            }
-
-            //string $description, string $longDescription, int $qty, int $rate, int $order, string $unit
-            $invoiceSingleItem = new InvoiceSingleItemPerfexCRMObject(
-                $description,
-                "",
-                $quantity,
-                $unitPrice,
-                $order,
-                ""
-            );
-            array_push($invoiceItems, $invoiceSingleItem);
-        }
-
-        if($transaction->booking()->first()->fix_currency_id !== 1){
-            $total = ((1/$transaction->currency_rate) * $transaction->amount) + $transaction->service_charge + $transaction->tax;
-        }
-        else{
-            $total = $transaction->amount + $transaction->service_charge + $transaction->tax;
-        }
-
-        //cief TODO: To be updated, temporarily hardcoded allow payment modes
-        array_push($allowedPaymentModes, 1, 2);
-
-        $invoicePerfexCRMObject = new InvoicePerfexCRMObject(
-            $clientId,
-            $number,
-            $date,
-            $dueDate,
-            $currency,
-            $subTotal,
-            $total,
-            $billingStreet,
-            $projectId,
-            $allowedPaymentModes,
-            $invoiceItems
-        );
-
-        $result = $this->createsPerfexCRMInvoice->execute($invoicePerfexCRMObject);
-
-        //If there is a checking whether an payment to an invoice need to be generated, do it here
-        if(true && $result->payload['id']){
-            $invoicePaymentPerfexCRMObject = new InvoicePaymentPerfexCRMObject(
-                $result->payload['id'],
-                $total,
-                $date,
-                1,
-                "",
-                ""
-            );
-            $this->createsPerfexCRMInvoicePayment->execute($invoicePaymentPerfexCRMObject);
-        }
-
-        return true;
-    }
-
-}

app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMLeadProcessor.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-// use App\Classes\Modules\PerfexCRM\DataTransferObjects\ContactObject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMLead;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
-
-class CreatePerfexCRMLeadProcessor
-{
-
-    /** @var CreatesPerfexCRMLead */
-    private $createsPerfexCRMLead;
-
-    /**
-     * CreatePerfexCRMLeadProcessor constructor.
-     * @param CreatesPerfexCRMLead $createsPerfexCRMLead
-     */
-    public function __construct(CreatesPerfexCRMLead $createsPerfexCRMLead)
-    {
-        $this->createsPerfexCRMLead = $createsPerfexCRMLead;
-    }
-
-    /**
-     * @param CreateLeadPerfexCRMObject $createLeadPerfexCRMObject
-     * @return null|object
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject) {
-        return $this->createsPerfexCRMLead->execute($createLeadPerfexCRMObject);
-    }
-
-}

app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMTask;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-
-class CreatePerfexCRMTaskProcessor
-{
-    /** @var CreatesPerfexCRMTask */
-    private $createsPerfexCRMTask;
-
-    /**
-     * @param CreatesPerfexCRMTask $createsPerfexCRMTask
-    */
-    public function __construct(CreatesPerfexCRMTask $createsPerfexCRMTask)
-    {
-        $this->createsPerfexCRMTask = $createsPerfexCRMTask;
-    }
-
-   /**
-    * @param CreateTaskPerfexCRMObject $createTaskPerfexCRMObject
-    * @return true
-    * @throws \App\Classes\Exceptions\MalformedRequestException
-    */
-   public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
-        $this->createsPerfexCRMTask->execute(
-            $createTaskPerfexCRMObject->getName(),
-            $createTaskPerfexCRMObject->getDescription(),
-            $createTaskPerfexCRMObject->getLeadId(),
-            $createTaskPerfexCRMObject->getMilestoneId(),
-            $createTaskPerfexCRMObject->getProjectId(),
-            $createTaskPerfexCRMObject->getReference(),
-            $createTaskPerfexCRMObject->getOnTaskCompletion(),
-            $createTaskPerfexCRMObject->getStatus(),
-        );
-        return true;
-   }
-
-}

app/Classes/Modules/PerfexCRM/Processors/InitializePerfexCRMProcessor.php

@@ -1,192 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerContact;
-use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InitialPerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMMilestones;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\ValueObjects\Constants\PerfexCRMStatus;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Http\Request;
-
-class InitializePerfexCRMProcessor
-{
-    /** @var ConvertsPerfexCRMLeadToCustomer */
-    private $convertsPerfexCRMLeadToCustomer;
-
-    /** @var CreatesPerfexCRMCustomerProject */
-    private $createsPerfexCRMCustomerProject;
-
-    /** @var CreatesPerfexCRMMilestone */
-    private $createsPerfexCRMMilestone;
-
-    /** @var CreatesPerfexCRMTask */
-    private $createsPerfexCRMTask;
-
-    /** @var FetchesPerfexCRMProject */
-    private $fetchesPerfexCRMProject;
-
-    /** @var FetchesPerfexCRMMilestone */
-    private $fetchesPerfexCRMMilestone;
-
-    /** @var FetchesPerfexCRMTask */
-    private $fetchesPerfexCRMTask;
-
-    /** @var CreatesPerfexCRMCustomer */
-    private $createsPerfexCRMCustomer;
-
-    /** @var CreatesPerfexCRMCustomerContact */
-    private $createsPerfexCRMCustomerContact;
-
-    /** @var UpdatesPerfexCRM */
-    private $updatePerfexCRM;
-
-    /** @var UpdatesPerfexCRMCustomer */
-    private $updatesPerfexCRMCustomer;
-
-   /**
-     * @param ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer
-     * @param CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject
-     * @param CreatesPerfexCRMMilestone $createsPerfexCRMMilestone
-     * @param CreatesPerfexCRMTask $createsPerfexCRMTask
-     * @param FetchesPerfexCRMProject $fetchesPerfexCRMProject
-     * @param FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone
-     * @param FetchesPerfexCRMTask $fetchesPerfexCRMTask
-     * @param CreatesPerfexCRMCustomer $createsPerfexCRMCustomer
-     * @param CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact
-     * @param UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer
-    */
-    public function __construct(ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
-        CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
-        CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
-        CreatesPerfexCRMTask $createsPerfexCRMTask,
-        FetchesPerfexCRMProject $fetchesPerfexCRMProject,
-        FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
-        FetchesPerfexCRMTask $fetchesPerfexCRMTask,
-        CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
-        CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
-        UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer)
-   {
-        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
-        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
-        $this->createsPerfexCRMMilestone = $createsPerfexCRMMilestone;
-        $this->createsPerfexCRMTask = $createsPerfexCRMTask;
-        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
-        $this->fetchesPerfexCRMMilestone = $fetchesPerfexCRMMilestone;
-        $this->fetchesPerfexCRMTask = $fetchesPerfexCRMTask;
-        $this->createsPerfexCRMCustomer = $createsPerfexCRMCustomer;
-        $this->createsPerfexCRMCustomerContact = $createsPerfexCRMCustomerContact;
-        $this->updatesPerfexCRMCustomer = $updatesPerfexCRMCustomer;
-    }
-
-   /**
-    * @param InitialPerfexCRMObject $initialPerfexCRMObject
-    * @return null|object
-    * @throws \App\Classes\Exceptions\MalformedRequestException
-    */
-   public function execute(InitialPerfexCRMObject $initialPerfexCRMObject) {
-
-       // Customer has to exist first before Project can appear under it
-       // Check with Perfex CRM, if this user (email) was previously a lead, should automatically now become a customer
-       $crmCompany = $initialPerfexCRMObject->getCompanyName();
-       $result = $this->convertsPerfexCRMLeadToCustomer->execute($initialPerfexCRMObject->getContactEmail());
-       if(isset($result->payload)){
-           $crmClientId = $result->payload['client_id'];
-           if (isset($result->payload['company'])) {
-               $crmCompany = $result->payload['company'];
-           }
-       }
-       else{
-           //if reach this point, this means this user is not a official customer nor is a lead in crm
-           //Create Customer has 2 parts: Create Company (client), Create Contact
-           $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           if(is_null($result)){
-                $crmCompany = $crmCompany." 2";
-                $result = $this->createsPerfexCRMCustomer->execute($crmCompany);
-           }
-
-           $crmClientId = $result->payload['clientId'];
-
-           $customerContactObject = new CustomerContactObject(
-               $crmClientId,
-               $initialPerfexCRMObject->getContactName(),
-               $initialPerfexCRMObject->getContactName(),
-               $initialPerfexCRMObject->getContactEmail(),
-               "pU^T@sC#9Q",
-               "on",
-               "on"
-           );
-           $result = $this->createsPerfexCRMCustomerContact->execute($customerContactObject);
-       }
-
-       //Update custom fields to identify company reference from exchange or shipping portal
-       $value_exists = false;
-       if (isset($result->payload['customfields'])) {
-           foreach ($result->payload['customfields'] as $element) {
-               if ($element['value'] === $initialPerfexCRMObject->getCompanyReference()) {
-                   $value_exists = true;
-                   break;
-               }
-           }
-       }
-       if(!$value_exists);
-       {
-           $result = $this->updatesPerfexCRMCustomer->execute($crmClientId, $crmCompany, $initialPerfexCRMObject->getCompanyReference());
-       }
-
-       // Get existing or create project, project has to exist first before milestone can appear under it
-       $result = $this->createsPerfexCRMCustomerProject->execute($initialPerfexCRMObject->getProjectName(), $crmClientId);
-       if(isset($result->payload)){  //Here means project creation successful
-            $projectId = $result->payload['project_id'];
-       }
-       else{
-            $projectId = $this->fetchesPerfexCRMProject->execute($initialPerfexCRMObject->getProjectName(), $crmClientId)->id;
-       }
-
-       if(!is_null($result)){
-            $tasks = $initialPerfexCRMObject->getTaskNames();
-
-            //Create tasks with milestone
-            for($count=0; $count < count($tasks); $count++) {
-                $milestoneId = 0; //By default milestoneId is 0, having this set at individual task is optional
-                if($tasks[$count]['milestone'] != "") //Create milestone only if it is defined
-                {
-                    // Get existing or create milestone, milestone has to exist first before task can appear under it
-                    $result = $this->createsPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId, $count);
-                    if(isset($result->payload)){
-                        $milestoneId = $result->payload['milestone_id'];
-                    }
-                    else{
-                        $milestone = $this->fetchesPerfexCRMMilestone->execute($tasks[$count]['milestone'], $projectId);
-                        $array = json_decode(json_encode($milestone), true);
-                        $milestoneId = $array[0]['id'];
-                    }
-                }
-
-                $taskStatus = PerfexCRMStatus::NOT_STARTED;
-                if($tasks[$count]['status'] != ''){
-                    $taskStatus = $tasks[$count]['status'];
-                }
-
-                // Get existing or create task
-                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $taskStatus);
-            }
-        }
-        return true;
-   }
-
-}

app/Classes/Modules/PerfexCRM/Processors/NewLeadTaskToPerfexCRMProcessor.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMStatus;
-use App\Classes\Jobs\CreatePerfexCRMSingleTask;
-
-class NewLeadTaskToPerfexCRMProcessor
-{
-    /**
-     * @param None
-     * @return true
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute()
-    {
-        $createTaskPerfexCRMObject = new CreateTaskPerfexCRMObject(
-            "dillontest1@gmail.com",
-            "test is the name of the task",
-            "this is the description of the task",
-            "",
-            "",
-            "",
-            "",
-            "",
-            PerfexCRMStatus::NOT_STARTED
-        );
-
-        CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);
-        return true;
-    }
-
-}

app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessor.php

@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\InitializePerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Services\Init;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InitialPerfexCRMObject;
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\ValueObjects\Constants\PerfexCRMMilestones;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Models\Transaction;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Jobs\InitializePerfexCRM;
-use App\Classes\Jobs\UpdatePerfexCRM;
-
-class TransactionToPerfexCRMProcessor
-{
-    /** @var FetchesCompany  */
-    private $fetchesCompany;
-
-    /** @var UpdatePerfexCRMProcessor */
-    private $updatePerfexCRMProcessor;
-
-    /** @var InitializePerfexCRMProcessor */
-    private $initializePerfexCRMProcessor;
-
-    /**
-     * TransactionToPerfexCRMProcessor constructor.
-     * @param UpdatePerfexCRMProcessor $updatePerfexCRMProcessor
-     * @param InitializePerfexCRMProcessor $initializePerfexCRMProcessor
-     * @param FetchesCompany $fetchesCompany
-     */
-    public function __construct(UpdatePerfexCRMProcessor $updatePerfexCRMProcessor, InitializePerfexCRMProcessor $initializePerfexCRMProcessor, FetchesCompany $fetchesCompany)
-    {
-        $this->updatePerfexCRMProcessor = $updatePerfexCRMProcessor;
-        $this->initializePerfexCRMProcessor = $initializePerfexCRMProcessor;
-        $this->fetchesCompany = $fetchesCompany;
-    }
-
-
-    /**
-     * @param Transaction $model
-     * @param int $status
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Transaction $model, int $status)
-    {
-        if($model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED){
-            //dd(json_encode($packingList->owner()->first()->companyModule()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference));
-            //dd(json_encode($model->owner->owner->owner()->first()->companyModule()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference));
-            $companyModule = $model->owner->owner->owner()->first()->companyModule()->first();
-            $companyName = $companyModule->name;
-            $companyReference = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-            $employee = $companyModule->employees()->first();
-            $contactEmail = $employee->email;
-            $contactName = $employee->name;
-
-            $orderReference = $model->owner->owner->owner()->first()->reference;
-            $packingListReference = $model->owner->owner->reference;
-            $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
-
-            $bookingMarking = $model->owner->owner->id."-".$model->owner->owner->owner->id;
-            $initialPerfexCRMObject = new InitialPerfexCRMObject(
-                $companyName,
-                $companyReference,
-                $contactName,
-                $contactEmail,
-                $bookingMarking,
-                $projectName,
-                [],
-                [
-                    PerfexCRMTasks::TASK_1,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_1,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_2,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_3,
-                    PerfexCRMTasks::TASK_POST_PAYMENT_4,
-                ]
-            );
-
-            //$this->initializePerfexCRMProcessor->execute($initialPerfexCRMObject);
-            InitializePerfexCRM::dispatch($initialPerfexCRMObject);
-        }
-        return true;
-    }
-}

app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php

@@ -1,139 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\Services\ConvertsPerfexCRMLeadToCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMMilestone;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomer;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerContact;
-use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMTask;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMStatus;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Http\Request;
-
-class UpdatePerfexCRMProcessor
-{
-    /** @var ConvertsPerfexCRMLeadToCustomer */
-    private $convertsPerfexCRMLeadToCustomer;
-
-    /** @var CreatesPerfexCRMCustomerProject */
-    private $createsPerfexCRMCustomerProject;
-
-    /** @var CreatesPerfexCRMMilestone */
-    private $createsPerfexCRMMilestone;
-
-    /** @var CreatesPerfexCRMTask */
-    private $createsPerfexCRMTask;
-
-    /** @var FetchesPerfexCRMProject */
-    private $fetchesPerfexCRMProject;
-
-    /** @var FetchesPerfexCRMMilestone */
-    private $fetchesPerfexCRMMilestone;
-
-    /** @var FetchesPerfexCRMTask */
-    private $fetchesPerfexCRMTask;
-
-    /** @var CreatesPerfexCRMCustomer */
-    private $createsPerfexCRMCustomer;
-
-    /** @var CreatesPerfexCRMCustomerContact */
-    private $createsPerfexCRMCustomerContact;
-
-    /** @var UpdatesPerfexCRMTask */
-    private $updatesPerfexCRMTask;
-
-
-    /**
-     * @param ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer
-     * @param CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject
-     * @param CreatesPerfexCRMMilestone $createsPerfexCRMMilestone
-     * @param CreatesPerfexCRMTask $createsPerfexCRMTask
-     * @param FetchesPerfexCRMProject $fetchesPerfexCRMProject
-     * @param FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone
-     * @param FetchesPerfexCRMTask $fetchesPerfexCRMTask
-     * @param CreatesPerfexCRMCustomer $createsPerfexCRMCustomer
-     * @param CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact
-     * @param UpdatesPerfexCRMTask $updatesPerfexCRMTask
-    */
-    public function __construct(ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
-    CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
-    CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
-    CreatesPerfexCRMTask $createsPerfexCRMTask,
-    FetchesPerfexCRMProject $fetchesPerfexCRMProject,
-    FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
-    FetchesPerfexCRMTask $fetchesPerfexCRMTask,
-    CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
-    CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
-    UpdatesPerfexCRMTask $updatesPerfexCRMTask)
-   {
-        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
-        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
-        $this->createsPerfexCRMMilestone = $createsPerfexCRMMilestone;
-        $this->createsPerfexCRMTask = $createsPerfexCRMTask;
-        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
-        $this->fetchesPerfexCRMMilestone = $fetchesPerfexCRMMilestone;
-        $this->fetchesPerfexCRMTask = $fetchesPerfexCRMTask;
-        $this->createsPerfexCRMCustomer = $createsPerfexCRMCustomer;
-        $this->createsPerfexCRMCustomerContact = $createsPerfexCRMCustomerContact;
-        $this->updatesPerfexCRMTask = $updatesPerfexCRMTask;
-   }
-
-   /**
-    * @param PerfexCRMObject $perfexCRMObject
-    * @return null|object
-    * @throws \App\Classes\Exceptions\MalformedRequestException
-    */
-    public function execute(UpdatePerfexCRMObject $updatePerfexCRMObject) {
-
-        // Customer has to exist first before Project can appear under it
-        // Check with Perfex CRM, if this user (email) was previously a lead, should automatically now become a customer
-        $result = $this->convertsPerfexCRMLeadToCustomer->execute($updatePerfexCRMObject->getContactEmail());
-        if(isset($result->payload)){
-            $crmClientId = $result->payload['client_id'];
-        }
-
-         // Get existing or create project, project has to exist first before milestone can appear under it
-         $result = $this->createsPerfexCRMCustomerProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId);
-         if(isset($result->payload)){
-             $projectId = $result->payload['project_id'];
-         }
-         else{
-             $projectId = $this->fetchesPerfexCRMProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId)->id;
-         }
-
-         // Get existing or create milestone, milestone has to exist first before task can appear under it
-         $result = $this->createsPerfexCRMMilestone->execute($updatePerfexCRMObject->getMilestoneName(), $projectId);
-         if(isset($result->payload)){
-             $milestoneId = $result->payload['milestone_id'];
-         }
-         else{
-             $milestone = $this->fetchesPerfexCRMMilestone->execute($updatePerfexCRMObject->getMilestoneName(), $projectId);
-             $array = json_decode(json_encode($milestone), true);
-             $milestoneId = $array[0]['id'];
-         }
-
-         // Get existing or create task
-         $result = $this->createsPerfexCRMTask->execute($updatePerfexCRMObject->getTaskName(), $milestoneId, $projectId);
-         if(isset($result->payload)){
-             $taskId = $result->payload['task_id'];
-         }
-         else{
-             $taskId = $this->fetchesPerfexCRMTask->execute($updatePerfexCRMObject->getTaskName(), $milestoneId)->id;
-         }
-
-         $this->updatesPerfexCRMTask->execute($taskId, $updatePerfexCRMObject->getTaskName(), $milestoneId, $projectId, PerfexCRMStatus::COMPLETED);
-
-         return null;
-    }
-
-}

app/Classes/Modules/PerfexCRM/Services/ConvertsPerfexCRMLeadToCustomer.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class ConvertsPerfexCRMLeadToCustomer
-{
-    /**
-     * @param string $email
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $email) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/leads/convertocustomer/'.$email);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomer.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMCustomer
-{
-    /**
-     * @param string $companyName
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $companyName) {
-        try{
-            $data = [
-                'company' => $companyName
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/customers',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerContact.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMCustomerContact
-{
-    /**
-     * @param CustomerContactObject $customerContactObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(CustomerContactObject $customerContactObject) {
-        try{
-            $data = [
-                'customer_id' => $customerContactObject->getCustomerId(),
-                'firstname' => $customerContactObject->getFirstName(),
-                'lastname' => $customerContactObject->getLastName(),
-                'email' => $customerContactObject->getEmail(), //$email
-                'password' => $customerContactObject->getPassword(),
-                'is_primary' => $customerContactObject->getIsPrimary(),
-                //'send_set_password_email' => $customerContactObject->getSendSetPasswordEmail(),
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/contacts',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerProject.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMCustomerProject
-{
-    /**
-     * @param string $projectName
-     * @param string $clientId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $projectName, string $clientId) {
-        try{
-            $data = [
-                'name' => $projectName,
-                'rel_type' => 'customer',
-                'billing_type' => 1,
-                'clientid' => $clientId,
-                'start_date' => date('Y-m-d'),
-                'status' => 1
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/projects',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoice.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
-
-class CreatesPerfexCRMInvoice
-{
-    /**
-     * @param InvoicePerfexCRMObject $invoicePerfexCRMObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(InvoicePerfexCRMObject $invoicePerfexCRMObject) {
-        try{
-            $data = [
-                'clientid' => $invoicePerfexCRMObject->getClientId(),
-                'number' => $invoicePerfexCRMObject->getNumber(),
-                'date' => $invoicePerfexCRMObject->getDate(),
-                'duedate' => $invoicePerfexCRMObject->getDueDate(),
-                'currency' => $invoicePerfexCRMObject->getCurrency(),
-                'subtotal' => $invoicePerfexCRMObject->getSubTotal(),
-                'total' => $invoicePerfexCRMObject->getTotal(),
-                'billing_street' => $invoicePerfexCRMObject->getBillingStreet(),
-                'project_id' => $invoicePerfexCRMObject->getProjectId(),
-                'allowed_payment_modes[0]' => 1,
-                'allowed_payment_modes[1]' => 2,
-            ];
-
-            for($count=0; $count < count($invoicePerfexCRMObject->getInvoiceItems()); $count++) {
-                $oneItem = [
-                    "newitems[".$count."][description]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->description,
-                    "newitems[".$count."][long_description]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->longDescription,
-                    "newitems[".$count."][qty]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->qty,
-                    "newitems[".$count."][rate]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->rate,
-                    "newitems[".$count."][order]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->order,
-                    "newitems[".$count."][unit]" => $invoicePerfexCRMObject->getInvoiceItems()[$count]->unit,
-                ];
-                $data = array_merge($data, $oneItem);
-            }
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/invoices',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoicePayment.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
-
-class CreatesPerfexCRMInvoicePayment
-{
-    /**
-     * @param InvoicePaymentPerfexCRMObject $invoicePaymentPerfexCRMObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(InvoicePaymentPerfexCRMObject $invoicePaymentPerfexCRMObject) {
-        try{
-            $data = [
-                'invoiceid' => $invoicePaymentPerfexCRMObject->getInvoiceId(),
-                'amount' => $invoicePaymentPerfexCRMObject->getAmount(),
-                'date' => $invoicePaymentPerfexCRMObject->getDate(),
-                'paymentmode' => $invoicePaymentPerfexCRMObject->getPaymentMode(),
-                'transactionid' => $invoicePaymentPerfexCRMObject->getTransactionId(),
-                'note' => $invoicePaymentPerfexCRMObject->getNote(),
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/invoices/recordpayment',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMLead.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
-
-class CreatesPerfexCRMLead
-{
-    /**
-     * @param CreateLeadPerfexCRMObject $createLeadPerfexCRMObject
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject) {
-        try{
-            $data = [
-                'name' => $createLeadPerfexCRMObject->getName(),
-                'email' => $createLeadPerfexCRMObject->getEmail(),
-                'phonenumber' => $createLeadPerfexCRMObject->getPhone(),
-                'company' => $createLeadPerfexCRMObject->getCompanyName(),
-                'source' => 2, //1: Exchange, 2: Shipping Portal
-                'status' => 2 //2: Lead, 1: Customer
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/leads/byemail',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server ' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMMilestone.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMMilestone
-{
-    /**
-     * @param string $$milestoneName
-     * @param string $projectId
-     * @param string $milestoneOrder
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $milestoneName, string $projectId, string $milestoneOrder =  "") {
-        try{
-            $data = [
-                'name' => $milestoneName,
-                'project_id' => $projectId,
-                'due_date' => date('Y-m-d'),
-                'start_date' => date('Y-m-d')
-            ];
-
-            if($milestoneOrder != ""){
-                $data['milestone_order'] = $milestoneOrder;
-            }
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/milestones',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMTask
-{
-    /**
-     * @param string $taskName
-     * @param string $taskDescription
-     * @param string $leadId
-     * @param string $milestoneId
-     * @param string $projectId
-     * @param string $reference, default: ''
-     * @param string $on_task_completion, default: ''
-     * @param string $status, default: 1
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $taskName, string $taskDescription, string $leadId, string $milestoneId, string $projectId, string $reference = '', string $on_task_completion = '', string $status = "1") {
-        try{
-            $data = [
-                'name' => $taskName,
-                'description' => $taskDescription,
-                'milestone' => $milestoneId,
-                'startdate' => date('Y-m-d'),
-                'rel_type' => 'project',
-                'rel_id' => $projectId,
-                'status' => $status,
-                'is_system_created' => 1,
-                'reference' => $reference,
-                'on_task_completion' => $on_task_completion
-            ];
-
-            if($leadId != '') {
-                $data = [
-                    'name' => $taskName,
-                    'description' => $taskDescription,
-                    'milestone' => $milestoneId,
-                    'startdate' => date('Y-m-d'),
-                    'rel_type' => 'lead',
-                    'rel_id' => $leadId,
-                    'status' => $status,
-                    'is_system_created' => 1,
-                    'reference' => $reference,
-                    'on_task_completion' => $on_task_completion
-                ];
-            }
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/tasks',$data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMLead.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMLead
-{
-    /**
-     * @param string $email
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $email) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/leads/byemail/'.$email);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMMilestone.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMMilestone
-{
-    /**
-     * @param string $milestoneName
-     * @param string $projectId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $milestoneName, string $projectId) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/milestones/bynameandprojectid/'.rawurlencode($milestoneName).'/'.$projectId);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMProject.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMProject
-{
-    /**
-     * @param string $projectName
-     * @param string $clientId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $projectName, string $clientId) {
-        try{
-            $data = [
-                'name' => $projectName,
-                'clientid' => $clientId,
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/projects/bynameandclientid', $data);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class FetchesPerfexCRMTask
-{
-    /**
-     * @param string $taskName
-     * @param string $milestoneId
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $taskName, string $milestoneId) {
-        try{
-            $response = Http::withHeaders([
-                'authtoken' => config('perfexcrm.api_key'),])
-            ->get(config('perfexcrm.base_url').'/api/tasks/bynameandmilestoneid/'.rawurlencode($taskName).'/'.$milestoneId);
-
-            if($response->successful()){
-                $data = $response->json();
-
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class UpdatesPerfexCRMCustomer
-{
-
-    /**
-     * @param string $customerId
-     * @param string $companyReference
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $customerId, string $companyName, string $companyReference) {
-        try{
-            $custom_fields = [
-                "customers" => [
-                    2 => $companyReference
-                ]
-            ];
-
-            $data = [
-                'company' => $companyName,
-                'custom_fields' => $custom_fields
-            ];
-
-            $response = Http::asJson()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->put(config('perfexcrm.base_url').'/api/customers/'.$customerId, $data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class UpdatesPerfexCRMTask
-{
-
-    /**
-     * @param string $taskName
-     * @param string $milestoneId
-     * @param string $projectId
-     * @param string $status, default: 1
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $taskId, string $taskName, string $milestoneId, string $projectId, string $status = "1") {
-        try{
-            $data = [
-                'name' => $taskName,
-                'milestone' => $milestoneId,
-                'startdate' => date('Y-m-d'),
-                'duedate' => date('Y-m-d'),
-                'rel_type' => 'project',
-                'rel_id' => $projectId,
-                'status' => $status,
-                'repeat_every' => '',
-            ];
-
-            $response = Http::asJson()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->put(config('perfexcrm.base_url').'/api/tasks/'.$taskId, $data);
-
-            if($response->successful()){
-                $data = $response->json();
-                return (object) $data;
-            }else{
-                Log::error($response);
-                return null;
-            }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
-        }
-    }
-}

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

@@ -1,104 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\ControllersLogic;
-
-
-use App\Classes\Notifications\InvoiceIssuedEmail;
-use Illuminate\Http\Request;
-
-
-use Illuminate\Http\JsonResponse;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Modules\Transactions\ControllersLogic\Document;
-
-class CreateCombinedInvoicesLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Shipping Invoice Status',
-            'message' => 'You have successfully updated multiple shipping invoices status'
-        ];
-    }
-
-    /** @var FetchesPackingList */
-    private $fetchesPackingList;
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFiles;
-
-    /**
-     * ApprovePaymentVerificationLogic constructor.
-     * @param FetchesPackingList $fetchesPackingList
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFiles
-     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
-     */
-    public function __construct(FetchesPackingList $fetchesPackingList, UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
-    {
-        $this->fetchesPackingList = $fetchesPackingList;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->createsDocument = $createsDocument;
-        $this->createsFiles = $createsFiles;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $items = $request->input('ids');
-        $invoice_transactions=array();
-        foreach($items as $item){
-
-            $packing_list = $this->fetchesPackingList->execute(['id' => $item['id']]);
-
-            $invoice_transaction = $packing_list->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::PENDING_SUBMISSION])->first();
-            array_push($invoice_transactions, $invoice_transaction);
-
-            // $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
-        }
-
-        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoices_combined', ['invoice_transactions' => $invoice_transactions]);
-
-        $document_object = new DocumentObject(
-            DocumentType::SHIPPING_INVOICE,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
-            '',
-            ApprovalStatus::COMPLETED,
-            'shipping_invoice'
-        );
-
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($invoice_transaction, $document_object);
-
-        $this->createsFiles->execute($document, $document_object);
-        $user = $packing_list->owner->companyModule->employees()->first();
-        if(app()->environment(['production'])) {
-            $user->notify(new InvoiceIssuedEmail($user, $packing_list));
-        }
-
-        return $this->response([]);
-    }
-
-}

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

@@ -4,27 +4,9 @@ namespace App\Classes\Modules\Transactions\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Models\Transaction;
-use App\Classes\Modules\PerfexCRM\Processors\TransactionToPerfexCRMProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 
 class UpdatesTransactionStatus extends AbstractUpdateRecord
 {
-    /** @var TransactionToPerfexCRMProcessor */
-    private $transactionToPerfexCRMProcessor;
-
-    /** @var NewLeadTaskToPerfexCRMProcessor */
-    private $newLeadTaskToPerfexCRMProcessor;
-
-    /**
-     * UpdatesTransactionStatus constructor.
-     * @param TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor
-     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
-     */
-    public function __construct(TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor, NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
-    {
-        $this->transactionToPerfexCRMProcessor = $transactionToPerfexCRMProcessor;
-        $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
-    }
 
     /**
      * @param Transaction $model
@@ -34,11 +16,7 @@ class UpdatesTransactionStatus extends AbstractUpdateRecord
      */
     public function execute(Transaction $model, int $status)
     {
-        if(config('perfexcrm.is_enabled') == 'true'){
-            $this->transactionToPerfexCRMProcessor->execute($model, $status);
-            // $this->newLeadTaskToPerfexCRMProcessor->execute();
-        }
         $model->status = $status;
         return $this->handler($model);
     }
-}
+}

app/Classes/ValueObjects/Constants/ApprovalStatus.php

@@ -18,14 +18,4 @@ final class ApprovalStatus {
 
     public const EXPIRED = 6;
 
-    public const APPROVAL_STATUS_ID = [
-        self::PENDING_SUBMISSION     => "Pending Submission",
-        self::PENDING_VERIFICATION   => "Pending Verification",
-        self::APPROVED               => "Approved",
-        self::COMPLETED              => "Completed",
-        self::REJECTED               => "Rejected",
-        self::SUSPENDED              => "Suspended",
-        self::EXPIRED                => "Expired",
-    ];  
-
 }

app/Classes/ValueObjects/Constants/PerfexCRMMilestones.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-class PerfexCRMMilestones
-{
-    public const MILESTONE_1 = 'MILESTONE 1 - Customer Paid';
-    public const MILESTONE_2 = 'MILESTONE 2 - Order Placed';
-    public const MILESTONE_3 = 'MILESTONE 3 - Purchase Order Approved';
-    public const MILESTONE_4 = 'MILESTONE 4';
-    public const MILESTONE_5 = 'MILESTONE 5';
-}

app/Classes/ValueObjects/Constants/PerfexCRMStatus.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class PerfexCRMStatus {
-
-    public const NOT_STARTED = 1;
-
-    public const AWAITING_FEEDBACK = 2;
-
-    public const TESTING = 3;
-
-    public const IN_PROGRESS = 4;
-    
-    public const COMPLETED = 5;
-
-}

app/Classes/ValueObjects/Constants/PerfexCRMTasks.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-class PerfexCRMTasks
-{
-    public const TASK_1 = [
-        'name' => 'Customer Paid',
-        'description' => '',
-        'milestone' => 'MILESTONE 1 - Customer Paid',
-        'reference' => '',
-        'on_task_completion' => '',
-        'status' => PerfexCRMStatus::COMPLETED
-    ];
-
-    public const TASK_POST_PAYMENT_1 = [
-        'name' => 'Map Bank Transaction Record',
-        'description' => '○ Purpose: To map a transaction to bank transaction in the bank statement<br>
-        ○ Initial Status: In Progress<br>
-        ○ Deadline: Same day<br>
-        ○ Responsible department: Accounts<br>
-        ○ Next step: Change the status of the Approve payment status to "In Progress" upon successful completion of the operation.<br>
-        ○ Additional details: ** Any specific requirements or notes for the operation.**<br>
-        ○ Dependencies: None<br>
-        ○ Outcomes: Bank transaction is mapped successfully, allowing the next steps in the process to be initiated.<br>',
-        'milestone' => '',
-        'reference' => 'TASK_POST_PAYMENT_1',
-        'on_task_completion' => 'TASK_POST_PAYMENT_2',
-        'status' => PerfexCRMStatus::IN_PROGRESS
-    ];
-    public const TASK_POST_PAYMENT_2 = [
-        'name' => 'Approve Payment',
-        'description' => '○ Purpose: To verify and approve the customer\'s payment on IZYIM<br>
-        ○ Initial Status: Not Started<br>
-        ○ Deadline:Same day<br>
-        ○ Responsible department: Accounts<br>
-        ○ Next step: Change the status of the Issue Shipping Autocount Invoice operation to "In Progress"<br>
-        ○ Additional details: When the payment method is FPX or Wallet this task is performed automatically by the system.<br>
-        ○ Dependencies: Map Transaction operation must be completed before this operation can begin.<br>
-        ○ Outcomes: The payment will be approved in IZYIM, which will release the customer’s goods for delivery.<br>',
-        'milestone' => '',
-        'reference' => 'TASK_POST_PAYMENT_2',
-        'on_task_completion' => 'TASK_POST_PAYMENT_3',
-        'status' => ''
-    ];
-    public const TASK_POST_PAYMENT_3 = [
-        'name' => 'Issue Shipping Autocount Invoince',
-        'description' => '○ Purpose: To issue an invoice for the customer\'s payment in accounting software.<br>
-        ○ Initial Status: Not Started<br>
-        ○ Deadline: Next day<br>
-        ○ Responsible department: Accounts<br>
-        ○ Next step: Change the status of the Knockoff Invoice operation to "In Progress" upon successful completion.<br>
-        ○ Additional details: ** Any specific requirements or notes for the operation.**<br>
-        ○ Dependencies: Approve Payment operation must be completed before this operation can begin.<br>
-        ○ Outcomes: An invoice will be issued in accounting software for the customer\'s payment.<br>',
-        'milestone' => '',
-        'reference' => 'TASK_POST_PAYMENT_3',
-        'on_task_completion' => 'TASK_POST_PAYMENT_4',
-        'status' => ''
-    ];
-    public const TASK_POST_PAYMENT_4 = [
-        'name' => 'Knockoff Invoice',
-        'description' => '○ Purpose: The purpose of this operation is to issue the official receipt and knockoff with invoice for the customer\'s payment.<br>
-        ○ Initial Status: Not Started<br>
-        ○ Deadline: Next day.<br>
-        ○ Responsible Department: Accounts<br>
-        ○ Next Step: None<br>
-        ○ Additional Details: ** Any specific requirements or notes for the operation.**<br>
-        ○ Dependencies: Issue Shipping Autocount Invoice operation must be completed before this operation can begin.<br>
-        ○ Outcomes: The customer’s payment is applied to the accounting software invoice and invoice is marked as paid.<br>',
-        'milestone' => '',
-        'reference' => 'TASK_POST_PAYMENT_4',
-        'on_task_completion' => '',
-        'status' => ''
-    ];
-}

app/Classes/ValueObjects/Constants/RouteType.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class RouteType {
-
-    public const WEB = 1;
-
-    public const API = 2;
-
-}

app/Console/Commands/FixInvoice.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\CompanyConnection;
-use App\Models\Order;
-use Carbon\Carbon;
-use Exception;
-use Illuminate\Console\Command;
-use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
-
-class FixInvoice extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'invoice:fix {--marking=}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Fix Invoice By Company Module Marking';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $connection = CompanyConnection::where('invitee_reference', $this->option('marking'))->first();
-        $company_module_id = $connection->invitee->id;
-
-        $orders = Order::where('company_module_id', $company_module_id)->get();
-
-        foreach ($orders as $order){
-            $invoices = $order->transactions()->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get();
-            foreach ($invoices as $invoice){
-    
-                dump($invoice->id);
-                
-                $invoice->documents()->delete();
-    
-                $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
-    
-                $document_object = new DocumentObject(
-                    DocumentType::SHIPPING_INVOICE,
-                    [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
-                    '',
-                    ApprovalStatus::COMPLETED,
-                    'shipping_invoice'
-                );
-    
-                /** @var Document $document */
-                $document = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
-    
-                (App()->make(CreatesFiles::class))->execute($document, $document_object);
-            }
-        }
-    }
-}

app/Console/Commands/approveInvoice.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Transaction;
-use Exception;
-use Illuminate\Console\Command;
-
-class approveInvoice extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'approve:invoice';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Command description';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::PENDING_SUBMISSION)->get();
-
-        foreach ($invoices as $invoice) {
-            $packingList = $invoice->owner;
-            $order = $packingList->owner;
-
-            try {
-                (App()->make(ApproveShippingInvoiceTransactionProcessor::class))->execute($packingList);
-                $this->info('Invoice Approved for reference ' . $order->reference . '.');
-            } catch (Exception $exception) {
-                $this->info('Failed to Approve invoice for reference ' . $order->reference . '. Exception: ' . $exception->getMessage());
-            }
-        }
-    }
-}

app/Console/Kernel.php

@@ -28,30 +28,25 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
 
-        // $schedule->command('command:curlVTCommand')
+        $schedule->command('command:curlVTCommand')
-        //     ->cron('0 8 * * *')
+            ->cron('0 8 * * *')
-        //     ->withoutOverlapping()
+            ->withoutOverlapping()
-        //     ->appendOutputTo (storage_path().'/logs/curlvt.log');
+            ->appendOutputTo (storage_path().'/logs/curlvt.log');
 
-        // $schedule->command('command:curlYdOrderListCommand')
+        $schedule->command('command:curlYdOrderListCommand')
-        //     ->cron('30 9-18/3 * * *')
+            ->cron('30 9-18/3 * * *')
-        //     ->withoutOverlapping()
+            ->withoutOverlapping()
-        //     ->appendOutputTo (storage_path().'/logs/curlyd.log');
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');
 
-        // $schedule->command('command:curlYdOrderListCommand')
+        $schedule->command('command:curlYdOrderListCommand')
-        //     ->cron('0 9 * * *')
+            ->cron('0 9 * * *')
-        //     ->withoutOverlapping()
+            ->withoutOverlapping()
-        //     ->appendOutputTo (storage_path().'/logs/departure_email.log');
+            ->appendOutputTo (storage_path().'/logs/departure_email.log');
 
         $schedule->command('invoice:generate')
             ->hourly()
             ->withoutOverlapping()
             ->appendOutputTo (storage_path().'/logs/auto_generate_invoice.log');
-
-        $schedule->command('approve:invoice')
-            ->hourly()
-            ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/approve_invoice.log');
     }
 
     /**

app/Http/Controllers/Addresses/CreateBillingAddressController.php

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

app/Http/Controllers/Transactions/CreateCombinedInvoicesController.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Transactions;
-
-use App\Classes\Modules\Transactions\ControllersLogic\CreateCombinedInvoicesLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class CreateCombinedInvoicesController
-{
-
-    public function combine(Request $request, CreateCombinedInvoicesLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}

app/Http/Kernel.php

@@ -38,13 +38,11 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            // \App\Http\Middleware\WebRouteLogs::class,
         ],
 
         'api' => [
             'throttle:300,1',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            // \App\Http\Middleware\ApiRouteLogs::class,
         ],
     ];
 

app/Http/Middleware/ApiRouteLogs.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
-use App\Models\RouteLog;
-use App\Classes\ValueObjects\Constants\RouteType;
-use Illuminate\Support\Facades\Auth;
-
-class ApiRouteLogs
-{
-	/**
-	 * Handle an incoming request.
-	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-	 * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-	 */
-	public function handle(Request $request, Closure $next)
-	{
-		$ip_address = getenv('REMOTE_ADDR') == '::1' ? '127.0.0.1' : getenv('REMOTE_ADDR');
-		$url = urldecode($request->fullUrl());
-		$request_method = $request->method();
-		$platform = $request->header('sec-ch-ua-platform');
-		$browser = Str::after($request->header('sec-ch-ua'), 'Not?A_Brand";v="8", "Chromium";v="108", "');
-		$geo = unserialize(file_get_contents("http://www.geoplugin.net/php.gp?ip=$ip_address"));
-		$longitude = $geo["geoplugin_longitude"];
-		$latitude = $geo["geoplugin_latitude"];
-		$last_page = url()->previous();
-		$countryName = $geo["geoplugin_countryName"];
-
-		$user_id = Auth::user() ? Auth::user()->id : 0;
-
-		// if ($user_id != 0) {
-		// 	// $ip_address
-		// 	$webRouteLogWithSameIp = RouteLog::where('ip_address', $ip_address)->where('user_id', 0)->get();
-		// 	dd($webRouteLogWithSameIp);
-		// 	foreach($webRouteLogWithSameIp as $result){
-		// 		$result
-		// 	}
-		// }
-
-		$route_log = [
-		    'user_id' => $user_id,
-		    // 'ip_address' => $request->ip(),
-		    'ip_address' => $ip_address,
-		    'url' => $url,
-		    'request_method' => $request_method,
-		    'browser' => $browser,
-		    'platform' => $platform,
-		    'longitude' => $longitude,
-		    'latitude' => $latitude,
-		    'last_page' => $last_page,
-		    'countryname' => $countryName,
-		    'route_type' => RouteType::API,
-		];
-
-		RouteLog::create($route_log);
-
-		return $next($request);
-	}
-}

app/Http/Middleware/WebRouteLogs.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
-use App\Models\RouteLog;
-use App\Classes\ValueObjects\Constants\RouteType;
-use Illuminate\Support\Facades\Auth;
-
-class WebRouteLogs
-{
-	/**
-	 * Handle an incoming request.
-	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-	 * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-	 */
-	public function handle(Request $request, Closure $next)
-	{
-		$ip_address = getenv('REMOTE_ADDR') == '::1' ? '127.0.0.1' : getenv('REMOTE_ADDR');
-		$url = $request->fullUrl();
-		$request_method = $request->method();
-		$platform = $request->header('sec-ch-ua-platform');
-		$browser = Str::after($request->header('sec-ch-ua'), 'Not?A_Brand";v="8", "Chromium";v="108", "');
-		$geo = unserialize(file_get_contents("http://www.geoplugin.net/php.gp?ip=$ip_address"));
-		$longitude = $geo["geoplugin_longitude"];
-		$latitude = $geo["geoplugin_latitude"];
-		$last_page = url()->previous();
-		$countryName = $geo["geoplugin_countryName"];
-
-		$route_log = [
-		    'user_id' => Auth::user() ? Auth::user()->id : 0,
-		    // 'ip_address' => $request->ip(),
-		    'ip_address' => $ip_address,
-		    'url' => $url,
-		    'request_method' => $request_method,
-		    'browser' => $browser,
-		    'platform' => $platform,
-		    'longitude' => $longitude,
-		    'latitude' => $latitude,
-		    'last_page' => $last_page,
-		    'countryname' => $countryName,
-		    'route_type' => RouteType::WEB,
-		];
-
-		// dd($route_log);
-
-		RouteLog::create($route_log);
-
-		return $next($request);
-	}
-}

app/Models/Booking.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Models;
+
+use App\Classes\General\Interfaces\Documentable;
+use App\Classes\General\Interfaces\Transactionable;
+use App\Classes\General\Traits\LogData;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Scopes\CustomerBookingsScope;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
+use Staudenmeir\EloquentHasManyDeep\HasRelationships;
+
+/**
+ * Class Booking
+ * @package App\Models
+ *
+ * @property \App\Models\Company company_id
+ * @property \App\Models\Bank transferable_bank_id
+ * @property string marking
+ * @property string reference
+ * @property float fix_amount
+ * @property int convertible_currency_id
+ * @property int conversion_currency_id
+ */
+class Booking extends AbstractModel implements Documentable, Transactionable
+{
+    use HasRelationships;
+    use SoftDeletes;
+    use LogData;
+
+    protected $table = 'bookings';
+
+    protected $dates = ['deleted_at'];
+
+    /**
+     * @return BelongsTo
+     */
+    public function company(): BelongsTo
+    {
+        return $this->BelongsTo(Company::class, 'company_id')->withTrashed();
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function service(): BelongsTo
+    {
+        return $this->BelongsTo(ServiceType::class, 'service_id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function bank(): BelongsTo
+    {
+        return $this->BelongsTo(Bank::class, 'bank_id')->withTrashed();
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function fixedCurrency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'fix_currency_id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function convertibleCurrency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'convertible_currency_id');
+    }
+
+    /**
+     * @return BelongsTo
+     */
+    public function conversionCurrency(): BelongsTo
+    {
+        return $this->BelongsTo(Currency::class, 'conversion_currency_id');
+    }
+
+    /**
+     * @return MorphMany
+     */
+    public function documents(): MorphMany
+    {
+        return $this->MorphMany(Document::class, 'owner');
+    }
+
+    /**
+     * @return MorphMany
+     */
+    public function transactions(): MorphMany
+    {
+        return $this->MorphMany(Transaction::class, 'owner');
+    }
+
+    /**
+     * @return hasManyDeep
+     */
+    public function bills(): hasManyDeep
+    {
+        return $this->hasManyDeep(Transaction::class, [Transaction::class.' as alias'], [['owner_type', 'owner_id'], ['owner_type', 'owner_id']], [null, null]);
+    }
+
+    protected static function booted()
+    {
+        if (auth()->user()) {
+            if (auth()->user()->type === RoleTypes::USER) {
+                static::addGlobalScope(new CustomerBookingsScope);
+            }
+        }
+    }
+
+
+}

app/Models/RouteLog.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class RouteLog extends Model
-{
-    use HasFactory;
-
-   protected $fillable = [
-        'user_id',
-        'ip_address',
-        'url',
-        'request_method',
-        'browser',
-        'platform',
-        'longitude',
-        'latitude',
-        'last_page',
-        'countryname',
-        'route_type'
-   ];
-}

app/Models/User.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -26,7 +25,7 @@ class User extends AbstractModel implements
     AuthorizableContract,
     CanResetPasswordContract
 {
-    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail, SoftDeletes, HasFactory;
+    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail, SoftDeletes;
 
     protected $dates = ['deleted_at'];
 

codeception.yml

@@ -1,12 +0,0 @@
-paths:
-  tests: tests
-  output: tests/_output
-  data: tests/_data
-  support: tests/_support
-  envs: tests/_envs
-actor_suffix: Tester
-extensions:
-  enabled:
-    - Codeception\Extension\RunFailed
-params:
-  - .env.testing

composer.json

@@ -2,24 +2,20 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The Laravel Framework.",
-    "keywords": [
+    "keywords": ["framework", "laravel"],
-        "framework",
-        "laravel"
-    ],
     "license": "MIT",
     "require": {
         "php": "^7.3",
         "ext-fileinfo": "^7.3",
         "ext-json": "*",
         "barryvdh/laravel-dompdf": "^0.9.0",
-        "carlos-meneses/laravel-mpdf": "*",
+        "carlos-meneses/laravel-mpdf": "^2.1",
         "doctrine/dbal": "^3.1",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "intervention/image": "^2.5",
         "laravel/framework": "^8.40",
-        "laravel/legacy-factories": "^1.3",
         "laravel/tinker": "^2.5",
         "maatwebsite/excel": "^3.1",
         "rinvex/countries": "^6.1",
@@ -29,13 +25,6 @@
         "tymon/jwt-auth": "^1.0"
     },
     "require-dev": {
-        "barryvdh/laravel-ide-helper": "^2.12",
-        "codeception/codeception": "^4.2",
-        "codeception/module-asserts": "^2.0",
-        "codeception/module-laravel": "^2.3",
-        "codeception/module-phpbrowser": "^2.0",
-        "codeception/module-rest": "^2.0",
-        "codeception/module-webdriver": "^2.0",
         "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
         "laravel/sail": "^1.0.1",

config/perfexcrm.php

@@ -1,7 +0,0 @@
-<?php
-
-return [
-    'base_url' => env('PERFEXCRM_BASE_URL', 'http://192.168.1.100:8084'), //cief todo: Update crm api domain here
-    'api_key' => env('PERFEXCRM_API_KEY', ''),
-    'is_enabled' => env('PERFEXCRM_IS_ENABLED', 'true'),
-];

database/factories/UserFactory.php

@@ -25,9 +25,23 @@ class UserFactory extends Factory
         return [
             'name' => $this->faker->name(),
             'email' => $this->faker->unique()->safeEmail(),
+            'email_verified_at' => now(),
             'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
             'remember_token' => Str::random(10),
         ];
     }
 
+    /**
+     * Indicate that the model's email address should be unverified.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    public function unverified()
+    {
+        return $this->state(function (array $attributes) {
+            return [
+                'email_verified_at' => null,
+            ];
+        });
+    }
 }

database/migrations/2022_12_27_165842_create_route_logs_table.php

@@ -1,42 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateRouteLogsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('route_logs', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('user_id')->unsigned();
-            $table->string('ip_address');
-            $table->string('url', 255);
-            $table->string('request_method');
-            $table->string('browser')->nullable();
-            $table->string('platform')->nullable();
-            $table->string('longitude')->nullable();
-            $table->string('latitude')->nullable();
-            $table->string('last_page')->nullable();
-            $table->string('countryname')->nullable();
-            $table->integer('route_type');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('route_logs');
-    }
-}

docker-compose.yml

@@ -1,40 +0,0 @@
-version: '3'
-services:
-  web:
-    build:
-      context: .
-      args:
-        PHP_VERSION: 7.4
-    ports:
-      - "9000:9000"
-  db:
-    image: mysql:5.7
-    environment:
-      MYSQL_DATABASE: laravel
-      MYSQL_USER: laravel
-      MYSQL_PASSWORD: secret
-      MYSQL_ROOT_PASSWORD: secret
-    ports:
-      - "3306:3306"
-  tests:
-    build:
-      context: .
-      args:
-        PHP_VERSION: 7.4
-    command: bash -c "composer install && php artisan migrate --seed && vendor/bin/phpunit"
-    links:
-      - db
-      - redis
-  acceptance:
-    image: node:14
-    working_dir: /app
-    volumes:
-      - ./:/app
-    command: bash -c "npm install && gulp build"
-    links:
-      - web
-      - redis
-  redis:
-    image: redis:6.0
-    ports:
-      - "6379:6379"

docker-setup/Dockerfile

@@ -1,28 +0,0 @@
-FROM php:7.4-fpm
-
-WORKDIR /var/www/html
-
-RUN docker-php-ext-install pdo pdo_mysql
-
-RUN apt-get update && apt-get install -y \
-        libfreetype6-dev \
-        libjpeg62-turbo-dev \
-        libpng-dev \
-        libzip-dev \
-        zip \
-        cron \
-        supervisor \
-        nano \
-    && docker-php-ext-configure gd --with-freetype --with-jpeg \
-    && docker-php-ext-install -j$(nproc) gd \
-  	&& docker-php-ext-install zip \
-  	&& docker-php-ext-install bcmath
-
-COPY --from=composer:1.9.3 /usr/bin/composer /usr/bin/composer
-
-#NODEJS & NPM
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt-get -y install nodejs
-
-RUN chown -R www-data:www-data /var/www
-RUN chmod 755 /var/www

docker-setup/docker-compose.yml

@@ -1,54 +0,0 @@
-version: '3'
-
-networks:
-  shipping-portal-staging:
-
-services:
-  #################################################################
-  nginx:
-    image: nginx:stable-alpine
-    container_name: shipping-portal-ngnix
-    ports:
-      - "8081:80"
-    volumes:
-      - ../:/var/www/html
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-    depends_on:
-      - php
-      - mysql
-    networks:
-      - shipping-portal-staging
-  #################################################################
-  mysql:
-    image: mysql:5.7.29
-    container_name: shipping-portal-mysql
-    restart: unless-stopped
-    tty: true
-    ports:
-      - 3307:3306
-    environment:
-      MYSQL_ROOT_USER: root
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: shipping-portal-db
-      MYSQL_USER: master
-      MYSQL_PASSWORD: cDe7gcrRBWetaAP
-    volumes:
-      - mysql-data:/var/lib/mysql
-    networks:
-      - shipping-portal-staging
-  #################################################################
-  php:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: shipping-portal-php
-    volumes:
-      - ../:/var/www/html
-    ports:
-      - "9001:9000"
-    networks:
-      - shipping-portal-staging
-  #################################################################
-
-volumes:
-  mysql-data:

docker-setup/nginx/default.conf

@@ -1,27 +0,0 @@
-server {
-    listen 80;
-    index index.php index.html;
-    server_name localhost;
-    error_log  /var/log/nginx/error.log;
-    access_log /var/log/nginx/access.log;
-    root /var/www/html/public;
-
-    server_name localhost;
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    location ~ \.php$ {
-        try_files $uri =404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass php:9000;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param PATH_INFO $fastcgi_path_info;
-        fastcgi_intercept_errors on;
-        fastcgi_keep_conn on;
-        fastcgi_param PHP_VALUE "auto_prepend_file= \n allow_url_include=Off \n  output_buffering=Off \n output_buffering=4096";
-    }
-}

phpunit.xml

@@ -21,8 +21,8 @@
         <server name="APP_ENV" value="testing"/>
         <server name="BCRYPT_ROUNDS" value="4"/>
         <server name="CACHE_DRIVER" value="array"/>
-        <server name="DB_CONNECTION" value="sqlite"/>
+        <!-- <server name="DB_CONNECTION" value="sqlite"/> -->
-        <server name="DB_DATABASE" value=":memory:"/>
+        <!-- <server name="DB_DATABASE" value=":memory:"/> -->
         <server name="MAIL_MAILER" value="array"/>
         <server name="QUEUE_CONNECTION" value="sync"/>
         <server name="SESSION_DRIVER" value="array"/>

resources/assets/vue/components/addresses/forms/AddressFormComponent.vue

@@ -198,9 +198,6 @@
         },
         methods:{
             submitForm(){
-                if (this.type) {
-                    this.parameters.type = this.type;
-                }
                 this.submit(this.data ? (this.route('api.address.update', this.data.id)) : (this.route('api.address.create')), this.data ? 'put' : 'post', 'addressList', true, true);
             },
         },

resources/assets/vue/components/addresses/sections/BillingAddressSectionComponent.vue

@@ -1,124 +0,0 @@
-<style>
-    @media screen and (min-width: 570px) {
-        .extend-modal-body{
-            width: 700px;
-            max-width: calc(100% - 20px);
-        }
-    }
-</style>
-<template>
-    <div class="row m-b-20 bg-white text-black padding-15 rounded extend-modal-body">
-        <div class="col">
-            <div class="row m-b-20 text-info">
-                <div class="col text-center">
-                    <h3>Please select the <b>Billing Address</b></h3>
-                </div>
-            </div>
-            <div class="row b-rounded justify-content-center m-b-15" @click="updateBillingAddressFilters">
-                <div class="col col-md-10 bg-master-lightest margin-auto padding-15">
-                    <div class="row justify-content-center">
-                        <div class="col pointer d-flex justtify-content-center align-items-center">
-                            <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !useDeliveryAddress, 'fa-check-square': useDeliveryAddress, 'text-primary':useDeliveryAddress}" ></i>
-                            <p class="m-b-0">Use Delivery Address</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row justify-content-center m-b-15" v-if="error">
-                <div class="col-10">
-                    <small class="text-danger">{{error}}</small>
-                </div>
-            </div>
-            <div class="row justify-content-center">
-                <div class="col col-md-10">
-                    <list-component :key="currentKey" style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="billingAddressFilters">
-                        <template slot="list" slot-scope="{data}">
-                            <select-address-component :data="data" :value="parameters.billing_address_id" v-model="parameters.billing_address_id"></select-address-component>
-                        </template>
-                    </list-component>
-                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
-                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.billing_address_id, 'b-grey': parameters.billing_address_id}" @click="parameters.billing_address_id = null">
-                            <div class="row align-items-center">
-                                <div class="col-auto p-r-0">
-                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.billing_address_id, 'fa-check-circle': !parameters.billing_address_id, 'text-primary': !parameters.billing_address_id}"></i>
-                                </div>
-                                <div class="col-auto semi-bold">New Address</div>
-                            </div>
-                            <div class="row" v-show="!parameters.billing_address_id">
-                                <div class="col">
-                                    <address-form-component :type="1" :id="company_module_id" section="addressList" @input="parameters.billing_address_id = $event"></address-form-component>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col"></div>
-                <div class="col-auto">
-                    <button type="button" class="btn btn-lg rounded btn-primary" v-if="parameters.billing_address_id" @click="submitForm()">Confirm</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        props: {
-            section: {
-                type: String,
-                default: 'addressList'
-            },
-            company_module_id: {
-                type: Number,
-                default: 1
-            },
-        },
-        data(){
-            return {
-                useDeliveryAddress: false,
-                isLoading: false,
-                error: '',
-                billingAddressFilters: {
-                    per_page: 10, 
-                    HasMorphCompanyModule: this.company_module_id,
-                    ownerType: 'App\\Models\\CompanyModule',
-                    type: 1
-                },
-                parameters : {
-                    company_module_id: this.company_module_id,
-                    billing_address_id: null,
-                },
-                item:{
-                    id:null
-                },
-                currentKey: 1,
-            }
-        },
-        methods: {
-            updateBillingAddressFilters(){
-                if(this.useDeliveryAddress) {
-                    // if use delivery address
-                    this.billingAddressFilters = {
-                        per_page: 10, 
-                        HasMorphCompanyModule: this.company_module_id,
-                        type: 1
-                    }
-                    this.parameters.billing_address_id = '';
-                } else {
-                    this.billingAddressFilters = {per_page: 10, HasMorphCompanyModule: this.company_module_id,};
-                }
-                this.useDeliveryAddress = !this.useDeliveryAddress;
-                this.currentKey++;
-            },
-            submitForm(){
-                this.submit(this.route('api.address.billingAddress.create'), 'post', this.section, true, true)
-            },
-            successHandler(response){
-                this.closeModal();
-                location.reload();
-            },
-        }
-    }
-</script>

resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue

@@ -58,12 +58,6 @@
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-auto">
-                                                                    <div class="btn-lg btn-primary b-a b-white pointer fs-14 position-relative bg-transparent requestModal" data-type="billingAddressComponent" style="z-index: 2;">Change Billing Address</div>
-                                                                </div>
-                                                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="billingAddressComponent">
-                                                                    <billing-address-section-component :company_module_id="company.company_module.id" :section="section"></billing-address-section-component>
-                                                                </modal-component>
                                                             </div>
                                                         </div>
                                                     </div>

resources/assets/vue/components/orders/forms/OrderFormComponent.vue

@@ -72,7 +72,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row justify-content-center" v-if="step === 2 && !chooseBillingAddress">
+            <div class="row justify-content-center" v-if="step === 2">
                 <div class="col col-md-10">
                     <div class="row m-b-20">
                         <div class="col">
@@ -88,7 +88,7 @@
                             </div>
                             <div class="row justify-content-center">
                                 <div class="col col-md-10">
-                                    <list-component style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 10, HasMorphCompanyModule: company.company_module.id, type:2}">
+                                    <list-component style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 10, HasMorphCompanyModule: company.company_module.id}">
                                         <template slot="list" slot-scope="{data}">
                                             <select-address-component :data="data" :value="parameters.address_id" v-model="parameters.address_id"></select-address-component>
                                         </template>
@@ -119,72 +119,7 @@
                                     <button type="button" class="btn btn-lg btn-default b-rad-none" @click="step--">back</button>
                                 </div>
                                 <div class="col p-l-5">
-                                    <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="createOrder()" v-if="parameters.address_id && company.company_module.billingAddress">Create Order</button>
+                                    <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="createOrder()" v-if="parameters.address_id">Create Order</button>
-                                    <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click=" chooseBillingAddress = !chooseBillingAddress" v-if="parameters.address_id && !company.company_module.billingAddress">Select Billing Address</button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row justify-content-center" v-if="step === 2 && chooseBillingAddress">
-                <div class="col col-md-10">
-                    <div class="row m-b-20">
-                        <div class="col">
-                            <div class="row m-b-20 text-info">
-                                <div class="col text-center">
-                                    <h3>Please select the <b>Billing Address</b></h3>
-                                </div>
-                            </div>
-                            <div class="row b-rounded justify-content-center m-b-15" @click="updateBillingAddressFilters">
-                                <div class="col col-md-10 bg-master-lightest margin-auto padding-15">
-                                    <div class="row justify-content-center">
-                                        <div class="col pointer d-flex justtify-content-center align-items-center">
-                                            <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !useDeliveryAddress, 'fa-check-square': useDeliveryAddress, 'text-primary':useDeliveryAddress}" ></i>
-                                            <p class="m-b-0">Use Delivery Address</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row justify-content-center m-b-15" v-if="error">
-                                <div class="col-10">
-                                    <small class="text-danger">{{error}}</small>
-                                </div>
-                            </div>
-                            <div class="row justify-content-center">
-                                <div class="col col-md-10">
-                                    <list-component :key="currentKey" style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="billingAddressFilters">
-                                        <template slot="list" slot-scope="{data}">
-                                            <select-address-component :data="data" :value="parameters.billing_address_id" v-model="parameters.billing_address_id"></select-address-component>
-                                        </template>
-                                    </list-component>
-                                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
-                                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.billing_address_id, 'b-grey': parameters.billing_address_id}" @click="parameters.billing_address_id = null">
-                                            <div class="row align-items-center">
-                                                <div class="col-auto p-r-0">
-                                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.billing_address_id, 'fa-check-circle': !parameters.billing_address_id, 'text-primary': !parameters.billing_address_id}"></i>
-                                                </div>
-                                                <div class="col-auto semi-bold">New Address</div>
-                                            </div>
-                                            <div class="row" v-show="!parameters.billing_address_id">
-                                                <div class="col">
-                                                    <address-form-component :type="1" :id="company.company_module.id" section="addressList" @input="parameters.billing_address_id = $event"></address-form-component>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row justify-content-center animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
-                        <div class="col col-md-8 no-padding">
-                            <div class="row">
-                                <div class="col-auto p-r-5">
-                                    <button type="button" class="btn btn-lg btn-default b-rad-none" @click="chooseBillingAddress = !chooseBillingAddress">back</button>
-                                </div>
-                                <div class="col p-l-5">
-                                    <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="createOrder()" v-if="parameters.billing_address_id">Create Order</button>
                                 </div>
                             </div>
                         </div>
@@ -237,20 +172,11 @@
             return {
                 section: 'createOrderForm',
                 step: 1,
-                currentKey: 1,
                 error: '',
-                chooseBillingAddress: false,
-                useDeliveryAddress: false,
-                billingAddressFilters: {
-                    per_page: 10, 
-                    HasMorphCompanyModule: this.company.company_module.id,
-                    type: 1
-                },
                 parameters : {
                     warehouse_id: '',
                     address_id: '',
                     company_id: this.company.id,
-                    billing_address_id: '',
                 }
             }
         },
@@ -279,21 +205,6 @@
                 alert(response.message)
                 this.error = response.message;
                 this.step--;
-            },
-            updateBillingAddressFilters(){
-                if(this.useDeliveryAddress) {
-                    // if use delivery address
-                    this.billingAddressFilters = {
-                        per_page: 10, 
-                        HasMorphCompanyModule: this.company.company_module.id,
-                        type: 1
-                    }
-                    this.parameters.billing_address_id = '';
-                } else {
-                    this.billingAddressFilters = {per_page: 10, HasMorphCompanyModule: this.company.company_module.id};
-                }
-                this.useDeliveryAddress = !this.useDeliveryAddress;
-                this.currentKey++;
             }
         }
     }

resources/assets/vue/components/paymentsBilling/forms/BillingAddressFormComponent.vue

@@ -0,0 +1,66 @@
+<template>
+    <div class="row bg-white padding-25">
+        <div class="col">
+            <div class="row m-b-20 text-info">
+                <div class="col text-center">
+                    <h3>Please select the address where you want to receive this order</h3>
+                </div>
+            </div>
+            <div class="row justify-content-center m-b-15" v-if="error">
+                <div class="col-10">
+                    <small class="text-danger">{{error}}</small>
+                </div>
+            </div>
+            <div class="row justify-content-center">
+                <div class="col col-md-10">
+                    <list-component style="min-height: 50px;" class="m-b-20" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 5, HasMorphCompanyModule: data.order.company_module.id}">
+                        <template slot="list" slot-scope="{data}">
+                            <select-address-component :data="data" :value="parameters.address_id" v-model="parameters.address_id"></select-address-component>
+                        </template>
+                    </list-component>
+                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.address_id, 'b-grey': parameters.address_id}" @click="parameters.address_id = null">
+                            <div class="row align-items-center">
+                                <div class="col-auto p-r-0">
+                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.address_id, 'fa-check-circle': !parameters.address_id, 'text-primary': !parameters.address_id}"></i>
+                                </div>
+                                <div class="col-auto semi-bold">New Address</div>
+                            </div>
+                            <div class="row" v-show="!parameters.address_id">
+                                <div class="col">
+                                    <address-form-component :id="data.order.company_module.id" section="addressList" @input="parameters.address_id = $event"></address-form-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row m-t-15 justify-content-center">
+                <div class="col-6 col-md-4 p-r-5">
+                    <div class="btn btn-default w-100 btn-lg b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col-6 col-md-4 p-l-5">
+                    <!-- <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.segment.constant.update.postcode', 1), 'put', section, true, true)">Confirm</div> -->
+                    <div class="btn btn-primary w-100 btn-lg">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        data() {
+            return {
+                error: '',
+                parameters : {
+                    warehouse_id: '',
+                    address_id: '',
+                }
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>

resources/views/pages/customer_support.blade.php

@@ -0,0 +1,179 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row">
+        <div class="col bg-white p-t-15 p-b-15">
+            <div class="row no-margin">
+                <div class="col-12">
+                    <form method="post" >
+                        @csrf
+                        <div class="row">
+                            <div class="col">
+                                <input class="form-control" type="text" name="marking" placeholder="Marking" value="{{$marking}}">
+                            </div>
+                            <div class="col">
+                                <input class="form-control" type="text" name="customer_email" placeholder="Email" value="{{$email}}">
+                            </div>
+                            <div class="col">
+                                <input class="form-control" type="text" name="booking_reference" placeholder="Booking Reference" value="{{$bookingReference}}">
+                            </div>
+                            <div class="col-auto">
+                                <button class="btn btn-complete" type="submit">Search</button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col">
+            <main>
+                @if($company)
+                    @php
+                        $employees = $company->employees;
+                        $primaryEmployee = $employees->first();
+                        $identification = $company->documents->whereIn('document_type', \App\Classes\ValueObjects\Constants\DocumentType::IDENTIFICATION_DOCUMENTS)->first()
+                    @endphp
+                    <section id="customer-account" class="m-b-50">
+                        <h3>Customer Account</h3>
+                        <p>Marking: <span><a href="{{route('customer.profile', $company->reference)}}" target="_blank">{{$company->reference}}</a></span></p>
+                        <p>Account Type: <span>{{$company->type === 1 ? 'Business' : 'Personal'}}</span></p>
+                        @if($company->type === 1)<p>Company's Name: <span>{{$company->name}}</span></p>@endif
+                        <p>Customer's Name: <span>{{$employees->pluck('name')->implode(', ')}}</span></p>
+                        <p>Email: <span>{{$employees->pluck('email')->implode(', ')}}</span></p>
+                        <p>Phone: <span>{{$company->contacts->pluck('phone')->implode(', ')}}</span></p>
+                        <p>Registration Date: <span>{{$company->created_at->format('d-m-Y')}}</span></p>
+                    </section>
+                    <section id="customer-verification" class="m-b-50">
+                        <h3>Customer Verification</h3>
+                        <p>Email Verification Status: <span>{{ $primaryEmployee->status === 2 ? 'Verified' : 'Pending Verification'}}</span></p>
+                        <p>Identification Verification Status: <span>{{$identification ? ($identification->status === 2 ? 'Verified' : 'Pending Verification') : 'Not Submitted'}}</span></p>
+                    </section>
+                    @if(!$booking)
+                    <section>
+                        <h3>Customer Bookings</h3>
+                            @php
+                                $bookings = $company->bookings()->whereIn('status', [2, 3])->get();
+                            @endphp
+                            <section>
+                                @foreach($bookings as $booking)
+                                    @php
+                                        $payments = $booking->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PAYMENT)->get();
+                                        $purchaseOrder = $booking->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PURCHASE_ORDER)->first();
+                                    @endphp
+                                    <section class="m-b-50">
+                                        <h5 class="bold">Booking Reference: {{$booking->marking}}</h5>
+                                        <p>Amount: <span>{{$booking->fix_amount.' '.$booking->fixedCurrency->short_code}}</span></p>
+                                        <p>Status: <span>{{$booking->status === 3 ? 'Complete' : 'In Progress'}}</span></p>
+                                        <p>Purchase Order Status: <span>{{$purchaseOrder ? ($purchaseOrder->status === 3 ? 'Approved' : ($purchaseOrder->status === 1 ? 'Pending Approval' : 'Incomplete Submission')) : 'Pending Submission'}}</span></p>
+                                        @if($payments)<p class="m-t-35 bold">Payment History:</p>@endif
+                                        @php $i = 1; @endphp
+                                        @foreach($payments as $payment)
+                                            @php
+                                                $bill = $payment->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::BILL)->first();
+                                                $transferProof = null;
+                                                $status = 'Pending Submission';
+
+                                                if($payment->status === 1) {
+                                                    $status = 'Pending Approval';
+                                                }
+
+                                                if($payment->status === 2) {
+                                                    $status = 'Pending Confirmation';
+                                                }
+
+                                                if(in_array($payment->status, [4, 5])) {
+                                                    $status = 'Rejected/Failed Payment';
+                                                }
+
+                                                if($bill) {
+                                                    if($bill->status === 1) {
+                                                        $status = 'Pending Transfer Proof';
+                                                    }
+
+                                                    if(in_array($bill->status, [2, 3])) {
+                                                        $status = 'Transfer Complete';
+                                                        $transferProof = $bill->documents()->first();
+                                                    }
+                                                }
+
+                                            @endphp
+                                            <section class="m-b-35">
+                                                <p>{{$i++}}.</p>
+                                                <p>Amount: <span>{{$payment->original_amount.' '.$payment->original_currency->short_code}}</span></p>
+                                                <p>Status: <span>{{$status}}</span></p>
+                                                <p>Payment Date: <span>{{$payment->created_at->format('d-m-Y')}}</span></p>
+                                                @if($bill)
+                                                    <p>Supplier: <span>{{$bill->issuerCompany->name}}</span></p>
+                                                    <p>Supplier Order Date: <span>{{$bill->created_at->format('d-m-Y')}}</span></p>
+                                                    @if($transferProof)<p>Transfer Proof Upload Date: <span>{{$transferProof->created_at->format('d-m-Y')}}</span></p>@endif
+                                                @endif
+                                            </section>
+                                        @endforeach
+                                    </section>
+                                @endforeach
+                            </section>
+                    </section>
+                    @endif
+                @endif
+                @if($booking)
+                    @php
+                        $payments = $booking->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PAYMENT)->get();
+                        $purchaseOrder = $booking->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PURCHASE_ORDER)->first();
+                    @endphp
+                    <section>
+                        <h5 class="bold">Booking Reference: {{$booking->marking}}</h5>
+                        <p>Amount: <span>{{$booking->fix_amount.' '.$booking->fixedCurrency->short_code}}</span></p>
+                        <p>Status: <span>{{$booking->status === 3 ? 'Complete' : 'In Progress'}}</span></p>
+                        <p>Purchase Order Status: <span>{{$purchaseOrder ? ($purchaseOrder->status === 3 ? 'Approved' : ($purchaseOrder->status === 1 ? 'Pending Approval' : 'Incomplete Submission')) : 'Pending Submission'}}</span></p>
+                        @if($payments)<p class="m-t-35 bold">Payment History:</p>@endif
+                        @php $i = 1; @endphp
+                        @foreach($payments as $payment)
+                            @php
+                                $bill = $payment->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::BILL)->first();
+                                $transferProof = null;
+
+                                $status = 'Pending Submission';
+
+                                if($payment->status === 1) {
+                                    $status = 'Pending Approval';
+                                }
+
+                                if($payment->status === 2) {
+                                    $status = 'Pending Confirmation';
+                                }
+
+                                if(in_array($payment->status, [4, 5])) {
+                                    $status = 'Rejected/Failed Payment';
+                                }
+
+                                if($bill) {
+                                    if($bill->status === 1) {
+                                        $status = 'Pending Transfer Proof';
+                                    }
+
+                                    if(in_array($bill->status, [2, 3])) {
+                                        $status = 'Transfer Complete';
+                                        $transferProof = $bill->documents()->first();
+                                    }
+                                }
+
+                            @endphp
+                            <section class="m-b-35">
+                                <p>{{$i++}}.</p>
+                                <p>Amount: <span>{{$payment->original_amount.' '.$payment->original_currency->short_code}}</span></p>
+                                <p>Status: <span>{{$status}}</span></p>
+                                <p>Payment Date: <span>{{$payment->created_at->format('d-m-Y')}}</span></p>
+                                @if($bill)
+                                    <p>Supplier: <span>{{$bill->issuerCompany->name}}</span></p>
+                                    <p>Supplier Order Date: <span>{{$bill->created_at->format('d-m-Y')}}</span></p>
+                                    @if($transferProof)<p>Transfer Proof Upload Date: <span>{{$transferProof->created_at->format('d-m-Y')}}</span></p>@endif
+                                @endif
+                            </section>
+                        @endforeach
+                    </section>
+                @endif
+            </main>
+        </div>
+    </div>
+@endsection

routes/address.php

@@ -14,8 +14,6 @@ Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Address
     Route::get('state/list', 'ListStatesController@list')->name('state.list');
 
     Route::post('/create', 'CreateAddressController@create')->name('create');
-    
-    Route::post('billingAddress/create', 'CreateBillingAddressController@create')->name('billingAddress.create');
 
     Route::put('/update/{id}', 'UpdateAddressController@update')->name('update');
 

routes/transaction.php

@@ -13,18 +13,13 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
         Route::post('/upload-verification-document/{transaction_id}', 'UploadPaymentVerificationDocumentController@upload')->name('verification.create');
         Route::put('/approve/{transaction_id}/{status}', 'ApprovePaymentTransactionController@approve')->where('status', 'approve|reject')->name('approval');
     });
-
+    
     Route::group(['prefix' => 'invoice', 'as' => 'invoice.'], function () {
         route::post('/shipping-invoice/create', 'CreateShippingInvoiceTransactionController@create')->name('create');
         route::put('/shipping-invoice/{id}/update', 'UpdateShippingInvoiceTransactionController@update')->name('update');
         route::put('/shipping-invoice/{id}/approve', 'ApproveShippingInvoiceTransactionController@approve')->name('approve');
     });
 
-
-    Route::group(['prefix' => 'invoices', 'as' => 'invoices.'], function () {
-        route::put('/combine', 'CreateCombinedInvoicesController@combine')->name('combine');
-    });
-
     route::post('/shipping-invoice/calculator', 'ShippingEstimationCalculatorController@calculate')->name('shipping.estimation.calculator');
 
     // Route::group(['prefix' => '{id}/payment', 'as' => 'payment.'], function () {
@@ -39,4 +34,4 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
 
     // Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
 
-});
+});

routes/web.php

@@ -44,6 +44,8 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
 use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use App\Models\Company;
+use App\Models\Booking;
 
 /*
 |--------------------------------------------------------------------------
@@ -727,8 +729,6 @@ Route::get('/invoices/fix/{company_module_id}', function($company_module_id) {
             $document = (App()->make(CreatesDocument::class))->execute($invoice, $document_object);
 
             (App()->make(CreatesFiles::class))->execute($document, $document_object);
-
-            dump($document);
         }
     }
 
@@ -744,33 +744,33 @@ Route::get('/invoices/combine/{ids}', function($ids){
     return $pdf->download('combined_invoice_.pdf');
 })->name('invoice.combined_summary');
 
-// Route::get('/generate/invoices', function(){
+Route::get('/generate/invoices', function(){
-//     $packingLists = (App()->make(ListsPackingLists::class))->execute(['does_not_have_transaction_type' => 1, 'type' => 2]);
+    $packingLists = (App()->make(ListsPackingLists::class))->execute(['does_not_have_transaction_type' => 1, 'type' => 2]);
-//     foreach ($packingLists as $packingList){
+    foreach ($packingLists as $packingList){
-//         $order = $packingList->owner;
+        $order = $packingList->owner;
-//         if(!($order instanceof Order)) {
+        if(!($order instanceof Order)) {
-//             echo '<span style="color: red;">failed to generate...</span><br>';
+            echo '<span style="color: red;">failed to generate...</span><br>';
-//             continue;
+            continue;
-//         }
+        }
 
-//         $companyModule = $order->companyModule;
+        $companyModule = $order->companyModule;
-//         $billingAddress = $companyModule->addresses()->where('type', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
+        $billingAddress = $companyModule->addresses()->where('type', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();
-//         $deliveryAddress = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        $deliveryAddress = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
 
-//         $postCodes = \App\Models\SegmentConstant::whereIn('reference', ['CENTER_POSTCODE', 'OUTSTATION_POSTCODE'])->get()->pluck('value')->flatten();
+        $postCodes = \App\Models\SegmentConstant::whereIn('reference', ['CENTER_POSTCODE', 'OUTSTATION_POSTCODE'])->get()->pluck('value')->flatten();
 
-//         if(!!$billingAddress && in_array($deliveryAddress->postcode, $postCodes->toArray())){
+        if(!!$billingAddress && in_array($deliveryAddress->postcode, $postCodes->toArray())){
-//             try {
+            try {
-//                 (App()->make(CreateInvoiceTransactionProcessor::class))->execute($packingList);
+                (App()->make(CreateInvoiceTransactionProcessor::class))->execute($packingList);
-//                 echo '<span style="color: green;">Invoice Generated...</span><br>';
+                echo '<span style="color: green;">Invoice Generated...</span><br>';
 
-//             } catch (Exception $exception){
+            } catch (Exception $exception){
-//                 echo '<span style="color: red;">failed to generate...</span><br>';
+                echo '<span style="color: red;">failed to generate...</span><br>';
-//             }
+            }
-//         }
+        }
-//         echo '<span style="color: red;">failed to generate...</span><br>';
+        echo '<span style="color: red;">failed to generate...</span><br>';
-//     }
+    }
-// })->name('generate.invoices');
+})->name('generate.invoices');
 
 Route::get('/invoices/approve', function(Request $request){
 //    whereDoesntHave
@@ -780,10 +780,8 @@ Route::get('/invoices/approve', function(Request $request){
         $packingList = $invoice->owner;
         $order = $packingList->owner;
 
-        if ($request->input('exclude')){
+        if(in_array($order->reference, json_decode($request->input('exclude')))){
-            if(in_array($order->reference, json_decode($request->input('exclude')))){
+            continue;
-                continue;
-            }
         }
 
         try {
@@ -799,97 +797,46 @@ Route::get('/invoices/approve', function(Request $request){
 
 })->name('invoices.approve');
 
-Route::get('/invoices/show-duplicated', function(Request $request){
+Route::get('/support', function () {
-    $transactionWithMultipleInvoice = DB::table('transactions')
+    return view('pages.customer_support', [
-        ->where('type', TransactionType::SHIPPING_INVOICE)
+        'marking' => null,
-        ->where('status', '!=' , ApprovalStatus::COMPLETED)
+        'email' => null,
-        ->where('deleted_at', null)
+        'bookingReference' => null,
-        ->select('owner_id', DB::raw('count(*) as count'))
+        'company' => null,
-        ->groupBy('owner_id')
+        'booking' => null
-        ->having('count', '>', 1)
+    ]);
-        ->get();
+})->name('support');
 
-        // delete invoice type suspended
+Route::post('/support', function (Request $request) {
 
-    echo '<table>';
+    $marking = $request->input('marking');
-    echo "<tr>";
+    $email = $request->input('customer_email');
-    echo "<td style='border:1px solid'>owner_id</td>";
+    $bookingReference = $request->input('booking_reference');
-    echo "<td  style='border:1px solid'>count</td>";
-    echo "</tr>";
 
-    $duplicatedOrderId = [];
+    $company = null;
-    foreach($transactionWithMultipleInvoice as $invoice) {
+    $booking = null;
-        $duplicatedOrderId[] = $invoice->owner_id;
+
-        echo "<tr>";
+    if($email) {
-        echo "<td style='border:1px solid'>$invoice->owner_id</td>";
+        $company = Company::whereHas('Employees', function($user) use($email) {
-        echo "<td style='border:1px solid'>$invoice->count</td>";
+            return $user->where('email', $email);
-        echo "</tr>";
+        })->first();
     }
-    echo '</table>';
 
-    $duplicatedInvoice = Transaction::whereIn('owner_id', $duplicatedOrderId)->orderByDesc('owner_id')->get();
+    if($marking) {
-    // dd($duplicatedInvoice);
+        $company = Company::where('reference', $marking)->first();
-    echo '<br>';
-    echo '<table>';
-    echo "<tr>";
-    echo "<td style='border:1px solid'>Order Reference</td>";
-    echo "<td  style='border:1px solid'>Status</td>";
-    echo "<td  style='border:1px solid'>Invoice Owner ID</td>";
-    echo "<td  style='border:1px solid'>Invoice Owner ID</td>";
-    echo "</tr>";
-
-    foreach($duplicatedInvoice as $invoice) {
-        $order = $invoice->owner->owner;
-        echo "<tr>";
-        echo '<td style="border:1px solid"><a target="_blank" href="'.route('order.show', $order->reference).'">'. $order->reference.' - </a>' . $order->created_at . '</td>';
-        echo "<td style='border:1px solid'>".ApprovalStatus::APPROVAL_STATUS_ID[$invoice->status]."</td>";
-        echo "<td style='border:1px solid'>$invoice->owner_id</td>";
-        echo "<td style='border:1px solid'>$invoice->amount</td>";
-        echo "</tr>";
     }
-    echo '</table>';
-});
-
-
-
-Route::get('/invoices/delete-duplicated', function(Request $request){
-    $duplicatedInvoices = DB::table('transactions')
-        ->where('type', TransactionType::SHIPPING_INVOICE)
-        ->where('status', '!=' , ApprovalStatus::COMPLETED)
-        ->where('deleted_at', null)
-        ->select('owner_id', DB::raw('count(*) as count'))
-        ->groupBy('owner_id')
-        ->having('count', '>', 1)
-        ->get();
-
-    $duplicatedInvoices = Transaction::whereIn('owner_id', $duplicatedInvoices->pluck('owner_id'))->get()->groupBy('owner_id');
-
-    foreach($duplicatedInvoices as $invoice) {
-        $packingList = $invoice->first()->owner;
-        $order = $packingList->owner;
-
-        $paidInvoice = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::COMPLETED)->get();
-
-        $unpaidInvoices = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->orderBy('id', 'desc')->get();
-
-        if (count($paidInvoice)) {
-            $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::COMPLETED)->delete();
-            continue;
-        }
-
-        // delete duplicated invoices
-        $unpaidInvoicesIds = $unpaidInvoices->pluck('id')->toArray();
-        array_shift($unpaidInvoicesIds);
-        Transaction::whereIn('id', $unpaidInvoicesIds)->delete();
-
-        // delete expired invoices
-        $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::EXPIRED)->delete();
-
-        // delete suspended invoices
-        $suspendedInvoices = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::SUSPENDED)->orderBy('id', 'desc')->get();
-        $suspendedInvoicesIds = $suspendedInvoices->pluck('id')->toArray();
-        array_shift($suspendedInvoicesIds);
-        Transaction::whereIn('id', $suspendedInvoicesIds)->delete();
 
+    if($bookingReference) {
+        $booking = Booking::where('marking', $bookingReference)->first();
+        $company = $booking->company;
     }
-});
+
+    return view('pages.customer_support', [
+        'marking' => $marking,
+        'email' => $email,
+        'bookingReference' => $bookingReference,
+        'company' => $company,
+        'booking' => $booking,
+    ]);
+
+})->name('support');

selenium.json

@@ -1,9 +0,0 @@
-{
-    "default": {
-        "capabilities": {
-            "browserName": "chrome"
-        },
-        "port": 9515,
-        "path": "/wd/hub"
-    }
-}

tests/CreatesApplication.php

@@ -3,16 +3,15 @@
 namespace Tests;
 
 use Illuminate\Contracts\Console\Kernel;
-use Illuminate\Foundation\Application;
 
 trait CreatesApplication
 {
     /**
      * Creates the application.
      *
-     * @return Application
+     * @return \Illuminate\Foundation\Application
      */
-    public function createApplication(): Application
+    public function createApplication()
     {
         $app = require __DIR__.'/../bootstrap/app.php';
 

tests/TestCase.php

@@ -2,52 +2,9 @@
 
 namespace Tests;
 
-use Faker\Factory as Faker;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
-use Illuminate\Support\Facades\Artisan;
-use JWTAuth;
 
 abstract class TestCase extends BaseTestCase
 {
-
+    use CreatesApplication;
-    use CreatesApplication, RefreshDatabase, DatabaseMigrations;
-
-    protected $faker;
-
-
-   /* public function actingAs($user, $driver = "api"): TestCase
-    {
-        $token = JWTAuth::fromUser($user);
-        $this->withHeader('Authorization', "Bearer {$token}");
-        parent::actingAs($user);
-
-        return $this;
-    }*/
-
-
-    /**
-     * Sets up the tests
-     */
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->faker = Faker::create();
-
-        Artisan::call('migrate');
-    }
-
-
-    /**
-     * Rolls back migrations
-     */
-    public function tearDown(): void
-    {
-        Artisan::call('migrate:rollback');
-
-        parent::tearDown();
-    }
-
 }

tests/Unit/AuthenticationTest.php

@@ -1,230 +0,0 @@
-<?php
-
-namespace Tests\Unit;
-
-use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Http\Middleware\ValidateToken;
-use App\Models\User;
-use JWTAuth;
-use Tests\TestCase;
-
-class AuthenticationTest extends TestCase
-{
-
-    protected $loginRoute = 'api.account.authentication.authenticate.attempt';
-
-
-    /**
-     * Test Authenticated Users can not Access the login page
-     * TODO fix this test
-     * @return void
-     */
-    public function testAuthenticatedUsersCanNotAccessLoginPage()
-    {
-        $user = User::factory()->create();
-        $this->actingAs($user)
-            ->assertAuthenticatedAs($user)
-            ->get(route('login'))
-            ->assertSee('Sign In');
-    }
-
-
-    /**
-     * Empty email and password can not be null
-     * @return void
-     */
-    public function testBothEmailAndPasswordAreRequiredToLogin()
-    {
-        $response = $this->post(route($this->loginRoute), [
-            'email' => '',
-            'password' => ''
-        ]);
-
-        $response->assertStatus(500)
-            ->assertSee('Authentication failed');
-        //todo we need to implement Laravel Requests for proper error handling
-    }
-
-    /**
-     * Test a user with Valid credentials can login
-     * @return void
-     */
-    public function testUserWithValidCredentialsCanLogin()
-    {
-        $user = User::factory()->create([
-            'password' => bcrypt($password = 'password')
-        ]);
-        $response = $this->post(route($this->loginRoute), [
-            'email' => $user->email,
-            'password' => $password
-        ]);
-
-        $response->assertStatus(200)
-            ->assertSee('You have successfully logged in to your account')
-            ->assertSee('access_token');
-    }
-
-    /**
-     * Invalid Users get an error
-     *    * @return void
-     */
-    public function testUserWithInvalidCredentialCanNotLogin()
-    {
-        $user = User::factory()->create([
-            'password' => bcrypt($password = 'password')
-        ]);
-
-        $response = $this->post((route($this->loginRoute)), [
-            'email' => $user->email,
-            'password' => 'wrongpassword'
-        ]);
-
-        $response->assertStatus(401)
-            ->assertSee('Authentication failed')
-            ->assertSee('These credentials do not match our records.');
-    }
-
-    /**
-     * test User can Logout
-     * @return void
-     */
-    public function testUserCanLogout()
-    {
-        $user = User::factory()->create();
-
-        $token = JWTAuth::fromUser($user);
-
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('GET', route('api.account.authentication.logout'));
-
-
-        $response->assertStatus(200)
-            ->assertSee('Logout Successful')
-            ->assertSee('You have successfully logged out of your account')
-            ->assertDontSee('access_token');
-
-    }
-
-    /**
-     * test Refresh token
-     * @return void
-     */
-    public function testUserCanRefreshToken()
-    {
-        $user = User::factory()->create();
-
-        $token = JWTAuth::fromUser($user);
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('GET', route('api.account.authentication.refresh'));
-
-        $response->assertStatus(200)
-            ->assertSee('Refresh Authentication Successful')
-            ->assertSee('You have successfully your account authentication')
-            ->assertJsonStructure([
-                'title',
-                'message',
-                'payload',
-            ]);
-
-
-    }
-
-    /**
-     * test forgot password
-     * @return void
-     */
-    public function testForgotPassword()
-    {
-        $route = 'api.account.authentication.password.forget';
-
-        $user = User::factory()->create();
-
-
-        $response = $this->post(route($route), [
-            'email' => $user->email
-        ]);
-        $response->assertStatus(200)
-            ->assertSee('Reset Password Successful')
-            ->assertSee('Reset Password Successful')
-            ->assertSee('You have successfully sent you an email to reset your password');
-
-    }
-
-    /**
-     * test reset password
-     * @return void
-     */
-    public function testUserGetResetPasswordLink()
-    {
-        $route = 'api.account.authentication.password.reset';
-
-        $user = User::factory()->create();
-
-        $token = JWTAuth::fromUser($user);
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('POST', route($route), [
-            'password' => 'newPassword',
-            'confirmPassword' => 'newPassword'
-        ]);
-
-        $response->assertStatus(500)
-            ->assertSee('Password Change failed');
-    }
-
-
-    /*
-     * todo
-     *  $response->assertStatus(200)
-         ->assertSee('Reset Password Successful')
-         ->assertSee('Reset Password Successful')
-         ->assertSee('You have successfully sent you an email to reset your password');*/
-
-    /*}*/
-
-    /**
-     * test user can verify email
-     * @return void
-     */
-    /*public function testCanVerifyEmail()
-    {
-        $route = 'api.account.email.verify';
-        $user = User::factory()->create();
-
-        $token = Password::createToken($user);
-
-        dd($token);
-
-        $response = $this->actingAs($user)
-            ->post(route($route), [
-                'token' => $token
-            ])->assertStatus(200);
-
-    }*/
-
-    /**
-     * test Resend verification email
-     * @return void
-     */
-    public function testResendVerification()
-    {
-        $route = 'api.account.email.verification.resend';
-        $user = User::factory()->create();
-        $response = $this->post(route($route), [
-            'user_id' => $user->id
-        ])
-            ->assertStatus(200)
-            ->assertSee('Resend Verification Email Successful')
-            ->assertSee('Successfully resent a new verification email');
-
-    }
-
-
-}

tests/Unit/BrowserSessionsTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Tests\Unit;
-
-use App\Models\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Tests\TestCase;
-
-class BrowserSessionsTest extends TestCase
-{
-    use RefreshDatabase;
-
-    public function test_other_browser_sessions_can_be_logged_out()
-    {
-
-        $user = User::factory()->create();
-        $this->actingAs($user);
-
-        $response = $this->get('/user/other-browser-sessions', [
-            'password' => 'password',
-        ]);
-
-        $response->assertSessionHasNoErrors();
-    }
-
-}

tests/Unit/EmailVerificationTest.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace Tests\Unit;
-
-use App\Models\User;
-use App\Providers\RouteServiceProvider;
-use Illuminate\Auth\Events\Verified;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\URL;
-use JWTAuth;
-use Tests\TestCase;
-
-class EmailVerificationTest extends TestCase
-{
-    use RefreshDatabase;
-
-    public function test_check_existing_email()
-    {
-
-        $user = User::factory()->create();
-
-        $response = $this->post('api/v1/account/authentication/login/check_email', [
-            'email' => $user->email
-        ]);
-
-
-        $response->assertStatus(200)
-            ->assertSee("User found Successful")
-            ->assertSee("Account Already Exists");
-
-    }
-
-    public function test_check_unknown_email()
-    {
-
-        $response = $this->post('api/v1/account/authentication/login/check_email', [
-            'email' => 'random_email@test.com'
-        ]);
-
-        $response->assertStatus(404)
-            ->assertSee("User found failed")
-            ->assertSee("Unable to find any record based on the criteria provided");
-
-    }
-
-
-    //todo test post success email verification
-
-    public function test_email_verification()
-    {
-
-        $user = User::factory()->create();
-
-        //todo create a new email verification token, not post request method found
-
-        $response = $this->actingAs($user)->post('api/v1/account/email/verify', [
-            'token' => 'simple_string'
-        ]);
-        //todo need to register notification services on IOC
-
-        $response->assertStatus(404);
-    }
-
-    public function test_resend_email()
-    {
-
-        $user = User::factory()->create();
-
-        //create a new email verification token, not post request method found
-
-        $response = $this->actingAs($user)->post('api/v1/account/email/verification/resend', [
-
-            'user_id' => $user->id
-        ]);
-
-        $response->assertStatus(200)
-            ->assertSee("Resend Verification Email Successful")
-            ->assertSee("Successfully resent a new verification email");
-    }
-
-    public function test_change_email()
-    {
-        $user = User::factory()->create();
-
-        $token = JWTAuth::fromUser($user);
-
-        //create a new email verification token, not post request method found
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('POST', 'api/v1/company/team/create', [
-            'email' => "newemail@test.abc"
-        ]);
-
-//todo add user payload to the response and assert json
-        $response->assertStatus(200)
-            ->assertSee("Updated Email Successful")
-            ->assertSee("Successfully updated email");
-
-    }
-}

tests/Unit/ExampleTest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Unit;
+
+use PHPUnit\Framework\TestCase;
+
+class ExampleTest extends TestCase
+{
+    /**
+     * A basic test example.
+     *
+     * @return void
+     */
+    public function testBasicTest()
+    {
+        $this->assertTrue(true);
+        
+    }
+}

tests/Unit/PasswordRestTest.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace Tests\Unit;
-
-use App\Classes\Modules\Accounts\Services\ExpiresPasswordReset;
-use App\Models\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Queue;
-use Tests\TestCase;
-
-class PasswordRestTest extends TestCase
-{
-    use RefreshDatabase;
-
-    public function test_generate_reset_password()
-    {
-        $user = User::factory()->create();
-
-        $response = $this->actingAs($user)->post('api/v1/account/authentication/password/forget', [
-            'email' => $user->email
-        ]);
-
-        $response->assertStatus(200)
-            ->assertSee("Reset Password Successful")
-            ->assertSee("You have successfully sent you an email to reset your password");
-
-        //assert a reset data was saved in  the database
-        $this->assertDatabaseHas('password_resets', [
-            'user_id' => $user->id,
-        ]);
-
-        //todo register all classes in the IOC
-
-        //assert a verification Link was generated
-
-
-        //  Queue::assertDispatched(ProcessImage::class, function ($job) {
-        //            return $job->image === 'image.jpg';
-        //        });
-
-
-        //get the token and pass it on the verification link
-
-    }
-
-}

tests/Unit/RegistrationTest.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace Tests\Unit;
-
-use App\Providers\RouteServiceProvider;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Tests\TestCase;
-
-class RegistrationTest extends TestCase
-{
-    use RefreshDatabase;
-
-    /*    public function test_create_invitation_request_test()
-        {
-
-            //todo to be updated on finalizing creating company module
-
-            $response = $this->post('api/v1/account/invite/registration', [
-                'company_id' => 1,
-                'name' => 'Test User',
-                'email' => 'test@example.com',
-                'phone' => '899990989',
-                'wechat_id' => '5666',
-                'company_name' => 'test company co',
-                'password' => 'password',
-                'password_confirmation' => 'password',
-                'contact_email' => "contact@email.com",
-            ]);
-
-
-            $response->assertStatus(404);
-
-        }
-
-        public function test_new_users_can_register()
-        {
-            $response = $this->post('/api/v1/account/registration', [
-                'type' => 1,
-                'name' => 'Test User',
-                'email' => 'test@example.com',
-                'phone' => '899990989',
-                'wechat_id' => '5666',
-                'company_name' => 'test company co',
-                'password' => 'password',
-                'password_confirmation' => 'password',
-                'contact_email' => "contact@email.com",
-            ]);
-
-            $this->assertDatabaseHas('users', [
-                'id' => 1,
-                'email' => 'test@example.com',
-                'name' => 'Test User',
-            ]);
-
-            //todo an error experienced on line $inviter = $this->fetchesCompanyModule->execute(['reference'=>'CIEF']);
-
-            //todo 1. assert a user was logged in  2. assert a user was redirected 3. assert user has a token
-        }
-    */
-}

tests/Unit/UsersTest.php

@@ -1,180 +0,0 @@
-<?php
-
-namespace Tests\Unit;
-
-use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Http\Middleware\ValidateToken;
-use App\Models\User;
-use JWTAuth;
-use Tests\TestCase;
-
-class UsersTest extends TestCase
-{
-
-    protected $loginRoute = 'api.account.authentication.authenticate.attempt';
-
-
-    /**
-     * Get User by Id
-     *
-     * @return void
-     */
-    public function test_get_user_by_id()
-    {
-        $user = User::factory()->create();
-
-        $token = JWTAuth::fromUser($user);
-
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('POST', route('api.account.user.show', [
-            'user_id' => $user->id
-        ]));
-
-        $response->assertStatus(200)
-            ->assertSee('Fetch Users Successful')
-            ->assertSee('You have successfully retrieved the user');
-
-    }
-
-    /**
-     * Get User by email
-     *
-     * @return void
-     */
-    public function test_get_fetch_user_by_email()
-    {
-        $user = User::factory()->create();
-
-        $token = JWTAuth::fromUser($user);
-
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('GET', route('api.account.user.company', $user->email), [
-            'email' => $user->email
-        ]);
-
-        //todo fix the invitee issue
-
-        /*   $response->assertStatus(200)
-               ->assertSee('Fetch Users')
-               ->assertSee('You have successfully retrieved the user by email');  */
-
-        $response->assertStatus(500);
-    }
-
-    /**
-     * Get a List of all users test
-     * @return void
-     */
-    public function test_list_users()
-    {
-        $user = User::factory()->create([
-            'type' => RoleTypes::ADMIN,
-            'status' => ApprovalStatus::APPROVED
-        ]);
-
-        $token = JWTAuth::fromUser($user);
-
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('GET', 'api/v1/account/user/list?&filters=null}');
-
-        $response->assertStatus(404);
-
-        //todo add a default return list without filter or null filters
-
-/*
-        $response->assertStatus(200)
-            ->assertSee('Retrieved Companies Successful')
-            ->assertSee('You have successfully retrieved a list of users');*/
-    }
-
-
-    /**
-     * Test Can Create an Admin User
-     *
-     * @return void
-     */
-    public function test_create_an_admin_user()
-    {
-        $user = User::factory()->create();
-
-        $token = JWTAuth::fromUser($user);
-
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('POST', route('api.account.user.admin.create'),
-            [
-                'name' => 'Test Admin',
-                'email' => 'admin@example.com',
-                'password' => 'password',
-                'password_confirmation' => 'password',
-            ]);
-
-
-        $response->assertStatus(200)
-            ->assertSee('Created Account')
-            ->assertSee('You have successfully created a new Account');
-    }
-
-
-    /**
-     * Test Can create a user
-     *
-     * @return void
-     */
-    public function test_can_update_user()
-    {
-        $user = User::factory()->create();
-
-        $token = JWTAuth::fromUser($user);
-
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('PUT', route('api.account.user.update', $user->id), [
-                'name' => 'Test Admin',
-                /*'email' => 'admin@example.com',
-                'password' => 'password',
-                'password_confirmation' => 'password',*/
-        ]);
-        $response->assertStatus(200)
-            ->assertSee('Updated User Profile')
-            ->assertSee('You have successfully updated the User Profile');
-
-    }
-
-
-    /**
-     * Test Can delete a user
-     *
-     * @return void
-     */
-    public function test_can_delete_user_profile()
-    {
-        $user = User::factory()->create();
-
-        $token = JWTAuth::fromUser($user);
-
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer ' . $token,
-        ])->json('DELETE', route('api.account.user.delete', $user->id), [
-            'id' => $user->id
-        ]);
-
-        $response->assertStatus(200)
-            ->assertSee('Delete User Successful')
-            ->assertSee('You have successfully deleted the User');
-
-    }
-
-
-}

tests/_output/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

tests/_support/AcceptanceTester.php

@@ -1,28 +0,0 @@
-<?php
-
-use Codeception\Actor;
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method void pause()
- *
- * @SuppressWarnings(PHPMD)
-*/
-class AcceptanceTester extends Actor
-{
-    use _generated\AcceptanceTesterActions;
-
-    /**
-     * Define custom actions here
-     */
-}

tests/_support/FunctionalTester.php

@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method void pause()
- *
- * @SuppressWarnings(PHPMD)
-*/
-class FunctionalTester extends \Codeception\Actor
-{
-    use _generated\FunctionalTesterActions;
-
-    /**
-     * Define custom actions here
-     */
-}

tests/_support/Helper/Acceptance.php

@@ -1,10 +0,0 @@
-<?php
-namespace Helper;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class Acceptance extends \Codeception\Module
-{
-
-}

tests/_support/Helper/Functional.php

@@ -1,10 +0,0 @@
-<?php
-namespace Helper;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class Functional extends \Codeception\Module
-{
-
-}

tests/_support/Helper/Unit.php

@@ -1,10 +0,0 @@
-<?php
-namespace Helper;
-
-// here you can define custom actions
-// all public methods declared in helper class will be available in $I
-
-class Unit extends \Codeception\Module
-{
-
-}