Exchange-2.0 code sync for crm changes

update manual generate warehouse packinglist
2026-08-19 20:44:19 +00:00 · 2023-08-17 21:49:48 +08:00 · 2023-08-17 21:34:18 +08:00 · 2023-08-03 14:30:45 +08:00 · 2023-08-03 13:45:07 +08:00 · 2023-08-01 00:04:20 +08:00
175 changed files with 1648 additions and 4256 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,8 +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
@@ -27,6 +25,3 @@ package-lock.json
 public/*
 /public/*
 storage/framework/laravel-excel/*
-.vapor/
-.env.production
-.env.staging
@@ -1,48 +0,0 @@
-image: php:7.4
-stages:
-  - deploy
-
-#jobs
-#deploy
-deploy:
-  stage: deploy
-  before_script:
-    - apt-get update -yqq
-    - apt-get install -yqq
-    - apt-get install -y libonig-dev
-    - apt-get install -y libxml2-dev
-    - apt-get install -y libzip-dev
-    - apt-get install -y libgd-dev
-    - apt-get install -y libgd-dev
-
-    # Install PDO MySQL extension
-    - docker-php-ext-install pdo_mysql
-
-    # Install php dependencies
-    - docker-php-ext-install mbstring xml zip gd
-
-    # Install composer package manager
-    - curl --location --output /usr/local/bin/composer https://getcomposer.org/download/latest-stable/composer.phar
-    - chmod +x /usr/local/bin/composer
-
-    # Install node js
-    - apt-get update && apt-get install -y  nodejs npm
-
-    # Install docker
-    - apt-get update
-    - apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release software-properties-common
-    - curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
-    - add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
-    - apt-get update
-    - apt-get install -y docker-ce docker-ce-cli containerd.io
-    - service docker start
-
-    # Install gulp Js
-    - npm install -g gulp-cli
-  script:
-    - composer install
-    - vendor/bin/vapor deploy production --message="$CI_COMMIT_MESSAGE"
-  only:
-    - test
-
-
@@ -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).
@@ -4,8 +4,9 @@ namespace App\Classes\General\Eloquent\Filters;

 use Illuminate\Database\Eloquent\Builder;

-class IdNext implements Filter
+class BillNo implements Filter
 {
+
    /**
     * @param Builder $builder
     * @param $value
@@ -13,6 +14,7 @@ class IdNext implements Filter
     */
    public static function apply(Builder $builder, $value)
    {
-        return $builder->where('id', '>', $value);
+        return $builder->where('bill_no', $value);
    }
-}
+
+}
@@ -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)->whereIn('status', [0,1,2,3]);
+            $query->where('type', $value)->whereIn('status', [0,1,2,3,5]);
        })->whereHas('containers', function ($query){
            return $query->whereDate('loading_date', '>=', Carbon::parse('20-09-2022'));
        });
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class NextMainQuestion implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('next_main_question', $value);
-    }
-}
@@ -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);
-    }
-
-}
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class QuestionId implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('question_id', $value);
-    }
-
-}
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class QuestionNumber implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('question_number', $value);
-    }
-
-}
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class QuestionnaireSetId implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('questionnaire_set_id', $value);
-    }
-
-}
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Classes\General\Eloquent\Filters;
-
-use Illuminate\Database\Eloquent\Builder;
-
-class UserId implements Filter
-{
-    /**
-     * @param Builder $builder
-     * @param $value
-     * @return Builder|mixed
-     */
-    public static function apply(Builder $builder, $value)
-    {
-        return $builder->where('user_id', $value);
-    }
-}
@@ -24,12 +24,11 @@ class Helper
        return array_slice(get_class_methods($className), 1);
    }

-     /**
+    /**
     * @param $log
-     * @return none
     */
-    static function debugLoggerForPerfexCRM($log){
-        if($log){
+    static function debugLogger($log){
+        if($log && isset($log['message'])){
            $message = $log['message'];
            $substring = 'No data were found';
            if (isset($message)) {
@@ -3,6 +3,8 @@
 namespace App\Classes\Jobs;

 use App\Classes\Modules\PerfexCRM\Processors\UpdatePerfexCRMProcessor;
+use App\Classes\Modules\PerfexCRM\Processors\FetchPerfexCRMInvoiceProcessor;
+use App\Models\Transaction;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -10,6 +12,8 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\FetchPerfexCRMInvoiceObject;
+

 class UpdatePerfexCRM implements ShouldQueue
 {
@@ -18,37 +22,51 @@ class UpdatePerfexCRM implements ShouldQueue
    /** @var UpdatePerfexCRMObject */
    private $updatePerfexCRMObject;

-    /** @var UpdatePerfexCRMInvoice */
-    private $nextJob;
-
    /** @var */
    private $transaction;

+    /** @var bool|null */
+    private $shouldCreateInvoice;
+
    /**
     * UpdatePerfexCRM constructor.
     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param UpdatePerfexCRMInvoice $nextJob
-     * @param $transaction
+     * @param Transaction $transaction
+     * @param bool|null $shouldCreateInvoice
     */
-    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, $nextJob)
+    public function __construct(UpdatePerfexCRMObject $updatePerfexCRMObject, $transaction, ?bool $shouldCreateInvoice = false)
    {
        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->nextJob = $nextJob;
        $this->transaction = $transaction;
+        $this->shouldCreateInvoice = $shouldCreateInvoice;
    }

    public function handle()
    {
+        //To use invoice as a reference to decide whether more tasks should be created
+        $this->updatePerfexCRMObject->setInvoiceId($this->getInvoiceIdOrCreateInvoice());
+
        $result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
-        if($this->nextJob != null && $this->transaction != null){
+        if($this->transaction != null && $this->shouldCreateInvoice){
            $updatePerfexCRMInvoiceOject = new UpdatePerfexCRMInvoiceObject(
                $this->updatePerfexCRMObject->getContactEmail(),
                $result->projectId,
                $this->transaction,
                true
            );
-            /** @var UpdatePerfexCRMInvoice $nextJob */
-            $this->nextJob::dispatch($updatePerfexCRMInvoiceOject);
+            UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceOject);
        }
    }
+
+    private function getInvoiceIdOrCreateInvoice(){
+        if($this->transaction != null){
+            $fetchPerfexCRMInvoiceObject = new FetchPerfexCRMInvoiceObject(
+                $this->updatePerfexCRMObject->getContactEmail(),
+                $this->transaction
+            );
+            $invoiceId = (App()->make(FetchPerfexCRMInvoiceProcessor::class))->execute($fetchPerfexCRMInvoiceObject);
+            return $invoiceId;
+        }
+        return 0;
+    }
 }
@@ -11,16 +11,14 @@ use App\Classes\Modules\PerfexCRM\Services\UpdatesPerfexCRMInvoice;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMInvoiceObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
 use App\Classes\ValueObjects\Constants\PerfexCRMInvoiceStatus;
-use App\Models\PackingList;
 use App\Models\Transaction;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
 use Carbon\Carbon;
-
+use Illuminate\Support\Facades\Log;
 use App\Classes\General\Helper;

 class UpdatePerfexCRMInvoice implements ShouldQueue
@@ -32,7 +30,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue

    /**
     * CreatePerfexCRMSingleTask constructor.
-     * @param UpdatePerfexCRMInvoiceObject $createTaskPerfexCRMObject
+     * @param UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject
     */
    public function __construct(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
    {
@@ -49,7 +47,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
        $invoiceId = 0;
        $invoiceStatus = 0;
        $invoice = (App()->make(FetchesPerfexCRMInvoice::class))->execute($customer->userid,"INV-", $transaction->owner->bill_no);
-        Log::error(json_encode('UpdatePerfexCRMInvoice debug $transaction->owner->bill_no: '.$transaction->owner->bill_no));
+        Log::error('UpdatePerfexCRMInvoice debug bill_no: ' . $transaction->owner->bill_no . ', Project Id: ' . $this->updatePerfexCRMInvoiceObject->getProjectId());

        if(is_null($invoice)){
            $result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction->owner, $this->updatePerfexCRMInvoiceObject->getIsPaid());
@@ -57,7 +55,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                $invoiceId = $result->payload['id'];
            } else {
                // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
-                Helper::debugLoggerForPerfexCRM('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
+                Helper::debugLogger('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed');
            }
        }
        else{
@@ -66,7 +64,6 @@ class UpdatePerfexCRMInvoice implements ShouldQueue

            //This only run when invoice already exist and the invoice does not have a PAID status
            if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
-                Log::error(json_encode('UpdatePerfexCRMInvoice debug $this->updatePerfexCRMInvoiceObject->getProjectId(): '.$this->updatePerfexCRMInvoiceObject->getProjectId()));
                //update invoice
                (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $this->updatePerfexCRMInvoiceObject->getProjectId());
            }
@@ -27,27 +27,22 @@ class UpdatePerfexCRMPrelude implements ShouldQueue
    /** @var UpdatePerfexCRMObject */
    private $updatePerfexCRMObject;

-    /** @var UpdatePerfexCRM */
-    private $nextJob1;
-
-    /** @var UpdatePerfexCRMInvoice */
-    private $nextJob2;
+    /** @var bool|null */
+    private $shouldCreateInvoice;

    /**
     * UpdatePerfexCRMPrelude constructor.
     * @param $packingList
-     * @param $transaction
+     * @param Transaction $transaction
     * @param UpdatePerfexCRMObject $updatePerfexCRMObject
-     * @param UpdatePerfexCRM $nextJob1
-     * @param UpdatePerfexCRMInvoice $nextJob2
+     * @param bool|null $shouldCreateInvoice
     */
-    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, $nextJob1, $nextJob2)
+    public function __construct($packingList, $transaction, UpdatePerfexCRMObject $updatePerfexCRMObject, ?bool $shouldCreateInvoice = false)
    {
        $this->packingList = $packingList;
        $this->transaction = $transaction;
        $this->updatePerfexCRMObject = $updatePerfexCRMObject;
-        $this->nextJob1 = $nextJob1;
-        $this->nextJob2 = $nextJob2;
+        $this->shouldCreateInvoice = $shouldCreateInvoice;
    }

    public function handle()
@@ -69,9 +64,7 @@ class UpdatePerfexCRMPrelude implements ShouldQueue

        $result = $this->replacePlaceholders($this->updatePerfexCRMObject->getTasks(), $data);
        $this->updatePerfexCRMObject->setTasks($result);
-        /** @var UpdatePerfexCRM $nextJob1 */
-        /** @var UpdatePerfexCRMInvoice $nextJob2 */
-        $this->nextJob1::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->nextJob2);
+        UpdatePerfexCRM::dispatch($this->updatePerfexCRMObject, $this->transaction, $this->shouldCreateInvoice);
    }

    function replacePlaceholders($template, $data, $prefix = '')
@@ -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));
    }

 }
@@ -131,10 +131,10 @@ class CallbackBillplzLogic

            if(($invoice->amount - $totalPaidAmount) < 0.01) {
                $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
+    
                $packingList->status = ApprovalStatus::APPROVED;
                $packingList->save();
-
+    
                if(app()->environment('production')){
                    $this->updateDoFromVTPortalProcessor->execute($packingList);
                    $this->updateDoFromYDPortalProcessor->execute($packingList);
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Billplzs\Services;

 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\App;

 class CreatesBillplzBill
 {
@@ -25,7 +26,7 @@ class CreatesBillplzBill
            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
                'collection_id' => config('billplz.collection_id'),
                'name' => $name,
-                'email' => $email,
+                'email' => App::environment('production') ? $email : 'development@cief-malaysia.com',
                'description' => $description,
                'amount' => $this->finalizeAmount($amount),
                'redirect_url' => route('online_payment.redirect'),
@@ -7,13 +7,9 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Documents\Services\ListsDocuments;
 use App\Classes\Modules\Documents\Standards\Rules\CanListDocuments;
 use App\Http\Resources\DocumentResource;
-use App\Models\Document;
-use App\Transformers\DocumentTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use League\Fractal;
-

 class ListDocumentLogic extends AbstractControllerLogic
 {
@@ -62,11 +58,6 @@ class ListDocumentLogic extends AbstractControllerLogic

        return $this->collectionResponse(DocumentResource::collection($query));

-
-      /*  return fractal()
-            ->collection($query, new DocumentTransformer)
-            ->respond(200, [], JSON_PRETTY_PRINT);*/
-
    }

 }
@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Documents\Processors;
-
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\Services\CreatesFiles;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Document;
-use Illuminate\Http\Request;
-use App\Models\QAUserAnswerSelected;
-
-class UploadDocumentForHelpMenuProcessor
-{
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFiles;
-
-    /**
-     * UploadDocumentForHelpMenuProcessor constructor.
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFiles
-     */
-    public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFiles)
-    {
-        $this->createsDocument = $createsDocument;
-        $this->createsFiles = $createsFiles;
-    }
-
-
-    /**
-     * @param Request $request
-     * @param QAUserAnswerSelected qaUserAnswerSelected
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Request $request, QAUserAnswerSelected $qaUserAnswerSelected) {
-        $object = new DocumentObject("HELP_MENU", $request->input('files'),
-            '123456', ApprovalStatus::PENDING_VERIFICATION, 'help_menu'); //cief todo: 123456 cannot be hardcoded
-
-        /** @var Document $document */
-        $document = $this->createsDocument->execute($qaUserAnswerSelected, $object);
-
-        $result = $this->createsFiles->execute($document, $object);
-        return $result;
-    }
-
-}
@@ -32,6 +32,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
            'DocNo',
            'DocDate',
            'DebtorCode',
+            'Ref',
            'ShipInfo',
            'AccNo',
            'DetailDescription',
@@ -126,6 +127,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
            $transaction->created_at->format('m/d/Y H:m'),
            $company->debtor,
            $order->reference,
+            $order->reference,
            '500-0000',
            'X1 Freight Service Charge',
            $furtherDescription,
@@ -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');
        });
