Fix a problem in invoice where rounding issue cause an invoice that is fully paid to appear partially paid

Fix a problem at CRM where downloading of invoice in PDF throws errors
Another attempt to fix an error where invoice created at crm has no project id
2026-08-19 12:34:18 +00:00 · 2023-03-19 22:21:10 +08:00 · 2023-03-19 22:20:49 +08:00 · 2023-03-19 17:34:34 +08:00 · 2023-03-19 16:31:30 +08:00 · 2023-03-17 17:28:18 +08:00
95 changed files with 1380 additions and 1963 deletions
@@ -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
@@ -56,4 +56,6 @@ MIX_EXCHANGE_URL="${EXCHANGE_URL}"

 YD_API_CODE=''

-JWT_SECRET=Btj63iMEleEaww6Bb2IBECkxWn7YHPhhPFluAkg9DfcQik0qDRy6QW75ABGmPT2h
+PERFEXCRM_BASE_URL=""
+PERFEXCRM_API_KEY=""
+PERFEXCRM_IS_ENABLED="false"
@@ -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
@@ -2,8 +2,6 @@
 /public/hot
 /public/storage
 /storage/*.key
-/tests/_output
-/tests/_support
 /vendor
 **/.idea/
 .env
@@ -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 =~ /.*/'
-
-
-
-
-
@@ -1,39 +1,62 @@
-## Shipping portal documentation
+<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p>

-simple documentation on how to install, run, test, commit and deploy application
+<p align="center">
+<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
+<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
+<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
+<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
+</p>

-## creating and running unit tests
+## About Laravel

-Required Tools
+Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:

- Chromium Driver / selenium
- add running and setting selenium  on all OS if possible
+- [Simple, fast routing engine](https://laravel.com/docs/routing).
+- [Powerful dependency injection container](https://laravel.com/docs/container).
+- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
+- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
+- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
+- [Robust background job processing](https://laravel.com/docs/queues).
+- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).

-Required Packages :
+Laravel is accessible, powerful, and provides tools required for large, robust applications.

- laravel/legacy-factories
+## Learning Laravel

- codeception/codeception
+Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.

-Or Simply Run
+If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.

-``Composer install``
+## Laravel Sponsors

-To create a unit test
+We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).

-``php artisan make test: Test Example --unit``
+### Premium Partners

-Running the tests :
+- **[Vehikl](https://vehikl.com/)**
+- **[Tighten Co.](https://tighten.co)**
+- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
+- **[64 Robots](https://64robots.com)**
+- **[Cubet Techno Labs](https://cubettech.com)**
+- **[Cyber-Duck](https://cyber-duck.co.uk)**
+- **[Many](https://www.many.co.uk)**
+- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
+- **[DevSquad](https://devsquad.com)**
+- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
+- **[OP.GG](https://op.gg)**

-Running a single Test
+## Contributing

-`` php artisan test --filter Example``
+Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).

-Running Unit tests -
+## Code of Conduct

-`` php artisan test ``
+In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).

-Running Codeception tests -
+## Security Vulnerabilities

-``vendor/bin/codecept run``
+If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.

+## License
+
+The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
@@ -15,7 +15,7 @@ class DoesNotHaveTransactionType implements Filter
    public static function apply(Builder $builder, $value)
    {
        return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
-            $query->where('type', $value);
+            $query->where('type', $value)->whereIn('status', [0,1,2,3]);
        })->whereHas('containers', function ($query){
            return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
        });
@@ -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);
-    }
-
-}
@@ -3,6 +3,8 @@
 namespace App\Classes\Jobs;

 use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMLead;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -28,6 +30,12 @@ class CreatePerfexCRMCustomer implements ShouldQueue

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

 use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMTaskProcessor;
 use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMLead;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;

 class CreatePerfexCRMSingleTask implements ShouldQueue
 {
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
+use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMInvoicePayment;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMProject;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
+use App\Classes\ValueObjects\Constants\PerfexCRMInvoiceStatus;
+use App\Models\Transaction;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+
+
+class UpdatePerfexCRMInvoice implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var UpdatePerfexCRMInvoiceObject */
+    private $updatePerfexCRMInvoiceObject;
+
+    /**
+     * CreatePerfexCRMSingleTask constructor.
+     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
+     */
+    public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
+    {
+        $this->updatePerfexCRMInvoiceObject = $updatePerfexCRMInvoiceObject;
+    }
+
+    public function handle()
+    {
+        //get the client id
+        $customer = (App()->make(FetchesPerfexCRMCustomer::class))->execute($this->updatePerfexCRMInvoiceObject->getEmail());
+        $transaction = $this->updatePerfexCRMInvoiceObject->getTransaction();
+
+        //get the invoice id
+        $invoiceId = 0;
+        $invoiceStatus = 0;
+        $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
+
+        if(is_null($invoice)){
+            $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
+            $invoiceId = $result->payload['id'];
+        }
+        else{
+            $invoiceId = $invoice->id;
+            $invoiceStatus = $invoice->status;
+
+            //This only run when invoice already exist and the invoice does not have a PAID status
+            if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
+                //get project
+                $projectId = "";
+                $projectName = "";
+                if($transaction->owner instanceof Transaction){
+                    $orderReference = $transaction->owner->owner->owner()->first()->reference;
+                    $packingListReference = $transaction->owner->owner->reference;
+                    $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                    $project = (App()->make(FetchesPerfexCRMProject::class))->execute($projectName, $customer->userid);
+                    if(!is_null($project)){
+                        $projectId = $project->id;
+                    }
+                }
+
+                if($projectId == ""){
+                    Log::error(json_encode('UpdatePerfexCRMInvoice debug: '.$projectName));
+                    Log::error(json_encode($transaction->owner));
+                }
+
+                //update invoice
+                (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $projectId);
+            }
+        }
+
+        //create invoice payment
+        if($invoiceId != 0 && $invoiceStatus != PerfexCRMInvoiceStatus::PAID){
+
+            $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
+
+            $invoicePaymentPerfexCRMObject = new InvoicePaymentPerfexCRMObject(
+                $invoiceId,
+                "$transaction->amount",
+                $date,
+                1,
+                "",
+                ""
+            );
+            (App()->make(CreatesPerfexCRMInvoicePayment::class))->execute($invoicePaymentPerfexCRMObject);
+        }
+    }
+
+    public function delay($delay)
+    {
+        // Add delay in seconds to the job
+        $this->delay = $delay;
+        return $this;
+    }
+}
@@ -161,7 +161,8 @@ class CreateCustomerLogic extends AbstractControllerLogic
                $request->input('name'),
                $request->input('email'),
                $request->input('phone'),
-                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name')
+                $request->input('type') === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'),
+                $connection->invitee_reference
            );
            CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
        }
@@ -68,19 +68,19 @@ class CreateBillingAddressLogic extends AbstractControllerLogic
    {
        $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
        
-        $billingAddressInputed = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
+        $address = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);

-        if ($billingAddressInputed->type !== AddressType::BILLING || $billingAddressInputed->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
+        if ($address->type !== AddressType::BILLING || $address->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
            // delete all current billing address
            Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();

-            // create 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);
+            // create addrress
+            $billingAddress = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $address->reference);
            $this->canCreateAddress->passes($billingAddress);
            $this->createsAddress->execute($companyModule, $billingAddress);
        }

-        return $this->resourceResponse(new AddressResource($billingAddressInputed));
+        return $this->resourceResponse(new AddressResource($address));
    }

 }
@@ -101,7 +101,7 @@ class CallbackBillplzLogic
        $token = Auth::fromUser(User::find(1));
        $request->headers->set('Authorization', 'Bearer '.$token);

-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
+        $this->updatesTransactionStatus->execute($transaction, $status);

        if(($invoice->amount - $transaction->amount) < 0.01) {
            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
@@ -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) {
-            $address->where('status', ApprovalStatus::APPROVED);
+        $johor_state_id = State::where('name', 'johor')->first()->id;
+
+        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');
        });
@@ -4,19 +4,14 @@ 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\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
 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 +40,8 @@ class CreateOrderLogic extends AbstractControllerLogic
    /** @var GeneratesOrderNumber */
    private $generatesOrderNumber;

-    /** @var CreatesAddress */
-    private $createsAddress;
-
-    /** @var CanCreateAddress */
-    private $canCreateAddress;
-
+    /** @var NewLeadTaskToPerfexCRMProcessor */
+    private $newLeadTaskToPerfexCRMProcessor;
    /**
     * CreateOrderLogic constructor.
     * @param FetchesCompany $fetchesCompany
@@ -58,45 +49,28 @@ class CreateOrderLogic extends AbstractControllerLogic
     * @param CreateOrderProcessor $createOrderProcessor
     * @param FetchesCompanyModule $fetchesCompanyModule
     * @param GeneratesOrderNumber $generatesOrderNumber
-     * @param CreatesAddress $createsAddress
-     * @param CanCreateAddress $canCreateAddress
+     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
     */
