'Your Payment Proof' feature missing for order with storage invoices through group payment

Inserted logs for monitoring warehouse storage charges

See merge request CIEFWorldwideSdnBhd/shipping-portal!223

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class CompanySegmentsIn implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('companyModules', function ($module) use ($value) {
+            $module->whereHas('connections', function ($connection) use ($value) {
+                $connection->whereHas('connectionSegments', function ($segment) use ($value) {
+                    $segment->whereIn('segment_id', $value);
+                });
+            });
+        });
+    }
+}

app/Classes/Modules/Companies/ControllersLogic/AssignCompanyConnectionToConnectionSegmentLogic.php

@@ -7,6 +7,8 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\AssignConnectionSegmentProcessor;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyConnection;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Http\Resources\CompanyResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -33,17 +35,22 @@ class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractController
     /** @var AssignConnectionSegmentProcessor */
     private $assignCompanyConnectionToConnectionSegmentProcessor;
 
+    /** @var CreateContactProcessor */
+    private $createContactProcessor;
+
     /**
      * AssignCompanyToSegmentLogic constructor.
      * @param FetchesCompany $fetchesCompany
      * @param FetchesCompanyConnection $fetchesCompanyConnection
      * @param AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor
+     * @param CreateContactProcessor $createContactProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesCompanyConnection $fetchesCompanyConnection, AssignConnectionSegmentProcessor $assignCompanyConnectionToConnectionSegmentProcessor, CreateContactProcessor $createContactProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesCompanyConnection = $fetchesCompanyConnection;
         $this->assignCompanyConnectionToConnectionSegmentProcessor = $assignCompanyConnectionToConnectionSegmentProcessor;
+        $this->createContactProcessor = $createContactProcessor;
     }
 
     /**
@@ -62,6 +69,11 @@ class AssignCompanyConnectionToConnectionSegmentLogic extends AbstractController
 
         $this->assignCompanyConnectionToConnectionSegmentProcessor->execute($companyConnection, $request->input('segment_id'));
 
+        if ($request->input('segment_id') == 10 || $request->input('segment_id') == 11) {
+            $contactObject = new ContactObject('Whatsapp: ' . $request->input('name'), $request->input('phone'), null, null);
+            $this->createContactProcessor->execute($contactObject, $company);
+        }
+
         return $this->resourceResponse(new CompanyResource($company));
     }
 }

app/Classes/Modules/PackingLists/ControllersLogic/Containers/RescheduleContainerLogic.php

@@ -56,27 +56,21 @@ class RescheduleContainerLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        try {
-            $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
-            $transport = $container->transports()->first();
+        $container = $this->fetchesContainer->execute(['id' => $request->route('id')]);
+        $transport = $container->transports()->first();
 
-            $old_sechedule = $transport->schedules()->first();
+        $old_schedule = $transport->schedules()->delete();
 
-            $this->updatesScheduleStatus->execute($old_sechedule, ApprovalStatus::REJECTED);
+        // $this->updatesScheduleStatus->execute($old_schedule, ApprovalStatus::REJECTED);
 
-            $scheduleObject = new ScheduleObject(
-                Carbon::parse($request->input('etd')), 
-                Carbon::parse($request->input('eta')), 
-                ApprovalStatus::APPROVED
-             );
-            $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-            return $this->resourceResponse(new ContainerResource($container));
-
-        } catch (\Exception $exception){
-            throw new ErrorException($exception->getMessage(), $exception->getCode());
-        }
+        $scheduleObject = new ScheduleObject(
+            Carbon::parse($request->input('etd')),
+            Carbon::parse($request->input('eta')),
+            ApprovalStatus::APPROVED
+        );
+        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
 
+        return $this->resourceResponse(new ContainerResource($container));
     }
 
 }

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

@@ -164,6 +164,7 @@ class CheckStorageInvoiceTransactionProcessor
                     if ($transport) {
                         $schedule = $transport->schedules->last();
                         if ($schedule) {
+                            Log::channel('storage_invoices')->info('schedule: '.json_encode($schedule));
                             return $schedule->eta;
                         }
                     }
@@ -177,11 +178,14 @@ class CheckStorageInvoiceTransactionProcessor
         $pricePerCBM = 3;
         $resultNumberOfDaysFree = 10;
         $dt1 = $eta->copy()->addDay()->startOfDay();
-        $resultStartDate =  $dt1->format('Y-m-d');
-        $currentDatetime = Carbon::now();
-        $dt2 = $currentDatetime->copy()->addDay()->startOfDay();
-        $resultCurrentDate = $dt2->format('Y-m-d H:i:s');
+        $dt2 = Carbon::now()->copy()->addDay()->startOfDay();
         $interval = Carbon::parse($dt2)->diff($dt1);
+        Log::channel('storage_invoices')->info('eta: '.json_encode($eta));
+        Log::channel('storage_invoices')->info('dt1: '.json_encode($dt1));
+        Log::channel('storage_invoices')->info('dt2: '.json_encode($dt2));
+        Log::channel('storage_invoices')->info('interval: '.json_encode($interval));
+        Log::channel('storage_invoices')->info('Carbon now: '.json_encode(Carbon::now()));
+
 
         $resultNumberOfDaysExceeded = $interval->days - $resultNumberOfDaysFree;
         $storageInvoice = $destinationWarehousePackage->transactions()->where('transactions.type', TransactionType::STORAGE_INVOICE)->first();
@@ -200,14 +204,13 @@ class CheckStorageInvoiceTransactionProcessor
         $taxPercentage = TaxPercentage::DEFAULT;
         $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
         $dateToCompare = Carbon::parse(env('SST_START_DATE', '2024-04-01 00:00:00'));
-        $shippingInvoiceTransactionCreatedDate = Carbon::now();
 
-        Log::channel('storage_invoices')->info('storageInvoice: '.json_encode($storageInvoice).', $transaction->status: '.$transaction->status);
+        Log::channel('storage_invoices')->info('dateToCompare: '.json_encode($dateToCompare));
         if(!$storageInvoice && $resultNumberOfDaysExceeded  > 0 && $transaction->status != ApprovalStatus::COMPLETED){
             Log::channel('storage_invoices')->info('Created $transaction->id: '.$transaction->id);
             $billNumber = $this->generatesTransactionBillNumber->execute('STOR-');
 
-            if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare)) {
+            if (Carbon::now()->isAfter($dateToCompare)) {
                 $taxPercentage = TaxPercentage::SIX_PERCENT;
                 $total_tax = $price_cbm * $taxPercentage / 100;
                 $price_cbm = $price_cbm + $total_tax;
@@ -228,13 +231,13 @@ class CheckStorageInvoiceTransactionProcessor
             $paymentStorageTransaction = $storageInvoice->transactions()->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', ApprovalStatus::APPROVED)->first();
             if($paymentStorageTransaction){
                 $dateStorageInvoicePaid = $paymentStorageTransaction->created_at->copy()->addDay()->startOfDay();
-                Log::channel('storage_invoices')->info('dateStorageInvoicePaid: '.$dateStorageInvoicePaid.', resultCurrentDate: '.$resultCurrentDate);
+                Log::channel('storage_invoices')->info('dateStorageInvoicePaid: '.$dateStorageInvoicePaid.', resultCurrentDate: '.$dt2->format('Y-m-d H:i:s'));
                 $intervalRecalculate = Carbon::parse($dateStorageInvoicePaid)->diff($dt1);
                 $resultNumberOfDaysExceeded = $intervalRecalculate->days - $resultNumberOfDaysFree;
                 $price_cbm = $pricePerCBM * $cbm * $resultNumberOfDaysExceeded;
             }
 
-            if ($shippingInvoiceTransactionCreatedDate->isAfter($dateToCompare)) {
+            if (Carbon::now()->isAfter($dateToCompare)) {
                 $taxPercentage = TaxPercentage::SIX_PERCENT;
                 $total_tax = $price_cbm * $taxPercentage / 100;
                 $price_cbm = $price_cbm + $total_tax;
@@ -280,8 +283,8 @@ class CheckStorageInvoiceTransactionProcessor
                 'storageInvoiceId' => $storageInvoiceId,
                 'numberOfDaysExceeded' => $resultNumberOfDaysExceeded,
                 'numberOfDaysFree' => $resultNumberOfDaysFree,
-                'startDate' => $resultStartDate,
-                'currentDate' => $resultCurrentDate,
+                'startDate' => $dt1->format('Y-m-d'),
+                'currentDate' => $dt2->format('Y-m-d H:i:s'),
                 'cbm' => $cbm,
                 'pricePerCBM' => $pricePerCBM,
                 'storageInvoice' => new TransactionWithStorageResource($storageInvoice)

app/Classes/Notifications/InvoiceIssuedEmail.php

@@ -8,6 +8,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\PackingList;
 use App\Models\User;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 
 class InvoiceIssuedEmail extends AbstractEmail
@@ -35,10 +36,14 @@ class InvoiceIssuedEmail extends AbstractEmail
         $invoice = $this->packingList->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->where('status', ApprovalStatus::APPROVED)->first();
         $invoiceDocument = $invoice->documents()->first()->files;
 
+        // $fileContent = Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file);
+        $filePath = storage_path('app/documents/' . $invoiceDocument->first()->file->file_info->original->file);
+
+        Log::info('InvoiceIssuedEmail sent - Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference);
 
         return (new MailMessage)
             ->subject('Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file), [
+            ->attach($filePath, [
                 'as' => 'name.pdf',
                 'mime' => 'application/pdf',
             ])->view('emails.shipment.invoice', ['user' => $this->user, 'packingList' => $this->packingList]);

app/Classes/Notifications/ShipmentDepartureEmail.php

@@ -9,6 +9,7 @@ use App\Models\PackingList;
 use App\Models\PasswordReset;
 use App\Models\User;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 
 class ShipmentDepartureEmail extends AbstractEmail
@@ -40,10 +41,14 @@ class ShipmentDepartureEmail extends AbstractEmail
 
         $invoiceDocument = $invoice->documents()->first()->files;
 
+        // $fileContent = Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file);
+        $filePath= storage_path('app/documents/' . $invoiceDocument->first()->file->file_info->original->file);
+
+        Log::info('ShipmentDepartureEmail sent - Att: '.$this->user->name.' - Invoice for order no.'. $this->packingList->owner->reference);
 
         return (new MailMessage)
             ->subject('Your packages are on the way to malaysia - Invoice pending payment for order no.'. $this->packingList->owner->reference)
-            ->attach(Storage::disk('documents')->get($invoiceDocument->first()->file->file_info->original->file), [
+            ->attach($filePath, [
                 'as' => 'name.pdf',
                 'mime' => 'application/pdf',
             ])->bcc(['email_test@cief-malaysia.com'])->view('emails.shipment.ETD', ['user' => $this->user, 'packingList' => $this->packingList]);

app/Http/Resources/CompanyResource.php

@@ -40,7 +40,8 @@ class CompanyResource extends JsonResource
             'last_order' => $companyModule->type === 7 ? new DeliveryOrderResource($companyModule->orders()->orderBy('id', 'DESC')->first()) : new OrderResource($companyModule->orders()->orderBy('id', 'DESC')->first()),
             'order_count' => $companyModule->orders()->count(),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first()),
-            'created_at' => $this->created_at->format('d-m-Y')
+            'created_at' => $this->created_at->format('d-m-Y'),
+            'whatsapp' => new ContactResource($this->contacts()->where('reference', 'LIKE', '%Whatsapp%')->orderBy('created_at', 'DESC')->first())
 
         ];
 

app/Http/Resources/GroupForOrderV2Resource.php

@@ -26,7 +26,7 @@ class GroupForOrderV2Resource extends JsonResource
             'original_currency' => new CurrencyResource($this->original_currency),
             'issuer_name' => $this->issuerCompany->name,
             'issuer_id' => $this->issuerCompany->id,
-            'amount' => (float) $this->amount, //cief todo: 58
+            'amount' => (float) $this->amount,
             'service_charge' => (float) $this->amount,
             'currency' => new CurrencyResource($this->currency),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),

app/Http/Resources/MappableTransactionWithDetailsResource.php

@@ -32,9 +32,11 @@ class MappableTransactionWithDetailsResource extends JsonResource
 
         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
+            if ($order) {
+                $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 : '';
@@ -48,17 +50,20 @@ class MappableTransactionWithDetailsResource extends JsonResource
             if ($payments->count()) {
                 $data['payment_transactions'] = $payments->map(function ($payment) {
                     $order = $payment->owner->owner->owner;
-                    return [
-                        'id' => $payment->id,
-                        'updated_at' => $payment->updated_at,
-                        'debtor_code' => $order->companyModule->company->debtor,
-                        'order_reference' => $order->reference,
-                        'bill_no' => null,
-                        'type' => $payment->type,
-                        'marking' => null,
-                        'amount' => $payment->amount,
-                        'created_at' => $this->created_at
-                    ];
+
+                    if ($order) {
+                        return [
+                            'id' => $payment->id,
+                            'updated_at' => $payment->updated_at,
+                            'debtor_code' => $order->companyModule->company->debtor,
+                            'order_reference' => $order->reference,
+                            'bill_no' => null,
+                            'type' => $payment->type,
+                            'marking' => null,
+                            'amount' => $payment->amount,
+                            'created_at' => $this->created_at
+                        ];
+                    }
                 })->toArray();
             } else {
                 $data['status'] = 'error';

app/Http/Resources/SegmentResource.php

@@ -18,7 +18,7 @@ class SegmentResource extends JsonResource
         $constant = $this->constants->where('reference', SegmentConstants::CUSTOM_PRICE)->first();
         return [
             'id' => $this->id,
-            'name' => $this->name,
+            'name' => ucwords(str_replace('_', ' ', $this->name)),
             'price' => $constant ? $constant->value[0] : 0
         ];
     }

app/Http/Resources/TransactionResource.php

@@ -52,7 +52,7 @@ class TransactionResource extends JsonResource
             '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, //cief todo: 58
+            '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')),

app/Http/Resources/TransactionWithStorageResource.php

@@ -5,6 +5,7 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Group;
+use App\Models\PackingList;
 use App\Models\Transaction;
 use App\Models\Wallet;
 use Carbon\Carbon;
@@ -27,7 +28,9 @@ class TransactionWithStorageResource extends JsonResource
         $groupPaymentAttemptsFiltered = [];
         $group_payment_expired = null;
         $group_payment_history = null;
+        $group_payment_history_query = null;
         $groupTotalAmount = 0;
+        $payment_history = null;
 
         if ($this->owner instanceof Transaction) {
             if ($this->owner) {
@@ -43,7 +46,8 @@ class TransactionWithStorageResource extends JsonResource
             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]));
+                $group_payment_history_query = $this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED]);
+                $group_payment_history  = GroupForOrderV2Resource::collection($group_payment_history_query);
             }
 
         } else {
@@ -54,12 +58,16 @@ class TransactionWithStorageResource extends JsonResource
 
         }
 
+        $packingListReference = null;
+        if ($this->owner instanceof PackingList) {
+            $packingListReference = $this->owner->reference;
+        }
 
         $ts = $this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION])->last();
-        if ($ts) {
+        if ($ts && $group_payment_history && $group_payment_attempts) {
             $paymentTransaction = Transaction::where('payment_reference',  $ts->reference)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION])->first();
             if($paymentTransaction){
-                $groupTotalAmount = (double) $this->amount; //cief todo: 58
+                $groupTotalAmount = (double) $this->amount;
 
                 foreach ($group_payment_history as $key => $value) {
                     if ($value->id === $ts->id && $value->reference === $ts->reference) {
@@ -76,6 +84,21 @@ class TransactionWithStorageResource extends JsonResource
         }
 
 
+        $payment_history = TransactionResource::collection($this->transactions()
+        ->payments()
+        ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED])
+        ->get());
+
+        //For 'Your Payment Proof' at frontend
+
+        if($group_payment_history_query && count($group_payment_history_query) > 0){
+            if($this->getReferenceForGroupPayment($group_payment_history_query)){
+                foreach ($payment_history as $item) {
+                    $item['payment_reference'] = $this->getReferenceForGroupPayment($group_payment_history_query);
+                }
+            }
+        }
+
         return [
             'id' => $this->id,
             'owner_type' => $this->owner_type,
@@ -88,10 +111,10 @@ class TransactionWithStorageResource extends JsonResource
             '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, //cief todo: 58
+            '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')), //cief todo: 58
+            '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,
@@ -112,13 +135,9 @@ class TransactionWithStorageResource extends JsonResource
                     ->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()
-            ),
+            'payment_history' => $payment_history,
             'remarks' => RemarkResource::collection($this->remarks),
+            'packing_list_reference' => $packingListReference,
             'storages' => $this->storages ? $this->storages : null, //from middleware
             'is_waived' => (int) $this->is_waived,
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
@@ -126,4 +145,12 @@ class TransactionWithStorageResource extends JsonResource
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')
         ];
     }
+
+    private function getReferenceForGroupPayment($groups){
+        if(count($groups)){
+            $firstGroup = $groups[0];
+            return $firstGroup['reference'];
+        }
+        return null;
+    }
 }

app/Models/CompanyConnection.php

@@ -69,4 +69,12 @@ class CompanyConnection extends AbstractModel
         return $this->belongsToMany(Segment::class, (new ConnectionSegment())->getTable(), 'company_connection_id', 'segment_id');
     }
 
+    /**
+     * @return belongsToMany
+     */
+    public function connectionSegments(): HasMany
+    {
+        return $this->hasMany(ConnectionSegment::class, 'company_connection_id');
+    }
+
 }