@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\HelpMenu\Standards\Rules\CanFetchHelpMenuQuestionList;
-use App\Classes\Modules\HelpMenu\Processors\FetchFirstHelpMenuQuestionProcessor;
-use App\Http\Resources\HelpMenuQuestionResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class FetchHelpMenuQuestionLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Help Menu First Question',
-            'message' => 'You have successfully retrieved a Help Menu First Question'
-        ];
-    }
-
-    /** @var CanFetchHelpMenuQuestionList */
-    private $canFetchHelpMenuQuestionList;
-
-    /** @var FetchFirstHelpMenuQuestionProcessor */
-    private $fetchFirstHelpMenuQuestionProcessor;
-
-    /**
-     * FetchHelpMenuQuestionLogic constructor.
-     * @param CanFetchHelpMenuQuestionList $canFetchHelpMenuQuestionList
-     * @param FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor
-     */
-    public function __construct(CanFetchHelpMenuQuestionList $canFetchHelpMenuQuestionList, FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor)
-    {
-        $this->canFetchHelpMenuQuestionList = $canFetchHelpMenuQuestionList;
-        $this->fetchFirstHelpMenuQuestionProcessor = $fetchFirstHelpMenuQuestionProcessor;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $this->canFetchHelpMenuQuestionList->passes();
-
-        $userId = Auth::user()->id;
-
-        $query = $this->fetchFirstHelpMenuQuestionProcessor->execute($request);
-
-        return $this->resourceResponse(new HelpMenuQuestionResource($query, $userId));
-    }
-
-}
@@ -1,124 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMSupportTicket;
-use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
-use App\Classes\Modules\HelpMenu\Standards\Rules\CanFetchHelpMenuQuestionList;
-use App\Classes\Modules\HelpMenu\Processors\SaveHelpMenuAnswerProcessor;
-use App\Classes\Modules\HelpMenu\Processors\DeleteHelpMenuAnswerProcessor;
-use App\Classes\Modules\HelpMenu\Processors\FetchNextHelpMenuQuestionProcessor;
-use App\Classes\Modules\HelpMenu\Processors\FetchFirstHelpMenuQuestionProcessor;
-use App\Http\Resources\HelpMenuQuestionResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Auth;
-use App\Classes\ValueObjects\Constants\QAType;
-
-class UpdateHelpMenuNextQuestionLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Help Menu Next Question',
-            'message' => 'You have successfully retrieved a Help Menu Next Question'
-        ];
-    }
-
-    /** @var CanFetchHelpMenuQuestionList */
-    private $canFetchHelpMenuQuestionList;
-
-    /** @var SaveHelpMenuAnswerProcessor */
-    private $saveHelpMenuAnswerProcessor;
-
-    /** @var DeleteHelpMenuAnswerProcessor */
-    private $deleteHelpMenuAnswerProcessor;
-
-    /** @var FetchNextHelpMenuQuestionProcessor */
-    private $fetchNextHelpMenuQuestionProcessor;
-
-    /** @var FetchFirstHelpMenuQuestionProcessor */
-    private $fetchFirstHelpMenuQuestionProcessor;
-
-    /** @var CreatesPerfexCRMSupportTicket */
-    private $createsPerfexCRMSupportTicket;
-
-    /** @var FetchesPerfexCRMCustomer */
-    private $fetchesPerfexCRMCustomer;
-
-    /**
-     * UpdateHelpMenuNextQuestionLogic constructor.
-     * @param CanFetchHelpMenuQuestionList $canFetchHelpMenuQuestionList
-     * @param SaveHelpMenuAnswerProcessor $saveHelpMenuAnswerProcessor
-     * @param FetchNextHelpMenuQuestionProcessor $fetchNextHelpMenuQuestionProcessor
-     * @param FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor
-     * @param DeleteHelpMenuAnswerProcessor $deleteHelpMenuAnswerProcessor
-     */
-    public function __construct(CanFetchHelpMenuQuestionList $canFetchHelpMenuQuestionList, SaveHelpMenuAnswerProcessor $saveHelpMenuAnswerProcessor, FetchNextHelpMenuQuestionProcessor $fetchNextHelpMenuQuestionProcessor, FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor,  CreatesPerfexCRMSupportTicket $createsPerfexCRMSupportTicket, FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer, DeleteHelpMenuAnswerProcessor $deleteHelpMenuAnswerProcessor)
-    {
-        $this->canFetchHelpMenuQuestionList = $canFetchHelpMenuQuestionList;
-        $this->saveHelpMenuAnswerProcessor = $saveHelpMenuAnswerProcessor;
-        $this->fetchNextHelpMenuQuestionProcessor = $fetchNextHelpMenuQuestionProcessor;
-        $this->fetchFirstHelpMenuQuestionProcessor = $fetchFirstHelpMenuQuestionProcessor;
-        $this->createsPerfexCRMSupportTicket = $createsPerfexCRMSupportTicket;
-        $this->fetchesPerfexCRMCustomer = $fetchesPerfexCRMCustomer;
-        $this->deleteHelpMenuAnswerProcessor = $deleteHelpMenuAnswerProcessor;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $questionId = 0;
-        $userId = Auth::user()->id;
-        $currentQuestion = $request->question;
-        $questionId = $currentQuestion['id'];
-        $questionType = $currentQuestion['question_type'];
-
-        $this->canFetchHelpMenuQuestionList->passes();
-
-        //Delete answer
-        $this->deleteHelpMenuAnswerProcessor->execute($userId, $questionId, $request);
-
-        //Save answer given by user
-        if (!$request->has('isPrevious')) {
-            $this->saveHelpMenuAnswerProcessor->execute($userId, $questionId, $request);
-        }
-
-        //Create ticket at crm
-        if (!$request->has('isPrevious')) {
-            if($questionType == QAType::TICKET_CRM){
-                $email = Auth::user()->email;
-                $customer = $this->fetchesPerfexCRMCustomer->execute($email);
-                $subject = "test subject 3";
-                $department = 1;
-                $contactid = 0;
-                $userid = 0;
-                if($customer){
-                    $contactid = $customer->id;
-                    $userid = $customer->userid;
-                }
-                $this->createsPerfexCRMSupportTicket->execute($subject, $department, $contactid, $userid);
-            }
-        }
-
-        //Get returned question (previous or next)
-        $returnQuestion = $this->fetchNextHelpMenuQuestionProcessor->execute($request);
-        //When a questionnaire ended, return back the first question
-        if(is_null($returnQuestion)){
-            $returnQuestion = $this->fetchFirstHelpMenuQuestionProcessor->execute($request);
-        }
-
-        return $this->resourceResponse(new HelpMenuQuestionResource($returnQuestion, $userId));
-    }
-}
@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Processors;
-
-use App\Models\QAUserAnswerSelected;
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelectedList;
-
-class DeleteHelpMenuAnswerProcessor
-{
-    /** @var FetchesHelpMenuUserAnswerSelected */
-    private $fetchesHelpMenuUserAnswerSelected;
-
-    /** @var FetchesHelpMenuUserAnswerSelectedList */
-    private $fetchesHelpMenuUserAnswerSelectedList;
-
-    /**
-     * DeleteHelpMenuAnswerProcessor constructor.
-     * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
-     * @param FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList
-     */
-    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList)
-    {
-        $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
-        $this->fetchesHelpMenuUserAnswerSelectedList = $fetchesHelpMenuUserAnswerSelectedList;
-    }
-
-    public function execute($userId, $questionId, $request){
-        if ($request->has('isPrevious')) {
-            //Get current and previous question's answer
-            try{
-                $selectedAnswer = $this->fetchesHelpMenuUserAnswerSelectedList->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
-            } catch (\Exception $exception){
-                $selectedAnswer = null;
-            }
-
-            if($selectedAnswer)
-            {
-                $this->fetchesHelpMenuUserAnswerSelected->execute(['id' => $selectedAnswer['id']])->delete();
-            }
-        }
-        else{
-            //Delete all answer's belongs to the user
-            $currentQuestion = $request->question;
-            $isStart = $currentQuestion['is_start'];
-            if($isStart){
-                QAUserAnswerSelected::where('user_id', $userId)->delete();
-            }
-        }
-    }
-}
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Processors;
-
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuQuestion;
-use ErrorException;
-use Illuminate\Http\Request;
-
-
-class FetchFirstHelpMenuQuestionProcessor
-{
-    /** @var FetchesHelpMenuQuestion */
-    private $fetchesHelpMenuQuestion;
-
-    /**
-     * FetchFirstHelpMenuQuestionProcessor constructor.
-     * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
-     */
-    public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion)
-    {
-        $this->fetchesHelpMenuQuestion = $fetchesHelpMenuQuestion;
-    }
-
-    public function execute(Request $request){
-        try {
-            $query = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1]);
-            return $query;
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
-    }
-}
@@ -1,93 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Processors;
-
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuQuestion;
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelectedList;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use App\Classes\ValueObjects\Constants\QAType;
-
-class FetchNextHelpMenuQuestionProcessor
-{
-    /** @var FetchesHelpMenuQuestion */
-    private $fetchesHelpMenuQuestion;
-
-    /** @var FetchesHelpMenuUserAnswerSelected */
-    private $fetchesHelpMenuUserAnswerSelected;
-
-    /** @var FetchesHelpMenuUserAnswerSelectedList */
-    private $fetchesHelpMenuUserAnswerSelectedList;
-    /**
-     * FetchNextHelpMenuQuestionProcessor constructor.
-     * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
-     * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
-     * @param FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList
-     */
-    public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion, FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, FetchesHelpMenuUserAnswerSelectedList $fetchesHelpMenuUserAnswerSelectedList)
-    {
-        $this->fetchesHelpMenuQuestion = $fetchesHelpMenuQuestion;
-        $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
-        $this->fetchesHelpMenuUserAnswerSelectedList = $fetchesHelpMenuUserAnswerSelectedList;
-    }
-
-    public function execute(Request $request){
-        $isEnd = 0;
-        $questionId = 0;
-        $nextQuestionNumber = 0;
-        $nextNestedQuestion = 0;
-        $nextMainQuestion= 0;
-        $currentQuestion = $request->question;
-        $questionType = QAType::DEFAULT;
-        $returnQuestion = null;
-
-        if ($currentQuestion && array_key_exists('id', $currentQuestion)) {
-            $questionId = $currentQuestion['id'];
-            $isEnd = $currentQuestion['is_end'];
-            $questionType = $currentQuestion['question_type'];
-            $nextNestedQuestion = $currentQuestion['next_nested_question'];
-            $nextMainQuestion = $currentQuestion['next_main_question'];
-        }
-        if ($request->has('answerObj')) {
-            $nextQuestionNumber = $request->answerObj['next_question_number'];
-        }
-
-        if ($request->has('isPrevious')) {
-            $userId = Auth::user()->id;
-            $previousAnswer = $this->fetchesHelpMenuUserAnswerSelectedList->execute(['user_id' => $userId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
-
-            //Get previous question
-            $previousQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'id' => $previousAnswer['question_id']]);
-            $returnQuestion = $previousQuestion;
-        }
-        else{
-            //Get next question
-            $nextQuestion = null;
-            $question_number = 0;
-            if($nextQuestionNumber != 0){
-                $question_number = $nextQuestionNumber;
-            }
-            else if($nextNestedQuestion != 0){
-                $question_number = $nextNestedQuestion;
-            }
-            else {
-                $question_number = $nextMainQuestion;
-            }
-
-            if($isEnd){
-                $returnQuestion = null;
-            }
-            else if($question_number != 0){
-                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'question_number' => $question_number]);
-                $returnQuestion =  $nextQuestion;
-            }
-            else if (array_key_exists('id', $request->input('question'))) {
-                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'id_next' => $questionId, 'next_main_question' => null]);
-                $returnQuestion = $nextQuestion;
-            }
-        }
-
-        return $returnQuestion;
-    }
-}
@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Processors;
-
-use App\Models\QAUserAnswerSelected;
-use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
-use App\Classes\Modules\Documents\Processors\UploadDocumentForHelpMenuProcessor;
-
-
-class SaveHelpMenuAnswerProcessor
-{
-    /** @var FetchesHelpMenuUserAnswerSelected */
-    private $fetchesHelpMenuUserAnswerSelected;
-
-    /** @var UploadDocumentForHelpMenuProcessor */
-    private $uploadDocumentForHelpMenuProcessor;
-
-    /**
-     * SaveHelpMenuAnswerProcessor constructor.
-     * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
-     * @param UploadDocumentForHelpMenuProcessor $uploadDocumentForHelpMenuProcessor
-     */
-    public function __construct(FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected, UploadDocumentForHelpMenuProcessor $uploadDocumentForHelpMenuProcessor)
-    {
-        $this->fetchesHelpMenuUserAnswerSelected = $fetchesHelpMenuUserAnswerSelected;
-        $this->uploadDocumentForHelpMenuProcessor = $uploadDocumentForHelpMenuProcessor;
-    }
-
-    public function execute($userId, $questionId, $request){
-        $filesUpload = $request->input('files');
-        $answer = null;
-        try{
-             // $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId, 'order_by' => ['column' => 'id','DESC' => 1]]);
-            $answer = $this->fetchesHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'question_id' => $questionId]);
-        } catch (\Exception $exception){
-            $answer = null;
-        }
-
-        if(is_null($answer))
-        {
-            $answer = new QAUserAnswerSelected;
-        }
-        $answer->user_id = $userId;
-        $answer->question_id = $questionId;
-        if ($request->has('answerObj')) {
-            $answer->answer_option_id = intval($request->answerObj['id']);
-        }
-        $answer->free_text_answer = $request->answer;
-        $answer->save();
-
-        if($filesUpload){
-            $result = $this->uploadDocumentForHelpMenuProcessor->execute($request, $answer);
-            $newData = array_map(function ($item) {
-                return [
-                    'document_id' => $item->document_id,
-                    'file_id' => $item->id,
-                ];
-            }, $result);
-            $answer->free_text_answer = json_encode($newData);
-            $answer->save();
-        }
-    }
-}
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Services;
-
-use App\Classes\General\Eloquent\AbstractFetchRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\QAUserAnswerSelected;
-
-class FetchesHelpMenuUserAnswerSelected extends AbstractFetchRecord
-{
-
-    /** @var QAUserAnswerSelected */
-    private $repository;
-
-    /**
-     * FetchesHelpMenuUserAnswerSelected constructor.
-     * @param QAUserAnswerSelected $repository
-     */
-    public function __construct(QAUserAnswerSelected $repository)
-    {
-        $this->repository = $repository;
-    }
-
-
-    /**
-     * @return Builder
-     */
-    public function getRepository(): Builder
-    {
-        return $this->repository->newQuery();
-    }
-}
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Services;
-
-use App\Classes\General\Eloquent\AbstractListRecord;
-use Illuminate\Database\Eloquent\Builder;
-use App\Models\QAUserAnswerSelected;
-
-class FetchesHelpMenuUserAnswerSelectedList extends AbstractListRecord
-{
-
-    /** @var QAUserAnswerSelected */
-    private $repository;
-
-    /**
-     * FetchesHelpMenuUserAnswerSelectedList constructor.
-     * @param QAUserAnswerSelected $repository
-     */
-    public function __construct(QAUserAnswerSelected $repository)
-    {
-        $this->repository = $repository;
-    }
-
-
-    /**
-     * @return Builder
-     */
-    public function getRepository(): Builder
-    {
-        return $this->repository->newQuery();
-    }
-}
@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\HelpMenu\Standards\Rules;
-
-
-use App\Classes\General\Abstracts\AbstractRule;
-
-class CanFetchHelpMenuQuestionList extends AbstractRule
-{
-    /**
-     * @return bool
-     */
-    protected function authorized(): bool
-    {
-        // TODO  Set Authorization rules
-        return true;
-    }
-
-    /**
-     * @param  $object
-     * @return bool
-     */
-    protected function validators($object): bool
-    {
-        return true;
-    }
-
-    /**
-     * @param  $object
-     * @return bool
-     */
-    protected function criteria($object): bool
-    {
-        return true;
-    }
-
-}
@@ -4,20 +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;

