code update

app/Classes/Exceptions/JobResourceNotFoundException.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Classes\Exceptions;
-
-use App\Classes\ValueObjects\Constants\HttpStatus;
-
-final class JobResourceNotFoundException extends ServiceApiException {
-    public function __construct(?string $message = null) {
-        parent::__construct($message ?? 'Unable to find the requested resource', HttpStatus::RESOURCE_NOT_FOUND);
-    }
-}

app/Classes/General/Abstracts/AbstractControllerLogic.php

@@ -15,8 +15,6 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\DB;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use Illuminate\Support\Facades\Log;
 
 abstract class AbstractControllerLogic
 {
@@ -64,19 +62,6 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions|TypeError  $exception){
-            if ($exception instanceof JobResourceNotFoundException) {
-                Log::error(sprintf(
-                    "Uncaught exception '%s' with message '%s' in %s:%d",
-                    get_class($exception),
-                    $exception->getMessage(),
-                    $exception->getTrace()[0]['file'],
-                    $exception->getTrace()[0]['line']
-                ));
-            }
-            else{
-                Log::error($exception);
-            }
-
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
                 !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 

app/Classes/General/Eloquent/AbstractFetchRecord.php

@@ -6,8 +6,6 @@ namespace App\Classes\General\Eloquent;
 use App\Classes\Exceptions\ResourceNotFoundException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-
 
 abstract class AbstractFetchRecord extends AbstractGetRecord
 {
@@ -28,18 +26,12 @@ abstract class AbstractFetchRecord extends AbstractGetRecord
      * @return Model
      * @throws ResourceNotFoundException
      */
-    public function getResults(Builder $query, array $param = []): Model {
+    public function getResults(Builder $query): Model {
         if(!$query->exists()){
-            $table = $query->getModel()->getTable();
-            if($table ==='job_results'){
-                throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
-            }
-            else{
-                throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
-            }
+            throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
         }
 
         return $query->first();
     }
 
-}
+}

app/Classes/General/Eloquent/AbstractGetRecord.php

@@ -50,9 +50,9 @@ abstract class AbstractGetRecord
      * @param array $filters
      * @return mixed
      */
-    public function handler(array $filters, array $params = []){
+    public function handler(array $filters){
         $this->filters = collect($filters);
-        return $this->getResults($this->applyFiltersToQuery(), $params);
+        return $this->getResults($this->applyFiltersToQuery());
     }
 
 
@@ -65,6 +65,6 @@ abstract class AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    abstract function getResults(Builder $query, array $params = []);
+    abstract function getResults(Builder $query);
 
-}
+}

app/Classes/General/Eloquent/AbstractListRecord.php

@@ -16,10 +16,11 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @return mixed
      * @throws MalformedRequestException
      */
-    public function execute(array $filters = [], array $param = []){
+    public function execute(array $filters = []){
 
         try{
-            return $this->handler($filters, $param);
+
+            return $this->handler($filters);
 
         } catch (QueryException $exception){
             throw new MalformedRequestException('Unable to fetch the list of records due to unexpected error');
@@ -31,7 +32,7 @@ abstract class AbstractListRecord extends AbstractGetRecord
      * @param Builder $query
      * @return mixed
      */
-    public function getResults(Builder $query, array $param = []) {
+    public function getResults(Builder $query) {
         $filters = $this->getDecorationFilters();
 
         if($filters->has('order_by')){
@@ -43,12 +44,8 @@ abstract class AbstractListRecord extends AbstractGetRecord
         }
 
         //dd($query->toSql());
-        if(!empty($param)){
-            return $filters->has('per_page') ? $query->paginate($filters->get('per_page'), ['*'], 'page', $param['page']) : $query->get(); //page data from query parameters e.g ?page=1
-        }
-        else{
-            return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
-        }
+        return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();
+
     }
 
 }

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

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

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

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

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

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

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

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

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

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

app/Classes/General/Helper.php

@@ -2,7 +2,6 @@
 
 namespace App\Classes\General;
 
-use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Log;
 
@@ -41,12 +40,4 @@ class Helper
             }
         }
     }
-
-    /**
-     * @param ResourceCollection $collection
-     * @return array
-     */
-    static function collectionResponse(ResourceCollection $collection){
-        return json_decode($collection->response()->getContent(), true);
-    }
 }

app/Classes/Jobs/ListPackingListsJob.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Classes\Jobs;
-
-use App\Classes\Modules\PackingLists\Processors\ListPackingListsJobProcessor;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-
-class ListPackingListsJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 900;
-
-    /** @var ListGenericJobObject */
-    private $listGenericJobObject;
-
-    /**
-     * ListPackingListsJob constructor.
-     * @param ListGenericJobObject $listGenericJobObject
-     */
-    public function __construct(ListGenericJobObject $listGenericJobObject)
-    {
-        $this->listGenericJobObject = $listGenericJobObject;
-    }
-
-    public function handle()
-    {
-        $rawPayload = $this->job->payload();
-        if(isset($rawPayload['data']['commandName'])){
-            $this->listGenericJobObject->setJobCommandName($rawPayload['data']['commandName']);
-        }
-
-        if(isset($rawPayload['data']['command'])){
-            $this->listGenericJobObject->setJobCommand($rawPayload['data']['command']);
-        }
-
-        $result = (App()->make(ListPackingListsJobProcessor::class))->execute($this->listGenericJobObject);
-    }
-}

app/Classes/Modules/Jobs/ControllersLogic/FetchJobResultLogic.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Jobs\Processors\FetchesJobResultProcessor;
-use App\Http\Resources\JobResultResource;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchJobResultLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Retrieved Data',
-            'message' => 'You have successfully retrieved data'
-        ];
-    }
-
-    /** @var FetchesJobResultProcessor */
-    private $fetchesJobResultProcessor;
-
-    /**
-     * FetchJobResultLogic constructor.
-     * @param FetchesJobResultProcessor $fetchesJobResultProcessor
-     */
-    public function __construct(FetchesJobResultProcessor $fetchesJobResultProcessor)
-    {
-        $this->fetchesJobResultProcessor = $fetchesJobResultProcessor;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->fetchesJobResultProcessor->execute($request);
-
-        return $this->resourceResponse(new JobResultResource($query));
-    }
-
-}

app/Classes/Modules/Jobs/DataTransferObjects/ListGenericJobObject.php

