fix invoice appearing in PENDING PAYMENT and also GROUP PAYMENT IN PROGRESS

.env.example

@@ -10,9 +10,9 @@ LOG_LEVEL=debug
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=shpping_portal
+DB_DATABASE=laravel
 DB_USERNAME=root
-DB_PASSWORD=root
+DB_PASSWORD=
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -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"

.env.testing

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

.gitignore

@@ -2,8 +2,6 @@
 /public/hot
 /public/storage
 /storage/*.key
-/tests/_output
-/tests/_support
 /vendor
 **/.idea/
 .env
@@ -27,6 +25,3 @@ package-lock.json
 public/*
 /public/*
 storage/framework/laravel-excel/*
-.vapor/
-.env.production
-.env.staging

.gitlab-ci.yml

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

README.md

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/Classes/Jobs/UpdatePerfexCRMInvoice.php

@@ -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

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

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

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

@@ -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);

app/Classes/Modules/Documents/ControllersLogic/ListDocumentLogic.php

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

app/Classes/Modules/Documents/Processors/UploadDocumentForHelpMenuProcessor.php

@@ -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;
-    }
-
-}

app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php

@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Exports\Services;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Models\Order;
+use App\Models\State;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
@@ -31,8 +32,10 @@ class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadin
      */
     public function query()
     {
-        return Order::whereHas('addresses', function($address) {
-            $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');
         });

app/Classes/Modules/HelpMenu/ControllersLogic/FetchHelpMenuQuestionLogic.php

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

app/Classes/Modules/HelpMenu/ControllersLogic/UpdateHelpMenuNextQuestionLogic.php

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

app/Classes/Modules/HelpMenu/Processors/DeleteHelpMenuAnswerProcessor.php

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

app/Classes/Modules/HelpMenu/Processors/FetchFirstHelpMenuQuestionProcessor.php

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

app/Classes/Modules/HelpMenu/Processors/FetchNextHelpMenuQuestionProcessor.php

@@ -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;
-    }
-}

app/Classes/Modules/HelpMenu/Processors/SaveHelpMenuAnswerProcessor.php

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

app/Classes/Modules/HelpMenu/Services/FetchesHelpMenuQuestion.php

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

app/Classes/Modules/HelpMenu/Services/FetchesHelpMenuUserAnswerSelected.php

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

app/Classes/Modules/HelpMenu/Services/FetchesHelpMenuUserAnswerSelectedList.php

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

app/Classes/Modules/HelpMenu/Standards/Rules/CanFetchHelpMenuQuestionList.php

@@ -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;
-    }
-
-}

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

@@ -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;
     }
 

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

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PerfexCRM\Services;
-
-use Illuminate\Support\Facades\Http;
-use App\Classes\Exceptions\MalformedRequestException;
-use Illuminate\Support\Facades\Log;
-
-class 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());
-        }
-    }
-}

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

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

app/Classes/ValueObjects/Constants/QAType.php

@@ -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;
-}

app/Classes/ValueObjects/Constants/RouteType.php

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

app/Console/Kernel.php

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

app/Http/Controllers/HelpMenu/FetchHelpMenuQuestionController.php

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

app/Http/Controllers/HelpMenu/UpdateHelpMenuNextQuestionController.php

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

app/Http/Controllers/Reports/MonthlyReportController.php

@@ -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,

app/Http/Controllers/Transactions/CreateCombinedInvoicesController.php

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

app/Http/Kernel.php

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

app/Http/Middleware/ApiRouteLogs.php

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

app/Http/Middleware/WebRouteLogs.php

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

app/Http/Resources/DocumentResource.php

@@ -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;
-    }
-
-
 }

app/Http/Resources/HelpMenuAnswerOptionsResource.php

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

app/Http/Resources/HelpMenuQuestionResource.php

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

app/Http/Resources/HelpMenuQuestionnaireAnswersResource.php

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

app/Library/helper.php

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

app/Models/Company.php