@@ -47,12 +41,6 @@ class CreateOrderLogic extends AbstractControllerLogic
    /** @var GeneratesOrderNumber */
    private $generatesOrderNumber;

-    /** @var CreatesAddress */
-    private $createsAddress;
-
-    /** @var CanCreateAddress */
-    private $canCreateAddress;
-
    /** @var NewLeadTaskToPerfexCRMProcessor */
    private $newLeadTaskToPerfexCRMProcessor;
    /**
@@ -63,18 +51,14 @@ class CreateOrderLogic extends AbstractControllerLogic
     * @param FetchesCompanyModule $fetchesCompanyModule
     * @param GeneratesOrderNumber $generatesOrderNumber
     * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
-     * @param CreatesAddress $createsAddress
-     * @param CanCreateAddress $canCreateAddress
     */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber, CreatesAddress $createsAddress, CanCreateAddress $canCreateAddress,  NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
+    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;
    }

@@ -99,11 +83,10 @@ class CreateOrderLogic extends AbstractControllerLogic
        } else {
            $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);

-            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]);
-            }
+            $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
+//            if (!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST))
        }
-        
+
        if($originWarehouse->reference === WarehouseReferences::YD_YIWU && in_array($address->state_id, [5, 13, 14])) {
            throw new RequestValidationException('Our Yiwu warehouse is unable to ship goods to Sabah & Sarawak at the moment. you can select our Guangzhou warehouse as an alternative.');
        }
@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\PackingLists\Processors\CreatePackageProcessor;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
+use App\Http\Resources\PackingListResource;
+use App\Models\PackingList;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class CreateWarehouseTransportLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Created Warehouse PackingList',
+            'message' => 'You have successfully created a Warehouse PackingList'
+        ];
+    }
+
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+    /** @var GeneratesPackingListReferenceNumber */
+    private $generatesPackingListReferenceNumber;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    public function __construct(
+        FetchesPackingList $fetchesPackingList,
+        CreatePackingListProcessor $createPackingListProcessor,
+        CreatesTransport $createsTransport,
+        CreatesSchedule $createsSchedule,
+        CreatePackageProcessor $createPackageProcessor,
+        GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber
+    ) {
+        $this->fetchesPackingList = $fetchesPackingList;
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->createPackageProcessor = $createPackageProcessor;
+        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        $packing_list = $this->fetchesPackingList->execute([
+            'id' => $request->route('id'),
+        ]);
+
+        $count_warehouse_packing_list = PackingList::where('reference', $packing_list->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->count();
+
+        if ($count_warehouse_packing_list) {
+            throw new MalformedRequestException('Warehouse Receive List Exists');
+        }
+
+        $order = $packing_list->owner;
+
+        $reference_number = $this->generatesPackingListReferenceNumber->execute();
+
+        $packingListObject = new PackingListObject(
+            $packing_list->reference,
+            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id,
+            PackingListType::WAREHOUSE_RECEIVE_LIST,
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+        $transportObject = new TransportObject(TransportType::LAND, null, $request->input('tracking'), Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
+        $transport = $this->createsTransport->execute($transportObject, $packingList);
+
+        $scheduleObject = new ScheduleObject(Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
+        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
+
+        $packages = $packing_list->packages;
+
+        foreach ($packages as $key => $row) {
+            $packageObject = new PackageObject(
+                $row['type'],
+                $row['description'],
+                $row['width'],
+                $row['height'],
+                $row['length'],
+                $row['weight'],
+                $row['quantity'],
+                ApprovalStatus::APPROVED,
+                $row['reference'],
+            );
+            $this->createPackageProcessor->execute($packageObject, $packingList);
+        }
+
+        return $this->resourceResponse(new PackingListResource($packingList));
+    }
+}
@@ -51,7 +51,7 @@ class FetchContainersUpdatesFromYdPortalProcessor
        foreach ($containers as $container) {
            $time_start = microtime(true);

-            $packingList = $container->packingLists()->random();
+            $packingList = $container->packingLists()->first();

            $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [
                'trakingno' => $packingList->reference
@@ -108,6 +108,8 @@ class FetchContainersUpdatesFromYdPortalProcessor
                }
            }

+            dump($delayDate, $unstuffingDate);
+
            if($delayDate){
                $delayDate = $delayDate->addDays(2);
                $transport = $container->transports()->first();
@@ -42,7 +42,10 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
    /** @var string */
    private $duedate;

-    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department, string $priority, string $duedate)
+    /** @var int */
+    private $invoiceId;
+
+    public function __construct(string $email, string $name, string $description, string $leadId, string $projectId, string $milestoneId, string $reference, string $onTaskCompletion, string $status, string $department, string $priority, string $duedate, int $invoiceId)
    {
        $this->email = $email;
        $this->name = $name;
@@ -56,6 +59,7 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
        $this->department = $department;
        $this->priority = $priority;
        $this->duedate = $duedate;
+        $this->invoiceId = $invoiceId;
    }

    /**
@@ -158,4 +162,12 @@ class CreateTaskPerfexCRMObject implements DataTransferObject
    {
        return $this->duedate;
    }
+
+    /**
+     * @return int
+     */
+    public function getInvoiceId(): int
+    {
+        return $this->invoiceId;
+    }
 }
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\Transaction;
+
+class FetchPerfexCRMInvoiceObject implements DataTransferObject
+{
+    /** @var string */
+    private $email;
+
+    /** @var Transaction */
+    private $transaction;
+
+
+    public function __construct(string $email, Transaction $transaction)
+    {
+        $this->email = $email;
+        $this->transaction = $transaction;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+    /**
+     * @return Transaction
+     */
+    public function getTransaction(): Transaction
+    {
+        return $this->transaction;
+    }
+}
@@ -28,6 +28,9 @@ class UpdatePerfexCRMObject implements DataTransferObject
    /** @var int */
    private $projectStatus;

+    /** @var int */
+    private $invoiceId = 0;
+
    /** @var array */
    private $milestoneNames;

@@ -35,7 +38,7 @@ class UpdatePerfexCRMObject implements DataTransferObject
    private $tasks;


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

        $this->companyName = $companyName;
@@ -45,6 +48,7 @@ class UpdatePerfexCRMObject implements DataTransferObject
        $this->bookingMarking = $bookingMarking;
        $this->projectName = $projectName;
        $this->projectStatus = $projectStatus;
+        $this->$invoiceId = $invoiceId;
        $this->milestoneNames = $milestoneNames;
        $this->tasks = $tasks;
    }
@@ -105,6 +109,14 @@ class UpdatePerfexCRMObject implements DataTransferObject
        return $this->projectStatus;
    }

+    /**
+     * @return int
+     */
+    public function getInvoiceId(): int
+    {
+        return $this->invoiceId;
+    }
+
    /**
     * @return array
     */
@@ -125,4 +137,9 @@ class UpdatePerfexCRMObject implements DataTransferObject
    {
        $this->tasks = $tasks;
    }
+
+    public function setInvoiceId($invoiceId)
+    {
+        $this->invoiceId = $invoiceId;
+    }
 }
@@ -25,19 +25,7 @@ class CreatePerfexCRMTaskProcessor
    * @throws \App\Classes\Exceptions\MalformedRequestException
    */
   public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