-    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,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
    {
        $this->fetchesCompany = $fetchesCompany;
        $this->fetchesAddress = $fetchesAddress;
        $this->createOrderProcessor = $createOrderProcessor;
        $this->fetchesCompanyModule = $fetchesCompanyModule;
        $this->generatesOrderNumber = $generatesOrderNumber;
-        $this->createsAddress = $createsAddress;
-        $this->canCreateAddress = $canCreateAddress;
+        $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
    }


    public function logic(Request $request) : JsonResponse {

-        
+
        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
-        
+
        $address = $this->fetchesAddress->execute(['id' => $request->input('address_id')]);

        $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]);
        }
@@ -107,6 +81,10 @@ class CreateOrderLogic extends AbstractControllerLogic

        $order = $this->createOrderProcessor->execute($company, $originWarehouse, $address, $this->generatesOrderNumber->execute());

+        if(config('perfexcrm.is_enabled') == 'true'){
+            $this->newLeadTaskToPerfexCRMProcessor->execute($company);
+        }
+
        return $this->resourceResponse(new OrderResource($order));
    }
 }
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PackingLists\Processors;


 use App\Classes\General\Interfaces\Packable;
+use App\Classes\Modules\PerfexCRM\Processors\PackingListToPerfexCRMProcessor;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
@@ -25,16 +26,20 @@ class CreatePackingListProcessor
    /** @var CreatesPackingList */
    private $createsPackingList;

+    /** @var PackingListToPerfexCRMProcessor */
+    private $packingListToPerfexCRMProcessor;

    /**
     * CreatePackingListProcessor constructor.
     * @param CanCreatePackingList $canCreatePackingList
     * @param CreatesPackingList $createsPackingList
+     * @param PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor
     */
-    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList)
+    public function __construct(CanCreatePackingList $canCreatePackingList, CreatesPackingList $createsPackingList, PackingListToPerfexCRMProcessor $packingListToPerfexCRMProcessor)
    {
        $this->canCreatePackingList = $canCreatePackingList;
        $this->createsPackingList = $createsPackingList;
+        $this->packingListToPerfexCRMProcessor = $packingListToPerfexCRMProcessor;
    }

    /**
@@ -59,6 +64,10 @@ class CreatePackingListProcessor
        $object = new PackingListObject($object->getReference().'_01', $appointee_id, $type, ApprovalStatus::PENDING_SUBMISSION);
        $this->createsPackingList->execute($object, $packingList);

+        if(config('perfexcrm.is_enabled') == 'true'){
+            $this->packingListToPerfexCRMProcessor->execute($packingList);
+        }
+
        return $packingList;
    }

@@ -19,13 +19,17 @@ class CreateLeadPerfexCRMObject implements DataTransferObject
    /** @var string */
    private $companyName;

-    public function __construct(string $name, string $email, string $phone, string $companyName)
+    /** @var string */
+    private $companyReference;
+
+    public function __construct(string $name, string $email, string $phone, string $companyName, string $companyReference)
    {

        $this->name = $name;
        $this->email = $email;
        $this->phone = $phone;
        $this->companyName = $companyName;
+        $this->companyReference = $companyReference;
    }

    /**
@@ -60,4 +64,11 @@ class CreateLeadPerfexCRMObject implements DataTransferObject
        return $this->companyName;
    }

+    /**
+     * @return string
+     */
+    public function getCompanyReference(): string
+    {
+        return $this->companyReference;
+    }
 }
@@ -33,8 +33,10 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
    /** @var string */
    private $status;

+    /** @var string */
+    private $department;

-    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status)
+    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department)
    {
        $this->email = $email;
        $this->name = $name;
@@ -45,6 +47,7 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
        $this->reference = $reference;
        $this->onTaskCompletion = $onTaskCompletion;
        $this->status = $status;
+        $this->department = $department;
    }

    /**
@@ -124,4 +127,11 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
        return $this->status;
    }

+    /**
+     * @return string
+     */
+    public function getDepartment(): string
+    {
+        return $this->department;
+    }
 }
@@ -25,6 +25,9 @@ class InitialPerfexCRMObject implements DataTransferObject
    /** @var string */
    private $projectName;

+    /** @var int */
+    private $projectStatus;
+
    /** @var array */
    private $milestoneNames;

@@ -32,7 +35,7 @@ class InitialPerfexCRMObject implements DataTransferObject
    private $taskNames;


-    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, array $milestoneNames, array $taskNames)
+    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $taskNames)
    {

        $this->companyName = $companyName;
@@ -41,6 +44,7 @@ class InitialPerfexCRMObject implements DataTransferObject
        $this->contactEmail = $contactEmail;
        $this->bookingMarking = $bookingMarking;
        $this->projectName = $projectName;
+        $this->projectStatus = $projectStatus;
        $this->milestoneNames = $milestoneNames;
        $this->taskNames = $taskNames;
    }
@@ -93,6 +97,14 @@ class InitialPerfexCRMObject implements DataTransferObject
        return $this->projectName;
    }

+    /**
+     * @return string
+     */
+    public function getProjectStatus(): int
+    {
+        return $this->projectStatus;
+    }
+
    /**
     * @return array
     */
@@ -7,7 +7,7 @@ use App\Classes\General\Interfaces\DataTransferObject;

 class InvoicePerfexCRMObject implements DataTransferObject
 {
-    /** @var int */
+    /** @var string */
    private $clientId;

    /** @var string */
@@ -56,9 +56,9 @@ class InvoicePerfexCRMObject implements DataTransferObject
    }

    /**
-     * @return int
+     * @return string
     */
-    public function getClientId(): int
+    public function getClientId(): string
    {
        return $this->clientId;
    }
@@ -14,7 +14,7 @@ class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
    /** @var string */
    public $longDescription;

-    /** @var int */
+    /** @var float */
    public $qty;

    /** @var float */
@@ -26,7 +26,7 @@ class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
    /** @var string */
    public $unit;

-    public function __construct(string $description, string $longDescription, int $qty, float $rate, int $order, string $unit)
+    public function __construct(string $description, string $longDescription, float $qty, float $rate, int $order, string $unit)
    {
        $this->description = $description;
        $this->longDescription = $longDescription;
@@ -53,9 +53,9 @@ class InvoiceSingleItemPerfexCRMObject implements DataTransferObject
    }

    /**
-     * @return int
+     * @return float
     */
-    public function getQty(): int
+    public function getQty(): float
    {
        return $this->qty;
    }
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
+
+use Illuminate\Http\Request;
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\Transaction;
+
+class UpdatePerfexCRMInvoiceObject implements DataTransferObject
+{
+    /** @var string */
+    private $email;
+
+    /** @var Transaction */
+    private $transaction;
+
+    /** @var bool */
+    private $isPaid;
+
+    public function __construct(string $email, Transaction $transaction, bool $isPaid)
+    {
+        $this->email = $email;
+        $this->transaction = $transaction;
+        $this->isPaid = $isPaid;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+    /**
+     * @return Transaction
+     */
+    public function getTransaction(): Transaction
+    {
+        return $this->transaction;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getIsPaid(): bool
+    {
+        return $this->isPaid;
+    }
+}
@@ -13,6 +13,9 @@ class UpdatePerfexCRMObject implements DataTransferObject
    /** @var string */
    private $companyReference;

+    /** @var string */
+    private $contactName;
+
    /** @var string */
    private $contactEmail;

@@ -22,23 +25,28 @@ class UpdatePerfexCRMObject implements DataTransferObject
    /** @var string */
    private $projectName;

-    /** @var string */
-    private $milestoneName;
+    /** @var int */
+    private $projectStatus;

-    /** @var string */
-    private $taskName;
+    /** @var array */
+    private $milestoneNames;
+
+    /** @var array */
+    private $taskNames;


-    public function __construct(string $companyName, string $companyReference, string $contactEmail, string $bookingMarking, string $projectName, string $milestoneName, string $taskName)
+    public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, array $milestoneNames, array $taskNames)
    {

        $this->companyName = $companyName;
        $this->companyReference = $companyReference;
+        $this->contactName = $contactName;
        $this->contactEmail = $contactEmail;
        $this->bookingMarking = $bookingMarking;
        $this->projectName = $projectName;
-        $this->milestoneName = $milestoneName;
-        $this->taskName = $taskName;
+        $this->projectStatus = $projectStatus;
+        $this->milestoneNames = $milestoneNames;
+        $this->taskNames = $taskNames;
    }

    /**
@@ -57,6 +65,14 @@ class UpdatePerfexCRMObject implements DataTransferObject
        return $this->companyReference;
    }

+    /**
+     * @return string
+     */
+    public function getContactName(): string
+    {
+        return $this->contactName;
+    }
+
    /**
     * @return string
     */
@@ -82,19 +98,26 @@ class UpdatePerfexCRMObject implements DataTransferObject
    }

    /**
-     * @return string
+     * @return int
     */
-    public function getMilestoneName(): string
+    public function getProjectStatus(): int
    {
-        return $this->milestoneName;
+        return $this->projectStatus;
    }

    /**
-     * @return string
+     * @return array
     */
-    public function getTaskName(): string
+    public function getMilestoneNames(): array
    {
-        return $this->taskName;
+        return $this->milestoneNames;
    }

+    /**
+     * @return array
+     */
+    public function getTaskNames(): array
+    {
+        return $this->taskNames;
+    }
 }