database/migrations/2021_10_16_223036_create_transaction_logs_table.php

@@ -1,65 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\TransactionType;
-
-class CreateTransactionLogsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('transaction_logs', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('transaction_id');
-            $table->morphs('owner');
-            $table->string('type')->default(TransactionType::PAYMENT);
-            $table->foreignId('issuer')->unsigned();
-            $table->foreignId('receiver')->unsigned();
-            $table->foreignId('recipient_bank_account_id')->unsigned();
-            $table->string('payment_method')->nullable();
-            $table->string('payment_reference')->nullable();
-            $table->string('bill_no')->unique();
-            $table->decimal('amount', 25, 5)->default(0.00);
-            $table->decimal('original_amount', 25, 5)->default(0.00);
-            $table->foreignId('currency_id')->unsigned();
-            $table->foreignId('original_currency_id')->unsigned();
-            $table->decimal('currency_rate', 14, 5)->default(0.00);
-            $table->decimal('tax', 14, 5)->default(0.00);
-            $table->decimal('service_charge', 14, 5)->default(0.00);
-            $table->timestamp('expires_on')->nullable();
-            $table->integer('status')->default(ApprovalStatus::PENDING_SUBMISSION);
-            $table->softDeletes();
-            $table->timestamps();
-
-            $table->foreign('transaction_id')->references('id')->on('transactions');
-            $table->foreign('currency_id')->references('id')->on('currencies');
-            $table->foreign('issuer')->references('id')->on('company_modules');
-            $table->foreign('receiver')->references('id')->on('company_modules');
-            $table->foreign('original_currency_id')->references('id')->on('currencies');
-
-        });
-
-        //In-case the model name lengthy
-        Schema::table('transaction_logs', function (Blueprint $table) {
-            $table->string('owner_type', 250)->change();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('transaction_logs');
-    }
-}