@@ -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
 {

app/Models/Contact.php

@@ -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
 {

app/Models/Document.php

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

app/Models/File.php

@@ -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
 {

app/Models/Order.php

@@ -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;

app/Models/QAAnswerOptions.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Models;
-
-
-class QAAnswerOptions extends AbstractModel
-{
-	protected $table = 'qa_answer_options';
-}

app/Models/QAQuestionnaireSet.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-class QAQuestionnaireSet extends AbstractModel
-{
-	protected $table = 'qa_questionnaire_sets';
-}

app/Models/QAQuestions.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Models;
-
-
-class QAQuestions extends AbstractModel
-{
-	protected $table = 'qa_questions';
-}

app/Models/QAUserAnswerSelected.php

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

app/Models/RouteLog.php

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

app/Models/User.php

@@ -2,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'];
 

app/Transformers/CompanyTransformer.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Transformers;
-
-use App\Models\Company;
-use Illuminate\Support\Facades\Crypt;
-use League\Fractal\Resource\Item;
-use League\Fractal\TransformerAbstract;
-
-class CompanyTransformer extends TransformerAbstract
-{
-
-
-    /**
-     * List of all default includes
-     */
-    protected array $defaultIncludes = [
-        'contact',
-    ];
-
-    /**
-     * List of all possible includes
-     * @var array|string[]
-     */
-    protected array $availableIncludes = [
-
-        'segments',
-        'employee',
-        'company_module',
-        'last_order',
-        'order_count',
-        'identification',
-    ];
-
-    public function transform(Company $company): array
-    {
-        return [
-            'id' => $company->id,
-            'hash_id' => Crypt::encryptString($company->id),
-            'name' => $company->name,
-            'debtor' => $company->debtor,
-            'reference' => $company->reference,
-            'type' => $company->type,
-            'business_type' => (int)$company->business_type,
-            'status' => $company->status,
-            'created_at' => $company->created_at->format('d-m-Y')
-        ];
-
-    }
-
-
-    /**
-     * Include Contact
-     *
-     * @return Item
-     */
-    public function includeContact(Company $company): Item
-    {
-        $contact = $company->contacts();
-
-        return $this->item($contact->first(), new ContactTransformer());
-    }
-}

app/Transformers/ContactTransformer.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Transformers;
-
-use App\Models\Contact;
-use League\Fractal\TransformerAbstract;
-
-class ContactTransformer extends TransformerAbstract
-{
-
-    /**
-     * Additional includes to the ContactResource
-     */
-    protected array $defaultIncludes = [
-
-    ];
-
-    /**
-     * Transform contact
-     * @param Contact $contact
-     * @return array
-     */
-    public function transform(Contact $contact): array
-    {
-        return [
-            'id' => $contact->id,
-            'reference' => $contact->reference,
-            'phone' => $contact->phone,
-            'email' => $contact->email,
-            'wechat_id' => $contact->wechat_id,
-        ];
-
-    }
-
-}

app/Transformers/DocumentTransformer.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Transformers;
-
-use App\Models\Document;
-use Carbon\Carbon;
-use League\Fractal\Resource\Collection;
-use League\Fractal\Resource\Item;
-use League\Fractal\TransformerAbstract;
-
-class DocumentTransformer extends TransformerAbstract
-{
-
-    /**
-     * Default Includes for Document Module
-     * @var array
-     */
-    protected array $defaultIncludes = [
-        'files'
-    ];
-    /**
-     * Available includes
-     * @var array
-     */
-    protected array $availableIncludes = [
-        'owner'
-    ];
-
-    public function transform(Document $document): array
-    {
-        return [
-            'id' => $document->id,
-            'reference' => $document->reference,
-            'status' => $document->status,
-            'document_type' => $document->document_type,
-            'created_at' => Carbon::parse($document->created_at)->format('d-m-Y h:i:s A')
-        ];
-    }
-
-    public function includeFiles(Document $document): Collection
-    {
-        $files = $document->files;
-        return $this->collection($files, new FileTransformer());
-    }
-
-    public function includeOwner(Document $document): Item
-    {
-        $owner = $document->owner;
-        return $this->item($owner, new CompanyTransformer());
-    }
-
-}

app/Transformers/FileTransformer.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Transformers;
-
-use App\Models\File;
-use League\Fractal\TransformerAbstract;
-
-class FileTransformer extends TransformerAbstract
-{
-
-    /**
-     * AA Array of possible includes for file model
-     * @var array
-     */
-    protected array $availableIncludes = [
-
-    ];
-
-    /**
-     * Transform File
-     * @param File $file
-     * @return array
-     */
-    public function transform(File $file): array
-    {
-
-        return [
-            'id' => $file->id,
-            'file' => $file->file,
-            'type' => (int)$file->file_type,
-        ];
-
-    }
-}

app/Transformers/UserTransformer.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Transformers;
-
-use App\Models\User;
-use League\Fractal\TransformerAbstract;
-
-class UserTransformer extends TransformerAbstract
-{
-    /**
-     * List of default User modal includes
-     * @var array
-     */
-    protected array $defaultIncludes = [
-    ];
-
-    /**
-     * User Modal Available includes
-     * @var array
-     */
-    protected array $availableIncludes = [
-
-    ];
-
-    public function transform(User $user): array
-    {
-
-        return [
-            'id' => $user->id,
-            'name' => $user->name,
-            'email' => $user->email,
-            'type' => $user->type,
-            'status' => $user->status
-        ];
-
-    }
-
-}

codeception.yml

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

composer.json

@@ -2,44 +2,29 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The Laravel Framework.",
-    "keywords": [
-        "framework",
-        "laravel"
-    ],
+    "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {
         "php": "^7.3",
         "ext-fileinfo": "^7.3",
         "ext-json": "*",
         "barryvdh/laravel-dompdf": "^0.9.0",
-        "carlos-meneses/laravel-mpdf": "*",
+        "carlos-meneses/laravel-mpdf": "^2.1",
         "doctrine/dbal": "^3.1",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
         "intervention/image": "^2.5",
         "laravel/framework": "^8.40",
-        "laravel/legacy-factories": "^1.3",
         "laravel/tinker": "^2.5",
-        "laravel/vapor-cli": "^1.55",
-        "laravel/vapor-core": "^2.30",
-        "league/fractal": "^0.20.1",
         "maatwebsite/excel": "^3.1",
         "rinvex/countries": "^6.1",
         "spatie/laravel-activitylog": "^3.14",
-        "spatie/laravel-fractal": "^5.8",
         "spatie/laravel-permission": "^4.2",
         "staudenmeir/eloquent-has-many-deep": "^1.7",
         "tymon/jwt-auth": "^1.0"
     },
     "require-dev": {
-        "barryvdh/laravel-ide-helper": "^2.12",
-        "codeception/codeception": "^4.2",
-        "codeception/module-asserts": "^2.0",
-        "codeception/module-laravel": "^2.3",
-        "codeception/module-phpbrowser": "^2.0",
-        "codeception/module-rest": "^2.0",
-        "codeception/module-webdriver": "^2.0",
         "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
         "laravel/sail": "^1.0.1",
@@ -57,10 +42,7 @@
     "autoload-dev": {
         "psr-4": {
             "Tests\\": "tests/"
-        },
-        "files": [
-            "app/Library/helper.php"
-        ]
+        }
     },
     "scripts": {
         "post-autoload-dump": [

database/factories/UserFactory.php

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

database/migrations/2022_12_27_165842_create_route_logs_table.php

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

database/migrations/2023_02_20_134100_create_qa_questionnaire_sets_table.php

@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateQAQuestionnaireSetsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('qa_questionnaire_sets', function (Blueprint $table) {
-            $table->id();
-            $table->string('name');
-            $table->string('description')->nullable();
-            $table->unsignedSmallInteger('order')->default(0);
-            $table->unsignedBigInteger('next_set')->nullable();
-            $table->unsignedSmallInteger('version')->default(1);
-            $table->timestamps();
-            $table->softDeletes();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('qa_questionnaire_sets');
-    }
-}

database/migrations/2023_02_20_134124_create_qa_questions_table.php

@@ -1,45 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateQAQuestionsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('qa_questions', function (Blueprint $table) {
-            $table->id();
-            $table->unsignedBigInteger('question_number');
-            $table->text('question_text');
-            $table->unsignedBigInteger('questionnaire_set_id');
-            $table->unsignedBigInteger('next_nested_question')->nullable();
-            $table->unsignedBigInteger('next_main_question')->nullable();
-            $table->unsignedBigInteger('question_type');
-            $table->tinyInteger('is_start');
-            $table->tinyInteger('is_end');
-            $table->string('end_text')->nullable();
-            $table->unsignedInteger('order')->default(0);
-            $table->timestamps();
-            $table->softDeletes();
-
-            $table->foreign('questionnaire_set_id')->references('id')->on('qa_questionnaire_sets');
-
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('qa_questions');
-    }
-}

database/migrations/2023_02_21_091314_create_qa_answer_options_table.php

@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateQAAnswerOptionsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('qa_answer_options', function (Blueprint $table) {
-            $table->id();
-            $table->text('display_text');
-            $table->string('value');
-            $table->unsignedSmallInteger('order')->default(0);
-            $table->unsignedBigInteger('question_number');
-            $table->unsignedBigInteger('next_question_number')->nullable();
-            $table->timestamps();
-            $table->softDeletes();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('qa_answer_options');
-    }
-}

database/migrations/2023_02_21_091507_create_qa_user_answer_selected_table.php

@@ -1,40 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateQAUserAnswerSelectedTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('qa_user_answer_selected', function (Blueprint $table) {
-            $table->id();
-            $table->unsignedBigInteger('user_id');
-            $table->unsignedBigInteger('question_id');
-            $table->unsignedBigInteger('answer_option_id')->default(0);
-            $table->string('free_text_answer')->nullable();
-            $table->timestamps();
-            $table->softDeletes();
-
-            $table->foreign('question_id')->references('id')->on('qa_questions');
-            // $table->foreign('answer_option_id')->references('id')->on('qa_answer_options');
-            $table->foreign('user_id')->references('id')->on('users');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('qa_answer_option_selections');
-    }
-}

database/seeders/DatabaseSeeder.php

@@ -21,8 +21,5 @@ class DatabaseSeeder extends Seeder
         $this->call(SegmentConstantsTableSeeder::class);
 
         $this->call(DummyDataSeeder::class);
-
-        // $this->call(QAQuestionSeeder::class);
-        // $this->call(QAAnswerOptionsSeeder::class);
     }
 }

database/seeders/QAAnswerOptionsSeeder.php

@@ -1,155 +0,0 @@
-<?php
-
-namespace Database\Seeders;
-
-use Illuminate\Database\Seeder;
-use App\Models\QAAnswerOptions;
-
-class QAAnswerOptionsSeeder extends Seeder
-{
-    public function run()
-    {
-       // Option 1 for Question 10
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Billing";
-       $answerOption->value = "Billing";
-       $answerOption->question_number = 10;
-       $answerOption->next_question_number = 100;
-       $answerOption->save();
-
-       // Option 2 for Question 10
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Shipping";
-       $answerOption->value = "Shipping";
-       $answerOption->question_number = 10;
-       $answerOption->next_question_number = 100;
-       $answerOption->save();
-
-       // Option 3 for Question 10
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Returns";
-       $answerOption->value = "Returns";
-       $answerOption->question_number = 10;
-       $answerOption->next_question_number = 100;
-       $answerOption->save();
-
-       // Option 4 for Question 10
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Product Information";
-       $answerOption->value = "Product Information";
-       $answerOption->question_number = 10;
-       $answerOption->next_question_number = 100;
-       $answerOption->save();
-
-       // Option 5 for Question 10
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Technical Support";
-       $answerOption->value = "Technical Support";
-       $answerOption->question_number = 10;
-       $answerOption->next_question_number = 100;
-       $answerOption->save();
-
-       // Option 6 for Question 10
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Shipping Fee Calculation";
-       $answerOption->value = "Shipping Fee Calculation";
-       $answerOption->question_number = 10;
-       $answerOption->next_question_number = 600;
-       $answerOption->save();
-
-       // Option 7 for Question 10
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Error-in Measurements";
-       $answerOption->value = "Error-in Measurements";
-       $answerOption->question_number = 10;
-       $answerOption->next_question_number = 700;
-       $answerOption->save();
-
-       // Option 8 for Question 10
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Contact Us";
-       $answerOption->value = "Contact Us";
-       $answerOption->question_number = 10;
-       $answerOption->next_question_number = 800;
-       $answerOption->save();
-
-        // Option 1 for Question 20
-        $answerOption = new QAAnswerOptions;
-        $answerOption->display_text = "Option 1 for Question 20";
-        $answerOption->value = "Option 1 for Question 20";
-        $answerOption->question_number = 20;
-        $answerOption->save();
-
-        // Option 2 for Question 20
-        $answerOption = new QAAnswerOptions;
-        $answerOption->display_text = "Option 2 for Question 20";
-        $answerOption->value = "Option 2 for Question 20";
-        $answerOption->question_number = 20;
-        $answerOption->save();
-
-       // Option 1 for Question 100
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Option 1 for Question 100";
-       $answerOption->value = "Option 1 for Question 100";
-       $answerOption->question_number = 100;
-       $answerOption->save();
-
-       // Option 2 for Question 100
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Option 2 for Question 100";
-       $answerOption->value = "Option 2 for Question 100";
-       $answerOption->question_number = 100;
-       $answerOption->save();
-
-       // Option 1 for Question 30
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Option 1 for Question 30";
-       $answerOption->value = "Option 1 for Question 30";
-       $answerOption->question_number = 30;
-       $answerOption->save();
-
-       // Option 2 for Question 30
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Option 2 for Question 30";
-       $answerOption->value = "Option 2 for Question 30";
-       $answerOption->question_number = 30;
-       $answerOption->save();
-
-       // Option 3 for Question 30
-       $answerOption = new QAAnswerOptions;
-       $answerOption->display_text = "Option 3 for Question 30";
-       $answerOption->value = "Option 3 for Question 30";
-       $answerOption->question_number = 30;
-       $answerOption->save();
-
-
-        // Option 1 for Question 300
-        $answerOption = new QAAnswerOptions;
-        $answerOption->display_text = "Option 1 for Question 300";
-        $answerOption->value = "Option 1 for Question 300";
-        $answerOption->question_number = 300;
-        $answerOption->save();
-
-        // Option 2 for Question 300
-        $answerOption = new QAAnswerOptions;
-        $answerOption->display_text = "Option 2 for Question 300";
-        $answerOption->value = "Option 2 for Question 300";
-        $answerOption->question_number = 300;
-        $answerOption->save();
-
-        // Option 3 for Question 300
-        $answerOption = new QAAnswerOptions;
-        $answerOption->display_text = "Option 3 for Question 300";
-        $answerOption->value = "Option 3 for Question 300";
-        $answerOption->question_number = 300;
-        $answerOption->save();
-
-        // Option 1 for Question 600
-        $answerOption = new QAAnswerOptions;
-        $answerOption->display_text = '<h1>Et harum accusamus eum quis dolorum? </h1><p>Lorem ipsum dolor sit amet. Est corporis voluptas et repudiandae libero <em>Aut quis</em>! Est aperiam voluptatum eum quidem rerumnam deserunt sit internos possimus non dolore voluptate. Vel explicabo aliquam <strong>Sit sunt ut maxime voluptatibus non vero libero ad ratione dolore</strong>. </p><h2>Ea incidunt dolor in obcaecati harum ut dignissimos facilis! </h2><p>Et adipisci illo et laborum internos <strong>Nam aperiam est ipsa nisi non quia architecto ut itaque autem</strong>. Eos maiores sunt <em>Et voluptas aut expedita quidem aut odio repellendus eum neque voluptate</em> et iusto nisi vel consequatur quos. Sit doloribus omnis in minima illoQui soluta est omnis quasi vel officia reiciendis qui aliquid quis! Sed odit esse aut sint laborumEa internos et magni amet sed dolores omnis hic totam temporibus ut quia numquam. </p><ul><li>Est soluta praesentium ut vero obcaecati! </li><li>Sit nobis facere in porro rerum et quidem deserunt qui inventore odit. </li></ul><h3>Et laborum quaerat vel animi ipsum. </h3><p>Aut quos libero <a href="https://www.loremipzum.com" target="_blank">Et explicabo qui enim libero id rerum ipsa</a>. Est quod tempora est soluta enimaut quasi aut eligendi fugit et fugit Quis. </p>
-        ';
-        $answerOption->value = "Answer";
-        $answerOption->question_number = 600;
-        $answerOption->save();
-    }
-}

database/seeders/QAQuestionSeeder.php

@@ -1,187 +0,0 @@
-<?php
-
-namespace Database\Seeders;
-
-use Illuminate\Database\Seeder;
-use App\Models\QAQuestionnaireSet;
-use App\Models\QAQuestions;
-use App\Classes\ValueObjects\Constants\QAType;
-
-class QAQuestionSeeder extends Seeder
-{
-    public function run()
-    {
-        $questionnaireSets = [
-            [
-                'name' => 'Set 1',
-                'description' => 'This is set 1 questions',
-            ],
-        ];
-
-        foreach ($questionnaireSets as $set) {
-            $questionnaireSet = QAQuestionnaireSet::create([
-                'name' => $set['name'],
-                'description' => $set['description'],
-            ]);
-
-            $questions = [];
-
-            switch ($set['name']) {
-                case 'Set 1':
-                    $questions = [
-                    [
-                        'question_number' => 10,
-                        'question_text' => 'Please select one',
-                        'question_type' => QAType::MULTIPLE_CHOICES,
-                        'is_start' => true,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 20,
-                        'question_text' => 'Question text for question number 20?',
-                        'question_type' => QAType::MULTIPLE_CHOICES,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 30,
-                        'question_text' => 'Question text for question number 30?',
-                        'question_type' => QAType::MULTIPLE_CHOICES,
-                        'next_nested_question' => 300,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 40,
-                        'question_text' => 'What is your name?',
-                        'question_type' => QAType::FREE_TEXT,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 50,
-                        'question_text' => 'The End',
-                        'question_type' => QAType::ANSWER,
-                        'is_start' => false,
-                        'is_end' => true,
-                    ],
-                    [
-                        'question_number' => 60,
-                        'question_text' => 'We have received your request and will response as soon as possible.',
-                        'question_type' => QAType::TICKET_CRM,
-                        'is_start' => false,
-                        'is_end' => true,
-                    ],
-                    [
-                        'question_number' => 100,
-                        'question_text' => 'Question text for question number 100?',
-                        'question_type' => QAType::MULTIPLE_CHOICES,
-                        'next_nested_question' => 110, //200 //3 digits - first level
-                        'next_main_question' => 20,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 110,
-                        'question_text' => 'Question text for question number 110?',
-                        'question_type' => QAType::FREE_TEXT,
-                        'next_nested_question' => 1000, //1000 //4 digits - second level
-                        'next_main_question' => 20,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 300,
-                        'question_text' => 'Question text for question number 300?',
-                        'question_type' => QAType::MULTIPLE_CHOICES,
-                        'next_main_question' => 40,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 600,
-                        'question_text' => 'Shipping Fee Calculations',
-                        'question_type' => QAType::ANSWER,
-                        'is_start' => false,
-                        'is_end' => true,
-                    ],
-                    [
-                        'question_number' => 700,
-                        'question_text' => 'Please enter your measurements',
-                        'question_type' => QAType::FREE_TEXT,
-                        'next_nested_question' => 710,
-                        'next_main_question' => 20,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 710,
-                        'question_text' => 'Please upload the photo proof',
-                        'question_type' => QAType::DOCUMENT_UPLOAD,
-                        'next_main_question' => 60,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 800,
-                        'question_text' => 'What is your name?',
-                        'question_type' => QAType::FREE_TEXT,
-                        'next_nested_question' => 810,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 810,
-                        'question_text' => 'Click Next to speak to our customer service',
-                        'question_type' => QAType::FREE_TEXT,
-                        'is_start' => false,
-                        'is_end' => true,
-                        'end_text' => 'We have received your request and will response as soon as possible.',
-                    ],
-                    [
-                        'question_number' => 1000,
-                        'question_text' => 'Question text for question number 1000?',
-                        'question_type' => QAType::FREE_TEXT,
-                        'next_nested_question' => 10000, //10000 - 5 digits - 3rd level
-                        'next_main_question' => 20,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                    [
-                        'question_number' => 10000,
-                        'question_text' => 'Question text for question number 10000?',
-                        'question_type' => QAType::FREE_TEXT,
-                        'next_main_question' => 20,
-                        'is_start' => false,
-                        'is_end' => false,
-                    ],
-                ];
-                break;
-            }
-
-            foreach ($questions as $key => $questionData) {
-                $question = new QAQuestions;
-                $question->question_number = $questionData['question_number'];
-                $question->question_text = $questionData['question_text'];
-                $question->question_type = $questionData['question_type'];
-                $question->questionnaire_set_id = $questionnaireSet->id;
-
-                if (isset($questionData['next_nested_question'])) {
-                    $question->next_nested_question = $questionData['next_nested_question'];
-                }
-                if (isset($questionData['next_main_question'])) {
-                    $question->next_main_question = $questionData['next_main_question'];
-                }
-
-                $question->is_start = $questionData['is_start'];
-                $question->is_end = $questionData['is_end'];
-                if (isset($questionData['end_text'])) {
-                    $question->end_text = $questionData['end_text'];
-                }
-
-                $question->order = $key + 1;
-                $question->save();
-            }
-        }
-    }
-}

docker-compose.yml

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

phpunit.xml

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

production.Dockerfile

@@ -1,3 +0,0 @@
-FROM laravelphp/vapor:php82
-
-COPY . /var/task

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

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

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

@@ -83,12 +83,11 @@
                 billingAddressFilters: {
                     per_page: 10, 
                     HasMorphCompanyModule: this.company_module_id,
-                    ownerType: 'App\\Models\\CompanyModule',
                     type: 1
                 },
                 parameters : {
                     company_module_id: this.company_module_id,
-                    billing_address_id: null,
+                    billing_address_id: '',
                 },
                 item:{
                     id:null

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

@@ -84,7 +84,7 @@
                                 <div class="col bg-master-lightest p-1 p-sm-4">
                                     <div class="row tabsContainer tabContent" tab-name="pendingPayment">
                                         <div class="col">
-                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPendingPaymentInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, 'type': 1, 'does_not_have_payment_status_in': [0,1] ,'does_not_have_group_transactions': 1}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component :endpoint="route('api.transaction.list')" section="customerPendingPaymentInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, 'type': 1, 'does_not_have_payment_status_in': [0,1] ,'does_not_have_groups': 1}"></customer-payment-billing-inner-component>
                                         </div>
                                     </div>
                                     <div class="row tabsContainer tabContent hide" tab-name="groupPaymentInProgress">

resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue

@@ -1,235 +0,0 @@
-<template>
-    <div class="row">
-        <div class="col bg-white padding-40 b-rad-lg">
-            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
-            <div class="row" v-if="question" v-show="!$store.getters.isLoading(section)">
-                <div class="col">
-                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
-                        <div class="col">
-                            <small class="bold fs-10 text-danger">{{error}}</small>
-                        </div>
-                    </div>
-                    <div class="row m-b-20">
-                        <div class="col">
-                            <h3>{{question.question_text}}</h3>
-                        </div>
-                    </div>
-                    <div class="row m-b-10" v-if="question.question_type === 4" >
-                        <div class="col" v-for="ans in question.question_answers">
-                            <div v-html="ans.display_text"></div>
-                        </div>
-                    </div>
-                    <div class="row m-b-15" v-else-if="question.question_type === 3">
-                        <div class="col">
-                            <file-input-component :validator="$v.files" v-model="files">
-                                <template slot="label">
-                                    <div class="font-heading fs-11 all-caps">Photo or File</div>
-                                </template>
-                                <template slot="tips">
-                                    <div class="row"  v-show="false">
-                                        <div class="col">
-                                            <div class="row m-b-20">
-                                                <div class="col">
-                                                    <div class="font-heading fs-11 text-warning m-b-10">{{ documentType === 0 ? 'IC': 'SSM registration'}} number shown in the photo should tally with {{ documentType === 0 ? 'IC': 'SSM registration'}} number provided above.</div>
-                                                    <div class="font-heading fs-11 muted">Tips on how your photo should look</div>
-                                                </div>
-                                            </div>
-
-                                        </div>
-                                    </div>
-                                </template>
-                            </file-input-component>
-                        </div>
-                    </div>
-                    <div class="row m-b-10" v-show="question.is_end === 0" v-else-if="question.question_type === 1" >
-                        <validation-wrapper-component :validator="$v.answer" class="col">
-                            <div class="col" v-for="ans in question.question_answers">
-                                <div class="col question.answers">
-                                    <div class="btn btn-xs btn-block" :answerValue="ans.value" :answerId=ans.id @click="addClass($event, 'question.answers')">{{ ans.display_text }}</div>
-                                </div>
-                            </div>
-                        </validation-wrapper-component>
-                    </div>
-                    <div class="row m-b-10" v-show="question.is_end === 0" v-else>
-                        <div class="col" >
-                            <validation-wrapper-component :validator="$v.answer">
-                                <label>Answer</label>
-                                <input type="text" class="form-control" v-model="answer" @input="formTouched = true">
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col p-r-5">
-                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" @click=" submitForm('previous')">Previous</div>
-                        </div>
-                        <div class="col p-r-5">
-                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
-                        </div>
-                        <div class="col p-l-5">
-                            <div class="btn btn-sm btn-primary btn-block b-rad-none" :disabled="!$v.$dirty || !$v.$valid" @click="formTouched = true; submitForm('next')">{{ data.remarks.length > 0 ? 'Edit' : (question.is_end === 0 ? 'Next' : 'Finish') }}</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import { required } from "vuelidate/lib/validators";
-    export default {
-        props: {
-            data:{
-                type: Object,
-                required: true
-            },
-            module_type: {
-                type: String,
-                required: true
-            }
-        },
-        data(){
-            return {
-                section: 'helpMenuForm',
-                showAnswerInput: false,
-                showUploadInput: false,
-                formTouched: false,
-                question: null,
-                answer: '',
-                answerId: 0,
-                direction: 'next',
-                documentType: 1,
-                files: [],
-                error: null
-            }
-        },
-        validations() {
-            return {
-                answer: {
-                    required:  this.formTouched && this.showAnswerInput ? required : false,
-                },
-                files: {
-                    required:  this.formTouched && this.showUploadInput ? required : false,
-                }
-            };
-        },
-        computed: {
-            pendingQueue () {
-                return this.$store.getters.isInCompleteQueue(this.section);
-            },
-            parametersExist() {
-                return Boolean(this.answer);
-            }
-        },
-        watch: {
-            pendingQueue(inComplete, oldValue){
-                if(inComplete){
-                    this.fetchCompany();
-                }
-            }
-        },
-        created(){
-            this.$store.dispatch('updateListQueue', {'name': this.section});
-        },
-        methods: {
-            fetchCompany(){
-                this.isLoading = true;
-                this.submit(route('api.helpmenu.first.question'), 'get', this.section, false, false);
-            },
-            successHandler(response){
-                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
-                this.question = response.payload.data;
-                this.reset();
-                this.removeClass('question.answers');
-                if(this.question.answer != null && this.direction == "previous"){
-                    this.answer = this.question.answer.free_text_answer;
-                }
-            },
-            errorHandler(error){
-                this.error = error.message;
-            },
-            submitForm(direction) {
-                this.parameters = {}
-                this.error = null;
-                this.direction = direction;
-                if(this.question.question_type === 3){
-                    this.showAnswerInput = false;
-                    this.showUploadInput = true;
-                }
-                else if(this.question.question_type === 1 || (this.question.question_type === 2)){
-                    this.showAnswerInput = true;
-                    this.showUploadInput = false;
-                }
-                if(direction === 'next'){
-                    this.parameters.question = this.question;
-                    this.parameters.answer = this.answer;
-                    this.parameters.answerId = this.answerId;
-                    this.parameters.answerObj = this.question.question_answers.find(item => item.id === Number(this.answerId));
-                    this.parameters.files = this.files;
-                    if(this.question.question_type === 4)
-                    {
-                        this.closeModal();
-                        this.reset();
-                        this.fetchCompany();
-                    }
-                    else{
-                        if(this.question.is_end){
-                            if(this.question.question_type === 5){
-                                this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, true, true);
-                                this.closeModal();
-                                this.reset();
-                            }
-                            else{
-                                $crisp.push(["do", "chat:open"]);
-                                const result = [
-                                    ...this.question.questionnaire_answers.map(item => [item.question_text.replace(/ /g, "_").replace(/\W/g, ''), item.free_text_answer])
-                                ];
-                                let payload = [];
-                                payload.push(result);
-                                $crisp.push(["set", "session:data", payload]);
-                                $crisp.push(["do", "message:send", ["text", "Hello there!"]]);
-                                this.closeModal();
-                                this.reset();
-                                this.fetchCompany();
-                            }
-                        }
-                        else{
-                            this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, true, true);
-                        }
-                    }
-                }
-                else if(direction === 'previous'){
-                    this.formTouched = false;
-                    this.parameters.question = this.question;
-                    this.parameters.isPrevious = true;
-                    this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, true, true);
-                }
-            },
-            reset() {
-                this.parameters = null;
-                this.isLoading = false;
-                this.answer = '';
-                this.answerId = 0;
-                this.files = [];
-                this.formTouched = false;
-                this.showAnswerInput = false;
-                this.showUploadInput = false;
-                this.error = null;
-            },
-            addClass(event, cls) {
-                const div = event.target;
-                this.answer = div.getAttribute('answerValue');
-                this.answerId = div.getAttribute('answerId');
-                this.removeClass(cls);
-                div.classList.add('btn-primary');
-            },
-            removeClass(cls) {
-                document.getElementsByClassName(cls).forEach(el => {
-                    const btnPrimaryEl = el.getElementsByClassName('btn-primary')[0];
-                    if (btnPrimaryEl) {
-                        btnPrimaryEl.classList.remove('btn-primary');
-                    }
-                });
-            }
-        },
-    }
-</script>