@@ -2,14 +2,19 @@

 namespace App\Classes\Modules\PerfexCRM\Processors;

-// use App\Classes\Modules\PerfexCRM\DataTransferObjects\ContactObject;
+use App\Models\Transaction;
 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\Services\FetchesPerfexCRMProject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoiceSingleItemPerfexCRMObject;
+use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use App\Models\PackingList;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;

 class CreatePerfexCRMInvoiceProcessor
 {
@@ -23,42 +28,57 @@ class CreatePerfexCRMInvoiceProcessor
    /** @var ConvertsPerfexCRMLeadToCustomer */
    private $convertsPerfexCRMLeadToCustomer;

+    /** @var FetchesPerfexCRMProject */
+    private $fetchesPerfexCRMProject;
+
+    /** @var CreatesPerfexCRMCustomerProject */
+    private $createsPerfexCRMCustomerProject;
+
    /**
     * CreatePerfexCRMInvoiceProcessor constructor.
     * @param CreatesPerfexCRMInvoice $createsPerfexCRMInvoice
     */
    public function __construct(CreatesPerfexCRMInvoice $createsPerfexCRMInvoice,
    CreatesPerfexCRMInvoicePayment $createsPerfexCRMInvoicePayment,
-    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer)
+    ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
+    FetchesPerfexCRMProject $fetchesPerfexCRMProject,
+    CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject)
    {
        $this->createsPerfexCRMInvoice = $createsPerfexCRMInvoice;
        $this->createsPerfexCRMInvoicePayment = $createsPerfexCRMInvoicePayment;
        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
+        $this->fetchesPerfexCRMProject = $fetchesPerfexCRMProject;
+        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
    }

    /**
-     * @param $transaction
-     * @param $purchaseOrder
-     * @param $supplier
+     * @param Transaction $transaction
+     * @param bool $isPaid, default: false
     * @return null|object
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
-    public function execute($transaction, $purchaseOrder, $supplier) {
+    public function execute(Transaction $transaction, bool $isPaid = false) {
        $clientId = "";
        $number = $transaction->bill_no;
        $prefix = "INV-";
+
+        //This will remove the prefix if prefix already exist in the string
        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');
+        $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
+        $dueDate = Carbon::parse($transaction->created_at)->format('Y-m-d');
        $currency = 1; //cief TODO: To look into Malaysia and Chinese currency
        $subTotal = 0.00;
        $total = 0.00;

+        $companyModule = $transaction->owner->owner->companyModule;
        $billingStreet = "";
-        $addresses = $supplier->addresses()->where('billing', '=', true)->first();
+        $addresses = $companyModule
+                    ->addresses()
+                    ->where('status', '=', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)
+                    ->where('type', '=', \App\Classes\ValueObjects\Constants\AddressType::BILLING)->first();

        $billingStreet = $billingStreet.$addresses->street_one;
        $billingStreet = $billingStreet.$addresses->street_two.',';
@@ -67,40 +87,51 @@ class CreatePerfexCRMInvoiceProcessor
        $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
+        $employee = $companyModule->employees()->first();
+        $email = $employee->email;
+
        $result = $this->convertsPerfexCRMLeadToCustomer->execute($email);
        if(isset($result->payload)){
            $clientId = $result->payload['client_id'];
        }

+        //get project
+        $projectId = ""; //Project only exist in CRM if the customer already made payment
+        $projectName = "";
+        if($isPaid){
+            if($transaction->owner instanceof PackingList){
+                $orderReference = $transaction->owner->owner->reference;
+                $packingListReference = $transaction->owner->reference;
+                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+                $project = $this->fetchesPerfexCRMProject->execute($projectName, $clientId);
+                if(!is_null($project)){
+                    $projectId = $project->id;
+                }
+                else{
+                    $result = $this->createsPerfexCRMCustomerProject->execute($projectName, PerfexCRMProjectStatus::NOT_STARTED, $clientId);
+                    if(isset($result->payload)){  //Here means project creation successful
+                        $projectId = $result->payload['project_id'];
+                    }
+                }
+            }
+
+            if($projectId == ""){
+                Log::error(json_encode('CreatePerfexCRMInvoiceProcessor debug: '.$projectName));
+                Log::error(json_encode($transaction->owner));
+            }
+        }
+
        //newitems
-        foreach ($purchaseOrder->transactionDetails as $key => $transaction_detail){
+        foreach ($transaction->transactionDetails as $key => $transaction_detail){
            $order = $key + 1;
-            $stockCode = $transaction_detail->product_code;
-            $description = $transaction_detail->product_name;
+            $description = $transaction_detail->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;
+            $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;
-            }
+            $subTotal = $subTotal + $transaction_detail->amount;

            //string $description, string $longDescription, int $qty, int $rate, int $order, string $unit
            $invoiceSingleItem = new InvoiceSingleItemPerfexCRMObject(
@@ -114,16 +145,11 @@ class CreatePerfexCRMInvoiceProcessor
            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;
-        }
+        $total = $transaction->amount;

-        //cief TODO: To be updated, temporarily hardcoded allow payment modes
+        //This setting is similar to Setup > Leads > Sources, Setup > Leads > Statuses
+        //Can be found at Finance > Payment Modes
        array_push($allowedPaymentModes, 1, 2);
-
        $invoicePerfexCRMObject = new InvoicePerfexCRMObject(
            $clientId,
            $number,
@@ -140,20 +166,7 @@ class CreatePerfexCRMInvoiceProcessor

        $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;
+        return $result;
    }

 }
@@ -33,6 +33,7 @@ class CreatePerfexCRMTaskProcessor
            $createTaskPerfexCRMObject->getProjectId(),
            $createTaskPerfexCRMObject->getReference(),
            $createTaskPerfexCRMObject->getOnTaskCompletion(),
+            $createTaskPerfexCRMObject->getDepartment(),
            $createTaskPerfexCRMObject->getStatus(),
        );
        return true;
@@ -18,7 +18,7 @@ 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 App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Http\Request;
@@ -149,7 +149,7 @@ class InitializePerfexCRMProcessor
       }

       // Get existing or create project, project has to exist first before milestone can appear under it
-       $result = $this->createsPerfexCRMCustomerProject->execute($initialPerfexCRMObject->getProjectName(), $crmClientId);
+       $result = $this->createsPerfexCRMCustomerProject->execute($initialPerfexCRMObject->getProjectName(), $initialPerfexCRMObject->getProjectStatus(), $crmClientId);
       if(isset($result->payload)){  //Here means project creation successful
            $projectId = $result->payload['project_id'];
       }
@@ -157,8 +157,8 @@ class InitializePerfexCRMProcessor
            $projectId = $this->fetchesPerfexCRMProject->execute($initialPerfexCRMObject->getProjectName(), $crmClientId)->id;
       }

-       if(!is_null($result)){
-            $tasks = $initialPerfexCRMObject->getTaskNames();
+       $tasks = $initialPerfexCRMObject->getTaskNames();
+       if(count($tasks) > 0){

            //Create tasks with milestone
            for($count=0; $count < count($tasks); $count++) {
@@ -177,13 +177,16 @@ class InitializePerfexCRMProcessor
                    }
                }

-                $taskStatus = PerfexCRMStatus::NOT_STARTED;
+                $taskStatus = PerfexCRMTaskStatus::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);
+                $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'],$tasks[$count]['department'], $taskStatus);
+                if(is_null($result)){
+                    break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
+                }
            }
        }
        return true;
@@ -3,28 +3,34 @@
 namespace App\Classes\Modules\PerfexCRM\Processors;

 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMStatus;
 use App\Classes\Jobs\CreatePerfexCRMSingleTask;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
+use App\Models\Company;

 class NewLeadTaskToPerfexCRMProcessor
 {
    /**
-     * @param None
+     * @param Company $company
     * @return true
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
-    public function execute()
+    public function execute(Company $company)
    {
+        $companyModule = $company->companyModules()->first();
+        $employee = $companyModule->employees()->first();
+        $contactEmail = $employee->email;
+
        $createTaskPerfexCRMObject = new CreateTaskPerfexCRMObject(
-            "dillontest1@gmail.com",
-            "test is the name of the task",
-            "this is the description of the task",
+            $contactEmail,
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['name'],
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['description'],
            "",
            "",
            "",
            "",
            "",
-            PerfexCRMStatus::NOT_STARTED
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['status'],
+            PerfexCRMTasks::TASK_IDENTIFICATION_1['department']
        );

        CreatePerfexCRMSingleTask::dispatch($createTaskPerfexCRMObject);
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Processors;
+
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
+use App\Classes\Jobs\UpdatePerfexCRM;
+use App\Models\PackingList;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use Illuminate\Support\Facades\Log;
+
+class PackingListToPerfexCRMProcessor
+{
+    /**
+     * @param PackingList $packingList
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(PackingList $packingList)
+    {
+        try {
+            if($packingList->owner instanceof \App\Models\Order) {
+                Log::error(json_encode($packingList));
+                $order = $packingList->owner;
+                $companyModule  = $order->companyModule()->first();
+                $connection = $companyModule->inviters()->withPivot('invitee_reference')->first();
+                $companyName = $companyModule->name;
+                $companyReference = $connection ? $connection->pivot->invitee_reference:'';
+                $employee = $companyModule->employees()->first();
+                $contactEmail = $employee->email;
+                $contactName = $employee->name;
+
+                $orderReference = $packingList->owner->reference;
+                $packingListReference = $packingList->reference;
+                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+
+                $updatePerfexCRMObject = new UpdatePerfexCRMObject(
+                    $companyName,
+                    $companyReference,
+                    $contactName,
+                    $contactEmail,
+                    "",
+                    $projectName,
+                    PerfexCRMProjectStatus::NOT_STARTED,
+                    [],
+                    [
+                        PerfexCRMTasks::TASK_LOADED_CONTAINER_1,
+                        PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
+                    ]
+                );
+                UpdatePerfexCRM::dispatch($updatePerfexCRMObject);
+            }
+        } catch (\Exception $exception){
+            Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));
+            Log::error(json_encode($packingList));
+            Log::error($exception);
+        }
+        return true;
+    }
+}
@@ -7,14 +7,16 @@ 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\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
 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\PerfexCRMProjectStatus;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Jobs\InitializePerfexCRM;
+use App\Classes\Jobs\UpdatePerfexCRMInvoice;
 use App\Classes\Jobs\UpdatePerfexCRM;
+use App\Models\Transaction;
+use Illuminate\Support\Facades\Log;

 class TransactionToPerfexCRMProcessor
 {
@@ -49,28 +51,30 @@ class TransactionToPerfexCRMProcessor
     */
    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();