-        $this->createsPerfexCRMTask->execute(
-            $createTaskPerfexCRMObject->getName(),
-            $createTaskPerfexCRMObject->getDescription(),
-            $createTaskPerfexCRMObject->getLeadId(),
-            $createTaskPerfexCRMObject->getMilestoneId(),
-            $createTaskPerfexCRMObject->getProjectId(),
-            $createTaskPerfexCRMObject->getReference(),
-            $createTaskPerfexCRMObject->getOnTaskCompletion(),
-            $createTaskPerfexCRMObject->getDepartment(),
-            $createTaskPerfexCRMObject->getStatus(),
-            $createTaskPerfexCRMObject->getPriority(),
-            $createTaskPerfexCRMObject->getDuedate()
-        );
+        $this->createsPerfexCRMTask->execute($createTaskPerfexCRMObject);
        return true;
   }

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Processors;
+
+
+use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMInvoiceProcessor;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
+use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMInvoice;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\FetchPerfexCRMInvoiceObject;
+use Illuminate\Support\Facades\Log;
+use App\Classes\General\Helper;
+
+class FetchPerfexCRMInvoiceProcessor
+{
+    private $fetchesPerfexCRMCustomer;
+    /** @var FetchesPerfexCRMCustomer */
+
+    /** @var FetchesPerfexCRMInvoice */
+    private $fetchesPerfexCRMInvoice;
+
+    /** @var CreatePerfexCRMInvoiceProcessor */
+    private $createPerfexCRMInvoiceProcessor;
+
+    /**
+     *
+     * FetchPerfexCRMInvoiceProcessor constructor.
+    * @param FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer
+    * @param FetchesPerfexCRMInvoice $fetchesPerfexCRMInvoice
+    * @param CreatePerfexCRMInvoiceProcessor $createPerfexCRMInvoiceProcessor
+    */
+    public function __construct(FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer,
+        FetchesPerfexCRMInvoice $fetchesPerfexCRMInvoice,
+        CreatePerfexCRMInvoiceProcessor $createPerfexCRMInvoiceProcessor)
+    {
+        $this->fetchesPerfexCRMCustomer = $fetchesPerfexCRMCustomer;
+        $this->fetchesPerfexCRMInvoice = $fetchesPerfexCRMInvoice;
+        $this->createPerfexCRMInvoiceProcessor = $createPerfexCRMInvoiceProcessor;
+    }
+
+    public function execute(FetchPerfexCRMInvoiceObject $fetchPerfexCRMInvoiceObject)
+    {
+        //invoiceId to be returned - fetch or create
+        $invoiceId = 0;
+
+        //get the client id
+        $customer = $this->fetchesPerfexCRMCustomer->execute($fetchPerfexCRMInvoiceObject->getEmail());
+        $transaction = $fetchPerfexCRMInvoiceObject->getTransaction();
+
+        $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));
+        }
+
+        $invoice = $this->fetchesPerfexCRMInvoice->execute($customer->userid,"INV-", $number);
+        if(is_null($invoice)){
+            $result = $this->createPerfexCRMInvoiceProcessor->execute($transaction->owner);
+            if ($result) {
+                $invoiceId = $result->payload['id'];
+            } else {
+                $log['message'] = 'FetchPerfexCRMInvoiceProcessor failed for transaction > bill_no: '.$number;
+                Helper::debugLogger($log);
+            }
+        }
+        else{
+            $invoiceId = $invoice->id;
+        }
+
+        return $invoiceId;
+    }
+}
@@ -14,10 +14,10 @@ class PackingListToPerfexCRMProcessor
 {
    /**
     * @param PackingList $packingList
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return bool
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
-    public function execute(PackingList $packingList)
+    public function execute(PackingList $packingList): bool
    {
        try {
            if($packingList->owner instanceof \App\Models\Order) {
@@ -42,13 +42,14 @@ class PackingListToPerfexCRMProcessor
                    "",
                    $projectName,
                    PerfexCRMProjectStatus::NOT_STARTED,
+                    0,
                    [],
                    [
                        PerfexCRMTasks::TASK_LOADED_CONTAINER_1,
                        PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
                    ]
                );
-                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, UpdatePerfexCRM::class, null);
+                UpdatePerfexCRMPrelude::dispatch($packingList, null, $updatePerfexCRMObject, false);
            }
        } catch (\Exception $exception){
            Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));
@@ -1,75 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Processors;
-
-use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
-use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
-use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\Jobs\UpdatePerfexCRMInvoice;
-use App\Classes\Jobs\UpdatePerfexCRM;
-use App\Classes\Jobs\UpdatePerfexCRMPrelude;
-use App\Classes\Jobs\CreatePerfexCRMInvoice;
-use App\Models\Transaction;
-use Illuminate\Support\Facades\Log;
-
-class TransactionToPerfexCRMProcessor
-{
-    /**
-     * @param Transaction $model
-     * @param int $status
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Transaction $model, int $status)
-    {
-        try
-        {
-            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 = $order->reference;
-                $packingListReference = $packingList->reference;
-                $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
-
-                $bookingMarking = $packingList->id."-".$packingList->owner->id;
-                $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-                    $companyName,
-                    $companyReference,
-                    $contactName,
-                    $contactEmail,
-                    $bookingMarking,
-                    $projectName,
-                    PerfexCRMProjectStatus::IN_PROGRESS,
-                    [],
-                    [
-                        PerfexCRMTasks::TASK_1,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_1,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_2,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_3,
-                        PerfexCRMTasks::TASK_POST_PAYMENT_4,
-                        ]
-                );
-
-                UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, UpdatePerfexCRM::class, UpdatePerfexCRMInvoice::class);
-            }
-            else if($model->owner instanceof \App\Models\PackingList && $model->status == ApprovalStatus::PENDING_SUBMISSION && $status == ApprovalStatus::APPROVED)
-            {
-                CreatePerfexCRMInvoice::dispatch($model);
-            }
-        }
-        catch (\Exception $exception) {
-            Log::error('TransactionToPerfexCRMProcessor debug:');
-            Log::error($exception);
-        }
-        return true;
-    }
-}
@@ -0,0 +1,145 @@
+<?php
+
+namespace App\Classes\Modules\PerfexCRM\Processors;
+
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\UpdatePerfexCRMObject;
+use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
+use App\Classes\Jobs\UpdatePerfexCRMPrelude;
+use App\Classes\Jobs\CreatePerfexCRMInvoice;
+use App\Models\Booking;
+use App\Models\Transaction;
+use Illuminate\Support\Facades\Log;
+
+class TransactionToPerfexCRMV2Processor
+{
+    public function execute(Transaction $model, int $status)
+    {
+        try {
+            if($model->owner instanceof \App\Models\Transaction && in_array($model->type, [TransactionType::PAYMENT])) {
+                //
+                $transaction = $model;
+                $info = $this->extractInfo($transaction);
+                $tasks = $this->defineTasks($model, $status);
+
+                //if(count($tasks) > 0) { //commented, otherwise when customer paid, invoice payment will not get created at crm because there is no tasks attached
+                    $updatePerfexCRMObject = new UpdatePerfexCRMObject(
+                        $info['companyName'],
+                        $info['companyReference'],
+                        $info['contactName'],
+                        $info['contactEmail'],
+                        $info['bookingMarking'],
+                        $info['projectName'],
+                        PerfexCRMProjectStatus::IN_PROGRESS,
+                        0,      //invoiceId
+                        [],     //milestoneNames
+                        $tasks
+                    );
+
+                    $this->dispatchUpdateJob($transaction, $status, $updatePerfexCRMObject);
+                //}
+            }
+            else if($model->owner instanceof \App\Models\PackingList && $model->status == ApprovalStatus::PENDING_SUBMISSION && $status == ApprovalStatus::APPROVED)
+            {
+                CreatePerfexCRMInvoice::dispatch($model);
+            }
+        } catch (\Exception $exception) {
+            Log::error($exception);
+        }
+        return true;
+    }
+
+    //Level 1
+    private function extractInfo(Transaction $model): array
+    {
+        $packingList = $model->owner->owner;
+        $order = $packingList->owner()->first();
+        $companyModule = $order->companyModule()->first();
+        $employee = $companyModule->employees()->first();
+
+        $info = [];
+        $info['companyName'] = $companyModule->name;
+        $info['companyReference'] = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        $info['contactName'] = $employee->name;
+        $info['contactEmail'] = $employee->email;
+        $info['bookingMarking'] = $packingList->id."-".$packingList->owner->id;
+        $info['projectName'] = 'IZYIM | X1 Shipping | '.$order->reference.' | '.$packingList->reference;
+
+        return $info;
+    }
+
+    private function defineTasks(Transaction $model, int $status): array
+    {
+        $tasks = [];
+
+        if ($status === ApprovalStatus::PENDING_SUBMISSION) {
+            $tasks = $this->defineTasks_handlePendingVerificationStatus($model);
+        } elseif ($status === ApprovalStatus::APPROVED) {
+            $tasks = $this->defineTasks_handleApprovedStatus($model);
+        }
+
+        return $tasks;
+    }
+
+    private function dispatchUpdateJob(Transaction $model, int $status, UpdatePerfexCRMObject $updatePerfexCRMObject)
+    {
+        $withInvoice = ($model->type === TransactionType::PAYMENT && $model->owner instanceof \App\Models\Transaction && $status == ApprovalStatus::APPROVED);
+        UpdatePerfexCRMPrelude::dispatch(null, $model, $updatePerfexCRMObject, $withInvoice);
+    }
+
+
+
+
+    //Level Others: Nested
+    private function defineTasks_handlePendingVerificationStatus(Transaction $model): array
+    {
+        $tasks = [];
+        switch($model->type) {
+            case TransactionType::PAYMENT:
+                $tasks = $this->definePaymentTasks($model);
+                break;
+        }
+
+        return $tasks;
+    }
+
+    private function defineTasks_handleApprovedStatus(Transaction $model): array
+    {
+        $tasks = [];
+        switch($model->type) {
+            case TransactionType::PAYMENT:
+                $tasks = $this->defineTasks_handleApprovedStatus_handlePaymentApprovedStatus();
+                break;
+        }
+
+        return $tasks;
+    }
+
+
+    private function definePaymentTasks(Transaction $model): array //cief todo: to comfirm what tasks need to be created
+    {
+        $tasks = [];
+        return $tasks;
+    }
+
+    private function defineTasks_handleApprovedStatus_handlePaymentApprovedStatus(): array //cief todo: to comfirm what tasks need to be created
+    {
+        $tasks = [];
+        // $tasks = [
+        //     PerfexCRMTasks::TASK_POST_PAYMENT_1,
+        //     PerfexCRMTasks::TASK_POST_PAYMENT_2,
+        //     PerfexCRMTasks::TASK_POST_PAYMENT_3,
+        //     PerfexCRMTasks::TASK_POST_PAYMENT_4,
+        // ];
+        return $tasks;
+    }
+
+    private function completeTask($startTask, $endTask) {
+        $startTask['status'] = PerfexCRMTaskStatus::COMPLETED;
+        $endTask['status'] = PerfexCRMTaskStatus::IN_PROGRESS;
+        return [$startTask, $endTask];
+    }
+}
@@ -15,10 +15,11 @@ 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\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
 use App\Classes\ValueObjects\Constants\PerfexCRMTaskStatus;
 use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Http\Request;
@@ -207,18 +208,46 @@ class UpdatePerfexCRMProcessor
                }

                // Get existing or create task
-                $result = $this->fetchesPerfexCRMTask->execute($tasks[$count]['name'], $milestoneId, 'project', $projectId);
+                $taskName = $tasks[$count]['name'];
+                $taskReference = $tasks[$count]['reference'];
+                $taskOnTaskCompletion = $tasks[$count]['on_task_completion'];
+                $taskIsAllowMultiple = $tasks[$count]['is_allow_multiple'];
+                $taskIsOnTaskCompletionUpdate = $tasks[$count]['is_on_task_completion_update'];
+                if($updatePerfexCRMObject->getInvoiceId() != 0 && $taskIsAllowMultiple){
+                    $taskName = $taskName." (".$updatePerfexCRMObject->getInvoiceId().")";
+                    $taskReference = $taskReference."_".$updatePerfexCRMObject->getInvoiceId();
+                    if($taskOnTaskCompletion && $taskIsOnTaskCompletionUpdate){
+                        $taskOnTaskCompletion = $taskOnTaskCompletion."_".$updatePerfexCRMObject->getInvoiceId();
+                    }
+                }
+
+                $result = $this->fetchesPerfexCRMTask->execute($taskName, $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId());
+
                if(isset($result->payload)){
-                    break; //Breaking the rest of the tasks in array assuming that they are all created as a batch previously
-                    //The following are code not needed at Shipping Portal, Exchange need certain task's status to be updated dynamically
-                    // if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED && $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED)
-                    // {
-                    //     $task = $result->payload[0];
-                    //     $result = $this->updatesPerfexCRMTask->execute($task['id'], $task['name'], $task['milestone'], $task['rel_id'], $taskStatus, $task['startdate'], is_null($task['duedate']) ? '': $task['duedate']);
-                    // }
+                    //  && $result->payload[0]['status'] == PerfexCRMTaskStatus::NOT_STARTED //purpose of this checking is just to make sure that only update task at crm when the status is NOT_STARTED, a double check to prevent unintentional update
+                    if($taskStatus != PerfexCRMTaskStatus::NOT_STARTED)
+                    {
+                        $task = $result->payload[0];
+                        $result = $this->updatesPerfexCRMTask->execute($task['id'], $task['name'], $task['milestone'], $task['rel_id'], $taskStatus, $task['startdate'], is_null($task['duedate']) ? '': $task['duedate']);
+                    }
                }
                else{
-                    $result = $this->createsPerfexCRMTask->execute($tasks[$count]['name'], $tasks[$count]['description'], '', $milestoneId, $projectId, $tasks[$count]['reference'], $tasks[$count]['on_task_completion'], $tasks[$count]['department'], $taskStatus, $tasks[$count]['priority'], $tasks[$count]['duedate']);
+                    $createTaskPerfexCRMObject = new CreateTaskPerfexCRMObject(
+                        "",
+                        $taskName,
+                        $tasks[$count]['description'],
+                        "",
+                        $projectId,
+                        $milestoneId,
+                        $taskReference,
+                        $taskOnTaskCompletion,
+                        $taskStatus,
+                        $tasks[$count]['department'],
+                        $tasks[$count]['priority'],
+                        $tasks[$count]['duedate'],
+                        $updatePerfexCRMObject->getInvoiceId()
+                    );
+                    $result = $this->createsPerfexCRMTask->execute($createTaskPerfexCRMObject);
                }
            }
        }
@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class CreatesPerfexCRMSupportTicket
-{
-    /**
-     * @param string $subject
-     * @param string $department
-     * @param int $contactid
-     * @param int $userid
-     * @return null|object
-     * @throws MalformedRequestException
-     */
-    public function execute(string $subject, string $department, int $contactid, int $userid) {
-        try{
-            $data = [
-                'subject' => $subject,
-                'department' => $department,
-                'contactid' => $contactid,
-                'userid' => $userid,
-            ];
-
-            $response = Http::asForm()->withHeaders([
-                'authtoken' => config('perfexcrm.api_key')])
-            ->post(config('perfexcrm.base_url').'/api/tickets',$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());
-        }
-    }
-}
@@ -6,67 +6,47 @@ use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
+use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;

 class CreatesPerfexCRMTask
 {
    /**
-     * @param string $taskName
-     * @param string $taskDescription
-     * @param string $leadId
-     * @param string $milestoneId
-     * @param string $projectId
-     * @param string $reference
-     * @param string $on_task_completion
-     * @param string $department
-     * @param string $status
-     * @param string $priority
-     * @param string $duedate
+     * @param CreateTaskPerfexCRMObject $createTaskPerfexCRMObject
     * @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 $department, string $status, string $priority, string $duedate) {
+
+    public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
        try{
            $custom_fields = [];
-            if($department != ""){
+            if($createTaskPerfexCRMObject->getDepartment() != ""){
                $custom_fields = [
                    "tasks" => [
-                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $department
+                        PerfexCRMCustomFields::TASKS_DEPARTMENT => $createTaskPerfexCRMObject->getDepartment()
                    ]
                ];
            }

            $data = [
-                'name' => $taskName,
-                'description' => $taskDescription,
-                'milestone' => $milestoneId,
+                'name' => $createTaskPerfexCRMObject->getName(),
+                'description' => $createTaskPerfexCRMObject->getDescription(),
+                'milestone' => $createTaskPerfexCRMObject->getMilestoneId(),
                'startdate' => date('Y-m-d'),
                'rel_type' => 'project',
-                'rel_id' => $projectId,
-                'status' => $status,
+                'rel_id' => $createTaskPerfexCRMObject->getProjectId(),
+                'status' => $createTaskPerfexCRMObject->getStatus(),
                'is_system_created' => 1,
-                'reference' => $reference,
-                'on_task_completion' => $on_task_completion,
+                'reference' => $createTaskPerfexCRMObject->getReference(),
+                'on_task_completion' => $createTaskPerfexCRMObject->getOnTaskCompletion(),
                'custom_fields' => $custom_fields,
-                'priority' => $priority,
-                'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
+                'priority' => $createTaskPerfexCRMObject->getPriority(),
+                'duedate' => date('Y-m-d', strtotime('+' . $createTaskPerfexCRMObject->getDuedate() . ' days')),
+                'invoice_id' => $createTaskPerfexCRMObject->getInvoiceId(),
            ];

-            if($leadId != '') {
-                $data = [
-                    'name' => $taskName,
-                    'description' => $taskDescription,
-                    'milestone' => $milestoneId,
-                    'startdate' => date('Y-m-d'),
-                    'rel_type' => 'lead',
-                    'rel_id' => $leadId,
-                    'status' => $status,
-                    'is_system_created' => 1,
-                    'reference' => $reference,
-                    'on_task_completion' => $on_task_completion,
-                    'custom_fields' => $custom_fields,
-                    'priority' => $priority,
-                    'duedate' => date('Y-m-d', strtotime('+' . $duedate . ' days')),
-                ];
+            if($createTaskPerfexCRMObject->getLeadId() != '') {
+                $data['rel_type'] = 'lead';
+                $data['rel_id'] = $createTaskPerfexCRMObject->getLeadId();
            }

            $response = Http::asForm()->withHeaders([
@@ -17,7 +17,7 @@ class FetchesPerfexCRMTask
     * @return null|object
     * @throws MalformedRequestException
     */
-    public function execute(string $taskName, string $milestoneId, string $relType, string $relId) {
+    public function execute(string $taskName, string $milestoneId, string $relType, string $relId, string $invoiceId) {
        try{
            $data = [
                'name' => $taskName,
@@ -30,6 +30,11 @@ class FetchesPerfexCRMTask
                $data = array_merge($data, $newItem);
            }

+            if($invoiceId != 0) {
+                $newItem = ['invoice_id' =>  $invoiceId ];
+                $data = array_merge($data, $newItem);
+            }
+
            $response = Http::asForm()->withHeaders([
                'authtoken' => config('perfexcrm.api_key')])
            ->post(config('perfexcrm.base_url').'/api/tasks/customsearch', $data);
@@ -39,7 +44,7 @@ class FetchesPerfexCRMTask

                return (object) $data;
            }else{
-                Helper::debugLoggerForPerfexCRM($response);
+                Helper::debugLogger($response);
                return null;
            }
        }catch(\Exception $exception){
@@ -38,7 +38,7 @@ class UpdatesPerfexCRMCustomer
                $data = $response->json();
                return (object) $data;
            }else{
-                Helper::debugLoggerForPerfexCRM($response);
+                Helper::debugLogger($response);
                return null;
            }
        }catch(\Exception $exception){
@@ -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([]);
-    }
-
-}
@@ -31,7 +31,7 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic
    private $createPaymentTransactionProcessor;

    public function __construct(
-        FetchesTransaction $fetchesTransaction, 
+        FetchesTransaction $fetchesTransaction,
        CreatePaymentTransactionProcessor $createPaymentTransactionProcessor
    )
    {
@@ -47,6 +47,20 @@ class CreatePaymentTransactionLogic extends AbstractControllerLogic

        $payment_transaction = $this->createPaymentTransactionProcessor->execute($invoice_transaction, $payment_method , $request->input('bank_code'));

+        //cief todo: at exchange there is a transition step
+        // if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
+        //     $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION);
+        // }
+
+        // if(config('perfexcrm.is_enabled') == 'true'){
+        //     $this->transactionToPerfexCRMV2Processor->execute($transaction, $status);
+        // }
+
+        //To use
+        //ApprovalStatus::PENDING_VERIFICATION;
+        //use this to trigger  $this->transactionToPerfexCRMV2Processor->execute > defineTasks > defineTasks_handlePendingVerificationStatus > definePaymentTasks
+
+
        return $this->resourceResponse(new TransactionResource($payment_transaction));
    }
 }