resources/assets/vue/components/companies/elements/CompanyComponent.vue

@@ -10,6 +10,10 @@
             <div class="font-heading all-caps fs-11">{{this.item.name}}</div>
             <div class="font-heading all-caps fs-11">CIEF/{{this.item.company_module.marking}}</div>
         </div>
+        <div class="col-auto" v-if="this.item.whatsapp">
+            <div class="font-heading all-caps fs-11">Whatsapp:</div>
+            <div class="font-heading all-caps fs-11">{{ this.item.whatsapp.reference.replace('Whatsapp:', '') }}: {{ this.item.whatsapp.phone }}</div>
+        </div>
         <div class="col-auto text-center">
             <div class="font-heading all-caps fs-11">Orders</div>
             <div class="font-heading all-caps fs-11">{{this.item.order_count}}</div>

resources/assets/vue/components/companies/elements/FulfilmentInterestedFormComponent.vue

@@ -0,0 +1,115 @@
+<template>
+    <div class="row bg-white padding-25">
+        <div class="col" v-if="step === 1">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <h3>Please provide your Whatsapp phone number:</h3>
+
+                        </div>
+                    </div>
+                    <div class="row m-t-20 m-b-15">
+                        <div class="col-12">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Name</label>
+                                <input class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 p-t-15">
+                            <validation-wrapper-component :validator="$v.parameters.phone">
+                                <label>Phone</label>
+                                <input class="form-control" v-model="parameters.phone">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row p-t-15">
+                        <div class="col p-r-5">
+                            <div class="btn btn-lg block btn m-b-5 no-border bg-master-lighter" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-lg block btn m-b-5 no-border text-white bg-primary pointer" @click="nextStep">Confirm</div>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+        <div class="col" v-if="step === 2">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <h3>欲知更多详情，请浏览 <a href="https://bit.ly/4a5v34p" target="_blank" class="text-underline">https://bit.ly/4a5v34p</a> 或联系 Whatsapp: <a href="https://wa.me/601136814520" target="_blank" class="text-underline text-success">+6011-36814520</a></h3>
+                        </div>
+                    </div>
+                    <div class="row p-t-15">
+                        <div class="col p-r-5">
+                            <div class="btn btn-lg block btn m-b-5 no-border bg-master-lighter" @click="previousStep">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-lg block btn m-b-5 no-border text-white bg-primary pointer" @click="activateService">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required } from 'vuelidate/lib/validators';
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        props: {
+            company:{
+                type: Object,
+                required: true
+            },
+            segmentId:{
+                type: Number,
+                required: false
+            }
+        },
+        data() {
+            return {
+                step: 1,
+                parameters: {
+                    name: '',
+                    phone: '',
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                name: { required },
+                phone: { required },
+            }
+        },
+        methods: {
+            previousStep() {
+                this.step = 1;
+            },
+            nextStep() {
+                if (this.parameters.name && this.parameters.phone) {
+                    this.step = 2;
+                } else {
+                    this.parameters = {};
+                    this.submit(this.route('api.company.connection.assign', this.company.id, this.company.company_module.connections[0].id), 'post', 'activateService', true, false);
+                }
+            },
+            activateService(){
+                this.parameters.segment_id = this.segmentId
+       
+                this.submit(this.route('api.company.connection.assign', this.company.id, this.company.company_module.connections[0].id), 'post', 'activateService', true, false);
+            },
+            successHandler(){
+                location.reload();
+            }
+        },
+        mixins: [componentHandler, modalFormHandler]
+
+    }
+</script>

resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue

@@ -0,0 +1,119 @@
+<template>
+    <div class="row m-t-15 m-b-15 align-items-end parentContainer" v-if="company">
+        <div class="col">
+            <!-- 1688 consent -->
+            <div class="row m-l-0 m-r-0 m-b-15 animate__animated animate__tada animate__repeat-2 animate__delay-3s" v-if="!company.segments.some(item => item.id === 10 || item.id === 11 || item.id === 12)">
+                <div class="col bg-white padding-15">
+                    <div class="row">
+                        <div class="col">
+                            <div class="row ">
+                                <div class="col">
+                                    <h5 class="m-t-0 text-justify">重磅消息! CIEF 正式开通 <span class="bold">3PL fulfillment 服务</span>!! 你从中国进来的货物, 我们可以直接帮你仓储, 分拣打包, 直接送货到您的顾客手上, 只需系统对接你的 Lazada , Shopee , Tiktok 网店, 就能实现全自动化! 一个月只需 <span class="bold">RMX88</span>! </h5>
+                                    <h5 class="m-t-0 text-justify">Exciting news! CIEF has officially launched its <span class="bold">3PL fulfillment service</span>! We can assist with warehousing, sorting, packaging, and direct delivery of your goods from China to your customers. Simply integrate your Lazada, Shopee, or TikTok online stores with our system for full automation! Only <span class="bold">RMX88</span> per month!</h5>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-12 text-center">
+                                    <div class="btn btn-md block btn m-b-5 no-border text-white pointer bg-success requestModal" data-type="fulfilment-interested-now">Interested now (感兴趣)</div>
+                                </div>
+                                <div class="col-12 text-center">
+                                    <div class="btn btn-md block btn m-b-5 pointer requestModal" data-type="fulfilment-interested-later">Interested later (感兴趣，但现在不需要)</div>
+                                </div>
+                                <div class="col-12 text-center">
+                                    <div class="btn btn-md block btn m-b-5 no-border text-white pointer bg-danger requestModal" data-type="not-interested-confirm">Not interested (不感兴趣)</div>
+                                </div>
+                              
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" type="fulfilment-interested-now" styleType="fill-in" size="large">
+                <fulfilment-interested-form-component
+                    section="activateService"
+                    :company="company"
+                    :segmentId="10"
+                >
+                </fulfilment-interested-form-component>
+            </modal-component>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" type="fulfilment-interested-later" styleType="fill-in" size="large">
+                <fulfilment-interested-form-component
+                    section="activateService"
+                    :company="company"
+                    :segmentId="11"
+                >
+                </fulfilment-interested-form-component>
+            </modal-component>
+            <modal-component small type="not-interested-confirm">
+                <div class="row">
+                    <div class="col text-center">
+                        <div class="row">
+                            <div class="col text-center">
+                                <div class="row m-b-20">
+                                    <div class="col">
+                                        <h5 class="all-caps">Are you Sure?</h5>
+                                        <div class="fs-11">Are you sure you are not interested in this service?</div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col p-r-5">
+                                        <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">No, take me back</div>
+                                    </div>
+                                    <div class="col p-l-5">
+                                        <div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="activateService(12)">Yes, I’m sure</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </modal-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                section: 'newServiceList',
+                parameters: {
+                    segment_id: ''
+                },
+                expanded: false,
+                failed: false,
+                part: 0,
+                isFetchCompany: false,
+                company: null
+            }
+        },
+        created(){
+            this.fetchCompany();
+        },
+        methods: {
+            fetchCompany(){
+                this.parameters = null;
+                this.isFetchCompany = true;
+                this.submit(route('api.company.show', this.$store.getters.getCompanyId), 'get', this.section, false, false)
+            },
+            activateService(segmentId){
+                this.parameters = {
+                    segment_id: segmentId
+                };
+                this.part = 1;
+                this.submit(this.route('api.company.connection.assign', this.company.id, this.company.company_module.connections[0].id), 'post', 'activateService', true, false);
+            },
+            successHandler(response){
+                if (this.isFetchCompany) {
+                    this.company = response.payload.data;
+                    this.isFetchCompany = false;
+                }
+                if(this.part == 1 || this.part == 4){
+                    location.reload();
+                }
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>

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

@@ -74,9 +74,6 @@
         data(){
             return {
                 filters: this.options,
-                pollingInterval: null,
-                isPolling: false,
-                isFetchingResult: false,
                 isLoading: false,
             }
         },
@@ -87,13 +84,26 @@
         computed: {
             pendingList () {
                 return this.$store.getters.isInCompleteQueue(this.section);
-            }
+            },
+            getJob() {
+                return this.$store.getters.getJob(this.section);
+            },
+            getJobAttemptCount() {
+                return this.$store.getters.getJobAttemptCount(this.section);
+            },
         },
         watch: {
             pendingList(inComplete){
                 if(inComplete){
                     this.fetchList();
                 }
+            },
+            getJobAttemptCount(newValue, oldValue) {
+                // console.log('Old value:',  JSON.stringify(oldValue));
+                // console.log('New value:',  JSON.stringify(newValue));
+                if(this.getJob){
+                    this.fetchJobResult(this.getJob.isLastAttempt);
+                }
             }
         },
         methods: {
@@ -101,7 +111,7 @@
                 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);
+                this.$store.dispatch('submitJobRequest', {'url': url, 'name': this.section});
             },
             successHandler(response){
                 let result = JSON.parse(response.payload.data.result);
@@ -118,83 +128,21 @@
                     to: result.meta.to,
                     total: result.meta.total
                 };