+        if($model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED)
+        {
+            $packingList = $model->owner->owner;
+            $order = $packingList->owner()->first();
+            $companyModule = $order->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;
+            $orderReference = $order->reference;
+            $packingListReference = $packingList->reference;
            $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;

-            $bookingMarking = $model->owner->owner->id."-".$model->owner->owner->owner->id;
-            $initialPerfexCRMObject = new InitialPerfexCRMObject(
+            $bookingMarking = $packingList->id."-".$packingList->owner->id;
+            $updatePerfexCRMObject = new UpdatePerfexCRMObject(
                $companyName,
                $companyReference,
                $contactName,
                $contactEmail,
                $bookingMarking,
                $projectName,
+                PerfexCRMProjectStatus::IN_PROGRESS,
                [],
                [
                    PerfexCRMTasks::TASK_1,
@@ -81,9 +85,16 @@ class TransactionToPerfexCRMProcessor
                ]
            );

-            //$this->initializePerfexCRMProcessor->execute($initialPerfexCRMObject);
-            InitializePerfexCRM::dispatch($initialPerfexCRMObject);
+            UpdatePerfexCRM::dispatch($updatePerfexCRMObject);
+
+            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
+                $contactEmail,
+                $model,
+                true
+            );
+            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject)->delay(6);
        }
+
        return true;
    }
 }
@@ -11,11 +11,13 @@ 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\Services\UpdatesPerfexCRMCustomer;
+use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMProject;
 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 App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Http\Request;
@@ -49,11 +51,16 @@ class UpdatePerfexCRMProcessor
    /** @var CreatesPerfexCRMCustomerContact */
    private $createsPerfexCRMCustomerContact;

-    /** @var UpdatesPerfexCRMTask */
-    private $updatesPerfexCRMTask;
+    /** @var UpdatesPerfexCRM */
+    private $updatePerfexCRM;

+    /** @var UpdatesPerfexCRMCustomer */
+    private $updatesPerfexCRMCustomer;

-    /**
+    /** @var UpdatesPerfexCRMProject */
+    private $updatesPerfexCRMProject;
+
+   /**
     * @param ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer
     * @param CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject
     * @param CreatesPerfexCRMMilestone $createsPerfexCRMMilestone
@@ -63,18 +70,20 @@ class UpdatePerfexCRMProcessor
     * @param FetchesPerfexCRMTask $fetchesPerfexCRMTask
     * @param CreatesPerfexCRMCustomer $createsPerfexCRMCustomer
     * @param CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact
-     * @param UpdatesPerfexCRMTask $updatesPerfexCRMTask
+     * @param UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer
+     * @param UpdatesPerfexCRMProject $updatesPerfexCRMProject
    */
    public function __construct(ConvertsPerfexCRMLeadToCustomer $convertsPerfexCRMLeadToCustomer,
-    CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
-    CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
-    CreatesPerfexCRMTask $createsPerfexCRMTask,
-    FetchesPerfexCRMProject $fetchesPerfexCRMProject,
-    FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
-    FetchesPerfexCRMTask $fetchesPerfexCRMTask,
-    CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
-    CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
-    UpdatesPerfexCRMTask $updatesPerfexCRMTask)
+        CreatesPerfexCRMCustomerProject $createsPerfexCRMCustomerProject,
+        CreatesPerfexCRMMilestone $createsPerfexCRMMilestone,
+        CreatesPerfexCRMTask $createsPerfexCRMTask,
+        FetchesPerfexCRMProject $fetchesPerfexCRMProject,
+        FetchesPerfexCRMMilestone $fetchesPerfexCRMMilestone,
+        FetchesPerfexCRMTask $fetchesPerfexCRMTask,
+        CreatesPerfexCRMCustomer $createsPerfexCRMCustomer,
+        CreatesPerfexCRMCustomerContact $createsPerfexCRMCustomerContact,
+        UpdatesPerfexCRMCustomer $updatesPerfexCRMCustomer,
+        UpdatesPerfexCRMProject $updatesPerfexCRMProject)
   {
        $this->convertsPerfexCRMLeadToCustomer = $convertsPerfexCRMLeadToCustomer;
        $this->createsPerfexCRMCustomerProject = $createsPerfexCRMCustomerProject;
@@ -85,55 +94,113 @@ class UpdatePerfexCRMProcessor
        $this->fetchesPerfexCRMTask = $fetchesPerfexCRMTask;
        $this->createsPerfexCRMCustomer = $createsPerfexCRMCustomer;
        $this->createsPerfexCRMCustomerContact = $createsPerfexCRMCustomerContact;
-        $this->updatesPerfexCRMTask = $updatesPerfexCRMTask;
-   }
+        $this->updatesPerfexCRMCustomer = $updatesPerfexCRMCustomer;
+        $this->updatesPerfexCRMProject = $updatesPerfexCRMProject;
+    }

   /**
-    * @param PerfexCRMObject $perfexCRMObject
+    * @param UpdatePerfexCRMObject $updatePerfexCRMObject
    * @return null|object
    * @throws \App\Classes\Exceptions\MalformedRequestException
    */
-    public function execute(UpdatePerfexCRMObject $updatePerfexCRMObject) {
+   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'];
+       // 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 = $updatePerfexCRMObject->getCompanyName();
+       $result = $this->convertsPerfexCRMLeadToCustomer->execute($updatePerfexCRMObject->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,
+               $updatePerfexCRMObject->getContactName(),
+               $updatePerfexCRMObject->getContactName(),
+               $updatePerfexCRMObject->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'] === $updatePerfexCRMObject->getCompanyReference()) {
+                   $value_exists = true;
+                   break;
+               }
+           }
+       }
+       if(!$value_exists);
+       {
+           $result = $this->updatesPerfexCRMCustomer->execute($crmClientId, $crmCompany, $updatePerfexCRMObject->getCompanyReference());
+       }
+
+       // Get existing or create project, project has to exist first before milestone can appear under it
+       $result = $this->createsPerfexCRMCustomerProject->execute($updatePerfexCRMObject->getProjectName(), $updatePerfexCRMObject->getProjectStatus(), $crmClientId);
+       if(isset($result->payload)){  //Here means project creation successful
+            $projectId = $result->payload['project_id'];
+       }
+       else{
+            $project = $this->fetchesPerfexCRMProject->execute($updatePerfexCRMObject->getProjectName(), $crmClientId);
+            $projectId = $project->id;
+            //if the project status is anything but PerfexCRMProjectStatus::NOT_STARTED, update the project
+            if($updatePerfexCRMObject->getProjectStatus() != PerfexCRMProjectStatus::NOT_STARTED)
+            {
+                $this->updatesPerfexCRMProject->execute($project, $updatePerfexCRMObject->getProjectStatus());
+            }
+       }
+
+       $tasks = $updatePerfexCRMObject->getTaskNames();
+       if(count($tasks) > 0){
+
+            //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 = PerfexCRMTaskStatus::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'], $tasks[$count]['department'], $taskStatus);
+                if(is_null($result)){
+                    break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
+                }
+            }
        }
-
-         // 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;
-    }
+        return true;
+   }

 }
@@ -14,7 +14,7 @@ class CreatesPerfexCRMCustomerProject
     * @return null|object
     * @throws MalformedRequestException
     */