@@ -1,118 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class ListGenericJobObject implements DataTransferObject
-{
-    /** @var string */
-    private $name;
-
-    /** @var array */
-    private $payload;
-
-    /** @var string */
-    private $jobId;
-
-    /** @var string */
-    private $requestSignature;
-
-    /** @var string */
-    private $resultSignature;
-
-    /** @var object */
-    private $userInfo;
-
-    /** @var string */
-    private $jobCommandName;
-
-    /** @var string */
-    private $jobCommand;
-
-    public function __construct(string $name, array $payload, string $requestSignature, ?string $resultSignature, string $jobId, object $userInfo = null)
-    {
-        $this->name = $name;
-        $this->payload = $payload;
-        $this->jobId = $jobId;
-        $this->requestSignature = $requestSignature;
-        $this->resultSignature = $resultSignature;
-        $this->userInfo = $userInfo;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPayload(): array
-    {
-        return $this->payload;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobId(): string
-    {
-        return $this->jobId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRequestSignature(): string
-    {
-        return $this->requestSignature;
-    }
-
-    /**
-     * @return string
-     */
-    public function getResultSignature(): ?string
-    {
-        return $this->resultSignature;
-    }
-
-    /**
-     * @return object
-     */
-    public function getUserInfo(): object
-    {
-        return $this->userInfo;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommandName(): string
-    {
-        return $this->jobCommandName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommand(): string
-    {
-        return $this->jobCommand;
-    }
-
-
-    public function setJobCommandName(string $jobCommandName)
-    {
-        $this->jobCommandName = $jobCommandName;
-    }
-
-    public function setJobCommand(string $jobCommand)
-    {
-        $this->jobCommand = $jobCommand;
-    }
-
-}

app/Classes/Modules/Jobs/DataTransferObjects/UpdateJobResultObject.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\DataTransferObjects;
-
-use App\Classes\General\Interfaces\DataTransferObject;
-
-class UpdateJobResultObject implements DataTransferObject
-{
-    /** @var string */
-    private $result;
-
-    /** @var string */
-    private $resultSignature;
-
-    /** @var string */
-    private $jobCommandName;
-
-    /** @var string */
-    private $jobCommand;
-
-    public function __construct(string $result, string $resultSignature, string $jobCommandName, string $jobCommand)
-    {
-        $this->result = $result;
-        $this->resultSignature = $resultSignature;
-        $this->jobCommandName = $jobCommandName;
-        $this->jobCommand = $jobCommand;
-    }
-
-    /**
-     * @return string
-     */
-    public function getResult(): string
-    {
-        return $this->result;
-    }
-
-    /**
-     * @return array
-     */
-    public function getResultSignature(): string
-    {
-        return $this->resultSignature;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommandName(): string
-    {
-        return $this->jobCommandName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getJobCommand(): string
-    {
-        return $this->jobCommand;
-    }
-}

app/Classes/Modules/Jobs/Processors/FetchesJobResultProcessor.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Processors;
-
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\Modules\Jobs\Services\FetchesJobResult;
-use Illuminate\Http\Request;
-
-
-class FetchesJobResultProcessor
-{
-    /** @var FetchesJobResult */
-    private $fetchesJobResult;
-
-
-    /**
-     * FetchesJobResultProcessor constructor.
-     * @param FetchesJobResult $fetchesJobResult
-     */
-    public function __construct(FetchesJobResult $fetchesJobResult)
-    {
-        $this->fetchesJobResult = $fetchesJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     * @throws \App\Classes\Exceptions\ResourceNotFoundException
-     */
-    public function execute(Request $request){
-
-        $res1 = $this->fetchesJobResult->execute(['job_id' => $request->route('job_id')]);
-        if($request->route('is_last')){
-            $res2 = $this->fetchesJobResult->execute(['request_signature' => $res1->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
-            return $res2;
-        }
-
-        if(!$res1->result){
-            throw new JobResourceNotFoundException('Unable to find any job based on the criteria provided');
-        }
-
-        return $res1;
-    }
-}

app/Classes/Modules/Jobs/Processors/UpdateJobResultProcessor.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Processors;
-
-
-use App\Classes\Modules\Jobs\Services\UpdatesJobResult;
-use App\Classes\Modules\Jobs\Services\FetchesJobResult;
-use App\Classes\Exceptions\JobResourceNotFoundException;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
-
-class UpdateJobResultProcessor
-{
-
-    /** @var FetchesJobResult */
-    private $fetchesJobResult;
-
-    /** @var UpdatesJobResult */
-    private $updatesJobResult;
-
-    /**
-     * UpdateJobResultProcessor constructor.
-     * @param FetchesJobResult $fetchesJobResult
-     * @param UpdatesJobResult $updatesJobResult
-     */
-    public function __construct(FetchesJobResult $fetchesJobResult, UpdatesJobResult $updatesJobResult)
-    {
-        $this->fetchesJobResult = $fetchesJobResult;
-        $this->updatesJobResult = $updatesJobResult;
-    }
-
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @param array $resultCurrent
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject, $resultCurrent) {
-        $jobResultCurrent = $this->fetchesJobResult->execute(['job_id' => $listGenericJobObject->getJobId()]);
-        $resultCurrentJson = json_encode($resultCurrent);
-        $resultSignatureCurrent = md5($resultCurrentJson);
-
-        try{
-            $jobResultExisting = $this->fetchesJobResult->execute(['request_signature' => $jobResultCurrent->request_signature, 'result_not_null' => true, 'order_by_id_desc' => true]);
-            $resultSignatureExisting = $jobResultExisting->result_signature;
-            //if($resultSignatureExisting != $resultSignatureCurrent){
-                $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
-            //}
-        } catch (JobResourceNotFoundException $exception){
-            $this->updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $listGenericJobObject->getJobCommandName(), $listGenericJobObject->getJobCommand());
-        }
-    }
-
-    private function updateJobResult($jobResultCurrent, $resultCurrentJson, $resultSignatureCurrent, $jobCommandName, $jobCommand){
-        $updateJobResultObject = new UpdateJobResultObject(
-            $resultCurrentJson,
-            $resultSignatureCurrent,
-            $jobCommandName,
-            $jobCommand
-        );
-        $create = $this->updatesJobResult->execute($jobResultCurrent, $updateJobResultObject);
-    }
-}

app/Classes/Modules/Jobs/Services/CreatesJobResult.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Models\JobResult;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-
-class CreatesJobResult extends AbstractUpdateRecord
-{
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject)
-    {
-        $model = new JobResult();
-        $model->job_id = $listGenericJobObject->getJobId();
-        $model->request_signature = $listGenericJobObject->getRequestSignature();
-        $model->result_signature = $listGenericJobObject->getResultSignature();
-        $model->url = $listGenericJobObject->getName();
-
-        return $this->handler($model);
-    }
-}

app/Classes/Modules/Jobs/Services/FetchesJobResult.php

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

app/Classes/Modules/Jobs/Services/ListsJobResult.php

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

app/Classes/Modules/Jobs/Services/UpdatesJobResult.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Jobs\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Jobs\DataTransferObjects\UpdateJobResultObject;
-use App\Models\JobResult;
-
-class UpdatesJobResult extends AbstractUpdateRecord
-{
-
-    /**
-     * @param JobResult $model
-     * @param UpdateJobResultObject $updateJobResultObject
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(JobResult $model, UpdateJobResultObject $updateJobResultObject) {
-
-        $model->result = $updateJobResultObject->getResult();
-        $model->result_signature = $updateJobResultObject->getResultSignature();
-        $model->job_command_name = $updateJobResultObject->getJobCommandName();
-        $model->job_command = $updateJobResultObject->getJobCommand();
-
-        return $this->handler($model);
-
-    }
-}

app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsJobLogic.php

@@ -1,78 +0,0 @@
-<?php
-
-
-namespace App\Classes\Modules\PackingLists\ControllersLogic;
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Jobs\ListPackingListsJob;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use App\Classes\Modules\Jobs\Services\CreatesJobResult;
-
-class ListPackingListsJobLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Job Retrieving PackingLists',
-            'message' => 'You have successfully submit a job to retrieve a list of PackingLists'
-        ];
-    }
-
-    /** @var CreatesJobResult */
-    private $createsJobResult;
-
-    /**
-     * ListPackingListsJobLogic constructor.
-     * @param CreatesJobResult $createsJobResult
-     */
-    public function __construct(CreatesJobResult $createsJobResult)
-    {
-        $this->createsJobResult = $createsJobResult;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $jobId = uniqid();
-
-        $user = Auth::user();
-        $userInfo = (object) [
-            // 'email' => $user->email,
-            'type' => $user->type,
-        ];
-
-
-        $userInfoJson = json_encode($userInfo);
-        $requestSignature = md5($userInfoJson . $request->fullUrl());
-
-
-        $listGenericJobObject = new ListGenericJobObject(
-            $request->fullUrl(),
-            $request->all(),
-            $requestSignature,
-            null,
-            $jobId,
-            $userInfo
-        );
-
-        ListPackingListsJob::dispatch($listGenericJobObject)->onQueue('high_priority');
-
-        $result = [];
-        $result['job_id'] = $jobId;
-
-
-        $this->createsJobResult->execute($listGenericJobObject);
-
-        return $this->response(['data' => $result]);
-    }
-
-}

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

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\PackingLists\Processors;
-
-
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
-use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
-use App\Classes\General\Helper;
-use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
-use App\Http\Resources\ListPackingListJobResource;
-
-class ListPackingListsJobProcessor
-{
-
-    /** @var ListsPackingLists */
-    private $listsPackingLists;
-
-    /** @var UpdateJobResultProcessor */
-    private $updateJobResultProcessor;
-
-    /**
-     * ListPackingListsJobProcessor constructor.
-     * @param ListsPackingLists $listsPackingLists
-     * @param UpdateJobResultProcessor $updateJobResultProcessor
-     */
-    public function __construct(ListsPackingLists $listsPackingLists, UpdateJobResultProcessor $updateJobResultProcessor)
-    {
-        $this->listsPackingLists = $listsPackingLists;
-        $this->updateJobResultProcessor = $updateJobResultProcessor;
-    }
-
-    /**
-     * @param ListGenericJobObject $listGenericJobObject
-     * @return void
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\JobResourceNotFoundException
-     */
-    public function execute(ListGenericJobObject $listGenericJobObject) {
-
-        // $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]);
-
-        $query = $this->listsPackingLists->execute(array_merge($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]));
-
-        foreach ($query->items() as &$item) {
-            $item['userInfo'] = $listGenericJobObject->getUserInfo();
-        }
-        $resultCurrent = Helper::collectionResponse(ListPackingListJobResource::collection($query));
-        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
-    }
-}

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

@@ -5,7 +5,7 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Http\Resources\TransactionWithStorageResource;
+use App\Http\Resources\TransactionResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -51,6 +51,6 @@ class ListTransactionsLogic extends AbstractControllerLogic
             }
         }
 
-        return $this->collectionResponse(TransactionWithStorageResource::collection($query));
+        return $this->collectionResponse(TransactionResource::collection($query));
     }
 }

app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php

@@ -24,7 +24,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransactionDetailType;
-use App\Http\Resources\TransactionWithStorageResource;
+use App\Http\Resources\TransactionResource;
 use App\Models\Order;
 use App\Models\PackingList;
 use App\Models\Transaction;
@@ -247,7 +247,7 @@ class CheckStorageInvoiceTransactionProcessor
                 'currentDate' => $resultCurrentDate,
                 'cbm' => $cbm,
                 'pricePerCBM' => $pricePerCBM,
-                'storageInvoice' => new TransactionWithStorageResource($storageInvoice)
+                'storageInvoice' => new TransactionResource($storageInvoice)
             ];
             return $result;
         }

app/Classes/Modules/Transactions/Processors/CreateStorageInvoiceDocTransactionFixProcessor.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Transactions\Processors;
-
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\Notifications\InvoiceIssuedEmail;
-use App\Models\Document;
-use App\Models\PackingList;
-use App\Models\Transaction;
-use Mccarlosen\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\Modules\Documents\Services\CreatesDocument;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-
-class CreateStorageInvoiceDocTransactionFixProcessor
-{
-
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var CreatesDocument */
-    private $createsDocument;
-
-    /** @var CreatesFiles */
-    private $createsFiles;
-
-
-    /**
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param CreatesDocument $createsDocument
-     * @param CreatesFiles $createsFiles
-     */
-    public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
-    {
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->createsDocument = $createsDocument;
-        $this->createsFiles = $createsFiles;
-    }
-
-
-    /**
-     * @throws MalformedRequestException
-     */
-    public function execute(PackingList $packingList)
-    {
-         /** @var Transaction $invoice_transaction */
-         $invoice_transaction = $packingList->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->whereIn('status', [ApprovalStatus::COMPLETED])->first();
-
-        //  $this->updatesTransactionStatus->execute($invoice_transaction, ApprovalStatus::APPROVED);
-
-         $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice_transaction]);
-
-         $document_object = new DocumentObject(
-             DocumentType::STORAGE_INVOICE,
-             [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
-             '',
-             ApprovalStatus::COMPLETED,
-             'storage_invoice'
-         );
-
-        // $invouce_transaction_document = $invoice_transaction->documents()->where('document_type', DocumentType::STORAGE_INVOICE)->first();
-        // if(!$invouce_transaction_document){
-            /** @var Document $document */
-            $document = $this->createsDocument->execute($invoice_transaction, $document_object);
-
-            $this->createsFiles->execute($document, $document_object);
-            // $user = $packingList->owner->companyModule->employees()->first();
-        //     if(app()->environment(['production'])) {
-        //         $user->notify(new InvoiceIssuedEmail($user, $packingList));
-        //     }
-        // }
-    }
-
-}

app/Console/Commands/FixGroupPaymentProblem.php

@@ -4,9 +4,7 @@ namespace App\Console\Commands;
 
 
 use App\Classes\Modules\Transactions\Services\FetchesGroup;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
 use App\Classes\Modules\Transactions\Processors\ReleaseGoodsToCustomerProcessor;
-use App\Classes\Modules\Transactions\Processors\CreateStorageInvoiceDocTransactionFixProcessor;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 
@@ -32,24 +30,17 @@ class FixGroupPaymentProblem extends Command
     /** @var ReleaseGoodsToCustomerProcessor */
     private $releaseGoodsToCustomerProcessor;
 
-    /** @var FetchesOrder */
-    private $fetchesOrder;
-
-    /** @var CreateStorageInvoiceDocTransactionFixProcessor */
-    private $createStorageInvoiceDocTransactionProcessor;
 
     /**
      * Create a new command instance.
      *
      * @return void
      */
-    public function __construct(FetchesGroup $fetchesGroup, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor, FetchesOrder $fetchesOrder, CreateStorageInvoiceDocTransactionFixProcessor $createStorageInvoiceDocTransactionProcessor)
+    public function __construct(FetchesGroup $fetchesGroup, ReleaseGoodsToCustomerProcessor $releaseGoodsToCustomerProcessor)
     {
         parent::__construct();
         $this->fetchesGroup = $fetchesGroup;
         $this->releaseGoodsToCustomerProcessor = $releaseGoodsToCustomerProcessor;
-        $this->fetchesOrder = $fetchesOrder;
-        $this->createStorageInvoiceDocTransactionProcessor = $createStorageInvoiceDocTransactionProcessor;
     }
 
 
@@ -65,25 +56,22 @@ class FixGroupPaymentProblem extends Command
         $this->info(Carbon::now() . ': Start data patch.');
         $start   = new Carbon();
 
-        /*
         $group = $this->fetchesGroup->execute(['id' => 325]);
+
         $this->info('FixGroupPaymentProblem group: '.json_encode($group));
         if ($group) {
             foreach ($group->groupTransactions as $groupTransaction) {
                 $invoice = $groupTransaction->transaction;
                 $this->info('FixGroupPaymentProblem group: '.json_encode($invoice));
-                $pL = $invoice->owner;
-                $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                //$paymentTransaction = $this->createPaymentTransactionProcessor->execute($invoice, PaymentMethodType::WALLET, null);
+
+                //if($paymentTransaction && $paymentTransaction->status == ApprovalStatus::APPROVED){
+                    $pL = $invoice->owner;
+                    $this->releaseGoodsToCustomerProcessor->execute($pL, $invoice);
+                //}
             }
-        }
-        */
-
-        $order = $this->fetchesOrder->execute(['reference' => '729251424']);
-        $packingLists = $order->destinationWarehousePackages;
-
-        foreach ($packingLists as $packingList){
-            $this->createStorageInvoiceDocTransactionProcessor->execute($packingList, true);
-            dd(json_encode($packingList));
+            // $group->status = $status;
+            // $group->save();
         }
 
 