-
-                this.stopPolling();
                 this.$store.dispatch('completeList', {'name': this.section, 'data': result.data});
+                this.$store.dispatch('stopPollingJobResultByJobId', {'jobId': this.getJob.jobId});
                 this.$refs.pagination.makePagination(result.meta, result.links);
                 this.isLoading = false;
             },
             errorHandler(error){
-                this.isFetchingResult = false;
-                this.isPolling = false;
+                // console.log("Error: " + JSON.stringify(error));
+                this.$store.dispatch('updatePollingJobResultByJobId', {'jobId': this.getJob.jobId, 'isPolling': false, 'isFetchingResult': 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){
+            fetchJobResult(isLastAttempt = false) {
+                this.$store.dispatch('updatePollingJobResultByJobId', {'jobId': this.getJob.jobId, 'isFetchingResult': true });
                 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);
+                    let anotherEndpoint = route('api.job.fetch', this.getJob.jobId);
                     if(isLastAttempt){
-                        anotherEndpoint = route('api.job.fetch.last.attempt', jobId, isLastAttempt);
+                        anotherEndpoint = route('api.job.fetch.last.attempt', this.getJob.jobId, isLastAttempt);
                     }
                     this.poll(anotherEndpoint, 'get', this.section, false, false); //cief todo: Uncaught (in promise) null
                 } catch (error) {

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

@@ -68,10 +68,10 @@
                                 <i class="fa fa-repeat"></i>
                             </span>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="regenerateInvoice">
-                                <general-confirmation-form-component 
-                                    contentText="Are you sure you want to regenerate this Invoice?" 
-                                    modalType="delete" 
-                                    buttonText="Regenerate" 
+                                <general-confirmation-form-component
+                                    contentText="Are you sure you want to regenerate this Invoice?"
+                                    modalType="delete"
+                                    buttonText="Regenerate"
                                     class="text-center"
                                     :apiRoute="route('api.transaction.invoice.regenerate', item.id)"
                                     apiMethod="post"
@@ -93,6 +93,16 @@
                     </div>
                 </div>
             </div>
+            <div class="row" v-if="$store.getters.isAdmin">
+                <div class="col padding-20">
+                    <div class="row">
+                        <div class="col">
+                            <p class="no-margin fs-10 all-caps">Packinglist Reference</p>
+                            <div>{{ item.packing_list_reference }}</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="![5, 6].includes(item.status)">
                 <div class="col-12 col-md-7 padding-20">
                     <div class="row bg-master-lightest h-100">
@@ -179,7 +189,7 @@
                                             <div class="font-heading fs-12">MYR {{(Math.round((item.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.outstanding - item.floating > 0.009">
+                                    <div class="row m-t-20" v-if="item.outstanding - item.floating > 0.009 && !paymentPending">
                                         <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">
@@ -238,6 +248,17 @@
             latestComment() {
                 let questions = this.item.remarks;
                 return questions.slice().reverse()[0];
+            },
+            paymentPending(){
+                if (Array.isArray(this.item.transactions)) {
+                    for (let i = 0; i < this.item.transactions.length; i++) {
+                        const status = this.item.transactions[i].status;
+                        if (status === 1) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
             }
         },
         created(){

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

@@ -157,6 +157,13 @@
                                     </div>
                                 </a>
                             </div>
+                            <div class="row no-margin" v-if="item.payment_method === 4 && item.payment_reference">
+                                <a :href="route('billplz.bill', item.payment_reference)" target="_blank">
+                                    <div class="icon-thumbnail fs-11 text-white icon-25 bg-primary btn-rounded float-left m-r-5">
+                                        <i class="fa fa-file-image-o fs-10"></i>
+                                    </div>
+                                </a>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -181,9 +188,13 @@
         },
         methods: {
             clickExpand(){
-                if(this.item
-                && ((this.item.payment_method !== 5 && this. item.documents.length)
-                || (this.item.payment_method === 5 && (this.item.status === 2 || this.item.status === 3)))){
+                // if(this.item
+                // && ((this.item.payment_method !== 5 && this. item.documents.length)
+                // || (this.item.payment_method === 5 && (this.item.status === 2 || this.item.status === 3)))){
+                //     this.expandPaymentDetails = !this.expandPaymentDetails;
+                // }
+
+                if(this.item){
                     this.expandPaymentDetails = !this.expandPaymentDetails;
                 }
             },

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/forms/PaymentFormComponent.vue

@@ -157,6 +157,7 @@
                     this.error = response.payload.data.message;
                 }
                 else{
+                    this.closeModal();
                     this.updateList();
                 }
             }

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

@@ -76,9 +76,14 @@
                     files: this.files
                 };
                 this.submit(this.route('api.transaction.payment.verification.create', this.data.id), 'post', this.section, true, true)
-            }
+            },
+            successHandler(response){
+                this.closeModal();
+                this.formHandler();
+                window.location.reload();
+            },
         },
         mixins: [ModalFromHandler]
 
     }
-</script>
+</script>

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

@@ -113,7 +113,7 @@
                     <div class="row tabsContainer tabContent hide" tab-name="pendingPayment" v-if="isActiveTab('pendingPayment') || showTabContent('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, check_for_storage_invoice: 1}" section="pendingPaymentSection" invoice_status="Pending Payment" :with_export="true"></admin-payments-billing-with-search-component>
+                            <admin-payments-billing-with-search-component :options="{has_invoice_status_in: [2], packing_list_limit_one_by_type_ordered_by_invoice_date: true, per_page: 5, check_for_storage_invoice: 1}" 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')">

resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue

@@ -0,0 +1,119 @@
+<template>
+    <div class="w-100">
+        <validation-wrapper-component
+            selectable
+            :validator="$v.parameters.id"
+        >
+            <label>Segment</label>
+            <selectable-component
+                :endpoint="
+                    route('api.segment.list')
+                "
+                :section="section"
+                :value="3"
+                valueColumn="id"
+                :labelColumn="['name']"
+                v-model="parameters.id"
+                @input="onSelect"
+                
+            ></selectable-component>
+        </validation-wrapper-component>
+        <list-component
+            v-if="parameters.id"
+            class="mt-4"
+            :key="parameters.id"
+            :section="`segments_${parameters.id}`"
+            :endpoint="route('api.company.list')"
+            :options="{
+                company_segments_in: [parameters.id],
+                // with_total_payments: true,
+                // recency: '2022-02-15',
+                // frequency: 15,
+                // business_type: 2,
+                // with_bookings: true,
+                // order_by: { column: 'total_payments', DESC: true },
+            }"
+        >
+            <template slot="list" slot-scope="{ data }">
+                <company-component :data="data"></company-component>
+            </template>
+        </list-component>
+        <div v-else>
+            <div
+                class="row align-items-center justify-content-center p-t-50 p-b-50"
+                style=""
+            >
+                <div class="col-10">
+                    <div
+                        class="row align-items-center justify-content-center hint-text"
+                    >
+                        <div class="col-4 hint-text">
+                            <img
+                                src="/images/2829248.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"
+                                    >
+                                        Please Select a Segment
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from "../../../general/mixins/componentHandler";
+export default {
+    props: {
+        section: {
+            type: String,
+            required: true,
+        },
+        type: {
+            type: Number,
+            required: true,
+        },
+        id: {
+            type: Number,
+            default: null,
+        }
+    },
+    data() {
+        return {
+            parameters: {
+                id: null,
+            },
+        };
+    },
+    validations: {
+        parameters: {
+            id: {},
+        },
+    },
+    methods: {
+        onSelect(val) {
+            this.parameters.id = val
+        },
+    },   
+    created(){
+        const id = new URL(location.href).searchParams.get('id')
+        if(id){
+            this.parameters.id = id
+        }
+    },
+    mixins: [componentHandler],
+};
+</script>

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

@@ -34,6 +34,15 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-auto">
+                    <div class="row">
+                        <div class="col">
+                            <a class="btn btn-xs btn-outline-info b-rad-none m-r-5 requestModal" :href="route('segments') + `?id=${item.id}`">
+                                <i class="fa fa-list"></i>
+                            </a>
+                        </div>
+                    </div>
+                </div>
                 <div class="col-auto hide">
                     <div class="row">
                         <div class="col">

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

@@ -0,0 +1,134 @@
+
+const state = {
+    pollingJobResults: []
+};
+
+export default {
+    state,
+    getters: {
+        getJob: (state) => (name) => {
+            return state.pollingJobResults.find(item => item.name === name);;
+        },
+        getJobAttemptCount: (state) => (name) => {
+            let job = state.pollingJobResults.find(item => item.name === name);
+            return job ? job.pollingAttemptsCount : 0;
+        },
+    },
+    mutations: {
+        ADD_POLLING_JOB_RESULT(state, {jobId, name, pollingAttemptsCount, isPolling, isFetchingResult, maxAttempts, pollJobResult, interval}) {
+            let intervalId = setInterval(() => {
+                if (pollJobResult) {
+                    pollJobResult(state);
+                }
+            }, interval);
+            state.pollingJobResults.push({ jobId, name, pollingAttemptsCount, isPolling, isFetchingResult, maxAttempts, intervalId});
+        },
+        UPDATE_POLLING_JOB_RESULT(state, { jobId, pollingAttemptsCount, isPolling, isFetchingResult, isLastAttempt}) {
+            const index = state.pollingJobResults.findIndex(s => s.jobId === jobId);
+            if (index !== -1) {
+              const updatedPollingJobResults = [...state.pollingJobResults];
+              updatedPollingJobResults[index] = { ...updatedPollingJobResults[index],
+                jobId,
+                pollingAttemptsCount: pollingAttemptsCount !== undefined ? pollingAttemptsCount : updatedPollingJobResults[index].pollingAttemptsCount,
+                isPolling: isPolling !== undefined ? isPolling : updatedPollingJobResults[index].isPolling,
+                isFetchingResult: isFetchingResult !== undefined ? isFetchingResult : updatedPollingJobResults[index].isFetchingResult,
+                isLastAttempt: isLastAttempt !== undefined ? isLastAttempt : updatedPollingJobResults[index].isLastAttempt,
+              };
+              state.pollingJobResults = updatedPollingJobResults;
+            }
+        },
+        REMOVE_POLLING_JOB_RESULT_BY_JOBID(state, jobId) {
+            const index = state.pollingJobResults.findIndex(s => s.jobId === jobId);
+            if (index !== -1) {
+              clearInterval(state.pollingJobResults[index].intervalId);
+              state.pollingJobResults.splice(index, 1);
+            }
+        },
+        // REMOVE_POLLING_JOB_RESULT_BY_JOBID_2(state, jobId) {
+        //     const index = state.pollingJobResults.findIndex(s => s.jobId === jobId);
+        //     if (index !== -1) {
+        //       clearInterval(state.pollingJobResults[index].intervalId);
+        //       //state.pollingJobResults.splice(index, 1);
+        //     }
+        // },
+        REMOVE_POLLING_JOB_RESULT_BY_NAME(state, name) {
+            const index = state.pollingJobResults.findIndex(s => s.name === name);
+            if (index !== -1) {
+              clearInterval(state.pollingJobResults[index].intervalId);
+              state.pollingJobResults.splice(index, 1);
+            }
+        },
+    },
+    actions: {
+        submitJobRequest({ dispatch }, { url, name }){
+            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){
+                        let pollingAttemptsCount = 0;
+                        dispatch('startPolling', { jobId, name, pollingAttemptsCount });
+                    }
+                });
+            })
+        },
+
+        stopPollingJobResultByJobId({ commit }, { jobId }){
+            commit('REMOVE_POLLING_JOB_RESULT_BY_JOBID', jobId);
+        },
+
+        stopPollingJobResultByName({ commit }, { name }){
+            commit('REMOVE_POLLING_JOB_RESULT_BY_NAME', name);
+        },
+
+        startPolling({ state, commit, dispatch }, { jobId, name, pollingAttemptsCount, maxAttempts = 8}) {
+            let interval = 10000;
+
+            // console.log(`startPolling jobId: ${jobId}, pollingAttemptsCount: ${pollingAttemptsCount}, name: ${name}`);
+
+            const pollJobResult = (state) => {
+                //console.log(`MONITOR state ${JSON.stringify(state)}`);
+                const index = state.pollingJobResults.findIndex(s => s.jobId === jobId);
+                if (index !== -1) {
+                    pollingAttemptsCount = state.pollingJobResults[index].pollingAttemptsCount;
+                    if (state.pollingJobResults[index].isPolling || state.pollingJobResults[index].isFetchingResult) {
+                        return;
+                    }
+                }
+                else{
+                    return;
+                }
+
+                pollingAttemptsCount++;
+                if(pollingAttemptsCount === 1){
+                    commit("REMOVE_POLLING_JOB_RESULT_BY_JOBID", jobId );
+                    commit("ADD_POLLING_JOB_RESULT", { jobId, name, pollingAttemptsCount, isPolling: false, isFetchingResult: false, maxAttempts, pollJobResult, interval: 5000});
+                }
+
+                if (pollingAttemptsCount > maxAttempts) {
+                    //console.log(`Reached maximum attempts (${maxAttempts}). Polling stopped.`);
+                    commit("REMOVE_POLLING_JOB_RESULT_BY_JOBID", jobId );
+                    return;
+                }
+
+                if(pollingAttemptsCount === maxAttempts){
+                    commit('UPDATE_POLLING_JOB_RESULT', { jobId, pollingAttemptsCount, isPolling: true, isFetchingResult: false, isLastAttempt: true });
+                }
+                else{
+                    commit('UPDATE_POLLING_JOB_RESULT',  { jobId, pollingAttemptsCount, isPolling: true, isFetchingResult: false, isLastAttempt: false});
+                }
+            }
+            commit("ADD_POLLING_JOB_RESULT", { jobId, name, pollingAttemptsCount, isPolling: false, isFetchingResult: false, maxAttempts, pollJobResult, interval});
+
+        },
+
+        updatePollingJobResultByJobId({ commit }, { jobId, isPolling, isFetchingResult }){
+            commit('UPDATE_POLLING_JOB_RESULT', { jobId, isPolling, isFetchingResult });
+        }
+    }
+}