-    public function execute(string $projectName, string $clientId) {
+    public function execute(string $projectName, int $status, string $clientId) {
        try{
            $data = [
                'name' => $projectName,
@@ -22,7 +22,7 @@ class CreatesPerfexCRMCustomerProject
                'billing_type' => 1,
                'clientid' => $clientId,
                'start_date' => date('Y-m-d'),
-                'status' => 1
+                'status' => $status
            ];

            $response = Http::asForm()->withHeaders([
@@ -16,14 +16,17 @@ class CreatesPerfexCRMInvoice
     */
    public function execute(InvoicePerfexCRMObject $invoicePerfexCRMObject) {
        try{
+            $subtotal = floor($invoicePerfexCRMObject->getSubTotal() * 100) / 100;
+            $total = floor($invoicePerfexCRMObject->getTotal() * 100) / 100;
+
            $data = [
                'clientid' => $invoicePerfexCRMObject->getClientId(),
                'number' => $invoicePerfexCRMObject->getNumber(),
                'date' => $invoicePerfexCRMObject->getDate(),
                'duedate' => $invoicePerfexCRMObject->getDueDate(),
                'currency' => $invoicePerfexCRMObject->getCurrency(),
-                'subtotal' => $invoicePerfexCRMObject->getSubTotal(),
-                'total' => $invoicePerfexCRMObject->getTotal(),
+                'subtotal' => number_format($subtotal, 2, '.', ''),
+                'total' => number_format($total, 2, '.', ''),
                'billing_street' => $invoicePerfexCRMObject->getBillingStreet(),
                'project_id' => $invoicePerfexCRMObject->getProjectId(),
                'allowed_payment_modes[0]' => 1,
@@ -18,7 +18,7 @@ class CreatesPerfexCRMInvoicePayment
        try{
            $data = [
                'invoiceid' => $invoicePaymentPerfexCRMObject->getInvoiceId(),
-                'amount' => $invoicePaymentPerfexCRMObject->getAmount(),
+                'amount' => number_format($invoicePaymentPerfexCRMObject->getAmount(), 2, '.', ''),
                'date' => $invoicePaymentPerfexCRMObject->getDate(),
                'paymentmode' => $invoicePaymentPerfexCRMObject->getPaymentMode(),
                'transactionid' => $invoicePaymentPerfexCRMObject->getTransactionId(),
@@ -16,13 +16,20 @@ class CreatesPerfexCRMLead
     */
    public function execute(CreateLeadPerfexCRMObject $createLeadPerfexCRMObject) {
        try{
+            $custom_fields = [
+                "leads" => [
+                    4 => $createLeadPerfexCRMObject->getCompanyReference()
+                ]
+            ];
+
            $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
+                'status' => 2, //2: Lead, 1: Customer
+                'custom_fields' => $custom_fields
            ];

            $response = Http::asForm()->withHeaders([
@@ -5,6 +5,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Support\Facades\Log;
+use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;

 class CreatesPerfexCRMTask
 {
@@ -20,8 +21,17 @@ class CreatesPerfexCRMTask
     * @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") {
+    public function execute(string $taskName, string $taskDescription, string $leadId, string $milestoneId, string $projectId, string $reference = '', string $on_task_completion = '', string $department = '', string $status = "1") {
        try{
+            $custom_fields = [];
+            if($department != ""){
+                $custom_fields = [
+                    "tasks" => [
+                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $department
+                    ]
+                ];
+            }
+
            $data = [
                'name' => $taskName,
                'description' => $taskDescription,
@@ -32,7 +42,8 @@ class CreatesPerfexCRMTask
                'status' => $status,
                'is_system_created' => 1,
                'reference' => $reference,
-                'on_task_completion' => $on_task_completion
+                'on_task_completion' => $on_task_completion,
+                'custom_fields' => $custom_fields
            ];

            if($leadId != '') {
@@ -46,7 +57,8 @@ class CreatesPerfexCRMTask
                    'status' => $status,
                    'is_system_created' => 1,
                    'reference' => $reference,
-                    'on_task_completion' => $on_task_completion
+                    'on_task_completion' => $on_task_completion,
+                    'custom_fields' => $custom_fields
                ];
            }

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class FetchesPerfexCRMCustomer
+{
+    /**
+     * @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/customers/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());
+        }
+    }
+}
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class FetchesPerfexCRMInvoice
+{
+    /**
+     * @param string $clientId
+     * @param string $invoicePrefix
+     * @param string $invoiceNumber
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute(string $clientId, string $invoicePrefix, string $invoiceNumber) {
+        try{
+            $response = Http::withHeaders([
+                'authtoken' => config('perfexcrm.api_key'),])
+            ->get(config('perfexcrm.base_url').'/api/invoices/customsearch/'.$clientId.'/'.$invoicePrefix.'/'.$invoiceNumber);
+
+            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());
+        }
+    }
+}
@@ -5,6 +5,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Support\Facades\Log;
+use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;

 class UpdatesPerfexCRMCustomer
 {
@@ -19,7 +20,7 @@ class UpdatesPerfexCRMCustomer
        try{
            $custom_fields = [
                "customers" => [
-                    2 => $companyReference
+                    PerfexCRMCustomFields::CUSTOMERS_SHIPPING_PORTAL_REFERENCE => $companyReference
                ]
            ];

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class UpdatesPerfexCRMInvoice
+{
+
+    /**
+     * @param $invoice
+     * @param string $projectId
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute($invoice, string $projectId) {
+        try{
+            // <p>The Invoice number field is required.<\/p>
+            // <p>The Invoice date field is required.<\/p>
+            // <p>The Currency field is required.<\/p>
+            // <p>The Items field is required.<\/p>
+            // <p>The Allow Payment Mode field is required.<\/p>
+            // <p>The Billing Street field is required.<\/p>
+            // <p>The Sub Total field is required.<\/p>
+            // <p>The Total field is required.<\/p>
+
+            $newInvoiceItems = [];
+            foreach ($invoice->items as $item) {
+                $item['itemid'] = $item['id'];
+                unset($item['id']);
+                $item['order'] = $item['item_order'];
+                unset($item['item_order']);
+                array_push($newInvoiceItems,$item);
+            }
+
+            $allowedPaymentModes = [];
+            array_push($allowedPaymentModes, 1, 2);
+
+            $data = [
+                'number' => $invoice->number,
+                'date' => $invoice->date,
+                'duedate' => $invoice->date,
+                'currency' => $invoice->currency,
+                'subtotal' => $invoice->subtotal,
+                'total' => $invoice->total,
+                'billing_street' => $invoice->billing_street,
+                'shipping_street' => $invoice->billing_street,
+                'project_id' => $projectId,
+                'items' => $newInvoiceItems,
+                'allowed_payment_modes' => $allowedPaymentModes,
+            ];
+
+            $response = Http::asJson()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->put(config('perfexcrm.base_url').'/api/invoices/'.$invoice->id, $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());
+        }
+    }
+}
@@ -0,0 +1,51 @@
+<?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\ValueObjects\Constants\PerfexCRMCustomFields;
+
+class UpdatesPerfexCRMLead
+{
+    /**
+     * @param $lead
+     * @param string $companyReference
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute($lead, string $companyReference) {
+        try{
+            $custom_fields = [
+                "leads" => [
+                    PerfexCRMCustomFields::LEADS_SHIPPING_PORTAL_REFERENCE => $companyReference
+                ]
+            ];
+
+            $data = [
+                'name' => $lead->name,
+                'email' => $lead->email,
+                'phonenumber' => $lead->phonenumber,
+                'company' => $lead->company,
+                'custom_fields' => $custom_fields,
+                'source' => $lead->source,
+                'status' => $lead->status,
+            ];
+
+            $response = Http::asJson()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->put(config('perfexcrm.base_url').'/api/leads/'.$lead->id, $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());
+        }
+    }
+}
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Services;
+
+use Illuminate\Support\Facades\Http;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
+
+class UpdatesPerfexCRMProject
+{
+    /**
+     * @param $project
+     * @param int $status
+     * @return null|object
+     * @throws MalformedRequestException
+     */
+    public function execute($project, int $status) {
+        try{
+            $data = [
+                'name' => $project->name,
+                'clientid' => $project->clientid,
+                // 'rel_type' => 'customer',
+                'billing_type' => 1,
+                'start_date' => $project->start_date,
+                'status' => $status
+            ];
+
+            $response = Http::asJson()->withHeaders([
+                'authtoken' => config('perfexcrm.api_key')])
+            ->put(config('perfexcrm.base_url').'/api/projects/'.$project->id, $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());
+        }
+    }
+}
@@ -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([]);
-    }
-
-}
@@ -16,6 +16,7 @@ use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Jobs\CreatePerfexCRMInvoice;

 class ApproveShippingInvoiceTransactionProcessor
 {
@@ -29,6 +30,7 @@ class ApproveShippingInvoiceTransactionProcessor
    /** @var CreatesFiles */
    private $createsFiles;

+
    /**
     * @param UpdatesTransactionStatus $updatesTransactionStatus
     * @param CreatesDocument $createsDocument
@@ -72,6 +74,12 @@ class ApproveShippingInvoiceTransactionProcessor
        if(app()->environment(['production'])) {
            $user->notify(new InvoiceIssuedEmail($user, $packingList));
        }
+
+        // update perfex crm
+        if(config('perfexcrm.is_enabled') == 'true'){
+            CreatePerfexCRMInvoice::dispatch($invoice_transaction);
+        }
+
        return;
    }

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class PerfexCRMCustomFields {
+
+    public const CUSTOMERS_EXCHANGE_REFERENCE = 1;
+
+    public const CUSTOMERS_SHIPPING_PORTAL_REFERENCE = 2;
+
+    public const LEADS_EXCHANGE_REFERENCE = 3;
+
+    public const LEADS_SHIPPING_PORTAL_REFERENCE = 4;
+
+    public const TICKETS_CUSTOM_TAGS = 5;
+
+    public const TASKS_DEPARTMENT = 6;
+}
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class PerfexCRMInvoiceStatus {
+
+    public const UNPAID = 1;
+
+    public const PAID = 2;
+
+    public const PARTIALLY_PAID = 3;
+
+    public const OVERDUE = 4;
+}
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class PerfexCRMProjectStatus {
+
+    public const NOT_STARTED = 1;
+
+    public const IN_PROGRESS = 2;
+
+    public const ON_HOLD = 3;
+
+    public const FINISHED = 4;
+
+    public const CANCELLED = 5;
+}
@@ -2,7 +2,7 @@

 namespace App\Classes\ValueObjects\Constants;

-final class PerfexCRMStatus {
+final class PerfexCRMTaskStatus {

    public const NOT_STARTED = 1;

@@ -11,7 +11,7 @@ final class PerfexCRMStatus {
    public const TESTING = 3;

    public const IN_PROGRESS = 4;
-    
+
    public const COMPLETED = 5;

 }
@@ -4,13 +4,17 @@ namespace App\Classes\ValueObjects\Constants;

 class PerfexCRMTasks
 {
+    //IMPORTANT NOTE: TASK NAME MUST BE UNIQUE ACCORDING TO REL_TYPE
+    //e.g. rel_type: lead, project
+
    public const TASK_1 = [
        'name' => 'Customer Paid',
        'description' => '',
        'milestone' => 'MILESTONE 1 - Customer Paid',
        'reference' => '',
        'on_task_completion' => '',
-        'status' => PerfexCRMStatus::COMPLETED
+        'department' => '',
+        'status' => PerfexCRMTaskStatus::COMPLETED
    ];

    public const TASK_POST_PAYMENT_1 = [
@@ -26,7 +30,8 @@ class PerfexCRMTasks
        'milestone' => '',
        'reference' => 'TASK_POST_PAYMENT_1',
        'on_task_completion' => 'TASK_POST_PAYMENT_2',
-        'status' => PerfexCRMStatus::IN_PROGRESS
+        'department' => 'Accounts',
+        'status' => PerfexCRMTaskStatus::IN_PROGRESS
    ];
    public const TASK_POST_PAYMENT_2 = [
        'name' => 'Approve Payment',
@@ -41,6 +46,7 @@ class PerfexCRMTasks
        'milestone' => '',
        'reference' => 'TASK_POST_PAYMENT_2',
        'on_task_completion' => 'TASK_POST_PAYMENT_3',
+        'department' => 'Accounts',
        'status' => ''
    ];
    public const TASK_POST_PAYMENT_3 = [
@@ -56,6 +62,7 @@ class PerfexCRMTasks
        'milestone' => '',
        'reference' => 'TASK_POST_PAYMENT_3',
        'on_task_completion' => 'TASK_POST_PAYMENT_4',
+        'department' => 'Accounts',
        'status' => ''
    ];
    public const TASK_POST_PAYMENT_4 = [
@@ -71,6 +78,54 @@ class PerfexCRMTasks
        'milestone' => '',
        'reference' => 'TASK_POST_PAYMENT_4',
        'on_task_completion' => '',
+        'department' => 'Accounts',
        'status' => ''
    ];
+
+    public const TASK_LOADED_CONTAINER_1 = [
+        'name' => 'Generate Shipping Invoices',
+        'description' => '○ Purpose: -<br>
+        ○ Initial Status: In Progress<br>
+        ○ Deadline: Next day<br>
+        ○ Responsible department: Operation<br>
+        ○ Assignee: -<br>
+        ○ Next step: Approve Shipping Invoice change to in progress.<br>',
+        'milestone' => '',
+        'reference' => 'TASK_LOADED_CONTAINER_1',
+        'on_task_completion' => 'TASK_LOADED_CONTAINER_2',
+        'department' => 'Operations',
+        'status' => PerfexCRMTaskStatus::IN_PROGRESS
+    ];
+
+    public const TASK_LOADED_CONTAINER_2 = [
+        'name' => 'Approve Shipping Invoices',
+        'description' => '○ Purpose: -<br>
+        ○ Initial Status: Not Starteds<br>
+        ○ Deadline: Next day<br>
+        ○ Responsible department: Customer Services<br>
+        ○ Next step: -<br>',
+        'milestone' => '',
+        'reference' => 'TASK_LOADED_CONTAINER_2',
+        'on_task_completion' => '',
+        'department' => 'Customer Services',
+        'status' => ''
+    ];
+
+
+    public const TASK_IDENTIFICATION_1 = [
+        'name' => 'Approve Identification Verification (Shipping)',
+        'description' => '○ Purpose: To ensure the customer submit information matches the information in their identification document.<br>
+        ○ Initial Status: In Progress<br>
+        ○ Deadline: Same Day<br>
+        ○ Responsible department: Operation<br>
+        ○ Next step: None<br>
+        ○ Additional details: ** Any specific requirements or notes for the operation.**<br>
+        ○ Dependencies: None<br>
+        ○ Outcomes: Customer account identification is verified<br>',
+        'milestone' => '',
+        'reference' => 'TASK_IDENTIFICATION_1',
+        'on_task_completion' => '',
+        'department' => 'Operations',
+        'status' => PerfexCRMTaskStatus::IN_PROGRESS
+    ];
 }
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class RouteType {
-
-    public const WEB = 1;
-
-    public const API = 2;
-
-}
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class AuditBillplz extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz:audit';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Audit Billplz';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1'); 
+
+        $this->info(Carbon::now() . ' : Audit Billplz cron started.');
+        $start   = new Carbon();
+
+        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
+        $totalTransactions = count($transactions);
+        $counter = 1;
+        $totalAmount = 0;
+        foreach ($transactions as $transaction){
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
+    
+            if($response->successful()){
+                $data = $response->json();
+                if($data['paid']){
+    
+                } else {
+                    $totalAmount += $transaction->amount;
+                    $this->info($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
+                }
+            }else{
+                $this->info("billplz error</br>");
+            }
+            $counter++;
+        }
+    
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done Audit Billplz. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+    }
+}
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class debugBillplzFailedPayment extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz-failed-payment:debug';
+
+    /**
+     * 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()
+    {
+        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
+    
+        $i = 0;
+        $totalAmount = 0;
+        foreach ($transactions as $transaction){
+            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
+    
+            // dd($response);
+
+            // dd($transaction->owner->owner->owner->reference);
+    
+            if($response->successful()){
+                $data = $response->json();
+                if($data['paid']){
+                    if (!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                        $this->returnLog('Paid transaction', $transaction);
+                    }
+                } 
+                // else {
+                //     $totalAmount += $transaction->amount;
+                //     $this->returnLog('Unpaid Transaction', $transaction);
+                // }
+            }else{
+                $this->returnLog('billplz error', $transaction);
+            }
+        }
+    }
+
+    public function returnLog($text, $transaction) {
+        $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
+        $this->info($text . ' - id: '. $transaction->id . '. Order Marking: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Current Status: ' . $approvalStatusArray[$transaction->status]);
+    }
+}
@@ -28,30 +28,25 @@ class Kernel extends ConsoleKernel
    protected function schedule(Schedule $schedule)
    {

-        // $schedule->command('command:curlVTCommand')
-        //     ->cron('0 8 * * *')
-        //     ->withoutOverlapping()
-        //     ->appendOutputTo (storage_path().'/logs/curlvt.log');
+        $schedule->command('command:curlVTCommand')
+            ->cron('0 8 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlvt.log');

-        // $schedule->command('command:curlYdOrderListCommand')
-        //     ->cron('30 9-18/3 * * *')
-        //     ->withoutOverlapping()
-        //     ->appendOutputTo (storage_path().'/logs/curlyd.log');
+        $schedule->command('command:curlYdOrderListCommand')
+            ->cron('30 9-18/3 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');

-        // $schedule->command('command:curlYdOrderListCommand')
-        //     ->cron('0 9 * * *')
-        //     ->withoutOverlapping()
-        //     ->appendOutputTo (storage_path().'/logs/departure_email.log');
+        $schedule->command('command:curlYdOrderListCommand')
+            ->cron('0 9 * * *')
+            ->withoutOverlapping()
+            ->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');
    }

    /**
@@ -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);
-    }
-}
@@ -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,
        ],
    ];

@@ -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);
-	}
-}
@@ -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);
-	}
-}
@@ -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'
-   ];
-}
@@ -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'];

@@ -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
@@ -2,24 +2,20 @@
    "name": "laravel/laravel",
    "type": "project",
    "description": "The Laravel Framework.",
-    "keywords": [
-        "framework",
-        "laravel"
-    ],
+    "keywords": ["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",
@@ -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,
+            ];
+        });
+    }
 }
@@ -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');
-    }
-}
@@ -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"
@@ -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_DATABASE" value=":memory:"/>
+        <!-- <server name="DB_CONNECTION" value="sqlite"/> -->
+        <!-- <server name="DB_DATABASE" value=":memory:"/> -->
        <server name="MAIL_MAILER" value="array"/>
        <server name="QUEUE_CONNECTION" value="sync"/>
        <server name="SESSION_DRIVER" value="array"/>
@@ -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);
            },
        },
@@ -83,12 +83,11 @@
                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,
+                    billing_address_id: '',
                },
                item:{
                    id:null
@@ -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=" 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>
+                                    <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="createOrder()" v-if="parameters.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++;
            }
        }
    }
@@ -35,7 +35,7 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account
    });

    Route::group(['middleware' => 'valid.token', 'prefix' => 'user', 'as' => 'user.'], function () {
-        Route::get('/{email}', 'FetchUserByEmailController@fetch')->name('company');
+        Route::get('/email/{email}', 'FetchUserByEmailController@fetch')->name('company');
        Route::post('/show', 'FetchUserController@fetch')->name('show');
        Route::get('/list', 'ListUsersController@list')->name('list');
        Route::put('/update/{id}', 'UpdateUserController@update')->name('update');
@@ -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');

-});
+});
@@ -802,40 +802,31 @@ Route::get('/invoices/approve', function(Request $request){
 Route::get('/invoices/show-duplicated', function(Request $request){
    $transactionWithMultipleInvoice = DB::table('transactions')
        ->where('type', TransactionType::SHIPPING_INVOICE)
-        ->where('status', '!=' , ApprovalStatus::COMPLETED)
+        ->where('status', '!=' , ApprovalStatus::EXPIRED)
        ->where('deleted_at', null)
        ->select('owner_id', DB::raw('count(*) as count'))
        ->groupBy('owner_id')
        ->having('count', '>', 1)
        ->get();

-        // delete invoice type suspended
-
-    echo '<table>';
-    echo "<tr>";
-    echo "<td style='border:1px solid'>owner_id</td>";
-    echo "<td  style='border:1px solid'>count</td>";
-    echo "</tr>";
+    echo 'Total Duplicates: ' . count($transactionWithMultipleInvoice) . '<br>';

    $duplicatedOrderId = [];
+    $duplicatedOrderArray = [];
    foreach($transactionWithMultipleInvoice as $invoice) {
        $duplicatedOrderId[] = $invoice->owner_id;
-        echo "<tr>";
-        echo "<td style='border:1px solid'>$invoice->owner_id</td>";
-        echo "<td style='border:1px solid'>$invoice->count</td>";
-        echo "</tr>";
+        $duplicatedOrderArray[$invoice->owner_id] = $invoice->count;
    }
-    echo '</table>';

    $duplicatedInvoice = Transaction::whereIn('owner_id', $duplicatedOrderId)->orderByDesc('owner_id')->get();
-    // dd($duplicatedInvoice);
    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 "<td  style='border:1px solid'>Amount</td>";
+    echo "<td  style='border:1px solid'>Count</td>";
    echo "</tr>";

    foreach($duplicatedInvoice as $invoice) {
@@ -845,17 +836,16 @@ Route::get('/invoices/show-duplicated', function(Request $request){
        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 "<td style='border:1px solid'>".$duplicatedOrderArray[$invoice->owner_id]."</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('status', '!=' , ApprovalStatus::EXPIRED)
        ->where('deleted_at', null)
        ->select('owner_id', DB::raw('count(*) as count'))
        ->groupBy('owner_id')
@@ -870,26 +860,128 @@ Route::get('/invoices/delete-duplicated', function(Request $request){

        $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 have completed invoice (verified payment)
        if (count($paidInvoice)) {
            $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::COMPLETED)->delete();
            continue;
+        } else {
+            dump($order->reference . ' -no');
        }

-        // delete duplicated invoices
-        $unpaidInvoicesIds = $unpaidInvoices->pluck('id')->toArray();
-        array_shift($unpaidInvoicesIds);
-        Transaction::whereIn('id', $unpaidInvoicesIds)->delete();
+        // if have unverified payment
+        // $paymentHistory = $packingList->transactions()->whereHas('transactions', function($query){
+        //     return $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION ,ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);
+        // })->get();
+        // if (count($paymentHistory)) {
+        //     $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('id', '!=', $paymentHistory->first()->id)->delete();
+        //     continue;
+        // }

-        // delete expired invoices
-        $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', '!=', ApprovalStatus::EXPIRED)->delete();
+        // // delete duplicated invoices
+        // $unpaidInvoices = $packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->orderBy('id', 'desc')->get();

-        // 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();
+        // $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();
    }
 });
+
+Route::get('/packing-lists/show-duplicated', function(Request $request){
+    $results = PackingList::select('reference', 'type', DB::raw('count(*) as total'))
+            ->groupBy('reference', 'type')
+            ->having('total', '>', 1)
+            ->get()
+            ->toArray();
+
+    echo '<table>';
+    echo "<tr>";
+    echo "<td style='border:1px solid'>reference</td>";
+    echo "<td  style='border:1px solid'>type</td>";
+    echo "<td  style='border:1px solid'>count</td>";
+    echo "</tr>";
+
+    foreach($results as $result) {
+        // dd($result);
+        echo "<tr>";
+        echo "<td style='border:1px solid'>" . $result['reference'] . "</td>";
+        echo "<td style='border:1px solid'>" . $result['type'] . "</td>";
+        echo "<td style='border:1px solid'>" . $result['total'] . "</td>";
+        echo "</tr>";
+    }
+    echo '</table>';
+});
+
+Route::get('/packing-lists/delete-duplicated', function(Request $request){
+    $results = PackingList::select('reference', 'type', DB::raw('count(*) as total'))
+        ->groupBy('reference', 'type')
+        ->having('total', '>', 1)
+        ->get()
+        ->toArray();
+
+    foreach($results as $result) {
+        $duplicatedPackingList = PackingList::where('reference', $result['reference'])->where('type', $result['type'])->orderBy('id', 'desc')->get();
+
+        // if packinglist has paid inivoice
+        $paidPackinglist = PackingList::where('reference', $result['reference'])->where('type', $result['type'])->whereHas('transactions', function($query){
+            return $query->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::COMPLETED);
+        })->get();
+
+        if (count($paidPackinglist)) {
+            // delete all the other packing list
+            $paidPackinglistID = $paidPackinglist->first()->id;
+            $duplicatedPackingList = PackingList::where('reference', $result['reference'])->where('type', $result['type'])->where('id', '!=', $paidPackinglistID)->get();
+            // $duplicatedPackingList->delete();
+            foreach ($duplicatedPackingList as $p) {
+                $p->delete();
+                dump('have paid packinglist, deleting id:' . $p->id);
+            }
+        } else {
+            // delete all but left the latest packing list
+            $firstItem = $duplicatedPackingList->shift();
+            // dump('dont have paid packinglist, keep first and delete others');
+            foreach ($duplicatedPackingList as $p) {
+                $p->delete();
+                dump('dont have paid packinglist, keep latest id:' . $firstItem->id . ', and deleting id:' . $p->id);
+            }
+        }
+    }
+});
+
+Route::get('/billplz/audit', function (Request $request) {
+    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
+    $i = 0;
+    $totalAmount = 0;
+    foreach ($transactions as $transaction){
+        $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
+
+        if($response->successful()){
+            $data = $response->json();
+            if($data['paid']){
+
+            } else {
+
+                $transaction->status = ApprovalStatus::REJECTED;
+                $transaction->save();
+
+                $invoice = $transaction->owner;
+                $invoice->status = ApprovalStatus::APPROVED;
+
+                $totalAmount += $transaction->amount;
+                echo 'Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . " </br></br>";
+            }
+        }else{
+            echo "billplz error</br>";
+        }
+    }
+
+    echo 'Total: ' . $totalAmount;
+});
@@ -1,9 +0,0 @@
-{
-    "default": {
-        "capabilities": {
-            "browserName": "chrome"
-        },
-        "port": 9515,
-        "path": "/wd/hub"
-    }
-}
@@ -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';

@@ -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, 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();
-    }
-
+    use CreatesApplication;
 }
@@ -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');
-
-    }
-
-
-}
@@ -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();
-    }
-
-}
@@ -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");
-
-    }
-}
@@ -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);
+        
+    }
+}
@@ -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
-
-    }
-
-}
@@ -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
-        }
-    */
-}
@@ -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');
-
-    }
-
-
-}
@@ -1,2 +0,0 @@
-*
-!.gitignore
@@ -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
-     */
-}
@@ -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
-     */
-}
@@ -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
-{
-
-}
@@ -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
-{
-
-}
@@ -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
-{
-
-}
@@ -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 UnitTester extends \Codeception\Actor
-{
-    use _generated\UnitTesterActions;
-
-    /**
-     * Define custom actions here
-     */
-}
@@ -1,2 +0,0 @@
-*
-!.gitignore
@@ -1,9 +0,0 @@
-actor: AcceptanceTester
-modules:
-  enabled:
-    - WebDriver:
-        browser: chrome
-        url: http://127.0.0.1:8000
-    - Laravel:
-        part: ORM
-        environment_file: .env.testing
@@ -1,55 +0,0 @@
-<?php
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Models\User;
-use Codeception\Util\Debug;
-
-class AuthenticationCest
-{
-    public function _before(AcceptanceTester $I)
-    {
-        $I->wantTo('Test the Authentication Flow');
-        $I->amOnPage('/');
-    }
-
-    /**
-     * test if the home page is loaded
-     * @param AcceptanceTester $I
-     * @return void
-     */
-    public function tryToTestIfWelcomePageIsLoaded(AcceptanceTester $I)
-    {
-
-        $I->wantTo('Check if the home page works.');
-        $I->amOnPage('/');
-        $I->see('SIGN IN');
-        $I->see('To keep using the service please sign in with your personal info');
-        $I->see('New Customer? Create Account');
-    }
-
-    /**
-     * test if admin can log in
-     * @param AcceptanceTester $I
-     * @return void
-     */
-    public function tryToTestIfAdminCanLogin(AcceptanceTester $I)
-    {
-
-
-        // Fill out the login form
-        $I->fillField('email', 'omair@cief-malaysia.com');
-        $I->fillField('password', '123456abcabc');
-        $I->click(['css' => '.btn.btn-block.btn-lg.b-rad-none.no-border']);
-
-        $I->wait(5); // 2 seconds delay
-
-        $I->expectTo('be redirected to the dashboard');
-        $I->seeCurrentUrlEquals('/dashboard');
-        $I->see('Dashboard');
-        $I->see('NEW CUSTOMERS');
-        $I->see('Unclaimed Packing Lists');
-        $I->see('Identification Verification');
-        $I->see('ACTIVATED ORDERS');
-    }
-}
@@ -1,49 +0,0 @@
-<?php
-
-class DashboardCest
-{
-    public function _before(AcceptanceTester $I)
-    {
-
-        $I->wantTo('Test All Dashboard Data is Loaded');
-        $I->amOnPage('/dashboard');
-    }
-
-    /**
-     * test if the sidebar was loaded
-     * @param AcceptanceTester $I
-     * @return void
-     */
-    public function tryToTestIfAllAdminSidebarAreLoaded(AcceptanceTester $I)
-    {
-        $I->amOnPage('/dashboard');
-        $I->see('DASHBOARD');
-        $I->see('CUSTOMERS');
-        $I->see('DELIVERY LIST');
-        $I->see('CONTAINERS');
-        $I->see('PAYMENT AND BILLING');
-
-    }
-
-
-    /**
-     * test if the dashboard content is Loaded
-     * @param AcceptanceTester $I
-     * @return void
-     */
-    public function tryToTestAllDashboardComponentLoaded(AcceptanceTester $I)
-    {
-        $I->amOnPage('/dashboard');
-        $I->see('Dashboard');
-        $I->see('NEW CUSTOMERS');
-        $I->see('Unclaimed Packing Lists');
-        $I->see('Identification Verification');
-        $I->see('ACTIVATED ORDERS');
-        $I->see('PENDING SHIPMENT');
-
-        //delay a few second
-        $I->wait(5); // 2 seconds delay
-
-        $I->see('Unclaimed Packing Lists');
-    }
-}
@@ -1,13 +0,0 @@
-# Codeception Test Suite Configuration
-#
-# Suite for functional tests
-# Emulate web requests and make application process them
-# Include one of framework modules (Symfony2, Yii2, Laravel5, Phalcon4) to use it
-# Remove this suite if you don't use frameworks
-
-actor: FunctionalTester
-modules:
-    enabled:
-        # add a framework module here
-        - \Helper\Functional
-    step_decorators: ~        
@@ -1,10 +0,0 @@
-# Codeception Test Suite Configuration
-#
-# Suite for unit or integration tests.
-
-actor: UnitTester
-modules:
-    enabled:
-        - Asserts
-        - \Helper\Unit
-    step_decorators: ~
Author	SHA1	Message	Date
Dillon	32591273f8	Fix a problem in invoice where rounding issue cause an invoice that is fully paid to appear partially paid	2023-03-19 22:21:10 +08:00
Dillon	f73b1d7fe3	Fix a problem at CRM where downloading of invoice in PDF throws errors	2023-03-19 22:20:49 +08:00
Dillon	0d4f7e0ed5	Another attempt to fix an error where invoice created at crm has no project id	2023-03-19 17:34:34 +08:00
Dillon	9786198ca2	Fix Error: BadMethodCallException: Call to undefined method	2023-03-19 16:31:30 +08:00
Dillon	64ec76eed6	Insert logs for debugging	2023-03-17 17:28:18 +08:00
edmondlang	ef3c738fb1	debug billplz payment	2023-03-15 19:58:05 +08:00
edmondlang	92b6e6dc3a	debug billplz payment	2023-03-15 19:48:48 +08:00
Dillon Ngo	0d330447eb	Merge branch 'dillon/crm-tasks-department' into 'master' CRM add department custom field to tasks See merge request CIEFWorldwideSdnBhd/shipping-portal!152	2023-03-14 12:41:49 +00:00
Omair Saleh	daeb376aa5	billplz audit	2023-03-13 16:05:41 +08:00
Omair Saleh	f4d81cbde9	Merge remote-tracking branch 'origin/master'	2023-03-13 16:03:18 +08:00
Omair Saleh	0fd3584af2	billplz audit	2023-03-13 16:03:05 +08:00
edmondlang	a2f70f266d	billplz audit	2023-03-13 06:57:19 +08:00
Omair Saleh	432ce2d14a	billplz audit	2023-03-13 01:42:14 +08:00
edmondlang	715384f4a4	audit billplz	2023-03-13 00:42:44 +08:00
edmondlang	8277b9d0fd	fix bug unsuccessfull payment can went through	2023-03-13 00:32:59 +08:00
Dillon	4769541535	CRM add department custom field to tasks	2023-03-12 17:37:49 +08:00
Dillon Ngo	fe8b6d0518	Merge branch 'dillon/crm-create-task-2' into 'master' Add in missing update project function See merge request CIEFWorldwideSdnBhd/shipping-portal!151	2023-03-11 11:45:11 +00:00
Dillon	5934fbcb6c	Add in missing update project function	2023-03-11 19:43:30 +08:00
Dillon Ngo	c078a879d2	Merge branch 'dillon/crm-feed-improvement-1' into 'master' Dillon/crm feed improvement 1 See merge request CIEFWorldwideSdnBhd/shipping-portal!150	2023-03-11 08:56:40 +00:00
Dillon Ngo	c58f2e55d7	Merge branch 'dillon/crm-create-task-2' into 'master' Dillon/crm create task 2 See merge request CIEFWorldwideSdnBhd/shipping-portal!149	2023-03-11 08:56:25 +00:00
Dillon	45c94321b1	Fix a problem in invoice item where the amount cannot be 0	2023-03-11 16:32:49 +08:00
Dillon	4fbe771dce	Fix a problem with task name in CRM must be unique	2023-03-10 21:12:43 +08:00
edmondlang	9f8ba5163c	fix list admin user	2023-03-10 19:23:01 +08:00
Dillon	b06cef4045	Feedback from user on crm leads registration	2023-03-10 17:58:13 +08:00
Dillon	1c072d7b96	CRM create all remaining tasks according to documentation	2023-03-10 02:41:41 +08:00
edmondlang	eeb7bb77bb	delete duplicated invoice	2023-03-09 12:46:00 +08:00
edmondlang	2de60c8262	test delete duplicated invoice	2023-03-09 12:44:36 +08:00
edmondlang	c8a2ce71e1	test delete duplicated invoice	2023-03-09 12:39:28 +08:00
edmondlang	7e04580be0	update show duplicated invoice	2023-03-09 12:34:37 +08:00
edmondlang	3d15a8e312	delete duplicate invoice logic	2023-03-09 10:21:40 +08:00
edmondlang	9936e42574	update show duplicated invoice	2023-03-09 10:15:20 +08:00
edmondlang	16ffec01d4	fix missing invoices	2023-03-09 09:28:45 +08:00
edmondlang	7959f8c83c	fix missing invoices	2023-03-08 22:02:03 +08:00
edmondlang	16b5660f12	fix duplicated packing list	2023-03-08 15:33:17 +08:00
edmondlang	023954db70	fix duplicated packing list	2023-03-08 14:32:10 +08:00
edmondlang	535b8a59b9	fix invoice drop date	2023-03-08 11:48:38 +08:00
omair saleh	dc4d7004a3	Merge branch 'dillon/crm-create-invoice' into 'master' Dillon/crm create invoice See merge request CIEFWorldwideSdnBhd/shipping-portal!148	2023-03-07 15:16:46 +00:00
Dillon	128c8083c3	CRM tie invoice to project	2023-03-06 15:12:55 +08:00
Dillon	d52131d9df	CRM create invoice	2023-03-05 20:28:48 +08:00