@@ -5,9 +5,8 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\FetchesGroup;
 use App\Classes\Modules\Transactions\Services\DeletesTransaction;
+use App\Classes\Modules\Transactions\Services\DeletesGroup;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Http\Resources\GroupResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

@@ -24,14 +23,11 @@ class DeleteGroupLogic extends AbstractControllerLogic
        ];
    }

-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
    /** @var FetchesGroup */
    private $fetchesGroup;

-    /** @var DeletesTransaction */
-    private $deletesTransaction;
+    /** @var DeletesGroup */
+    private $deletesGroup;

    /**
     * DeleteGroupLogic constructor.
@@ -39,11 +35,10 @@ class DeleteGroupLogic extends AbstractControllerLogic
     * @param FetchesGroup $fetchesGroup
     * @param DeletesTransaction $deletesTransaction
     */
-    public function __construct(updatesTransactionStatus $updatesTransactionStatus, FetchesGroup $fetchesGroup, DeletesTransaction $deletesTransaction)
+    public function __construct(FetchesGroup $fetchesGroup, DeletesGroup $deletesGroup)
    {
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
        $this->fetchesGroup = $fetchesGroup;
-        $this->deletesTransaction = $deletesTransaction;
+        $this->deletesGroup = $deletesGroup;
    }

    /**
@@ -55,19 +50,9 @@ class DeleteGroupLogic extends AbstractControllerLogic
    {
        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);

-        $items = $group->transactions()->get();
+        $this->deletesGroup->execute($group);

-        foreach($items as $item) {
-            $bill = $item;
-            $payment = $bill->owner;
-            $group->transactions()->detach($bill->id);
-            $this->updatesTransactionStatus->execute($payment, ApprovalStatus::APPROVED);
-            $this->deletesTransaction->execute($bill);
-        }
-
-        $group->delete();
-        
-        return $this->resourceResponse(new GroupResource($group));
+        return $this->response([]);
    }

 }
@@ -0,0 +1,56 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Http\Resources\MappableTransactionWithDetailsResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class ListMappableTransactionWithDetailsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Transactions With Details',
+            'message' => 'You have successfully retrieved a list of transactions'
+        ];
+    }
+
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /**
+     * ListTransactionsLogic constructor.
+     * @param ListsTransactions $listsTransactions
+     */
+    public function __construct(ListsTransactions $listsTransactions)
+    {
+        $this->listsTransactions = $listsTransactions;
+    }
+
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $filePath     = storage_path('logs/list_mappable_transaction_with_details.log');
+        $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' ' . $request->input('filters') . PHP_EOL;
+        
+        file_put_contents($filePath, $textToAppend, FILE_APPEND);
+
+        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(MappableTransactionWithDetailsResource::collection($query));
+
+    }
+
+
+
+}
@@ -0,0 +1,53 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\Services\ListsTransactions;
+use App\Http\Resources\BookingResource;
+use App\Http\Resources\MappableTransactionResource;
+use App\Http\Resources\TransactionResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListMappableTransactionsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Transactions',
+            'message' => 'You have successfully retrieved a list of transactions'
+        ];
+    }
+
+
+    /** @var ListsTransactions */
+    private $listsTransactions;
+
+    /**
+     * ListTransactionsLogic constructor.
+     * @param ListsTransactions $listsTransactions
+     */
+    public function __construct(ListsTransactions $listsTransactions)
+    {
+        $this->listsTransactions = $listsTransactions;
+    }
+
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(MappableTransactionResource::collection($query));
+
+    }
+
+
+
+}
@@ -20,6 +20,7 @@ use App\Models\Wallet;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use Illuminate\Support\Facades\Log;

 class CreatePaymentTransactionProcessor
 {
@@ -38,7 +39,7 @@ class CreatePaymentTransactionProcessor

    /** @var UpdatesWalletBalance */
    private $updatesWalletBalance;
-    
+
    /** @var UpdateDoFromVTPortalProcessor */
    private $updateDoFromVTPortalProcessor;

@@ -69,7 +70,7 @@ class CreatePaymentTransactionProcessor
        UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor,
        UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor,
        UpdatesTransactionStatus $updatesTransactionStatus
-    ) 
+    )
    {
        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
        $this->createsPaymentTransaction = $createsPaymentTransaction;
@@ -87,7 +88,8 @@ class CreatePaymentTransactionProcessor
    public function execute(Transaction $invoice, $payment_method, $bank_code)
    {
        $amount             = $invoice->amount;
-        $company_module     = $invoice->owner()->first()->owner()->first()->companyModule()->first();
+        Log::info($invoice->owner);
+        $company_module     = $invoice->owner->owner->companyModule()->first();
        $approvalStatus     = ApprovalStatus::PENDING_SUBMISSION;
        $billNumber         = $this->generatesTransactionBillNumber->execute('PYMT-');
        $payment_reference  = null;
@@ -97,12 +99,12 @@ class CreatePaymentTransactionProcessor
            // create billplz transaction
            $payment_method = PaymentMethodType::PAYMENT_GATEWAY;
            $billPlzBill = $this->createsBillplzBill->execute(
-                $company_module->name, 
+                $company_module->name,
                (app()->environment(['production'])) ? $company_module->employees()->first()->email : 'uldvstar@gmail.com',
                'This payment is for the invoice number . ' . $billNumber,
                $amount,
-                $billNumber, 
-                $bank_code, 
+                $billNumber,
+                $bank_code,
                true
            );

@@ -117,7 +119,7 @@ class CreatePaymentTransactionProcessor
            }

            $walletPaymentBillNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-            
+
            $transaction_object = new TransactionObject($walletPaymentBillNumber, TransactionType::PAYMENT, 1, $company_module->id, 1, PaymentMethodType::WALLET, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], '');
            $transaction = $this->createsTransactionableTransaction->execute($wallet, $transaction_object);

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

-namespace App\Classes\Modules\HelpMenu\Services;
+namespace App\Classes\Modules\Transactions\Services;


 use App\Classes\General\Eloquent\AbstractFetchRecord;
 use Illuminate\Database\Eloquent\Builder;
-use App\Models\QAQuestions;
+use App\Models\Group;

-class FetchesHelpMenuQuestion extends AbstractFetchRecord
+class FetchesGroup extends AbstractFetchRecord
 {

-    /** @var QAQuestions */
+    /** @var Transaction */
    private $repository;

    /**
-     * FetchesHelpMenuQuestion constructor.
-     * @param QAQuestions $repository
+     * FetchesTransaction constructor.
+     * @param Transaction $repository
     */
-    public function __construct(QAQuestions $repository)
+    public function __construct(Group $repository)
    {
        $this->repository = $repository;
    }
@@ -30,4 +30,4 @@ class FetchesHelpMenuQuestion extends AbstractFetchRecord
    {
        return $this->repository->newQuery();
    }
-}
+}
@@ -4,20 +4,20 @@ namespace App\Classes\Modules\Transactions\Services;

 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Models\Transaction;