resources/assets/vue/components/general/forms/RemarkFormComponent.vue

@@ -36,7 +36,6 @@
     </div>
 </template>
 <script>
-    import { required } from "vuelidate/lib/validators";
     import ModalFormHandler from '../../../general/mixins/modalFormHandler';
     export default {
         props: {
@@ -59,7 +58,9 @@
         },
         validations: {
             parameters: {
-                content: { required: required },
+                content: {
+                    required: false
+                }
             }
         },
         methods: {
@@ -70,4 +71,4 @@
         mixins: [ModalFormHandler]
 
     }
-</script>
+</script>

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

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

resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue

@@ -25,13 +25,9 @@
                                         </div>
                                         <div class="col d-flex">
                                             <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo" v-if="$store.getters.isSuperAdmin">Change Order Number</div>
-                                            <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex m-l-10" data-type="helpMenu" v-if="$store.getters.isSuperAdmin">Help Menu</div>
                                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
                                                 <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                             </modal-component>
-                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="helpMenu">
-                                                <help-menu-form-component module_type="Order" :data="order"></help-menu-form-component>
-                                            </modal-component>
                                         </div>
                                     </div>
                                     <div class="row m-b-20">
@@ -504,4 +500,4 @@
             }
         }
     }
-</script>
+</script>

resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue

@@ -25,13 +25,9 @@
                                         </div>
                                         <div class="col d-flex">
                                             <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex" data-type="changeOrderNo" v-if="$store.getters.isSuperAdmin">Change Order Number</div>
-                                            <div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal align-items-center d-flex m-l-10" data-type="helpMenu" v-if="$store.getters.isSuperAdmin">Help Menu</div>
                                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeOrderNo">
                                                 <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                             </modal-component>
-                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="helpMenu">
-                                                <help-menu-form-component module_type="Order" :data="order"></help-menu-form-component>
-                                            </modal-component>
                                         </div>
                                     </div>
                                     <div class="row m-b-20">
@@ -204,4 +200,4 @@
             }
         }
     }
-</script>
+</script>

resources/assets/vue/components/paymentsBilling/elements/GroupPaymentsBillingComponents.vue

@@ -20,12 +20,10 @@
                             <p class="no-margin fs-10 all-caps">Payment Date</p>
                             <div>{{ item.created_at }}</div>
                         </div>
-                        <div class="col-auto pointer btn btn-success" v-if="item.payment_method == 5 && item.status != 2">
-                            <a :href="route('billplz.bill', item.reference)">
-                                <div class=" no-border h-100">
-                                    <i class="fa fa-repeat fs-20 text-white"></i>
-                                </div>
-                            </a>
+                        <div class="col-auto pointer btn btn-success" v-if="item.payment_method == 5 && item.status != 2" @click="retryPayment()">
+                            <div class=" no-border h-100">
+                                <i class="fa fa-repeat fs-20 text-white"></i>
+                            </div>
                         </div>
                         <div class="col-auto pointer btn btn-success requestModal pointer" v-if="item.payment_method == 1 && item.status != 2" data-type="paymentProofModal" @click="selectedID(item.id)">
                             <div class="no-border h-100">