app/Http/Controllers/Jobs/FetchJobResultController.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Jobs;
-
-use App\Classes\Modules\Jobs\ControllersLogic\FetchJobResultLogic;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class FetchJobResultController
-{
-    /**
-     * @param Request $request
-     * @param FetchJobResultLogic $logic
-     * @return JsonResponse
-     */
-    public function fetch(Request $request, FetchJobResultLogic $logic): JsonResponse {
-        return $logic->execute($request);
-    }
-}

app/Http/Controllers/PackingLists/ListPackingListsJobController.php

@@ -1,21 +0,0 @@
-<?php
-
-
-namespace App\Http\Controllers\PackingLists;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use App\Classes\Modules\PackingLists\ControllersLogic\ListPackingListsJobLogic;
-
-
-class ListPackingListsJobController
-{
-    /**
-     * @param Request $request
-     * @param ListPackingListsJobLogic $logic
-     * @return JsonResponse
-     */
-    public function list(Request $request, ListPackingListsJobLogic $logic) : JsonResponse {
-        return $logic->execute($request);
-    }
-}

app/Http/Kernel.php

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

app/Http/Middleware/ApiResponseTimeLog.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class ApiResponseTimeLog
+{
+	public function handle(Request $request, Closure $next)
+	{
+		// Get route information
+		$route = $request->route();
+		$routeName = $route ? $route->getName() : 'undefined';
+		$uri = $request->getPathInfo();
+
+		$startTime = microtime(true); // Start time
+
+		$response = $next($request); // Handle the request
+
+		$endTime = microtime(true); // End time
+		$responseTime = $endTime - $startTime; // Calculate the response time
+
+		Log::channel('apiResponseTimeLog')->info("\nRequest to route: {$uri} \nRoute name: {$routeName} \nTime Taken: " . number_format($responseTime * 1000, 2) . "ms\n");
+
+		return $response;
+	}
+}

app/Http/Middleware/WebResponseTimeLog.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class WebResponseTimeLog
+{
+	public function handle(Request $request, Closure $next)
+	{
+		// Get route information
+		$route = $request->route();
+		$routeName = $route ? $route->getName() : 'undefined';
+		$uri = $request->getPathInfo();
+
+		$startTime = microtime(true); // Start time
+
+		$response = $next($request); // Handle the request
+
+		$endTime = microtime(true); // End time
+		$responseTime = $endTime - $startTime; // Calculate the response time
+
+		Log::channel('webResponseTimeLog')->info("\nRequest to route: {$uri} \nRoute name: {$routeName} \nTime Taken: " . number_format($responseTime * 1000, 2) . "ms\n");
+
+		return $response;
+	}
+}

app/Http/Resources/GroupForOrderV2Resource.php

@@ -4,7 +4,6 @@ namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
-use App\Models\Transaction;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -18,8 +17,6 @@ class GroupForOrderV2Resource extends JsonResource
      */
     public function toArray($request)
     {
-        $payment_transaction = Transaction::where('payment_reference', $this->reference)->first();
-
         return [
             'id' => $this->id,
             'original_amount' => (float) $this->original_amount,
@@ -36,12 +33,7 @@ class GroupForOrderV2Resource extends JsonResource
             'payment_method' => (int)$this->payment_method,
             'payment_method_name' => ucwords(PaymentMethodType::PAYMENT_METHODS_ID[$this->payment_method]),
             'payment_reference' => $this->reference,
-            'transactions_ids' => GroupTransactionsForOrderV2Resource::collection($this->groupTransactions),
-            'payment_transaction' => $payment_transaction ? [
-                'id' => $payment_transaction->id,
-                'status' => $payment_transaction->status,
-                'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status]
-            ] : []
+            'transactions_ids' => GroupTransactionsForOrderV2Resource::collection($this->groupTransactions)
         ];
     }
 }

app/Http/Resources/JobResultResource.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class JobResultResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'job_id' => $this->job_id,
-            'result' => $this->result,
-        ];
-    }
-}

app/Http/Resources/ListPackingListJobResource.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Models\Order;
-use App\Models\PackingList;
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Http\Resources\V2\PackingListV2Resource;
-
-class ListPackingListJobResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $exceptionUsers = in_array($this->userInfo ? $this->userInfo->type : Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
-
-        return [
-            'id' => $this->id,
-            'claimant_id' => $this->claimant_id,
-            'reference' => $this->reference,
-            'status' => $this->status,
-            'transport' => new TransportResource($this->transports()->first()),
-            'type' => $this->type,
-            'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListV2Resource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first(), $this->userInfo)),
-            // 'packages' => PackageResource::collection($packages),
-            // $this->mergeWhen($this->owner instanceof Order, [
-            //     'order' => New OrderResource($this->owner)
-            // ]),
-            'container' => new ContainerResource($this->containers->first()),
-            'packages' => PackageWithoutOrderResource::collection($packages),
-            $this->mergeWhen($this->owner instanceof Order, [ 'order' => New OrderResource($this->owner) ]),
-            'shipping_transaction' => new TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first()),
-            'suspended_invoice' => new TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->first()),
-            // 'suspended_invoices' => TransactionResource::collection($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->get()),
-        ];
-    }
-}

app/Http/Resources/MappableTransactionResource.php

@@ -37,7 +37,6 @@ class MappableTransactionResource extends JsonResource
             'owner_type' => Transaction::class,
             'owner_id'=> $this->id,
             'owner_reference'=> $reference,
-            'created_at'=> $this->created_at, // invoice date
         ];
     }
 }

app/Http/Resources/MappableTransactionWithDetailsResource.php

@@ -27,19 +27,16 @@ class MappableTransactionWithDetailsResource extends JsonResource
             'order_reference' => null,
             'bill_no' => null,
             'marking' => null,
-            'created_at' => null
         ];
 
         if ($this->type === TransactionType::PAYMENT) {
             $order = $this->owner->owner->owner;
             $data['order_reference'] = $order->reference;
             $data['debtor_code'] = $order->companyModule->company->debtor;
-            $data['created_at'] = $this->owner->created_at; // invoice date
         } elseif (in_array($this->type, [TransactionType::GROUP_PAYMENT, TransactionType::TOP_UP])) {
             $connection = $this->owner->owner->inviters()->withPivot('invitee_reference')->first();
             $data['marking'] = $connection ? $connection->pivot->invitee_reference : '';
             $data['bill_no'] = $this->bill_no;
-            $data['created_at'] = $this->created_at;
         } else {
             $payments = $this->transactions()
                 ->payments()->where('status', ApprovalStatus::APPROVED)
@@ -57,7 +54,6 @@ class MappableTransactionWithDetailsResource extends JsonResource
                         'type' => $payment->type,
                         'marking' => null,
                         'amount' => $payment->amount,
-                        'created_at' => $this->created_at
                     ];
                 })->toArray();
             } else {
@@ -65,7 +61,6 @@ class MappableTransactionWithDetailsResource extends JsonResource
                 $data['amount'] = 'Transaction Type not allowed';
                 $data['transaction_type'] = $this->type;
                 $data['payment_transactions'] = null;
-                $data['created_at'] = null;
             }
         }
 

app/Http/Resources/OrderV2Resource.php

@@ -31,7 +31,7 @@ class OrderV2Resource extends JsonResource
             'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
             'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
             'invoices' => $this->whenLoaded('packingLists', function() {
-                return TransactionWithStorageResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get());
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get());
             }),
             'storages' => $this->storages ? $this->storages : null, //from middleware
             'remarks' => RemarkResource::collection($this->remarks),

app/Http/Resources/PackageWithoutOrderResource.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Models\Order;
-use App\Models\PackingList;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class PackageWithoutOrderResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'type' => $this->type,
-            'description' => $this->description,
-            'width' => floatval($this->width),
-            'height' => floatval($this->height),
-            'length' => floatval($this->length),
-            'weight' => $this->weight,
-            'quantity' => $this->quantity,
-            'cbm' => (($this->width / 100) * ($this->height / 100) * ($this->length / 100)) * $this->quantity,
-            'reference' => $this->packingList->reference,
-            'status' => $this->status,
-            // $this->mergeWhen($originalPackingList->owner instanceof Order, [
-            //     'order' => New OrderResource($originalPackingList->owner)
-            // ]),
-            // 'container' => new ContainerResource($originalPackingList->containers()->first()),
-            // 'transport' => new TransportResource($originalPackingList->transports()->first())
-        ];
-    }
-}

app/Http/Resources/TransactionResource.php

@@ -3,15 +3,14 @@
 namespace App\Http\Resources;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Group;
-use App\Models\Order;
 use App\Models\Transaction;
 use App\Models\Wallet;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