-use App\Classes\Modules\PerfexCRM\Processors\TransactionToPerfexCRMProcessor;
+use App\Classes\Modules\PerfexCRM\Processors\TransactionToPerfexCRMV2Processor;

 class UpdatesTransactionStatus extends AbstractUpdateRecord
 {
-    /** @var TransactionToPerfexCRMProcessor */
-    private $transactionToPerfexCRMProcessor;
+    /** @var TransactionToPerfexCRMV2Processor */
+    private $transactionToPerfexCRMV2Processor;

    /**
     * UpdatesTransactionStatus constructor.
-     * @param TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor
+     * @param TransactionToPerfexCRMProcessor $transactionToPerfexCRMV2Processor
     */
-    public function __construct(TransactionToPerfexCRMProcessor $transactionToPerfexCRMProcessor)
+    public function __construct(TransactionToPerfexCRMV2Processor $transactionToPerfexCRMV2Processor)
    {
-        $this->transactionToPerfexCRMProcessor = $transactionToPerfexCRMProcessor;
+        $this->transactionToPerfexCRMV2Processor = $transactionToPerfexCRMV2Processor;
    }

    /**
@@ -33,7 +33,7 @@ class UpdatesTransactionStatus extends AbstractUpdateRecord
        $result = $this->handler($model);

        if(config('perfexcrm.is_enabled') == 'true'){
-            $this->transactionToPerfexCRMProcessor->execute($transaction, $status);
+            $this->transactionToPerfexCRMV2Processor->execute($transaction, $status);
        }
        return $result;
    }
@@ -6,7 +6,6 @@ namespace App\Classes\Notifications;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\PackingList;
-use App\Models\PasswordReset;
 use App\Models\User;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Support\Facades\Storage;
@@ -39,7 +38,7 @@ class InvoiceIssuedEmail extends AbstractEmail

        return (new MailMessage)
            ->subject('Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->file->file_info->original->file), [
+            ->attach(Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file), [
                'as' => 'name.pdf',
                'mime' => 'application/pdf',
            ])->view('emails.shipment.invoice', ['user' => $this->user, 'packingList' => $this->packingList]);
@@ -9,6 +9,7 @@ use App\Models\PackingList;
 use App\Models\PasswordReset;
 use App\Models\User;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Storage;

 class ShipmentDepartureEmail extends AbstractEmail
 {
@@ -42,7 +43,7 @@ class ShipmentDepartureEmail extends AbstractEmail

        return (new MailMessage)
            ->subject('Your packages are on the way to malaysia - Invoice pending payment for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->file->file_info->original->file), [
+            ->attach(Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file), [
                'as' => 'name.pdf',
                'mime' => 'application/pdf',
            ])->bcc(['email_test@cief-malaysia.com'])->view('emails.shipment.ETD', ['user' => $this->user, 'packingList' => $this->packingList]);
@@ -16,7 +16,9 @@ class PerfexCRMTasks
        'department' => '',
        'status' => PerfexCRMTaskStatus::COMPLETED,
        'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
    ];

    public const TASK_POST_PAYMENT_1 = [
@@ -35,7 +37,9 @@ class PerfexCRMTasks
        'department' => 'Accounts',
        'status' => PerfexCRMTaskStatus::IN_PROGRESS,
        'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
    ];
    public const TASK_POST_PAYMENT_2 = [
        'name' => 'Approve Payment',
@@ -47,7 +51,9 @@ class PerfexCRMTasks
        'department' => 'Accounts',
        'status' => '',
        'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
    ];
    public const TASK_POST_PAYMENT_3 = [
        'name' => 'Issue Shipping Autocount Invoince',
@@ -65,7 +71,9 @@ class PerfexCRMTasks
        'department' => 'Accounts',
        'status' => '',
        'priority' => PerfexCRMTaskPriority::MEDIUM,
-        'duedate' => 1
+        'duedate' => 1,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
    ];
    public const TASK_POST_PAYMENT_3_1 = [
        'name' => 'Issue Shipping Autocount OR',
@@ -78,7 +86,9 @@ class PerfexCRMTasks
        'department' => 'Accounts',
        'status' => '',
        'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
    ];
    public const TASK_POST_PAYMENT_4 = [
        'name' => 'Knockoff Invoice',
@@ -96,7 +106,9 @@ class PerfexCRMTasks
        'department' => 'Accounts',
        'status' => '',
        'priority' => PerfexCRMTaskPriority::MEDIUM,
-        'duedate' => 1
+        'duedate' => 1,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
    ];

    public const TASK_LOADED_CONTAINER_1 = [
@@ -109,7 +121,9 @@ class PerfexCRMTasks
        'department' => 'Operations',
        'status' => PerfexCRMTaskStatus::IN_PROGRESS,
        'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 1
+        'duedate' => 1,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
    ];

    public const TASK_LOADED_CONTAINER_2 = [
@@ -122,7 +136,9 @@ class PerfexCRMTasks
        'department' => 'Customer Services',
        'status' => '',
        'priority' => PerfexCRMTaskPriority::HIGH,
-        'duedate' => 1
+        'duedate' => 1,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
    ];


@@ -142,6 +158,8 @@ class PerfexCRMTasks
        'department' => 'Operations',
        'status' => PerfexCRMTaskStatus::IN_PROGRESS,
        'priority' => PerfexCRMTaskPriority::DEFAULT,
-        'duedate' => 0
+        'duedate' => 0,
+        'is_allow_multiple' => false,
+        'is_on_task_completion_update' => false
    ];
 }
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class QAType {
-
-    public const DEFAULT = 0;
-
-    public const MULTIPLE_CHOICES = 1;
-
-    public const FREE_TEXT = 2;
-
-    public const DOCUMENT_UPLOAD = 3;
-
-    public const ANSWER = 4;
-
-    public const TICKET_CRM = 5;
-}
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Classes\ValueObjects\Constants;
-
-final class RouteType {
-
-    public const WEB = 1;
-
-    public const API = 2;
-
-}
@@ -77,7 +77,6 @@ class FixBillplzFailedCallbackPayment extends Command
    {
        ini_set('memory_limit', '-1'); 

-        $this->info(Carbon::now() . ' : Fix failled callback from billplz cron started.');
        $this->outputArray = []; 
        $start   = new Carbon();

@@ -85,6 +84,11 @@ class FixBillplzFailedCallbackPayment extends Command

        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
        $totalTransactions = count($transactions);
+
+        if ($totalTransactions) {
+            $this->info(Carbon::now() . ' : Fix failled callback from billplz cron started.');
+        }
+
        $counter = 1;
        $totalAmount = 0;
        foreach ($transactions as $transaction){
@@ -180,6 +184,9 @@ class FixBillplzFailedCallbackPayment extends Command
        $end = new Carbon();
        $elapsedTime = $start->diff($end)->format('%H:%I:%S');

-        $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+        if ($totalTransactions) {
+            $this->info(Carbon::now() . ' : Done Billplz Failled Callback. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+        }
+
    }
 }
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Container;
+use App\Models\ContainerPackingList;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class FixDuplicateContainerReference extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-duplicate-container-reference';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fix all duplicated container reference';
+
+
+    /**
+     * 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() . ' : Started.');
+        $start   = new Carbon();
+
+        $duplicatedContainers = Container::select('reference', DB::raw('COUNT(reference) as count'))
+            ->groupBy('reference')
+            ->having('count', '>', 1)
+            ->get();
+
+        foreach ($duplicatedContainers as $duplicatedContainer) {
+            $containers = Container::where('reference', $duplicatedContainer->reference)->get();
+
+            $containers = $containers->sortByDesc(function ($container) {
+                return $container->packingLists->count();
+            });
+
+            $firstContainer = $containers->shift();
+
+            foreach ($containers as $container) {
+                $firstContainer->packingLists()->syncWithoutDetaching($container->packingLists);
+                $container->packingLists()->detach();
+                $this->info('Deleted container ' . $container->id);
+                $container->delete();
+            }
+        }
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done. ElapsedTime: ' . $elapsedTime);
+    }
+}
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\PackingList;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class FixPackingList extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-packinglist';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fix PackingList';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $packingLists = PackingList::whereDoesntHave('packages')->get();
+
+        if ($packingLists->isNotEmpty()) {
+            $this->info(Carbon::now() . ' : ' . $this->description . ' cron started.');
+            $start = Carbon::now();
+
+            $restoredPackagesCount = 0;
+            $restoredPackagesIds = [];
+
+            // Eager loading packages for all packing lists
+            $packingLists->load(['packages' => function ($query) {
+                $query->onlyTrashed();
+            }]);
+
+            foreach ($packingLists as $packingList) {
+                $deletedPackages = $packingList->packages->filter(function ($package) use ($restoredPackagesIds) {
+                    // Filter out packages that have already been restored
+                    return !in_array($package->id, $restoredPackagesIds);
+                });
+
+                if ($deletedPackages->isNotEmpty()) {
+                    $groupedPackages = $deletedPackages->groupBy(function ($item) {
+                        return $item->only(['type', 'description', 'width', 'height', 'length', 'weight', 'quantity']);
+                    });
+
+                    foreach ($groupedPackages as $group) {
+                        $latestPackage = $group->sortByDesc('created_at')->first();
+
+                        // Check if the package ID is already restored before attempting to restore it
+                        if (!in_array($latestPackage->id, $restoredPackagesIds)) {
+                            $latestPackage->restore();
+                            $this->info('Package ID: ' . $latestPackage->id . ' has been restored');
+                            $restoredPackagesCount++;
+                            $restoredPackagesIds[] = $latestPackage->id;
+                        }
+                    }
+                }
+            }
+
+            $end = Carbon::now();
+            $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+            $this->info(Carbon::now() . ' : Done ' . $this->description . '. ElapsedTime: ' . $elapsedTime . '.');
+            $this->info('Restored Packages Count: ' . $restoredPackagesCount);
+        }
+    }
+}
@@ -28,35 +28,40 @@ 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('0 9-18/3 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/curlyd.log');
+
+        $schedule->command('fix-packinglist')
+            ->cron('30 9-18/3 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/fix_packinglist.log');

        // $schedule->command('command:curlYdOrderListCommand')
        //     ->cron('0 9 * * *')
        //     ->withoutOverlapping()
        //     ->appendOutputTo (storage_path().'/logs/departure_email.log');

+        $schedule->command('fix-duplicate-container-reference')
+            ->cron('0 1 * * *')
+            ->withoutOverlapping()
+            ->appendOutputTo (storage_path().'/logs/fix_duplicate_container_reference.log');
+
        $schedule->command('invoice:generate')
            ->hourly()
            ->withoutOverlapping()
            ->appendOutputTo (storage_path().'/logs/auto_generate_invoice.log');

-        $schedule->command('approve:invoice')
+        $schedule->command('billplz-failed-callback:fix')
            ->hourly()
            ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/approve_invoice.log');
-
-        $schedule->command('billplz-failed-callback:fix')
-            ->dailyAt('00:00')
-            ->withoutOverlapping()
-            ->appendOutputTo (storage_path().'/logs/dix_failed_callback_from_billplz.log');
+            ->appendOutputTo (storage_path().'/logs/fix_failed_callback_from_billplz.log');
    }

    /**
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\HelpMenu;
-
-use App\Classes\Modules\HelpMenu\ControllersLogic\FetchHelpMenuQuestionLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchHelpMenuQuestionController
-{
-    /**
-     * @param Request $request
-     * @param FetchHelpMenuQuestionLogic $logic
-     * @return JsonResponse
-     */
-    public function fetch(Request $request, FetchHelpMenuQuestionLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-
-}
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\HelpMenu;
-
-use App\Classes\Modules\HelpMenu\ControllersLogic\UpdateHelpMenuNextQuestionLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateHelpMenuNextQuestionController
-{
-    /**
-     * @param Request $request
-     * @param FetchQAQuestionListLogic $logic
-     * @return JsonResponse
-     */
-    public function fetch(Request $request, UpdateHelpMenuNextQuestionLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\PackingLists;
+
+use App\Classes\Modules\PackingLists\ControllersLogic\CreateWarehouseTransportLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateWarehouseTransportController
+{
+    /**
+     * @param Request $request
+     * @param CreateContainerLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateWarehouseTransportLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
@@ -19,39 +19,7 @@ use Illuminate\Http\Request;

 class MonthlyReportController
 {
-
-    /**
-     * Get Containers
-     * @param $from
-     * @param $to
-     * @return mixed
-     */
-    private function getContainersByLoadingDate($from, $to)
-    {
-        return Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();
-
-    }
-
-    private function getPackages($from, $to)
-    {
-
-        $containers = $this->getContainersByLoadingDate($from, $to);
-
-        $packingLists = $containers->flatMap(function ($container) {
-            return $container->packingLists;
-        });
-
-        return $packingLists->map(function ($packingList) {
-            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-            return $replica ? $replica : $packingList;
-        })->flatMap(function ($packingList) {
-            return $packingList->packages;
-        });
-
-    }
-
-    public function salesReport(Request $request): JsonResponse
-    {
+    public function salesReport(Request $request): JsonResponse {
        $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::now()->startOfMonth();
        $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now()->endOfMonth();

@@ -71,18 +39,16 @@ class MonthlyReportController
            return $container->orders;
        })->unique();

-        $packages = $this->getPackages($from, $to);
+        $packingLists = $containers->flatMap(function ($container) {
+            return $container->packingLists;
+        });

-        /* $packingLists = $containers->flatMap(function ($container) {
-             return $container->packingLists;
-         });
-
-         $packages = $packingLists->map(function ($packingList) {
-             $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-             return $replica ? $replica : $packingList;
-         })->flatMap(function ($packingList) {
-             return $packingList->packages;
-         });*/
+        $packages = $packingLists->map(function ($packingList) {
+            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            return $replica ? $replica : $packingList;
+        })->flatMap(function ($packingList) {
+            return $packingList->packages;
+        });

        $totalCbm = $packages->sum(function($package){
            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
@@ -123,18 +89,19 @@ class MonthlyReportController
        $model = (int) $request->route('model');
        $value = (float) $request->route('value');

-        $packages = $this->getPackages($from, $to);

-        /* $packingLists = $containers->flatMap(function ($container) {
-             return $container->packingLists;
-         });
+        $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();

-         $packages = $packingLists->map(function ($packingList) {
-             $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-             return $replica ? $replica : $packingList;
-         })->flatMap(function ($packingList) {
-             return $packingList->packages;
-         });*/
+        $packingLists = $containers->flatMap(function ($container) {
+            return $container->packingLists;
+        });
+
+        $packages = $packingLists->map(function ($packingList) {
+            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            return $replica ? $replica : $packingList;
+        })->flatMap(function ($packingList) {
+            return $packingList->packages;
+        });

        $totalCbm = $packages->sum(function($package){
            return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
@@ -175,20 +142,18 @@ class MonthlyReportController
        $from = $request->route('from') ? Carbon::parse($request->route('from')) : Carbon::parse('01-01-2018');
        $to = $request->route('to') ? Carbon::parse($request->route('to')) : Carbon::now();

-        /*   $containers = $this->getContainersByLoadingDate($from, $to);
+        $containers = Container::whereBetween('loading_date', [$from, $to])->orderBy('loading_date')->get();

-           $packingLists = $containers->flatMap(function ($container) {
-               return $container->packingLists;
-           });
+        $packingLists = $containers->flatMap(function ($container) {
+            return $container->packingLists;
+        });

-           $packages = $packingLists->map(function ($packingList) {
-               $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
-               return $replica ? $replica : $packingList;
-           })->flatMap(function ($packingList) {
-               return $packingList->packages;
-           });*/
-
-        $packages = $this->getPackages($from, $to);
+        $packages = $packingLists->map(function ($packingList) {
+            $replica = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]) ? $packingList : $packingList->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST_REPLICA)->first();
+            return $replica ? $replica : $packingList;
+        })->flatMap(function ($packingList) {
+            return $packingList->packages;
+        });

        $packages = $packages->filter(function($package) use ($id) {
            return $package->companyModule->id === $id;
@@ -245,19 +210,17 @@ class MonthlyReportController
        $minCbm = $request->input('cbm');
        $minOrders = $request->input('minOrders');

-        /*   $activeCompanies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function ($query) use ($inactive_start, $inactive_end) {
-               return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
-                   return $query->where('drop_date', '>=', Carbon::parse($inactive_start))->where('drop_date', '<=', Carbon::parse($inactive_end)->addDay());
-               });
-           })->pluck('id');
+        $activeCompanies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($inactive_start, $inactive_end) {
+            return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
+                return $query->where('drop_date', '>=', \Carbon\Carbon::parse($inactive_start))->where('drop_date', '<=', \Carbon\Carbon::parse($inactive_end)->addDay());
+            });
+        })->pluck('id');

-           $companies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function ($query) use ($active_start, $active_end) {
-               return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
-                   return $query->whereDate('drop_date', '>=', Carbon::parse($active_start))->whereDate('drop_date', '<=', Carbon::parse($active_end)->addDay());
-               });
-           })->whereNotIn('id', $activeCompanies)->get();*/
-
-        $companies = getActiveCompanies($inactive_start, $inactive_end, $active_start, $active_end);
+        $companies = CompanyModule::where('type', \App\Classes\ValueObjects\Constants\BusinessType::IMPORTER)->whereHas('orderPackingLists', function($query) use($active_start, $active_end) {
+            return $query->where('packing_lists.type', \App\Classes\ValueObjects\Constants\PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
+                return $query->whereDate('drop_date', '>=', \Carbon\Carbon::parse($active_start))->whereDate('drop_date', '<=', \Carbon\Carbon::parse($active_end)->addDay());
+            });
+        })->whereNotIn('id', $activeCompanies)->get();

        $customerActivityData = [];
        $counter = 1;
@@ -277,7 +240,7 @@ class MonthlyReportController
            if ($minOrders != 'null' && $packingList->count() < $minOrders) { continue; }

            array_push($customerActivityData, array(
-                'key' => $counter,
+                'key' => $counter, 
                'marking' => $marking,
                'packingListCount'=> $packingList->count(),
                'totalCbm'=> $totalCbm,
@@ -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);
-    }
-}
@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\ListMappableTransactionWithDetailsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class ListMappableTransactionWithDetailsController
+{
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListMappableTransactionWithDetailsLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\ListMappableTransactionsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class ListMappableTransactionsController
+{
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListMappableTransactionsLogic $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,
        ],

        'apipub' => [
@@ -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);
-	}
-}
@@ -50,6 +50,7 @@ class CompanyModuleResource extends JsonResource
            'warehouseCharges' => array_key_exists($this->id, $segmentConstant) ? $segmentConstant[$this->id] : null,
            'connections' => $this->connections,
            'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
+            'debtor' => $this->company->debtor,
        ];

    }
@@ -28,16 +28,4 @@ class DocumentResource extends JsonResource
            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
        ];
    }