@@ -83,6 +81,9 @@
             },
             selectedID(id){
                 this.selected_id = id;
+            },
+            retryPayment(){
+                window.location.href = route('billplz.bill', this.item.reference);
             }
         },
         computed: {

resources/views/partials/footer.blade.php

@@ -3,9 +3,9 @@
     <div class="container-fluid">
         <div class="row no-margin">
             <div class="col p-l-0 p-t-20 p-b-20 sm-text-center">
-                <small class="small no-margin pull-left sm-pull-reset all-caps fs-10 muted" style=" letter-spacing: 1px; ">Copyright © {{ date('Y'); }} CIEF IZYIM. All rights reserved. Powered by Laravel Vapor...</small>
+                <small class="small no-margin pull-left sm-pull-reset all-caps fs-10 muted" style=" letter-spacing: 1px; ">Copyright © {{ date('Y'); }} CIEF IZYIM. All rights reserved.</small>
             </div>
         </div>
     </div>
 </div>
-<!-- END COPYRIGHT -->
+<!-- END COPYRIGHT -->

robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /

routes/api.php

@@ -66,8 +66,6 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
         
         require __DIR__ . '/contact.php';
 
-        require __DIR__ . '/help_menu.php';
-
     });
 
     require __DIR__ . '/announcement.php';