+
 class TransactionResource extends JsonResource
 {
     /**
@@ -24,6 +23,8 @@ class TransactionResource extends JsonResource
     {
         $order = null;
         $groupTransactions = null;
+        $group_payment_attempts = null;
+        $group_payment_expired = null;
 
         if ($this->owner instanceof Transaction) {
             if ($this->owner) {
@@ -35,6 +36,12 @@ class TransactionResource extends JsonResource
             if ($this->owner) {
                 $order = new OrderResource($this->owner->owner);
             }
+
+            if($this->groups){
+                $group_payment_attempts = GroupForOrderV2Resource::collection($this->groups->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]));
+                $group_payment_expired = GroupForOrderV2Resource::collection($this->groupsWithTrashed->whereIn('status', [ApprovalStatus::EXPIRED]));
+            }
+
         } else {
             $group = Group::where('reference', $this->payment_reference)->first();
             if ($group) {
@@ -48,7 +55,9 @@ class TransactionResource extends JsonResource
             'owner_type' => $this->owner_type,
             'order' => $order,
             'group_transactions' => $groupTransactions,
-            'group_reference' => $groupTransactions ? ($group ? $group->reference : null )  : null,
+            'group_reference' => $groupTransactions ? ($group ? $group->reference : null ) : null,
+            'groups_payment_attempts' => $group_payment_attempts,
+            'groups_payment_expired' => $group_payment_expired,
             'documents' => $groupTransactions ? DocumentResource::collection($this->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)) : DocumentResource::collection($this->documents),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
@@ -71,6 +80,11 @@ class TransactionResource extends JsonResource
                     ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
                     ->get()
             ),
+            'payments_expired' => TransactionResource::collection(
+                $this->transactions()
+                    ->payments()->where('status', ApprovalStatus::EXPIRED)
+                    ->get()
+            ),
             'payment_history' => TransactionResource::collection(
                 $this->transactions()
                     ->payments()
@@ -78,6 +92,7 @@ class TransactionResource extends JsonResource
                     ->get()
             ),
             'remarks' => RemarkResource::collection($this->remarks),
+            'storages' => $this->storages ? $this->storages : null, //from middleware
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')

app/Http/Resources/TransactionWithStorageResource.php

@@ -1,128 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Group;
-use App\Models\Transaction;
-use App\Models\Wallet;
-use Carbon\Carbon;
-use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Log;
-
-class TransactionWithStorageResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $order = null;
-        $groupTransactions = null;
-        $group_payment_attempts = null;
-        $groupPaymentAttemptsFiltered = [];
-        $group_payment_expired = null;
-        $group_payment_history = null;
-        $groupTotalAmount = 0;
-
-        if ($this->owner instanceof Transaction) {
-            if ($this->owner) {
-                if ($this->owner->owner) {
-                    $order = new OrderResource($this->owner->owner->owner);
-                }
-            }
-        } else if (!($this->owner instanceof Transaction) && !($this->owner instanceof Wallet)) {
-            if ($this->owner) {
-                $order = new OrderResource($this->owner->owner);
-            }
-
-            if($this->groups){
-                $group_payment_attempts = GroupForOrderV2Resource::collection($this->groups->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]));
-                $group_payment_expired = GroupForOrderV2Resource::collection($this->groupsWithTrashed->whereIn('status', [ApprovalStatus::EXPIRED]));
-                $group_payment_history  = GroupForOrderV2Resource::collection($this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED]));
-            }
-
-        } else {
-            $group = Group::where('reference', $this->payment_reference)->first();
-            if ($group) {
-                $groupTransactions = GroupTransactionResource::collection($group->groupTransactions);
-            }
-
-        }
-
-
-        $ts = $this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION])->last();
-        if ($ts) {
-            $paymentTransaction = Transaction::where('payment_reference',  $ts->reference)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION])->first();
-            if($paymentTransaction){
-                $groupTotalAmount = (double) $this->amount;
-
-                foreach ($group_payment_history as $key => $value) {
-                    if ($value->id === $ts->id && $value->reference === $ts->reference) {
-                        unset($group_payment_history[$key]);
-                    }
-                }
-
-                foreach ($group_payment_attempts as $key => $value) {
-                    if ($value->id === $ts->id && $value->reference == $ts->reference) {
-                        $groupPaymentAttemptsFiltered[$key] = $value;
-                    }
-                }
-            }
-        }
-
-
-        return [
-            'id' => $this->id,
-            'owner_type' => $this->owner_type,
-            'order' => $order,
-            'group_transactions' => $groupTransactions,
-            'group_reference' => $groupTransactions ? ($group ? $group->reference : null ) : null,
-            'groups_payment_attempts' => $groupPaymentAttemptsFiltered,
-            'groups_payment_expired' => $group_payment_expired,
-            'groups_payment_history' => $group_payment_history,
-            'documents' => $groupTransactions ? DocumentResource::collection($this->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)) : DocumentResource::collection($this->documents),
-            'type' => (int) $this->type,
-            'bill_no' => $this->bill_no,
-            'amount' => (double) $this->amount,
-            'payment_method' => (int) $this->payment_method,
-            'payment_reference' => $this->payment_reference,
-            'outstanding' => (double) $this->amount - ($this->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount')),
-            'floating' => $group_payment_attempts ? $groupTotalAmount : (double) $this->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION])->sum('amount'),
-            'service_charge' => (double) $this->service_charge,
-            'tax' => (double) $this->tax,
-            'original_amount' => (double) $this->original_amount,
-            'currency' => new CurrencyResource($this->currency),
-            'original_currency' => new CurrencyResource($this->original_currency),
-            'currency_rate' => (double) $this->currency_rate,
-            'status' => (int) $this->status,
-            'details' => TransactionDetailResource::collection($this->transactionDetails),
-            'transactions' => TransactionResource::collection($this->transactions),
-            'payment_attempts' => TransactionResource::collection(
-                $this->transactions()
-                    ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
-                    ->get()
-            ),
-            'payments_expired' => TransactionResource::collection(
-                $this->transactions()
-                    ->payments()->where('status', ApprovalStatus::EXPIRED)
-                    ->get()
-            ),
-            'payment_history' => TransactionResource::collection(
-                $this->transactions()
-                    ->payments()
-                    ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED])
-                    ->get()
-            ),
-            'remarks' => RemarkResource::collection($this->remarks),
-            'storages' => $this->storages ? $this->storages : null, //from middleware
-            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
-            'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
-            'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')
-        ];
-    }
-}

app/Http/Resources/V2/PackingListV2Resource.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Http\Resources\V2;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Classes\ValueObjects\Constants\RoleTypes;
-use App\Models\Order;
-use App\Models\PackingList;
-use Illuminate\Http\Resources\Json\JsonResource;
-use App\Http\Resources as V1;
-
-
-class PackingListV2Resource extends JsonResource
-{
-    private $userInfo;
-
-    public function __construct($resource, $userInfo = null)
-    {
-        parent::__construct($resource);
-        $this->userInfo = $userInfo;
-    }
-
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $user = $this->userInfo ? $this->userInfo : Auth()->user();
-        $exceptionUsers = in_array($user->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
-
-        return [
-            'id' => $this->id,
-            'claimant_id' => $this->claimant_id,
-            'reference' => $this->reference,
-            'status' => $this->status,
-            'transport' => new V1\TransportResource($this->transports()->first()),
-            'type' => $this->type,
-            'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListV2Resource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first(), $user)),
-            'packages' => V1\PackageResource::collection($packages),
-            $this->mergeWhen($this->owner instanceof Order, [
-                'order' => New V1\OrderResource($this->owner)
-            ]),
-            'shipping_transaction' => new V1\TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first()),
-            'suspended_invoice' => new V1\TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->first()),
-            // 'suspended_invoices' => V1\TransactionResource::collection($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->get()),
-        ];
-    }
-}

app/Models/JobResult.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class JobResult extends AbstractModel
-{
-    protected $table = 'job_results';
-
-    public $fillable = [
-        'job_id',
-        'result'
-   ];
-}

config/logging.php

@@ -112,6 +112,18 @@ return [
             'path' => storage_path('logs/paymentUnknownOrderLog.log'),
             'level' => 'info',
         ],
+
+        'apiResponseTimeLog' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/apiResponseTime.log'),
+            'level' => 'info',
+        ],
+
+        'webResponseTimeLog' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/webResponseTimeLog.log'),
+            'level' => 'info',
+        ],
     ],
 
 ];

config/queue.php

@@ -34,14 +34,6 @@ return [
             'driver' => 'sync',
         ],
 
-        'high_priority' => [
-            'driver' => 'database',
-            'table' => 'jobs',
-            'queue' => 'high_priority',
-            'retry_after' => 3600,
-            'after_commit' => false,
-        ],
-
         'database' => [
             'driver' => 'database',
             'table' => 'jobs',

database/migrations/2023_08_08_124848_create_job_results_table.php

@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateJobResultsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('job_results', function (Blueprint $table) {
-            $table->id();
-            $table->string('job_id', 50);
-            $table->longText('result')->nullable();
-            $table->timestamps();
-
-            // $table->foreign('job_id')->references('id')->on('jobs')->onDelete('cascade');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('job_results');
-    }
-}

database/migrations/2023_08_29_063531_add_new_column_to_job_results_table.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddNewColumnToJobResultsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->longText('url')->after('result')->nullable();
-            $table->string('job_command_name')->after('url')->nullable();
-            $table->longText('job_command')->after('job_command_name')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->dropColumn('url');
-            $table->dropColumn('job_command_name');
-            $table->dropColumn('job_command');
-        });
-    }
-}

database/migrations/2023_12_11_193200_add_new_column_2_to_job_results_table.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddNewColumn2ToJobResultsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->string('request_signature')->after('job_id')->nullable();
-            $table->string('result_signature')->after('request_signature')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('job_results', function (Blueprint $table) {
-            $table->dropColumn('request_signature');
-            $table->dropColumn('result_signature');
-        });
-    }
-}

gulpfile.js

@@ -37,7 +37,6 @@ gulp.task('vendorCss', () => {
         .pipe(plugins.cleanCss())
         .pipe(plugins.replace('../../../font-awesome/', './'))
         .pipe(plugins.replace('../../jquery-ui-dist/', ''))
-        //.pipe(plugins.replace(/background-image:url\(\.\.\/\.\./g, `background-image:url(`)) //cief todo: gulp
         .pipe(gulp.dest(pkg.paths.build.css));
 });
 
@@ -116,4 +115,4 @@ gulp.task('watch', (done) => {
     gulp.watch(pkg.globs.sourceJs, gulp.series('sourceJs'));
     gulp.watch(pkg.globs.sourceJs, gulp.series('sourceFonts'));
     done();
-});
+});

resources/assets/vue/components/addresses/elements/DisplayWarehouseAddressComponent.vue

@@ -5,7 +5,7 @@
                <div class="col-auto">
                    <div class="row">
                         <div class="col">
-                            <h6 v-if="item" class="no-margin fs-12 text-black">{{item.street_one}} {{item.street_two}}, {{item.district.name}}, {{item.post_code}} {{item.state.name}}, {{item.country.name}}</h6>
+                            <h6 class="no-margin fs-12 text-black">{{item.street_one}} {{item.street_two}}, {{item.district.name}}, {{item.post_code}} {{item.state.name}}, {{item.country.name}}</h6>
                         </div>
                    </div>
                </div>

resources/assets/vue/components/general/elements/ListPollingComponent.vue

@@ -1,207 +0,0 @@
-<template>
-    <transition-component group enter-class="animate__animated animate__fadeInUp animate__delay-1 animate__faster p-r-30" leave-class="animate__animated animate__fadeOutDown animate__faster p-r-30" style="min-height: 300px;width:100%">
-        <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
-        <div class="row" key="2" v-show="!$store.getters.isLoading(section)">
-            <div class="col">
-                <div class="row">
-                    <div class="col">
-                        <div class="row align-items-center justify-content-center p-t-50 p-b-50"  v-show="!$store.getters.getListData(section).length && !isLoading && emptyListSection">
-                            <div class="col-10">
-                                <div class="row align-items-center justify-content-center  hint-text">
-                                    <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
-                                </div>
-                                <div class="row text-center">
-                                    <div class="col">
-                                        <div class="row m-t-20">
-                                            <div class="col">
-                                                <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here</p>
-                                            </div>
-                                        </div>
-                                        <div class="row m-t-5 align-items-center justify-content-center">
-                                            <div class="col">
-                                                <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">There is no results found, Try adjusting your filters to find what you are looking for.</small>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row" v-show="!isLoading">
-                            <div class="col">
-                                <div class="list disable-text-selection" data-check-all="checkAll">
-                                    <div class="row" ref="list" v-for="item in $store.getters.getListData(section)" v-bind:key="item.id" :data="item">
-                                        <div class="col">
-                                            <slot name="list" :data="item"></slot>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row" v-show="!isLoading">
-                            <div class="col">
-                                <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </transition-component>
-</template>
-
-<script>
-    import requestV2 from '../../../general/mixins/aws/requestV2'
-    export default {
-        props: {
-            section:{
-                type: String,
-                required: true
-            },
-            endpoint: {
-                type: String,
-                required: true
-            },
-            options: {
-                default () {
-                    return {}
-                }
-            },
-            emptyListSection: {
-                type: Boolean,
-                default: true,
-            }
-        },
-        data(){
-            return {
-                filters: this.options,
-                pollingInterval: null,
-                isPolling: false,
-                isFetchingResult: false,
-                isLoading: false,
-            }
-        },
-        created(){
-            this.setDecoratorDefault();
-            this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters}); //cief todo: Uncaught (in promise) null
-        },
-        computed: {
-            pendingList () {
-                return this.$store.getters.isInCompleteQueue(this.section);
-            }
-        },
-        watch: {
-            pendingList(inComplete){
-                if(inComplete){
-                    this.fetchList();
-                }
-            }
-        },
-        methods: {
-            fetchList(){
-                let listDecorators = this.$store.getters.getListDetails(this.section);
-                let url = this.endpoint + '?page=' + listDecorators.page + '&filters=' + JSON.stringify(listDecorators.filters);
-                this.isLoading = true;
-                this.submitJob(url);
-            },
-            successHandler(response){
-                let result = JSON.parse(response.payload.data.result);
-                result.meta = {
-                    current_page: result.meta.current_page,
-                    first_page_url: result.meta.first_page_url,
-                    from: result.meta.from,
-                    last_page: result.meta.last_page,
-                    last_page_url: result.meta.last_page_url,
-                    next_page_url: result.meta.next_page_url,
-                    path: result.meta.path,
-                    per_page: result.meta.per_page,
-                    prev_page_url: result.meta.prev_page_url,
-                    to: result.meta.to,
-                    total: result.meta.total
-                };
-
-                this.stopPolling();
-                this.$store.dispatch('completeList', {'name': this.section, 'data': result.data});
-                this.$refs.pagination.makePagination(result.meta, result.links);
-                this.isLoading = false;
-            },
-            errorHandler(error){
-                this.isFetchingResult = false;
-                this.isPolling = false;
-            },
-            startPolling(jobId, maxAttempts = 8) {
-                let attempts = 0;
-                let interval = 10000; // Initial interval
-
-                const resetPollingInterval = (customInterval) => {
-                    this.pollingInterval = setInterval(pollJobResult, customInterval);
-                };
-
-                const pollJobResult = () => {
-                    if (this.isPolling || this.isFetchingResult) {
-                        return;
-                    }
-                    this.isPolling = true;
-
-                    attempts++;
-                    if(attempts === 1){
-                        this.stopPolling();
-                        resetPollingInterval(5000);
-                    }
-
-                    if (attempts > maxAttempts) {
-                        this.stopPolling();
-                        this.isLoading = false;
-                        console.log(`Reached maximum attempts (${maxAttempts}). Polling stopped.`);
-                        return;
-                    }
-
-                    if(attempts === maxAttempts){
-                        this.fetchJobResult(jobId, true);
-                    }
-                    else{
-                        this.fetchJobResult(jobId);
-                    }
-                };
-
-                // pollJobResult();  // Initial call
-                this.pollingInterval = setInterval(pollJobResult, interval);
-            },
-            stopPolling() {
-                clearInterval(this.pollingInterval);
-                this.pollingInterval = null;
-                this.isPolling = false;
-                this.isFetchingResult = false;
-            },
-            submitJob(url){
-                try {
-                    this.$store.dispatch('crudRequestV2', {endpoint: url, method: 'get'}).then(response => {
-                        let success = response.ok;
-                        response.json().then(response => {
-                            if(!success){return;}
-                            let jobId = response.payload.data.job_id;
-                            if(jobId){
-                                this.startPolling(jobId);
-                            }
-                        });
-                    })
-                } catch (error) {
-                    console.error('Error submitJob', error);
-                }
-            },
-            fetchJobResult(jobId, isLastAttempt = false) {
-                // console.log('fetchJobResult: ', jobId);
-                this.isFetchingResult = true;
-                try {
-                    let anotherEndpoint = route('api.job.fetch', jobId);
-                    if(isLastAttempt){
-                        anotherEndpoint = route('api.job.fetch.last.attempt', jobId, isLastAttempt);
-                    }
-                    this.poll(anotherEndpoint, 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
-                } catch (error) {
-                    console.error('Error fetchJobResult', error);
-                }
-            }
-        },
-        mixins: [requestV2]
-    }
-</script>

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

@@ -34,17 +34,11 @@
                     </div>
                 </div>
             </div>
-            <!-- CIEF TODO: For easy revert to old code -->
             <list-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list')" :options="options">
                 <template slot="list" slot-scope="{data}">
                     <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
                 </template>
             </list-component>
-            <!-- <list-polling-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list.job')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
-                </template>
-            </list-polling-component> -->
         </div>
     </div>
 </template>

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

@@ -1,90 +0,0 @@
-<template>
-    <div class="row m-t-20" @keyup.enter="search">
-        <div class="col">
-            <div class="row">
-                <div class="col-12 col-md">
-                    <div class="row m-b-15">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col p-r-0">
-                                    <div class="form-group no-margin form-group-default b-rad-none">
-                                        <label class="text-primary">Order Number Like</label>
-                                        <input type="text" class="form-control" v-model="marking" />
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-auto p-l-0 p-r-0">
-                            <div class="btn btn-primary b-rad-none" @click="search">
-                                <i class="fa fa-search lh-40"></i>
-                            </div>
-                        </div>
-                        <div class="col-auto p-l-0">
-                            <div class="btn btn-secondary b-rad-none" @click="reset">
-                                <i class="fa fa-remove lh-40"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-md">
-                    <div class="row" v-if="with_export">
-                        <div class="col">
-                            <download-billing-with-dates-component :section="section"></download-billing-with-dates-component>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!-- CIEF TODO: For easy revert to old code -->
-            <!-- <list-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></admin-payments-billing-component>
-                </template>
-            </list-component> -->
-            <list-polling-component :key="currentKey" :section="section" :endpoint="route('api.packing_list.list.job')" :options="options">
-                <template slot="list" slot-scope="{data}">
-                    <single-admin-payments-billing-component :data="data" :invoice_status="invoice_status" :section="section" ></single-admin-payments-billing-component>
-                </template>
-            </list-polling-component>
-        </div>
-    </div>
-</template>
-<script>
-    export default {
-        props: {
-            invoice_status: {
-                type: String,
-                required: true
-            },
-            options: {
-                default () {
-                    return {}
-                }
-            },
-            section:{
-                type: String,
-                required: true
-            },
-            with_export:{
-                type: Boolean,
-                default: false
-            }
-        },
-        data(){
-            return {
-                marking: '',
-                currentKey: 1,
-            }
-        },
-        methods: {
-            search() {
-                this.options['order_marking_in'] = this.marking;
-                this.currentKey+=1;
-            },
-            reset() {
-                this.marking = '';
-                delete(this.options['order_marking_in']);
-                this.currentKey+=1;
-            },
-        },
-    }
-</script>

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

@@ -102,7 +102,7 @@
                 <div class="col-12 col-md-7 padding-20">
                     <div class="row bg-master-lightest">
                         <div class="col">
-                            <div v-for="(groupItem, index) in items" class="row bg-master-lightest" v-if="groupItem.groups_payment_attempts.length && groupItem.type == 1 && groupTransactionsExist(items, groupItem.groups_payment_attempts)">
+                            <div v-for="(groupPaymentAttemptItem, index) in items" class="row bg-master-lightest" v-if="groupPaymentAttemptItem.groups_payment_attempts.length && groupPaymentAttemptItem.type == 1 && groupTransactionsExist(items, groupPaymentAttemptItem.groups_payment_attempts)">
                                 <div class="col">
                                     <div class="row m-t-10 m-b-10">
                                         <div class="col">
@@ -111,12 +111,12 @@
                                     </div>
                                     <div class="row">
                                         <div class="col">
-                                            <single-group-payment-transaction-details-component v-for="group in groupItem.groups_payment_attempts" v-bind:key="group.id" :data="group" :section="section"></single-group-payment-transaction-details-component>
+                                            <shipping-transaction-component v-for="group in groupPaymentAttemptItem.groups_payment_attempts" v-bind:key="group.id" :data="group" :section="section"></shipping-transaction-component>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                            <div v-for="(groupItem, index) in items" class="row bg-master-lightest" v-if="groupItem.groups_payment_expired.length && groupItem.type == 1 && groupTransactionsExist(items, groupItem.groups_payment_expired)">
+                            <div v-for="(groupPaymentAttemptItem, index) in items" class="row bg-master-lightest" v-if="groupPaymentAttemptItem.groups_payment_expired.length && groupPaymentAttemptItem.type == 1 && groupTransactionsExist(items, groupPaymentAttemptItem.groups_payment_expired)">
                                 <div class="col">
                                     <div class="row m-t-10 m-b-10">
                                         <div class="col">
@@ -125,21 +125,7 @@
                                     </div>
                                     <div class="row">
                                         <div class="col">
-                                            <payment-expired-component v-for="group in groupItem.groups_payment_expired" v-bind:key="group.id" :data="group" :section="section"></payment-expired-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div v-for="(groupItem, index) in items" class="row bg-master-lightest" v-if="groupItem.groups_payment_history.length && groupItem.type == 1 && groupTransactionsExist(items, groupItem.groups_payment_history)">
-                                <div class="col">
-                                    <div class="row m-t-10 m-b-10">
-                                        <div class="col">
-                                            <div v-if="index === 0" class="font-head fs-10 all-caps">Payment History</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <single-group-payment-history-transaction-details-component v-for="group in groupItem.groups_payment_history" v-bind:key="group.id" :data="group" :section="section"></single-group-payment-history-transaction-details-component>
+                                            <payment-expired-component v-for="group in groupPaymentAttemptItem.groups_payment_expired" v-bind:key="group.id" :data="group" :section="section"></payment-expired-component>
                                         </div>
                                     </div>
                                 </div>
@@ -230,7 +216,7 @@
                                         <div class="col">
                                             <div class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="makePayment">Make Payment</div>
                                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="makePayment">
-                                                <group-payment-form-component :section="section" :selectedIds="selectedIds" :sumAmount="totalOutstanding.toFixed(2)" :showManualPayment="true"></group-payment-form-component>
+                                                <group-payment-form-component :section="section" :selectedIds="selectedIds" :sumAmount="totalOutstanding.toFixed(2)"></group-payment-form-component>
                                             </modal-component>
                                         </div>
                                     </div>

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

@@ -1,322 +0,0 @@
-<template>
-    <div class="row m-b-15 m-l-5 m-r-10 parentContainer">
-        <div class="col bg-white rounded">
-            <div class="row">
-                <div class="col padding-20">
-                    <div class="row align-items-center">
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Marking</p>
-                            <div class="no-margin">
-                                <div v-if="item.order">
-                                    <a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a>/<a :href="route('order.show', item.order.reference)">{{item.order.reference}}</a>
-                                    <p>{{item.loading_days_ago}}</p>
-                                </div>
-                                <div v-else class="text-danger">Unclaimed Packing List</div>
-                            </div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Container</p>
-                            <div v-if="item.container"> {{item.container.container_reference}}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Invoice Date</p>
-                            <div v-if="!item.shipping_transaction">n/a</div>
-                            <div v-if="item.shipping_transaction"> {{ item.shipping_transaction.updated_at }}</div>
-                        </div>
-                        <div class="col">
-                            <div v-if="item.order">
-                                <p class="no-margin fs-10 all-caps">Address</p>
-                                <div>{{ item.order.address.post_code_area}}</div>
-                                <div>{{ item.order.address.district.name +' '+item.order.address.postcode+' '+item.order.address.state.name  }}</div>
-                            </div>
-                            <div v-else class="text-danger">Unclaimed</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Status</p>
-                            <div class="all-caps">{{ invoice_status }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Amount</p>
-                            <div v-if="!item.shipping_transaction">n/a</div>
-                            <div v-if="item.shipping_transaction">MYR  {{ item.shipping_transaction.amount.toFixed(2) }}</div>
-                        </div>
-                        <div class="col-auto p-l-0 p-r-0" v-if="['Pending Payment', 'Paid Invoice', 'Suspended Invoice'].includes(invoice_status)">
-                            <div v-if="item.shipping_transaction">
-                                <div v-if="item.shipping_transaction.documents.length">
-                                    <div v-for="file in item.shipping_transaction.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
-                                        <document-file-viewer-component :file="file">
-                                            <template slot="button">
-                                                <div class="btn bg-grey no-border muted">
-                                                    <i class="fa fa-file-pdf-o"></i>
-                                                </div>
-                                            </template>
-                                        </document-file-viewer-component>
-                                    </div>
-                                </div>
-                                <div v-else>
-                                    <div class="btn bg-grey no-border muted invisible">
-                                        <i class="fa fa-file-pdf-o"></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-auto">
-                            <div class="row text-center parentContainer m-b-10" v-if="['Pending Invoice'].includes(invoice_status) && !item.receive_packing_list" >
-                                <div class="col">
-                                    <div class="requestModal pointer btn btn-primary btn-xs" data-type="addWarehouseTransport">
-                                        Add Warehouse Transport
-                                    </div>
-                                    <modal-component class="animate_animated animatefast animate_fadeIn" styleType="fill-in" type="addWarehouseTransport">
-                                        <create-warehouse-transport-form-component :packinglistId="item.id" :section="section"></create-warehouse-transport-form-component>
-                                    </modal-component>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col">
-                                    <div class="btn bg-grey no-border" @click="expanded = !expanded" v-if="['Pending Approval', 'Pending Payment'].includes(invoice_status)">
-                                        <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
-                                    </div>
-                                    <div v-if="!item.shipping_transaction">
-                                        <div v-if="item.order">
-                                            <div v-if="!item.order.company_module.billingAddress">
-                                                <div class="btn btn-primary btn-xs pointer requestModal btn-block" data-type="billingAddressComponent">Add Billing Address</div>
-                                                <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="billingAddressComponent">
-                                                    <address-form-component :id="item.order.company_module.id" :section="section" :type=1></address-form-component>
-                                                </modal-component>
-                                            </div>
-                                            <div class="row" v-if="item.order.company_module.billingAddress">
-                                                <div class="col">
-                                                    <div class="col-auto requestModal pointer" data-type="editBillingAddress">
-                                                        <i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
-                                                    </div>
-                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
-                                                        <div class="row">
-                                                            <div class="col bg-white">
-                                                                <address-form-component :id="item.order.company_module.id"  :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
-                                                            </div>
-                                                        </div>
-                                                    </modal-component>
-                                                </div>
-                                            </div>
-                                            <div v-if="!item.order.address.post_code_area">
-                                                <div class="btn btn-xs btn-primary pointer m-t-10 requestModal btn-block" data-type="defineLocation">Define Location</div>
-                                                <modal-component class="animate_animated animatefast animate_fadeIn" styleType="fill-in" type="defineLocation">
-                                                    <declare-postcode-area-form-component :data="item.order.address" :section="section"></declare-postcode-area-form-component>
-                                                </modal-component>
-                                            </div>
-                                            <div v-if="item.order.company_module.billingAddress && item.order.address.post_code_area" class="btn btn-outline-primary btn-lg pointer" @click="generateInvoice()">Generate Invoice</div>
-                                        </div>
-                                        <div v-else>
-                                            <div class="btn btn-outline-primary btn-lg pointer invisible">Generate Invoice</div>
-                                        </div>
-                                    </div>
-                                    <div class="btn bg-grey no-border muted requestModal" v-if="item.shipping_transaction && invoice_status == 'Pending Approval'" data-type="confirmInvoice">
-                                        <i class="fa fa-check fs-12"></i>
-                                    </div>
-                                    <div class="btn bg-grey no-border muted requestModal" v-if="item.shipping_transaction && invoice_status == 'Pending Approval'" data-type="deleteInoive">
-                                        <i class="fa fa-close fs-12"></i>
-                                    </div>
-                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="confirmInvoice">
-                                        <approve-shipping-invoice-form-component :section="section" :data="data"></approve-shipping-invoice-form-component>
-                                    </modal-component>
-                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteInoive">
-                                        <delete-shipping-invoice-form-component :section="section" :data="data"></delete-shipping-invoice-form-component>
-                                    </modal-component>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.shipping_transaction && ['Pending Approval', 'Suspended Invoice'].includes(invoice_status)">
-                <div class="col p-b-10">
-                    <div class="row">
-                        <div class="col p-l-20 p-r-20 p-t-10 p-b-10">
-                            <div class="row align-items-center">
-                                <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Container Reference</p>
-                                    <div v-if="item.packages.length">{{ item.container ? item.container.container_reference : 'n/a' }}</div>
-                                    <div v-else>n/a</div>
-                                </div>
-                                <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Due Date</p>
-                                    <div v-if="item.packages.length">
-                                        <div v-if="item.container">
-                                            <div v-if="item.container.transport">{{ item.container.transport.drop_date == null ? item.container.transport.current_schedule.etd : item.container.transport.drop_date }}</div>
-                                            <div v-else>n/a</div>
-                                        </div>
-                                        <div v-else>n/a</div>
-                                    </div>
-                                    <div v-else>n/a</div>
-                                </div>
-                                <!-- <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Paid Date</p>
-                                    <div>n/a</div>
-                                </div> -->
-                                <div class="col">
-                                    <p class="no-margin fs-10 all-caps">Total CBM</p>
-                                    <div>{{ (parseFloat(cbm) + parseFloat(overweight)).toFixed(3) }}</div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <h5 class="text-underline text-center">Invoice Details</h5>
-                    <invoice-items-form-component :data="item.shipping_transaction" :section="section"></invoice-items-form-component>
-
-                    <div class="row">
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Subtotal</p>
-                            <div>{{ item.shipping_transaction.amount -  item.shipping_transaction.service_charge - item.shipping_transaction.tax }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Service Charges</p>
-                            <div>{{ item.shipping_transaction.service_charge }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Tax</p>
-                            <div>{{ item.shipping_transaction.tax }}</div>
-                        </div>
-                        <div class="col">
-                            <p class="no-margin fs-10 all-caps">Total</p>
-                            <div>{{ item.shipping_transaction.amount }}</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.shipping_transaction && invoice_status == 'Pending Payment'">
-                <div class="col-12 col-md-7 padding-20">
-                    <div class="row bg-master-lightest h-100">
-                        <div class="col">
-                            <div class="row bg-master-lightest" v-if="item.shipping_transaction.payment_attempts.length">
-                                <div class="col">
-                                    <div class="row m-t-10 m-b-10">
-                                        <div class="col">
-                                            <div class="font-head fs-10 all-caps">Payment Attempt</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <shipping-transaction-component v-for="item in item.shipping_transaction.payment_attempts" v-bind:key="item.id" :data="item" ></shipping-transaction-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row bg-master-lightest" v-if="item.shipping_transaction.payment_history.length">
-                                <div class="col">
-                                    <div class="row m-t-10 m-b-10">
-                                        <div class="col">
-                                            <div class="font-head fs-10 all-caps">Payment History</div>
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col">
-                                            <payment-history-component v-for="item in item.shipping_transaction.payment_history" v-bind:key="item.id" :data="item" ></payment-history-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-md-5 padding-20 parentContainer">
-                    <div class="row bg-master-lightest h-100">
-                        <div class="col">
-                            <div class="row padding-10">
-                                <div class="col">
-                                    <div class="row align-items-end m-b-10 text-complete">
-                                        <div class="col">
-                                            <div class="font-heading all-caps fs-12">Total Amount:</div>
-                                        </div>
-                                        <div class="col-auto text-right">
-                                            <div class="font-heading fs-12">MYR {{(Math.round((item.shipping_transaction.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
-                                        </div>
-                                    </div>
-                                    <div class="row align-items-end m-b-10 text-success hide">
-                                        <div class="col">
-                                            <div class="font-heading all-caps fs-12">Paid Total:</div>
-                                        </div>
-                                        <div class="col-auto text-right">
-                                            <!-- <div class="font-heading fs-12">MYR {{(Math.round((item.shipping_transaction.paid_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
-                                            <div class="font-heading fs-12">Paid Total</div>
-                                        </div>
-                                    </div>
-                                    <div class="row align-items-end m-b-10 hide">
-                                        <div class="col">
-                                            <div class="font-heading all-caps fs-12">Floating Amount:</div>
-                                        </div>
-                                        <div class="col-auto text-right">
-                                            <!-- <div class="font-heading fs-12">MYR {{(Math.round((item.shipping_transaction.floating_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
-                                            <div class="font-heading fs-12">Floating Amount</div>
-                                        </div>
-                                    </div>
-                                    <div class="row align-items-end bold text-danger">
-                                        <div class="col">
-                                            <div class="font-heading all-caps fs-12">OutStanding Total:</div>
-                                        </div>
-                                        <div class="col-auto text-right">
-                                            <div class="font-heading fs-12">MYR {{(Math.round((item.shipping_transaction.outstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
-                                        </div>
-                                    </div>
-                                    <div class="row m-t-20" v-if="item.shipping_transaction.outstanding > 0">
-                                        <div class="col">
-                                            <div class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="makePayment">Make Payment</div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="makePayment">
-                                <payment-form-component :data="item.shipping_transaction" :section="section"></payment-form-component>
-                            </modal-component>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import componentHandler from '../../../general/mixins/componentHandler';
-    export default {
-        props: {
-            invoice_status: {
-                type: String,
-                required: true
-            },
-            section:{
-                type: String,
-                required: true
-            }
-        },
-        data(){
-            return {
-                parameters: {
-                    packing_list_id: null,
-                    transaction_details: [],
-                },
-                expanded: false,
-            }
-        },
-        computed: {
-            cbm () {
-                return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? 0 : obj.cbm) + total, 0)) * 1000) / 1000).toFixed(3)
-            },
-            overweight(){
-                return (Math.ceil((this.item.packages.reduce((total, obj) => (obj.type === 2 ? obj.cbm : 0) + total, 0)) * 1000) / 1000).toFixed(3)
-            }
-        },
-        created(){
-            this.parameters.packing_list_id = this.data.id;
-        },
-        methods: {
-            generateInvoice() {
-                this.submit(this.route('api.transaction.invoice.create'), 'post', this.section, true, true);
-            },
-            successHandler(response){
-                this.item = response.payload.data;
-                this.updateList();
-            }
-        },
-        mixins: [componentHandler]
-    }
-</script>

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

@@ -1,73 +0,0 @@
-<template>
-    <div class="row m-l-0 m-b-10 m-r-0 parentContainer">
-        <div class="col-auto bg-master-lighter requestModal pointer" data-type="deleteAttempt">
-            <div class="row align-items-center h-100">
-                <div class="col">
-                    <i class="fa fa-times muted"></i>
-                </div>
-            </div>
-        </div>
-        <div class="col bg-white p-t-10 p-b-10 p-r-0">
-            <div class="row m-b-5">
-                <div class="col-auto">
-                    <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
-                    <div class="font-heading fs-10 bold">
-                        MYR {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-auto p-l-5 p-r-5 bg-success pointer" v-if="item.payment_method === 5">
-            <a :href="route('billplz.bill', item.payment_reference)">
-                <div class="row align-items-center h-100">
-                    <div class="col">
-                        <i class="fa fa-repeat fs-20 text-white p-l-10 p-r-10"></i>
-                    </div>
-                </div>
-            </a>
-        </div>
-        <div class="col-auto p-l-5 p-r-5 bg-success requestModal pointer" v-if="item.payment_method !== 5" data-type="paymentProofModal">
-            <div @click="selectedID(item.payment_transaction.id)" class="row align-items-center h-100">
-                <div class="col">
-                    <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="30" height="30" viewBox="0 0 172 172" style=" fill:#000000;"><defs><linearGradient x1="86" y1="70.76994" x2="86" y2="116.46013" gradientUnits="userSpaceOnUse" id="color-1_52139_gr1"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="61.8125" y1="34.48869" x2="61.8125" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-2_52139_gr2"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="130.34375" y1="34.48869" x2="130.34375" y2="144.97181" gradientUnits="userSpaceOnUse" id="color-3_52139_gr3"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient><linearGradient x1="86" y1="32.25" x2="86" y2="148.71013" gradientUnits="userSpaceOnUse" id="color-4_52139_gr4"><stop offset="0" stop-color="#ffffff"></stop><stop offset="1" stop-color="#ffffff"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M102.45825,99.43213h-5.70825c-1.4835,0 -2.6875,1.16637 -2.6875,2.65256v8.10013c0,1.48081 -1.19862,2.68481 -2.67944,2.68481h-10.76612c-1.48081,0 -2.67944,-1.204 -2.67944,-2.68481v-8.10013c0,-1.48619 -1.204,-2.65256 -2.6875,-2.65256h-5.70825c-1.93769,0 -3.04225,-2.39188 -1.88125,-4.05275l14.577,-20.855c1.8275,-2.61494 5.69481,-2.61763 7.52231,-0.00538l14.577,20.86306c1.16369,1.66088 0.05644,4.05006 -1.87856,4.05006z" fill="url(#color-1_52139_gr1)"></path><path d="M51.0625,67.1875h5.375c0,-8.0625 7.23206,-16.12231 16.125,-16.12231v-5.375c-11.85456,0 -21.5,10.74731 -21.5,21.49731z" fill="url(#color-2_52139_gr2)"></path><path d="M139.75,80.625c0,-10.75 -8.44144,-18.80981 -18.8125,-18.80981v5.375c7.40944,0 13.4375,5.37231 13.4375,13.43481z" fill="url(#color-3_52139_gr3)"></path><path d="M148.09738,92.27263c1.59369,-3.68188 2.40263,-7.59219 2.40263,-11.64494c0,-16.29969 -13.26281,-29.5625 -29.5625,-29.5625c-6.5145,0 -12.68769,2.08819 -17.78588,5.96088c-4.30269,-13.03438 -16.52006,-22.08587 -30.58912,-22.08587c-17.78319,0 -32.25,14.46681 -32.25,32.25c0,4.14681 0.16662,8.05981 1.42437,10.74731h-1.42437c-13.33806,0 -24.1875,10.84944 -24.1875,24.1875c0,11.56431 8.16194,21.24737 19.0275,23.62044c1.02394,6.39894 6.53869,11.31706 13.2225,11.31706h56.4375h16.125h5.375c6.54944,0 12.00238,-4.71388 13.18488,-10.92469c9.2235,-1.20131 16.37762,-9.08913 16.37762,-18.63513c0,-6.09256 -2.924,-11.72019 -7.77762,-15.23006zM126.3125,131.6875h-5.375h-16.125h-56.4375c-3.49912,0 -6.45538,-2.6875 -7.568,-5.375h93.0735c-1.11263,2.6875 -4.06888,5.375 -7.568,5.375zM137.0625,120.9375h-96.75c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125c0,-10.37106 8.44144,-18.8125 18.8125,-18.8125h9.51375l-1.68506,-3.78131c-2.23063,-5.01488 -2.45369,-7.48737 -2.45369,-12.341c0,-14.81888 12.05613,-26.875 26.875,-26.875c13.01825,0 24.13106,9.29875 26.42619,22.11275l0.92719,5.17075l3.64962,-3.77325c4.60638,-4.76225 10.77687,-7.38525 17.372,-7.38525c13.33806,0 24.1875,10.84944 24.1875,24.1875c0,3.6765 -0.81431,7.21056 -2.37575,10.41944l-1.763,3.32713l2.37037,1.26044c4.40481,2.34081 7.14338,6.88806 7.14338,11.868c0,7.40944 -6.02806,13.43481 -13.4375,13.43481z" fill="url(#color-4_52139_gr4)"></path></g></g></svg>
-                </div>
-            </div>
-        </div>
-        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteAttempt">
-            <delete-payment-attempt-form-component :data="item" :section="section" class="text-center"></delete-payment-attempt-form-component>
-        </modal-component>
-        <modal-component type="paymentProofModal">
-            <payment-verification-form-component v-if="selected_id === item.payment_transaction.id" :section="section" :data="item"></payment-verification-form-component>
-        </modal-component>
-    </div>
-</template>
-
-<script>
-    import componentHandler from '../../../general/mixins/componentHandler';
-    export default {
-        data(){
-            return {
-                expandPaymentDetails: false,
-                amount: (Math.round(1000 * 100) / 100).toFixed(2),
-                selected_id: '',
-                parameters: {
-                    amount: (Math.round(1000 * 100) / 100).toFixed(2),
-                    bank_id: 1
-                },
-                section: 'bookingDetailSection',
-            }
-        },
-        mounted() {
-            this.item.id = this.item.payment_transaction.id;
-        },
-        methods: {
-            clickExpand(){
-                this.expandPaymentDetails = !this.expandPaymentDetails;
-            },
-            selectedID(id){
-                this.selected_id = id;
-            }
-        },
-        mixins: [componentHandler]
-    }
-</script>

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

@@ -55,7 +55,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div v-if="$store.getters.isSuperAdmin | showManualPayment">
+                                            <div v-if="$store.getters.isSuperAdmin">
                                                 <div class="row m-t-10 m-b-10">
                                                     <div class="col text-center"><div id="expend-method" class="padding-10 bg-master-lightest pointer" @click="$store.dispatch('toggleSection', {name: 'otherPaymentMethods', status: !$store.getters.isShowing('otherPaymentMethods')})"><i class="fa m-r-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i>{{$store.getters.isShowing('otherPaymentMethods') ? 'Hide' : 'Show'}} Alternative Methods <i class="fa m-l-10" :class="[{'fa-angle-up': $store.getters.isShowing('otherPaymentMethods')}, {'fa-angle-down': !$store.getters.isShowing('otherPaymentMethods')}]"></i></div></div>
                                                 </div>
@@ -170,10 +170,6 @@
                 type: Array,
                 required: true,
             },
-            showManualPayment: {
-                type: Boolean,
-                default: false
-            },
         },
         data(){
             return {

resources/assets/vue/components/paymentsBilling/sections/AdminPaymentsBillingSectionComponent.vue

@@ -6,7 +6,7 @@
                     <div class="row justify-content-end">
                         <div class="col">
                             <div class="row fs-12 text-center">
-                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" :class="{'active': item ? item.status === 2 : true }" tab-name="pendingInvoice" @click="setActiveTab($event)">
+                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" :class="{'active': item ? item.status === 2 : true }" tab-name="pendingInvoice">
                                     <div class="row justify-content-center m-b-5">
                                         <div class="col-auto">
                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -29,7 +29,7 @@
                     <div class="row justify-content-end">
                         <div class="col">
                             <div class="row fs-12 text-center">
-                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" tab-name="pendingApproval" @click="setActiveTab($event)">
+                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" tab-name="pendingApproval">
                                     <div class="row justify-content-center m-b-5">
                                         <div class="col-auto">
                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -52,7 +52,7 @@
                     <div class="row justify-content-end">
                         <div class="col">
                             <div class="row fs-12 text-center">
-                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" tab-name="pendingPayment" @click="setActiveTab($event)">
+                                <div class="col p-t-20 p-b-20 m-r-5 bg-master-lighter tabButton" tab-name="pendingPayment">
                                     <div class="row justify-content-center m-b-5">
                                         <div class="col-auto">
                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -78,7 +78,7 @@
                     <div class="row justify-content-end">
                         <div class="col">
                             <div class="row fs-12 text-center">
-                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="paidInvoice" @click="setActiveTab($event)">
+                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="paidInvoice">
                                     <div class="row justify-content-center m-b-5">
                                         <div class="col-auto">
                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -100,23 +100,23 @@
             </div>
             <div class="row no-margin">
                 <div class="col bg-master-lightest p-1 p-sm-4">
-                    <div class="row tabsContainer tabContent" tab-name="pendingInvoice" v-if="isActiveTab('pendingInvoice') || showTabContent('pendingInvoice')">
+                    <div class="row tabsContainer tabContent" tab-name="pendingInvoice">
                         <div class="col">
                             <admin-payments-billing-with-search-component :options="{does_not_have_transaction_type: 1, type: 2, per_page: 5}" section="pendingInvoiceSection" invoice_status="Pending Invoice"></admin-payments-billing-with-search-component>
                         </div>
                     </div>
-                    <div class="row tabsContainer tabContent hide" tab-name="pendingApproval" v-if="isActiveTab('pendingApproval') || showTabContent('pendingApproval')">
+                    <div class="row tabsContainer tabContent hide" tab-name="pendingApproval">
                         <div class="col">
                             <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [0, 1], per_page: 5}" section="pendingApprovalSection" invoice_status="Pending Approval"></admin-payments-billing-with-search-component>
                         </div>
                     </div>
-                    <div class="row tabsContainer tabContent hide" tab-name="pendingPayment" v-if="isActiveTab('pendingPayment') || showTabContent('pendingPayment')">
+                    <div class="row tabsContainer tabContent hide" tab-name="pendingPayment">
                         <div class="col">
                             <payment-filter-component :endpoint="route('api.packing_list.list')" :data="data"></payment-filter-component>
                             <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [2], packing_list_ordered_by_invoice_date: true, per_page: 5}" section="pendingPaymentSection" invoice_status="Pending Payment" :with_export="true"></admin-payments-billing-with-search-component>
                         </div>
                     </div>
-                    <div class="row tabsContainer tabContent hide" tab-name="paidInvoice" v-if="isActiveTab('paidInvoice') || showTabContent('paidInvoice')">
+                    <div class="row tabsContainer tabContent hide" tab-name="paidInvoice">
                         <div class="col">
                             <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [3], per_page: 5}" section="paidInvoiceSection" invoice_status="Paid Invoice" :with_export="true"></admin-payments-billing-with-search-component>
                         </div>
@@ -128,14 +128,7 @@
 </template>
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
-    import tabHandler from '../../../general/mixins/tabHandler';
     export default {
-        data() {
-            return {
-                activeTab: 'pendingInvoice',
-                displayedTabs: ['pendingInvoice'],
-            };
-        },
-        mixins: [componentHandler, tabHandler]
+        mixins: [componentHandler]
     }
 </script>

resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="row m-b-15 parentContainer" :class="{'d-none': searchValue != data.postcode && searchValue != ''}">
+    <div class="row m-b-15 parentContainer">
         <div class="col">
             <div class="row align-items-center">
                 <div class="col-auto p-r-0">
@@ -55,10 +55,6 @@
                 type: Object,
                 required: false
             },
-            searchValue: {
-                type: String,
-                default: null
-            },
             section: {
                 default: ''
             },

resources/assets/vue/components/settings/elements/PostcodeSectionComponent.vue

@@ -1,79 +0,0 @@
-<template>
-    <div class="row m-b-15 parentContainer">
-        <div class="col">
-            <div class="row m-b-10" @keyup.enter="submitSearch()">
-                <div class="col-6 col-md mb-2 mb-md-0">
-                    <validation-wrapper-component :validator="$v.postcode">
-                        <label class="text-primary">Postcode</label>
-                        <input type="text" class="form-control fs-12" v-model="postcode">
-                    </validation-wrapper-component>
-                </div>
-            </div>
-            <div class="row m-b-20">
-                <div class="col-12 col-md-auto m-b-15">
-                    <div class="row">
-                        <div class="col p-r-0">
-                            <div class="btn btn-primary b-rad-none w-100 h-100 d-flex justify-content-center align-items-center p-l-30 p-r-30"
-                                @click="submitSearch()">
-                                Search
-                            </div>
-                        </div>
-                        <div class="col p-l-0">
-                            <div class="btn btn-secondary b-rad-none w-100 h-100 d-flex justify-content-center align-items-center p-l-30 p-r-30"
-                                @click="resetSearch()">
-                                Reset
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row m-b-20">
-                <div class="col">
-                    <list-component :key="key" section="allPostcodesSection" :endpoint="route('api.address.district.list')" :options="options">
-                        <template slot="list" slot-scope="{data}">
-                            <list-postcode-component :data="item" :searchValue="submittedPostcode" v-for="(item, index) in data.postcodeArray" v-bind:key="index"></list-postcode-component>
-                        </template>
-                    </list-component>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-import modalFormHandler from '../../../general/mixins/modalFormHandler';
-import { required } from "vuelidate/lib/validators";
-
-export default {
-    props: {
-        section: {
-            default: 'allStateChargesSection'
-        },
-    },
-    data() {
-        return {
-            key: 1,
-            options: { country_id: 1 },
-            postcode: '',
-            submittedPostcode: '',
-        }
-    },
-    validations: {
-        postcode: {},
-    },
-    methods: {
-        submitSearch() {
-            this.submittedPostcode = this.postcode;
-            this.options = { country_id: 1, postcode_like: this.submittedPostcode };
-            this.key += 1;
-        },
-        resetSearch() {
-            this.options = { country_id: 1 };
-            this.submittedPostcode = '';
-            this.postcode = '';
-            this.key += 1;
-        },
-    },
-    mixins: [modalFormHandler]
-}
-
-</script>

resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue

@@ -107,8 +107,7 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <span v-if="data.contact">{{ data.contact.reference ? data.contact.reference : "-" }}</span>
-                                    <span v-else>-</span>
+                                    {{ data.contact.reference ? data.contact.reference : "-" }}
                                 </div>
                             </div>
                         </div>
@@ -120,8 +119,7 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <span v-if="data.contact">{{ data.contact.phone ? data.contact.phone : '-' }}</span>
-                                    <span v-else>-</span>
+                                    {{ data.contact.phone ? data.contact.phone : '-' }}
                                 </div>
                             </div>
                         </div>
@@ -133,8 +131,7 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <span v-if="data.contact">{{ data.contact.email ? data.contact.email : '-' }}</span>
-                                    <span v-else>-</span>
+                                    {{ data.contact.email ? data.contact.email : '-' }}
                                 </div>
                             </div>
                         </div>
@@ -146,20 +143,17 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <span v-if="data.contact">{{ data.contact.wechat_id ? data.contact.wechat_id : '-' }}</span>
-                                    <span v-else>-</span>
+                                    {{ data.contact.wechat_id ? data.contact.wechat_id : '-' }}
                                 </div>
                             </div>
                         </div>
                         <div class="col"></div>
-                        <div v-if="data.contact">
-                            <div class="col-auto">
-                                <div class="btn btn-xs btn-default pointer m-t-10 b-primary b-a text-primary requestModal" data-type="warehouseContact">Edit Contact</div>
-                            </div>
-                            <modal-component class="animate__animated animate__fast animate__fadeIn" type="warehouseContact" styleType="fill-in">
-                                <contact-form-component :section="section" :data="data.contact" :company_module_id="data.id"></contact-form-component>
-                            </modal-component>
+                        <div class="col-auto">
+                            <div class="btn btn-xs btn-default pointer m-t-10 b-primary b-a text-primary requestModal" data-type="warehouseContact">Edit Contact</div>
                         </div>
+                        <modal-component class="animate__animated animate__fast animate__fadeIn" type="warehouseContact" styleType="fill-in">
+                            <contact-form-component :section="section" :data="data.contact" :company_module_id="data.id"></contact-form-component>
+                        </modal-component>
                     </div>
                 </div>
             </div>

resources/assets/vue/components/wallets/elements/CustomerWalletTransactionComponent.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="row bg-white padding-10 m-b-10 rounded align-datas-center">
         <div class="col-3 fs-12">{{data.created_at}}</div>
-        <div class="col fs-12"><span v-html="data.description"></span> <a target=”_blank” v-if="[9,11].includes(data.type) " :href="route('transaction.credit_note.download', data.id)"><i class="fa fa-download fs-11 m-l-5 text-secondary hover-primary"></i></a><small v-if="data.bill_no && $store.getters.isAdmin"><br><br>{{ data.bill_no }}</small></div>
+        <div class="col fs-12"><span v-html="data.description"></span> <a target=”_blank” v-if="[9,11].includes(data.type) " :href="route('transaction.credit_note.download', data.id)"><i class="fa fa-download fs-11 m-l-5 text-secondary hover-primary"></i></a></div>
         <div class="col-2 text-success text-center">{{[5, 9, 15].includes(parseFloat(data.type)) ? formatValue(data.amount) : ''}}</div>
         <div class="col-2 text-danger text-center">{{[2, 11].includes(parseFloat(data.type)) ? '- ' + formatValue(data.amount, ) : ''}}</div>
         <div class="col-2 text-right">{{formatValue(data.running_balance)}}</div>

resources/assets/vue/general/mixins/aws/requestV2.js

@@ -1,49 +0,0 @@
-export default {
-    methods: {
-        poll(url, method, section, successNotification = true, errorNotification = true){
-            if(!this.validate()){ return; }
-            if (section) {
-                this.$store.dispatch('toggleLoading', {name: section, status: true})
-            }
-            this.$store.dispatch('crudRequestV2', {
-                endpoint: url,
-                method: method,
-                parameters: this.parameters
-            }).then(response => {
-                let statusCode = response.status,
-                    success = response.ok;
-
-                response.json().then(response => {
-
-                    if(!success){
-                        this.openModal();
-                        errorNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'error'}): null;
-                        this.errorHandler(response, statusCode); return;
-                    }
-
-                    successNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'success'}): null;
-                    this.successHandler(response)
-
-
-                });
-            }).catch((error) => {
-                this.$store.dispatch('createNotification', {title: 'Unexpected Error', message: 'An unexpected error has occurred. Try again!', type: 'error'});
-            }).then(() => {
-                if (section) {
-                    this.$store.dispatch('toggleLoading', {name: section, status: false})
-                }
-            })
-
-        },
-        validate() {
-            if(this.$v){
-                this.$v.$touch();
-                return !this.$v.$invalid;
-            }
-            return true;
-        },
-        successHandler(response){},
-        errorHandler(response){}
-    }
-
-}

resources/assets/vue/general/mixins/tabHandler.js

@@ -1,24 +0,0 @@
-export default {
-    data() {
-        return {
-            activeTab: null,
-            displayedTabs: [],
-        };
-    },
-    methods: {
-        setActiveTab(event) {
-            const tabName = event.currentTarget.getAttribute('tab-name');
-            // console.log(`Tab "${tabName}" clicked`);
-            this.activeTab = tabName;
-            if (!this.displayedTabs.includes(tabName)) {
-                this.displayedTabs.push(tabName);
-            }
-        },
-        isActiveTab(tabName) {
-            return this.activeTab === tabName;
-        },
-        showTabContent(tabName) {
-            return this.displayedTabs.includes(tabName);
-        },
-    },
-}

resources/assets/vue/vuex/modules/crudRequest.js

@@ -19,4 +19,4 @@ export default {
             })
         }
     }
-}
+}

resources/assets/vue/vuex/modules/crudRequestV2.js

@@ -1,47 +0,0 @@
-export default {
-    actions: {
-        crudRequestV2({getters, dispatch},  {endpoint, method, parameters}){
-            const queryDomain = endpoint.split('?')[0];
-            let encodedParams = endpoint.split('?')[1];
-            let decodedParams = fullyDecodeURI(encodedParams);
-            const queryParams = encodeURIComponent(decodedParams);
-            encodedParams = queryParams.toString();
-            let filteredEncodedParams = encodedParams.replace(/%3D/g,'=');
-            filteredEncodedParams = filteredEncodedParams.replace(/%26/g,'&');
-            let combinedAbsoluteUrl = queryDomain;
-            if(filteredEncodedParams !== undefined && filteredEncodedParams !== 'undefined'){
-                combinedAbsoluteUrl = queryDomain + '?' + filteredEncodedParams;
-            }
-
-            // return fetch(endpoint, {
-            return fetch(combinedAbsoluteUrl, {
-                method: method,
-                responseType: 'json',
-                body: parameters ? JSON.stringify(parameters):null,
-                headers: {
-                    'content-type': 'application/json',
-                    'Authorization': 'Bearer '+getters.getAccessToken
-                }
-            }).then(response => {
-                if(response.status === 401 && window.location.href !== route('login') && window.location.href.indexOf(route('last_mile_delivery.login')) <= -1){
-                    dispatch('userAuthentication', {access_token: '', redirect_url: [7, 8].includes(getters.getCompanyModuleType) ? route('last_mile_delivery.login') : route('login')});
-                }
-
-                return response;
-
-            })
-        }
-    }
-}
-
-function isEncoded(uri) {
-    uri = uri || '';
-    return uri !== decodeURIComponent(uri);
-}
-
-function fullyDecodeURI(uri){
-    while (isEncoded(uri)){
-        uri = decodeURIComponent(uri);
-    }
-    return uri;
-}

resources/assets/vue/vuex/store.js

@@ -4,7 +4,6 @@ import toggleSection from './modules/toggleSection'
 import toggleLoading from './modules/toggleLoading'
 import createNotification from './modules/createNotification'
 import crudRequest from './modules/crudRequest'
-import crudRequestV2 from './modules/crudRequestV2'
 import authentication from './modules/authentication'
 import loadRequestQueue from './modules/loadRequestQueue'
 
@@ -17,7 +16,6 @@ export default new Vuex.Store({
         loadRequestQueue,
         createNotification,
         crudRequest,
-        crudRequestV2,
         authentication
     }
-})
+})

resources/views/pages/paymentAndBilling2.blade.php

@@ -1,8 +0,0 @@
-@extends('layouts.base_portal')
-@section('inner_content')
-    <div class="row">
-        <div class="col">
-            <admin-payments-billing-polling-section-component></admin-payments-billing-polling-section-component>
-        </div>
-    </div>
-@endsection

resources/views/pages/settings.blade.php

@@ -369,7 +369,15 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <postcode-section-component></postcode-section-component>
+                                    <div class="row m-b-20">
+                                        <div class="col">
+                                            <list-component section="allPostcodesSection" :endpoint="route('api.address.district.list')" :options="{country_id: 1}">
+                                                <template slot="list" slot-scope="{data}">
+                                                    <list-postcode-component :data="item" v-for="item in data.postcodeArray"></list-postcode-component>
+                                                </template>
+                                            </list-component>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>

routes/api.php

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

routes/job.php

@@ -1,8 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Route;
-
-Route::group(['prefix' => 'job', 'as' => 'job.', 'namespace' => 'Jobs'], function () {
-    Route::get('/fetch/{job_id}', 'FetchJobResultController@fetch')->name('fetch');
-    Route::get('/fetch/{job_id}/{is_last}', 'FetchJobResultController@fetch')->name('fetch.last.attempt');
-});

routes/packing_list.php

@@ -5,7 +5,6 @@ use Illuminate\Support\Facades\Route;
 Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' => 'packing_list'], function () {
     Route::get('/{id}/show', 'FetchPackingListController@fetch')->name('show');
     Route::get('/list', 'ListPackingListsController@list')->name('list');
-    Route::get('/list/job', 'ListPackingListsJobController@list')->name('list.job');
     Route::post('/create', 'CreatePackingListController@create')->name('create');
     Route::post('/create/deliver', 'CreateDeliverPackingListController@create')->name('create.deliver');
 

routes/web.php

@@ -1247,9 +1247,4 @@ Route::get('fix-payment-status-updated-but-failed-update-invoice', function (Upd
             echo 'done fix ' . $invoice->owner->owner->reference . '<br>';
         }
     }
-});
-
-//A page to monitor Experimental solution (Vue Polling) to solve an AWS API Gateway problem limitation for Laravel Vapor in the event of a emergency rollback to Google
-Route::get('/payment-and-billing-2', function () {
-    return view('pages.paymentAndBilling2');
-})->name('admin.payment-and-billing-2');
+});