-
-    /**
-     * include only when should include file, to be loaded if needed in the UI
-     * @param bool $includeFile
-     * @return bool
-     */
-    private function shouldIncludeFiles(bool $includeFile): bool
-    {
-        return $includeFile;
-    }
-
-
 }
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class HelpMenuAnswerOptionsResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'display_text' => $this->display_text,
-            'value' => $this->value,
-            'order' => $this->order,
-            'question_number' => $this->question_number,
-            'next_question_number' => $this->next_question_number,
-        ];
-    }
-}
@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Models\QAQuestions;
-use App\Models\QAAnswerOptions;
-use App\Models\QAUserAnswerSelected;
-
-class HelpMenuQuestionResource extends JsonResource
-{
-    /** @var integer */
-    private $userId;
-
-    /** @var QAQuestions*/
-    private $question;
-
-    public function __construct($question, $userId) {
-        $this->question = $question;
-        $this->userId = $userId;
-    }
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        if($this->question){
-            $q = (object)$this->question;
-            return [
-                'id' => $q->id,
-                'question_number' => $q->question_number,
-                'question_text' => $q->question_text,
-                'question_type' => $q->question_type,
-                'question_answers' => HelpMenuAnswerOptionsResource::collection(QAAnswerOptions::where('question_number', $q->question_number)->get()),
-                'questionnaire_set_id' => $q->questionnaire_set_id,
-                'next_nested_question' => $q->next_nested_question,
-                'next_main_question' => $q->next_main_question,
-                'is_start' => $q->is_start,
-                'is_end' => $q->is_end,
-                'end_text' => $q->end_text,
-                'order' => $q->order,
-                'answer' => QAUserAnswerSelected::where('question_id', $q->id)->where('user_id', $this->userId)->first(),
-                'questionnaire_answers' => $q->is_end ? HelpMenuQuestionnaireAnswersResource::collection(QAUserAnswerSelected::where('user_id', $this->userId)->get()) : null,
-            ];
-        }
-        else{
-            return [];
-        }
-    }
-}
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Models\QAQuestions;
-
-class HelpMenuQuestionnaireAnswersResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $question = QAQuestions::where('id', $this->question_id)->first();
-        return [
-            'question_text' => $question ? $question->question_text : null,
-            'free_text_answer' => $this->free_text_answer
-        ];
-    }
-}
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use App\Models\Transaction;
+use App\Models\Wallet;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class MappableTransactionResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $reference = null;
+        if($this->type === TransactionType::TOP_UP) {
+            $reference = $this->owner->owner->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        }
+
+        if($this->type === TransactionType::PAYMENT && $this->owner !== Wallet::class){
+            $reference = $this->owner->owner->owner->reference;
+        }
+
+        return [
+            'status' => 'success',
+            'system' => 'SHIPPING_PORTAL',
+            'type' => $this->type,
+            'owner_type' => $this->owner_type,
+            'owner_id'=> $this->id,
+            'owner_reference'=> $reference,
+        ];
+    }
+}
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Exception;
+
+class MappableTransactionWithDetailsResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $data = [
+            'status' => 'success',
+            'id' => $this->id,
+            'updated_at' => $this->updated_at,
+            'type' => $this->type,
+            'amount' => $this->amount,
+            'debtor_code' => null,
+            'order_reference' => null,
+            'bill_no' => null,
+            'marking' => null,
+        ];
+
+        if ($this->type === TransactionType::PAYMENT) {
+            $order = $this->owner->owner->owner;
+            $data['order_reference'] = $order->reference;
+            $data['debtor_code'] = $order->companyModule->company->debtor;
+        } elseif (in_array($this->type, [TransactionType::GROUP_PAYMENT, TransactionType::TOP_UP])) {
+            $connection = $this->owner->owner->inviters()->withPivot('invitee_reference')->first();
+            $data['marking'] = $connection ? $connection->pivot->invitee_reference : '';
+            $data['bill_no'] = $this->bill_no;
+        } else {
+            $payments = $this->transactions()
+                ->payments()->where('status', ApprovalStatus::APPROVED)
+                ->get();
+
+            if ($payments->count()) {
+                $data['payment_transactions'] = $payments->map(function ($payment) {
+                    $order = $payment->owner->owner->owner;
+                    return [
+                        'id' => $payment->id,
+                        'updated_at' => $payment->updated_at,
+                        'debtor_code' => $order->companyModule->company->debtor,
+                        'order_reference' => $order->reference,
+                        'bill_no' => null,
+                        'type' => $payment->type,
+                        'marking' => null,
+                        'amount' => $payment->amount,
+                    ];
+                })->toArray();
+            } else {
+                $data['status'] = 'error';
+                $data['amount'] = 'Transaction Type not allowed';
+                $data['transaction_type'] = $this->type;
+                $data['payment_transactions'] = null;
+            }
+        }
+
+        return $data;
+    }
+}
@@ -5,7 +5,9 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\TransportType;
+use App\Models\Transaction;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;

@@ -19,6 +21,8 @@ class OrderResource extends JsonResource
     */
    public function toArray($request)
    {
+        $orderId = $this->id;
+
        return [
            'id' => $this->id,
            'reference' => $this->reference,
@@ -46,8 +50,8 @@ class OrderResource extends JsonResource
                    'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get()),
                ];
            }),
-            'invoices' => $this->whenLoaded('packingLists', function() {
-                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->get());
+            'invoices' => $this->whenLoaded('packingLists', function() use ($orderId) {
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get());
            }),
            'remarks' => RemarkResource::collection($this->remarks),
            'created_at' => $this->created_at->format('d-m-Y')
@@ -5,6 +5,7 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -30,7 +31,7 @@ class OrderV2Resource extends JsonResource
            'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
            'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
            'invoices' => $this->whenLoaded('packingLists', function() {
-                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->get());
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get());
            }),
            'remarks' => RemarkResource::collection($this->remarks),
            'created_at' => $this->created_at->format('d-m-Y')
@@ -22,6 +22,7 @@ class TransactionResource extends JsonResource
    {
        return [
            'id' => $this->id,
+            'owner_type' => $this->owner_type,
            'order' => ($this->owner instanceof Transaction) ? new OrderResource($this->owner->owner->owner) : new OrderResource($this->owner->owner),
            'documents' => DocumentResource::collection($this->documents),
            'type' => (int) $this->type,
@@ -1,49 +0,0 @@
-<?php
-//global helpers functions here
-use App\Classes\ValueObjects\Constants\BusinessType;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\Company;
-use App\Models\CompanyModule;
-use Carbon\Carbon;
-
-/**
- * Get Active companies
- * TODO add extract  BusinessType::IMPORTER to a $businessType parameter
- * @param $inactive_start
- * @param $inactive_end
- * @param $active_start
- * @param $active_end
- * @return mixed
- */
-
-if (!function_exists('getActiveCompanies')) {
-    function getActiveCompanies($inactive_start, $inactive_end, $active_start, $active_end)
-    {
-        $activeCompanies = CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function ($query) use ($inactive_start, $inactive_end) {
-            return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($inactive_start, $inactive_end) {
-                return $query->where('drop_date', '>=', Carbon::parse($inactive_start))->where('drop_date', '<=', Carbon::parse($inactive_end)->addDay());
-            });
-        })->pluck('id');
-
-        return CompanyModule::where('type', BusinessType::IMPORTER)->whereHas('orderPackingLists', function ($query) use ($active_start, $active_end) {
-            return $query->where('packing_lists.type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('transports', function ($query) use ($active_start, $active_end) {
-                return $query->whereDate('drop_date', '>=', Carbon::parse($active_start))->whereDate('drop_date', '<=', Carbon::parse($active_end)->addDay());
-            });
-        })->whereNotIn('id', $activeCompanies)->get();
-
-    }
-}
-/**
- *
- * Get Packing List
- * TODO change all packing related query to this
- * @param Company $company
- * @return mixed
- */
-if (!function_exists('getPackingList')) {
-    function getPackingList(Company $company)
-    {
-        return $company->orderPackingLists()->where('packing_lists.type', PackingListType::SHIPPING_PACKING_LIST)->get();
-    }
-}
-
@@ -5,72 +5,24 @@ namespace App\Models;
 use App\Classes\General\Interfaces\Documentable;
 use App\Classes\General\Interfaces\Contactable;
 use App\Classes\ValueObjects\Constants\BusinessType;