routes/help_menu.php

@@ -1,8 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Route;
-
-Route::group(['prefix' => 'helpmenu', 'as' => 'helpmenu.', 'namespace' => 'HelpMenu'], function () {
-    Route::get('/question', 'FetchHelpMenuQuestionController@fetch')->name('first.question');
-    Route::post('/question', 'UpdateHelpMenuNextQuestionController@fetch')->name('next.question');
-});

routes/transaction.php

@@ -14,7 +14,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
         Route::post('/upload-verification-document/{transaction_id}', 'UploadPaymentVerificationDocumentController@upload')->name('verification.create');
         Route::put('/approve/{transaction_id}/{status}', 'ApprovePaymentTransactionController@approve')->where('status', 'approve|reject')->name('approval');
     });
-
+    
     Route::group(['prefix' => 'invoice', 'as' => 'invoice.'], function () {
         route::post('/shipping-invoice/create', 'CreateShippingInvoiceTransactionController@create')->name('create');
         route::post('/shipping-invoice/company/{company_module_id}/regenerate', 'RegenerateShippingInvoiceTransactionController@regenerate')->name('company.regenerate');
@@ -22,11 +22,6 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
         route::put('/shipping-invoice/{id}/approve', 'ApproveShippingInvoiceTransactionController@approve')->name('approve');
     });
 
-
-    Route::group(['prefix' => 'invoices', 'as' => 'invoices.'], function () {
-        route::put('/combine', 'CreateCombinedInvoicesController@combine')->name('combine');
-    });
-
     route::post('/shipping-invoice/calculator', 'ShippingEstimationCalculatorController@calculate')->name('shipping.estimation.calculator');
 
     // Route::group(['prefix' => '{id}/payment', 'as' => 'payment.'], function () {
@@ -50,4 +45,4 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
         // Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');
     });
 
-});
+});

staging.Dockerfile

@@ -1,3 +0,0 @@
-FROM laravelphp/vapor:php82
-
-COPY . /var/task

storage/debugbar/.gitignore

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

tests/CreatesApplication.php

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

tests/TestCase.php

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

tests/Unit/AuthenticationTest.php

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

tests/Unit/BrowserSessionsTest.php

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

tests/Unit/EmailVerificationTest.php

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

tests/Unit/ExampleTest.php

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

tests/Unit/PasswordRestTest.php

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