resources/assets/vue/vuex/store.js

@@ -7,6 +7,7 @@ import crudRequest from './modules/crudRequest'
 import crudRequestV2 from './modules/crudRequestV2'
 import authentication from './modules/authentication'
 import loadRequestQueue from './modules/loadRequestQueue'
+import jobPolling from './modules/jobPolling'
 
 Vue.use(Vuex);
 
@@ -18,6 +19,7 @@ export default new Vuex.Store({
         createNotification,
         crudRequest,
         crudRequestV2,
-        authentication
+        authentication,
+        jobPolling
     }
 })

resources/views/layouts/base.blade.php

@@ -4,10 +4,16 @@
     @include('vendor/head')
 </head>
 <body class="horizontal-menu horizontal-app-menu bg-white overflow-hidden">
-<!-- Google Tag Manager (noscript) -->
-<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-T3XCNMB"
-                  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-<!-- End Google Tag Manager (noscript) -->
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-SP04J05142"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-SP04J05142');
+</script>
+<!-- End Google Tag Manager -->
     <div id="app" style="min-height: 100%;">
         @yield('content')
     </div>

resources/views/pages/segments/_tabs.blade.php

@@ -0,0 +1,134 @@
+<div class="row">
+    <div class="col b-r b-white">
+        <div class="row fs-12 text-center">
+            <div class="col p-t-20 p-b-20 bg-master-lighter tabButton @if($active==1) active @endif" tab-name="segment1">
+                <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" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;">
+                            <defs>
+                                <linearGradient x1="66.87575" y1="36.02325" x2="66.87575" y2="164.11756" gradientUnits="userSpaceOnUse" id="color-1_hUqtl21qkZmg_gr1">
+                                    <stop offset="0" stop-color="#009add"></stop>
+                                    <stop offset="1" stop-color="#00baa4"></stop>
+                                </linearGradient>
+                                <linearGradient x1="105.12425" y1="35.4535" x2="105.12425" y2="164.77331" gradientUnits="userSpaceOnUse" id="color-2_hUqtl21qkZmg_gr2">
+                                    <stop offset="0" stop-color="#009add"></stop>
+                                    <stop offset="1" stop-color="#00baa4"></stop>
+                                </linearGradient>
+                                <linearGradient x1="86" y1="130.00781" x2="86" y2="146.81275" gradientUnits="userSpaceOnUse" id="color-3_hUqtl21qkZmg_gr3">
+                                    <stop offset="0" stop-color="#4ec9ff"></stop>
+                                    <stop offset="1" stop-color="#2bffe6"></stop>
+                                </linearGradient>
+                                <linearGradient x1="86" y1="2.6875" x2="86" y2="163.9375" gradientUnits="userSpaceOnUse" id="color-4_hUqtl21qkZmg_gr4">
+                                    <stop offset="0" stop-color="#009add"></stop>
+                                    <stop offset="1" stop-color="#00baa4"></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="M73.43863,107.5c-3.30294,0 -6.03075,2.40531 -6.48763,5.53087h-0.1505c-0.45687,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62544,0 -6.56287,2.88906 -6.56287,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37812c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.18225 10.59681,-7.08962 10.59681,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56019,-6.45269z" fill="url(#color-1_hUqtl21qkZmg_gr1)"></path>
+                                    <path d="M111.68713,107.5c-3.30294,0 -6.03075,2.40531 -6.48762,5.53087h-0.1505c-0.45419,-3.12556 -3.182,-5.53087 -6.48763,-5.53087c-3.62275,0 -6.56288,2.88906 -6.56288,6.45269c0,7.2885 6.78325,12.19856 10.59681,14.37813c1.55606,0.88956 3.49913,0.88956 5.05519,0c3.81625,-2.17956 10.5995,-7.08694 10.5995,-14.37812c0,-3.56363 -2.93744,-6.45269 -6.56288,-6.45269z" fill="url(#color-2_hUqtl21qkZmg_gr2)"></path>
+                                    <path d="M75.25,134.375c0,5.93669 4.81331,10.75 10.75,10.75c5.93669,0 10.75,-4.81331 10.75,-10.75v-2.6875h-21.5z" fill="url(#color-3_hUqtl21qkZmg_gr3)"></path>
+                                    <path d="M139.75,95.90344v-6.74831c0.02956,-0.15856 0.09406,-0.301 0.09406,-0.46762l-0.00806,-22.12619c0.2795,-14.89412 -7.39331,-27.3695 -10.70431,-32.04038c-5.54431,-7.80719 -11.05906,-11.73631 -13.83525,-12.08569c-1.06156,-0.12362 -2.11775,0.387 -2.65794,1.31688l-1.14487,1.97262c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66012,-2.67406l-11.98625,-20.63194c-0.87613,-1.505 -2.44563,-2.40531 -4.1925,-2.40531c-1.74956,0 -3.31906,0.90031 -4.18981,2.408l-11.94056,20.54863c-0.97019,1.67431 -2.71169,2.67406 -4.65475,2.67406c-1.94306,0 -3.68994,-0.99975 -4.66281,-2.67406l-1.16906,-2.01025c-0.42463,-0.73369 -1.17712,-1.2255 -2.021,-1.31956c-2.64181,-0.3225 -7.47662,3.06375 -11.86531,8.38231c-6.26456,7.60025 -13.01019,20.86575 -13.15262,35.31375l-0.09406,22.66638c0,0 0,0 0,0.00269c0,0.00269 0,0.00538 0,0.00806v7.21594c-6.34519,3.02881 -10.75,9.48687 -10.75,16.97156c0,10.37106 8.44144,18.8125 18.8125,18.8125h0.12362c6.64888,18.77487 24.51,32.25 45.56388,32.25c21.05388,0 38.915,-13.47513 45.56388,-32.25h0.12363c10.37106,0 18.8125,-8.44144 18.8125,-18.8125c0,-7.48469 -4.40481,-13.94275 -10.75,-16.97156zM49.6435,34.11513c2.7735,-3.36475 4.94769,-5.02025 6.24038,-5.80769l0.0215,0.03762c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.88344,0 7.36106,-1.9995 9.30412,-5.35081l11.481,-19.76388l11.52669,19.84719c1.94844,3.34863 5.42875,5.34813 9.3095,5.34813c3.82969,0 7.267,-1.94844 9.22619,-5.21375c1.83019,1.20937 5.01756,3.90763 8.686,9.07031c2.28975,3.23038 9.59975,14.61463 9.69919,27.93119c-8.66719,-18.07881 -27.09538,-30.62406 -48.44756,-30.62406c-21.16406,0 -39.45788,12.32487 -48.21644,30.14838c0.4085,-12.65544 6.321,-24.252 11.85994,-30.97075zM26.875,112.875c0,-6.48763 4.62519,-11.91637 10.75,-13.16606v5.59806c-3.12556,1.10994 -5.375,4.0635 -5.375,7.568c0,3.59856 2.37306,6.60856 5.62763,7.64594c0.19619,1.91887 0.53481,3.79206 0.94869,5.64106c-6.70263,-0.74981 -11.95131,-6.3855 -11.95131,-13.287zM129,115.5625c0,23.70913 -19.29087,43 -43,43c-23.70913,0 -43,-19.29087 -43,-43v-16.125h8.0625c9.34981,0 17.47413,-5.32931 21.5,-13.11231c4.02587,7.783 12.15019,13.11231 21.5,13.11231h34.9375zM94.0625,94.0625c-10.37106,0 -18.8125,-8.44144 -18.8125,-18.8125v-2.6875h-5.375v2.6875c0,10.37106 -8.44144,18.8125 -18.8125,18.8125h-13.4375v-5.36425v-0.01075c0,-26.67344 21.70156,-48.375 48.375,-48.375c26.67344,0 48.375,21.70156 48.375,48.375v5.375zM133.17369,126.162c0.41387,-1.84631 0.75519,-3.7195 0.94869,-5.64106c3.25456,-1.03737 5.62762,-4.04738 5.62762,-7.64594c0,-3.5045 -2.24944,-6.45806 -5.375,-7.568v-5.59806c6.12481,1.24969 10.75,6.67575 10.75,13.16606c0,6.9015 -5.24869,12.53719 -11.95131,13.287z" fill="url(#color-4_hUqtl21qkZmg_gr4)"></path>
+                                </g>
+                            </g>
+                        </svg>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col">
+                        <div class="fs-12 m-t-5 all-caps">{{ __('Standard') }}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col b-r b-white">
+        <div class="row fs-12 text-center">
+            <div class="col p-t-20 p-b-20 bg-master-lighter tabButton @if($active==2) active @endif" tab-name="segment2">
+                <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" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;">
+                            <defs>
+                                <linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1">
+                                    <stop offset="0" stop-color="#4ec9ff"></stop>
+                                    <stop offset="1" stop-color="#2bffe6"></stop>
+                                </linearGradient>
+                                <linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2">
+                                    <stop offset="0" stop-color="#4ec9ff"></stop>
+                                    <stop offset="1" stop-color="#2bffe6"></stop>
+                                </linearGradient>
+                                <linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3">
+                                    <stop offset="0" stop-color="#4ec9ff"></stop>
+                                    <stop offset="1" stop-color="#2bffe6"></stop>
+                                </linearGradient>
+                                <linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4">
+                                    <stop offset="0" stop-color="#009add"></stop>
+                                    <stop offset="1" stop-color="#00baa4"></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>
+                                    <circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle>
+                                    <circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle>
+                                    <rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect>
+                                    <path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path>
+                                </g>
+                            </g>
+                        </svg>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col">
+                        <div class="fs-12 m-t-5 all-caps">{{ __('Custom') }}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col b-r b-white">
+        <div class="row fs-12 text-center">
+            <div class="col p-t-20 p-b-20 bg-master-lighter tabButton @if($active==3) active @endif" tab-name="segment3">
+                <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" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;">
+                            <defs>
+                                <linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1">
+                                    <stop offset="0" stop-color="#4ec9ff"></stop>
+                                    <stop offset="1" stop-color="#2bffe6"></stop>
+                                </linearGradient>
+                                <linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2">
+                                    <stop offset="0" stop-color="#4ec9ff"></stop>
+                                    <stop offset="1" stop-color="#2bffe6"></stop>
+                                </linearGradient>
+                                <linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3">
+                                    <stop offset="0" stop-color="#4ec9ff"></stop>
+                                    <stop offset="1" stop-color="#2bffe6"></stop>
+                                </linearGradient>
+                                <linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4">
+                                    <stop offset="0" stop-color="#009add"></stop>
+                                    <stop offset="1" stop-color="#00baa4"></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>
+                                    <circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle>
+                                    <circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle>
+                                    <rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect>
+                                    <path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path>
+                                </g>
+                            </g>
+                        </svg>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col">
+                        <div class="fs-12 m-t-5 all-caps">{{ __('Label') }}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/pages/segments/index.blade.php

@@ -0,0 +1,12 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+<div class="tabsContainer p-3 p-b-0 p-md-0">
+    <div class="row" v-if="$store.getters.isAdmin">
+        <div class="col bg-white padding-25">
+            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="segment1">
+                <segment-company-component section="customSegmentSection" />
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/vendor/head.blade.php

@@ -1,11 +1,3 @@
-<!-- Google Tag Manager -->
-<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','GTM-T3XCNMB');</script>
-<!-- End Google Tag Manager -->
-
 <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
 <meta charset="utf-8"/>
 <title>@yield('title', 'IZYIM Shipping')</title>

routes/web.php

@@ -1311,3 +1311,7 @@ Route::get('/show-all-extra-payments', function () {
     }
     echo '</table>';
 });
+
+Route::get('/segments', function (Request $request) {
+    return view('pages.segments.index');
+})->name('segments');