-use Eloquent;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Carbon;
-use Spatie\Activitylog\Models\Activity;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;

 /**
 * Class Company
- *
 * @package App\Models
- * @property Country country_id
- * @property State state_id
- * @property District district_id
+ *
+ * @property \App\Models\Country country_id
+ * @property \App\Models\State state_id
+ * @property \App\Models\District district_id
 * @property string postcode
 * @property string street_one
 * @property string street_two
 * @property integer billing_type
- * @property int $id
- * @property string $name
- * @property string $reference
- * @property string|null $debtor
- * @property int $type
- * @property int $status
- * @property Carbon|null $deleted_at
- * @property Carbon|null $created_at
- * @property Carbon|null $updated_at
- * @property-read Collection|Activity[] $activities
- * @property-read int|null $activities_count
- * @property-read Collection|Address[] $addresses
- * @property-read int|null $addresses_count
- * @property-read Collection|BankAccount[] $banks
- * @property-read int|null $banks_count
- * @property-read Model|Eloquent $causer
- * @property-read Collection|CompanyModule[] $companyModules
- * @property-read int|null $company_modules_count
- * @property-read Collection|Contact[] $contacts
- * @property-read int|null $contacts_count
- * @property-read Collection|Document[] $documents
- * @property-read int|null $documents_count
- * @property-read Collection|User[] $employees
- * @property-read int|null $employees_count
- * @property-read Model|Eloquent $subject
- * @property-read Model|Eloquent $target
- * @method static Builder|Company newModelQuery()
- * @method static Builder|Company newQuery()
- * @method static \Illuminate\Database\Query\Builder|Company onlyTrashed()
- * @method static Builder|Company query()
- * @method static Builder|Company whereCreatedAt($value)
- * @method static Builder|Company whereDebtor($value)
- * @method static Builder|Company whereDeletedAt($value)
- * @method static Builder|Company whereId($value)
- * @method static Builder|Company whereName($value)
- * @method static Builder|Company whereReference($value)
- * @method static Builder|Company whereStatus($value)
- * @method static Builder|Company whereType($value)
- * @method static Builder|Company whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|Company withTrashed()
- * @method static \Illuminate\Database\Query\Builder|Company withoutTrashed()
- * @mixin Eloquent
 */
 class Company extends AbstractModel implements Documentable, Contactable
 {
@@ -2,18 +2,13 @@

 namespace App\Models;

-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
-use Illuminate\Support\Carbon;
-use Spatie\Activitylog\Models\Activity;

 /**
 * Class Contact
- *
 * @package App\Models
+ *
 * @property int owner_id
 * @property string owner_type
 * @property string reference
@@ -21,34 +16,6 @@ use Spatie\Activitylog\Models\Activity;
 * @property string email
 * @property string wechat_id
 * @property int default
- * @property int $id
- * @property Carbon|null $deleted_at
- * @property Carbon|null $created_at
- * @property Carbon|null $updated_at
- * @property-read Collection|Activity[] $activities
- * @property-read int|null $activities_count
- * @property-read Model|\Eloquent $causer
- * @property-read Model|\Eloquent $owner
- * @property-read Model|\Eloquent $subject
- * @property-read Model|\Eloquent $target
- * @method static Builder|Contact newModelQuery()
- * @method static Builder|Contact newQuery()
- * @method static \Illuminate\Database\Query\Builder|Contact onlyTrashed()
- * @method static Builder|Contact query()
- * @method static Builder|Contact whereCreatedAt($value)
- * @method static Builder|Contact whereDefault($value)
- * @method static Builder|Contact whereDeletedAt($value)
- * @method static Builder|Contact whereEmail($value)
- * @method static Builder|Contact whereId($value)
- * @method static Builder|Contact whereOwnerId($value)
- * @method static Builder|Contact whereOwnerType($value)
- * @method static Builder|Contact wherePhone($value)
- * @method static Builder|Contact whereReference($value)
- * @method static Builder|Contact whereUpdatedAt($value)
- * @method static Builder|Contact whereWechatId($value)
- * @method static \Illuminate\Database\Query\Builder|Contact withTrashed()
- * @method static \Illuminate\Database\Query\Builder|Contact withoutTrashed()
- * @mixin \Eloquent
 */
 class Contact extends AbstractModel
 {
@@ -3,21 +3,17 @@
 namespace App\Models;

 use Carbon\Traits\Timestamp;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;

 use Illuminate\Database\Eloquent\Relations\hasMany;
-use Illuminate\Support\Carbon;
-use Spatie\Activitylog\Models\Activity;

 /**
 * Class Document
 * @package App\Models
 * @version August 4, 2020, 4:36 am
+ *
 * @property int owner_id
 * @property int owner_type
 * @property int document_type
@@ -27,39 +23,6 @@ use Spatie\Activitylog\Models\Activity;
 * @property timestamp issued_date
 * @property timestamp expired_date
 * @property timestamp approved_date
- * @property int $id
- * @property string|null $approval_date
- * @property Carbon|null $deleted_at
- * @property Carbon|null $created_at
- * @property Carbon|null $updated_at
- * @property-read Collection|Activity[] $activities
- * @property-read int|null $activities_count
- * @property-read Model|\Eloquent $causer
- * @property-read Collection|File[] $files
- * @property-read int|null $files_count
- * @property-read Model|\Eloquent $owner
- * @property-read Model|\Eloquent $subject
- * @property-read Model|\Eloquent $target
- * @method static Builder|Document newModelQuery()
- * @method static Builder|Document newQuery()
- * @method static \Illuminate\Database\Query\Builder|Document onlyTrashed()
- * @method static Builder|Document query()
- * @method static Builder|Document whereApprovalDate($value)
- * @method static Builder|Document whereApprover($value)
- * @method static Builder|Document whereCreatedAt($value)
- * @method static Builder|Document whereDeletedAt($value)
- * @method static Builder|Document whereDocumentType($value)
- * @method static Builder|Document whereExpiredDate($value)
- * @method static Builder|Document whereId($value)
- * @method static Builder|Document whereIssuedDate($value)
- * @method static Builder|Document whereOwnerId($value)
- * @method static Builder|Document whereOwnerType($value)
- * @method static Builder|Document whereReference($value)
- * @method static Builder|Document whereStatus($value)
- * @method static Builder|Document whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|Document withTrashed()
- * @method static \Illuminate\Database\Query\Builder|Document withoutTrashed()
- * @mixin \Eloquent
 */
 class Document extends AbstractModel
 {
@@ -80,7 +43,7 @@ class Document extends AbstractModel
    /**
     * @return hasMany
     */
-    public function files(): hasMany
+    public function files(): hasMany 
    {
        return $this->hasMany(File::class, 'document_id');
    }
@@ -2,45 +2,17 @@

 namespace App\Models;

-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Carbon;
-use Spatie\Activitylog\Models\Activity;

 /**
 * Class File
- *
 * @package App\Models
 * @version August 4, 2020, 4:36 am
- * @property Document document_id
+ *
+ * @property \App\Models\Document document_id
 * @property text file
 * @property int file_type_id
- * @property int $id
- * @property string $file_type
- * @property Carbon|null $deleted_at
- * @property Carbon|null $created_at
- * @property Carbon|null $updated_at
- * @property-read Collection|Activity[] $activities
- * @property-read int|null $activities_count
- * @property-read Model|\Eloquent $causer
- * @property-read Model|\Eloquent $subject
- * @property-read Model|\Eloquent $target
- * @method static Builder|File newModelQuery()
- * @method static Builder|File newQuery()
- * @method static \Illuminate\Database\Query\Builder|File onlyTrashed()
- * @method static Builder|File query()
- * @method static Builder|File whereCreatedAt($value)
- * @method static Builder|File whereDeletedAt($value)
- * @method static Builder|File whereDocumentId($value)
- * @method static Builder|File whereFile($value)
- * @method static Builder|File whereFileType($value)
- * @method static Builder|File whereId($value)
- * @method static Builder|File whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|File withTrashed()
- * @method static \Illuminate\Database\Query\Builder|File withoutTrashed()
- * @mixin \Eloquent
 */
 class File extends AbstractModel
 {
@@ -19,9 +19,6 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;

-/**
- * @method static whereBetween(string $string, array $array)
- */
 class Order extends AbstractModel implements Addressable, Packable, Remarkable, Notifiable
 {
    use SoftDeletes;
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Models;
-
-
-class QAAnswerOptions extends AbstractModel
-{
-	protected $table = 'qa_answer_options';
-}
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-class QAQuestionnaireSet extends AbstractModel
-{
-	protected $table = 'qa_questionnaire_sets';
-}
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Models;
-
-
-class QAQuestions extends AbstractModel
-{
-	protected $table = 'qa_questions';
-}
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Classes\General\Interfaces\Documentable;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-
-/**
- * Class Contact
- * @package App\Models
- */
-class QAUserAnswerSelected extends AbstractModel implements Documentable
-{
-	protected $table = 'qa_user_answer_selected';
-
-    /**
-     * @return MorphMany
-     */
-    public function documents(): morphMany
-    {
-        return $this->morphMany(Document::class, 'owner');
-    }
-}
@@ -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'
-   ];
-}
@@ -22,6 +22,10 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
    use SoftDeletes;
    use LogData;

+    protected $casts = [
+        'type' => 'int'
+    ];
+
    protected $table = 'transactions';

    public function owner(): morphTo
@@ -2,19 +2,10 @@

 namespace App\Models;

-use Database\Factories\UserFactory;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;

-use Illuminate\Notifications\DatabaseNotification;
-use Illuminate\Notifications\DatabaseNotificationCollection;
-use Illuminate\Support\Carbon;
-use Spatie\Activitylog\Models\Activity;
 use Spatie\Permission\Traits\HasRoles;
 use Illuminate\Database\Eloquent\SoftDeletes;

@@ -28,70 +19,13 @@ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;

-/**
- * App\Models\User
- *
- * @property int $id
- * @property string $name
- * @property string $email
- * @property string $password
- * @property int $type
- * @property int $status
- * @property string|null $remember_token
- * @property string|null $active_at
- * @property Carbon|null $created_at
- * @property Carbon|null $updated_at
- * @property Carbon|null $deleted_at
- * @property-read Collection|Activity[] $activities
- * @property-read int|null $activities_count
- * @property-read Model|\Eloquent $causer
- * @property-read Collection|CompanyModule[] $companyModule
- * @property-read int|null $company_module_count
- * @property-read Collection|Contact[] $contacts
- * @property-read int|null $contacts_count
- * @property-read Collection|UserEmailVerification[] $emailVerification
- * @property-read int|null $email_verification_count
- * @property-read DatabaseNotificationCollection|DatabaseNotification[] $notifications
- * @property-read int|null $notifications_count
- * @property-read Collection|PasswordReset[] $passwordReset
- * @property-read int|null $password_reset_count
- * @property-read Collection|Permission[] $permissions
- * @property-read int|null $permissions_count
- * @property-read Collection|Remark[] $remarks
- * @property-read int|null $remarks_count
- * @property-read Collection|Role[] $roles
- * @property-read int|null $roles_count
- * @property-read Model|\Eloquent $subject
- * @property-read Model|\Eloquent $target
- * @method static UserFactory factory(...$parameters)
- * @method static Builder|User newModelQuery()
- * @method static Builder|User newQuery()
- * @method static \Illuminate\Database\Query\Builder|User onlyTrashed()
- * @method static Builder|User permission($permissions)
- * @method static Builder|User query()
- * @method static Builder|User role($roles, $guard = null)
- * @method static Builder|User whereActiveAt($value)
- * @method static Builder|User whereCreatedAt($value)
- * @method static Builder|User whereDeletedAt($value)
- * @method static Builder|User whereEmail($value)
- * @method static Builder|User whereId($value)
- * @method static Builder|User whereName($value)
- * @method static Builder|User wherePassword($value)
- * @method static Builder|User whereRememberToken($value)
- * @method static Builder|User whereStatus($value)
- * @method static Builder|User whereType($value)
- * @method static Builder|User whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|User withTrashed()
- * @method static \Illuminate\Database\Query\Builder|User withoutTrashed()
- * @mixin \Eloquent
- */
 class User extends AbstractModel implements
    JWTSubject,
    AuthenticatableContract,
    AuthorizableContract,
    CanResetPasswordContract
 {
-    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail, SoftDeletes, HasFactory;
+    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail, SoftDeletes;

    protected $dates = ['deleted_at'];

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dillon	d769be137e	Exchange-2.0 code sync for crm changes	2023-08-17 21:49:48 +08:00
Dillon	d6a5dd56c6	Exchange-2.0 code sync for crm changes	2023-08-17 21:34:18 +08:00
edmondlang	64bfbac4f7	update manual generate warehouse packinglist	2023-08-03 14:30:45 +08:00
edmondlang	a5b7e79964	manual generate warehouse packinglist	2023-08-03 13:45:07 +08:00
edmondlang	03c9bec256	fix-duplicate-container-reference cron	2023-08-01 00:04:20 +08:00
edmondlang	06134e006c	fix deleted packinglist	2023-07-23 15:42:35 +08:00
Omair Saleh	7563b455ba	update yd updates link	2023-07-21 12:40:56 +08:00
Omair Saleh	26edb3bebd	Merge remote-tracking branch 'origin/master'	2023-07-21 12:34:35 +08:00
Omair Saleh	55e1a6ad02	remove all customer from vt warehouse list	2023-07-21 12:34:19 +08:00
edmondlang	381425c6bc	update export mappable transaction	2023-07-18 12:53:00 +08:00
edmondlang	09ab95faf8	update listing mapping transaction	2023-07-18 11:54:27 +08:00
edmondlang	8bb6f0317a	update list mappable transactino details log	2023-07-11 17:59:43 +08:00
edmondlang	fe95db2605	update list mappable transactino details log	2023-07-11 17:48:09 +08:00
edmondlang	02640e6ae8	update list mappable transactino details log	2023-07-11 17:39:09 +08:00
Omair Saleh	104dd19a6f	Merge remote-tracking branch 'origin/master'	2023-07-10 12:52:35 +08:00
Omair Saleh	89117c0706	debug yd api	2023-07-10 12:51:59 +08:00
edmondlang	bc650b0816	update public endpoint for exchange to get transaction data for accounting mapping	2023-07-09 22:01:35 +08:00
edmondlang	a6a239c489	add public endpoint for exchange to get transaction data for accounting mapping	2023-07-09 21:54:56 +08:00
edmondlang	45b78465da	add debtor code in company module resource for exchange accounting mapping purpose	2023-07-07 00:59:48 +08:00
Omair Saleh	71edeca994	Merge remote-tracking branch 'origin/master'	2023-07-05 14:18:02 +08:00
Omair Saleh	cd229c6a8f	fix the invoice export format	2023-07-05 14:17:43 +08:00
edmondlang	ebc3e588ca	update support	2023-06-29 14:35:12 +08:00
edmondlang	80471acc5b	update support page	2023-06-28 01:08:31 +08:00
Omair Saleh	ea08774111	Merge remote-tracking branch 'origin/master'	2023-06-23 14:43:04 +08:00
Omair Saleh	4a1f05e62a	include ref column to payment export for autocount	2023-06-23 14:42:46 +08:00
edmondlang	840fb86192	show bill_no for all payments	2023-06-22 13:41:48 +08:00
Omair Saleh	7a171685f6	create a public api for mappable transactions	2023-06-21 16:34:50 +08:00
Omair Saleh	096e039ffb	create a public api for mappable transactions	2023-06-21 16:31:52 +08:00
Omair Saleh	2319393758	create a public api for mappable transactions	2023-06-21 16:30:30 +08:00
Omair Saleh	85ba9d66d5	create a public api for mappable transactions	2023-06-21 16:21:08 +08:00
Omair Saleh	626dff6137	create a public api for mappable transactions	2023-06-21 15:19:45 +08:00
Omair Saleh	99efce22db	add owner type column to transaction resource to help with bank mapping function in exchange	2023-06-21 13:25:56 +08:00
Omair Saleh	4a9e89c752	disable accounting task in crm	2023-06-15 06:30:48 +08:00
Omair Saleh	39e3398f8e	debug yd api	2023-06-09 17:46:27 +08:00
Omair Saleh	7db77d619b	debug yd api	2023-06-09 17:40:59 +08:00
Omair Saleh	8f390311af	debug yd api	2023-06-09 15:32:39 +08:00
Omair Saleh	6502957021	debug yd api	2023-06-09 15:21:16 +08:00
Omair Saleh	d6ddf6d607	fix invoice email	2023-06-07 10:04:54 +08:00
Omair Saleh	b368b1c0d1	debug invoice email	2023-06-07 09:59:21 +08:00
Omair Saleh	a2ef3ed1b1	debug invoice email	2023-06-07 09:57:47 +08:00
Omair Saleh	e1b712ad10	debug invoice email	2023-06-07 09:54:52 +08:00
Omair Saleh	ddbfc5fdfd	debug invoice email	2023-06-07 09:51:06 +08:00
Omair Saleh	1cdd511f67	fix bug with invoice showing that doesn't belong to the order	2023-05-25 15:35:56 +08:00
Omair Saleh	f7d0fe117e	fix bug with invoice showing that doesn't belong to the order	2023-05-25 15:35:11 +08:00
Omair Saleh	4dede50156	fix bug with invoice showing that doesn't belong to the order	2023-05-25 15:34:19 +08:00
Omair Saleh	0d555eedc9	fix bug with invoice showing that doesn't belong to the order	2023-05-25 15:32:19 +08:00
Omair Saleh	7f73ec14a5	fix bug with fetching company module from invoice modal in create payment transaction processor	2023-05-25 15:08:24 +08:00
Omair Saleh	408397e20e	Merge remote-tracking branch 'origin/master'	2023-05-25 15:06:36 +08:00
Omair Saleh	ef37f1ebbe	fix bug with fetching company module from invoice modal in create payment transaction processor	2023-05-25 15:06:17 +08:00
edmondlang	914e9a6f0f	add BillNo Filter	2023-05-21 19:20:26 +08:00
edmondlang	525e7a5dd1	deletes group payment	2023-05-19 21:27:26 +08:00
edmondlang	a3cad7816c	deletes group payment	2023-05-19 21:22:16 +08:00
edmondlang	2100c4a14a	update fix_failed_callback_from_billplz log	2023-05-19 20:45:03 +08:00
Omair Saleh	0d090b4eaf	update public api for querying transactions and groups	2023-05-16 11:42:57 +08:00
edmondlang	73801a5acd	enable generate combine invoice function for unpaid invoice	2023-05-15 20:47:22 +08:00
edmondlang	2c0eeab84e	fix duplicated invoice	2023-05-10 23:01:07 +08:00
edmondlang	40c4a39927	revert order resource for debug	2023-05-10 13:47:29 +08:00
edmondlang	866df52e52	fix sending billplz email to customer on development environment	2023-05-10 13:37:50 +08:00
edmondlang	b34d909a09	fix order resource returning incorrect invoice	2023-05-10 13:24:10 +08:00
edmondlang	26b3e968e9	fix order resource returning incorrect invoice	2023-05-10 13:22:44 +08:00
edmondlang	7b127b2cba	fix order resource returning incorrect invoice	2023-05-10 13:15:57 +08:00
edmondlang	7488313a0e	fix order resource returning incorrect invoice	2023-05-10 13:12:56 +08:00
edmondlang	7589b5c553	customer payment and billing menu	2023-05-08 13:14:25 +08:00
edmondlang	d8391fe479	fix invoice appearing in PENDING PAYMENT and also GROUP PAYMENT IN PROGRESS	2023-05-08 12:53:52 +08:00
edmondlang	c01e8d6eb2	fix retry payment button coverage	2023-05-08 00:28:13 +08:00
edmondlang	5aad5f1729	merge master	2023-05-06 18:51:58 +08:00
edmondlang	485a6e2e82	merge master	2023-05-06 18:45:00 +08:00