initial commit for ToolsRequiredComponent and its options

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -13,7 +13,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
 
 class FetchOrdersFromYDPortalJob implements ShouldQueue
 {
@@ -30,17 +29,12 @@ class FetchOrdersFromYDPortalJob implements ShouldQueue
      */
     public function handle()
     {
-        Log::info('FetchOrdersFromYDPortalJob starts');
-        Log::info('FetchPackingListsFromYdPortalProcessor starts');
         (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute();
-        Log::info('FetchContainersFromYdPortalProcessor starts');
         (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
-        Log::info('FetchContainersUpdatesFromYdPortalProcessor starts');
         (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
-        Log::info('FetchDeliveryUpdatesFromYdPortalProcessor starts');
         (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
-        Log::info('FetchOrdersFromYDPortalJob ends');
-        //        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+
+//        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
     }
 
 }

app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php

@@ -36,8 +36,6 @@ use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 
 class CreateCustomerLogic extends AbstractControllerLogic
 {
@@ -169,18 +167,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
             CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
         }
 
-        if(!app()->environment(['production'])){
-            // call wac webhook
-            $url = 'https://wacontact.readyspace.com/rest/trigger/9fe03daf-2ace-4095-b064-601ef6d9bfe7';
-            $payload = [
-                'name'     => $request->input('name'),
-                'email'    => $request->input('email'),
-                'phone'    => $request->input('phone'),
-            ];
-            $response = Http::post($url, $payload);
-            Log::channel('wac_webhook')->info(json_encode($response));
-        }
-
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));

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

@@ -15,7 +15,6 @@ use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
 use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RemarkTypes;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use ErrorException;
@@ -101,16 +100,6 @@ class CreateAddressLogic extends AbstractControllerLogic
             $this->createRemarkProcessor->execute($address, $remarkObject);
         }
 
-        $addressExtraFields = [
-            'property_type'         => $request->input('property_type'),
-            'tools_required_unload' => $request->input('tools_required_unload'),
-            'pickup_time_from'      => $request->input('pickup_time_from'),
-            'pickup_time_to'        => $request->input('pickup_time_to'),
-        ];
-
-        $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
-        $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
-
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -15,12 +15,10 @@ use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 use App\Classes\ValueObjects\Constants\AddressType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\RemarkTypes;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Carbon\Carbon;
 
 class UpdateAddressLogic extends AbstractControllerLogic
 {
@@ -104,25 +102,6 @@ class UpdateAddressLogic extends AbstractControllerLogic
             $this->createRemarkProcessor->execute($address, $remarkObject);
         }
 
-        if ($request->input('pickup_time_to') <= $request->input('pickup_time_from')) {
-            $pickupTimeFrom = Carbon::parse($request->input('pickup_time_from'));
-            $request->merge([
-                'pickup_time_to' => $pickupTimeFrom->addHour()->format('H:i') // Format to hh:mm
-            ]);
-        }
-
-        $addressExtraFields = [
-            'property_type'                  => $request->input('property_type'),
-            'additional_request'             => $request->input('additional_request'),
-            'receive_goods_working_hours'    => $request->input('receive_goods_working_hours'),
-            'receive_goods_after_hours'      => $request->input('receive_goods_after_hours'),
-            'receive_goods_on_saturday'      => $request->input('receive_goods_on_saturday'),
-        ];
-
-        $address->addressExtraFields()->delete();
-        $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
-        $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
-
         return $this->resourceResponse(new AddressResource($address));
 
     }

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

@@ -31,7 +31,6 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
         return [
             'DocNo',
             'DocDate',
-            'PaymentDate',
             'DebtorCode',
             'Ref',
             'ShipInfo',
@@ -60,12 +59,12 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
     {
         $start_date = $this->request->input('startDate', null);
         if ($start_date) {
-            $start_date = Carbon::parse($start_date)->startOfDay();
+            $start_date = Carbon::parse($this->request->input('startDate'))->format('Y-m-d');
         }
 
         $end_date = $this->request->input('endDate', null);
         if ($end_date) {
-            $end_date = Carbon::parse($end_date)->endOfDay();
+            $end_date = Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
         }
 
         $query = Transaction::query();
@@ -78,31 +77,30 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $approvalStatus = ApprovalStatus::APPROVED;
         }
 
-        // Adjusted the query to include both types and status
-        $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])
-            ->where('status', $approvalStatus);
+        // $query->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [$approvalStatus]);
+        $query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->whereIn('status', [$approvalStatus]);
 
-        if ($start_date && $end_date) {
-            $query->whereHas('transactions', function($transaction) use ($start_date, $end_date) {
-                $transaction->where('type', TransactionType::PAYMENT)
-                    ->whereBetween('updated_at', [$start_date, $end_date]);
-            });
-        } elseif ($start_date) {
+        if($start_date && $end_date) {
+            $query->whereBetween('updated_at', [
+                Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
+                Carbon::parse($end_date)->format('Y-m-d 23:59:59')
+            ]);
+        }
+        elseif($start_date && !$end_date) {
             $query->whereHas('transactions', function($transaction) use ($start_date) {
-                $transaction->where('type', TransactionType::PAYMENT)
-                    ->where('updated_at', '>=', $start_date);
+                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($start_date)->format('Y-m-d 0:00:00'));
             });
-        } elseif ($end_date) {
+
+        }
+        elseif(!$start_date && $end_date) {
             $query->whereHas('transactions', function($transaction) use ($end_date) {
-                $transaction->where('type', TransactionType::PAYMENT)
-                    ->where('updated_at', '<=', $end_date);
+                $transaction->where('type', TransactionType::PAYMENT)->where('updated_at', '>=',  Carbon::parse($end_date)->format('Y-m-d 0:00:00'));
             });
         }
 
         return $query;
     }
 
-
     public function map($transaction): array
     {
         $container = $transaction->owner->containers()->first();
@@ -144,7 +142,6 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             $rows[] = [
                 $firstItem ? '<<New>>' : '',
                 $transaction->created_at->format('m/d/Y H:m'),
-                $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y H:m'),
                 $company->debtor,
                 $order->reference,
                 $order->reference,
@@ -169,7 +166,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
 
         return [
             '<<New>>',
-            $transaction->transactions()->where('type', TransactionType::PAYMENT)->first()->updated_at->format('m/d/Y H:m'),
+            $transaction->created_at->format('m/d/Y H:m'),
             $company->debtor,
             $order->reference,
             $order->reference,

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

@@ -76,7 +76,6 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
                 try {
                     $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
 
-                    Log::info('Delivery tracking sTrackingNo: '. $packingList->reference);
                     $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$packingList->reference.'&sOrgId=sti', ['timeout' => 3]);
                     $deliveryTracking = json_decode($request->getBody()->getContents());
                     foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
@@ -120,7 +119,7 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
             }
 
         }
-        Log::info('FetchDeliveryUpdatesFromYdPortalProcessor ends');
+
     }
 }
 

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

@@ -138,13 +138,7 @@ class FetchPackingListsFromYdPortalProcessor
 
                     $receiveDate = Carbon::parse(substr(preg_replace("/[^0-9]/", "", $row->expressno), 0, 8));
 
-                    $customerno = $row->customerno;
-                    // Check if $customerno contains '正确唛头YD' and extract the part after it
-                    if (strpos($customerno, '正确唛头YD') !== false) {
-                        $customerno = explode('正确唛头YD', $customerno)[1];
-                    }
-                    
-                    $customerno = preg_split('/[-()\/]/', $customerno);
+                    $customerno = preg_split('(-|\(|\)|\/)', $row->customerno);
 
                     $orderNumber = $customerno[array_key_last($customerno)];
                     $allow_contract = true;

app/Classes/Modules/Remarks/DataTransferObjects/RemarkObject.php

@@ -13,14 +13,10 @@ class RemarkObject implements DataTransferObject
     /** @var string*/
     private $content;
 
-    /** @var int|null */
-    private $type;
-
-    public function __construct(string $content, int $commenterID, int $type = null)
+    public function __construct(string $content, int $commenterID)
     {
         $this->commenterID = $commenterID;
         $this->content = $content;
-        $this->type = $type;
     }
 
     /**
@@ -39,12 +35,4 @@ class RemarkObject implements DataTransferObject
         return $this->content;
     }
 
-    /**
-     * @return int|null
-     */
-    public function getType(): ?int
-    {
-        return $this->type;
-    }
-
 }

app/Classes/Modules/Remarks/Services/CreatesRemark.php

@@ -24,7 +24,6 @@ class CreatesRemark extends AbstractUpdateRelationshipRecord
 
         $model->commenter_id = $object->getCommenterId();
         $model->content = $object->getContent();
-        $model->type = $object->getType();
 
         return $this->handler($remarkable->remarks(), $model);
 

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

@@ -114,7 +114,7 @@ class CreatePaymentTransactionProcessor
             /** @var Wallet $wallet */
             $wallet = $company_module->wallets()->first();
 
-            if((float) number_format(($wallet->amount - $amount),2) < -0.01){
+            if((float) number_format(($wallet->amount - $amount),2) < 0){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 

app/Classes/ValueObjects/Constants/RemarkTypes.php

@@ -10,6 +10,4 @@ final class RemarkTypes
 
     public const EXTERNAL = 1;
 
-    public const ADDRESS_EXTRA_COLUMNS = 2;
-    
-}
+}

app/Console/Commands/FixApprovedPaymentFailedGroup.php

@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Group;
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Http;
-
-class FixApprovedPaymentFailedGroup extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'fix-approved-payment-failed-group';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Fix all payment is approved or completed but group failed to be updated';
-
-    protected $output = null;
-
-    protected $outputArray = [];
-
-    /** @var CallbackBillplzProcessor */
-    private $callbackBillplzProcessor;
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct(CallbackBillplzProcessor $callbackBillplzProcessor)
-    {
-        parent::__construct();
-        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        ini_set('memory_limit', '-1');
-
-        $this->outputArray = [];
-        $start   = new Carbon();
-
-        $groups = Group::whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
-            ->whereHas('payment', function ($query) {
-                $query->whereIn('status', [2, 3]);
-            })->get();
-
-        foreach ($groups as $group) {
-            $transaction = $group->payment;
-
-            $response = Http::withBasicAuth(config('billplz.api_key') . ':', '')->get(config('billplz.base_url') . '/api/v3/bills/' . $transaction->payment_reference);
-
-            dump($transaction->payment_reference);
-
-            if ($response->successful()) {
-                $data = $response->json();
-                if ($data['paid']) {
-                    $status = ApprovalStatus::PENDING_VERIFICATION;
-
-                    if ($data['state'] === 'paid') {
-                        $status = ApprovalStatus::APPROVED;
-                    }
-
-                    $this->info(Carbon::now() . ' : Fixing ' . $transaction->payment_reference);
-                    $this->callbackBillplzProcessor->execute($transaction, $status);
-                }
-            } else {
-                $this->info("billplz error</br>");
-            }
-        }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-
-        if ($groups) {
-            $this->info(Carbon::now() . ' : Done . ElapsedTime: ' . $elapsedTime);
-        }
-    }
-}

app/Console/Commands/FixMissingPackingList.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
-use Carbon\Carbon;
-use Illuminate\Console\Command;
-
-class FixMissingPackingList extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'fix-missing-packinglist';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Fix Missing Packinglist';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $start_date = '2024-05-05';
-        $end_date = '2024-05-05';
-
-        $start = $start_date ? Carbon::parse($start_date) : null;
-        $end = $end_date ? Carbon::parse($end_date) : null;
-
-        if (!$start || !$end) {
-            return;
-        }
-
-        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute($start, $end);
-    }
-}

app/Console/Commands/SendPermitsReminderEmails.php

@@ -76,7 +76,7 @@ class SendPermitsReminderEmails extends Command
     protected function getEmailList(): array
     {
         return [
-            // 'edmond.wuiming2021@gmail.com',
+            'edmond.wuiming2021@gmail.com',
             'anithagurl96@gmail.com'
         ];
     }

app/Http/Controllers/Imports/ImportPermitsReminderController.php

@@ -40,41 +40,25 @@ class ImportPermitsReminderController
             $row['reminder_date'] = $this->changeExcelDate($row['reminder_date']);
 
             $validator = Validator::make($row, [
-                'model' => 'required',
-                // 'expiry_date' => 'required|date|after_or_equal:today',
-                'expiry_date' => 'required|date',
-                // 'reminder_date' => 'required|date|after_or_equal:today',
-                'reminder_date' => 'required|date',
+                'model' => 'required|unique:permits_reminders,model',
+                'expiry_date' => 'required|date|after_or_equal:today',
+                'reminder_date' => 'required|date|after_or_equal:today',
             ]);
 
             if ($validator->fails()) {
                 $row['status'] = 'failed';
                 $row['message'] = $validator->errors()->all();
+
                 $returnArray[] = $row;
             } else {
-                $existingRecord = PermitsReminder::where('model', $row['model'])->first();
-
-                if ($existingRecord) {
-                    $existingRecord->update([
-                        'expiry_date' => $row['expiry_date'],
-                        'reminder_date' => $row['reminder_date'],
-                    ]);
-
-                    $row['status'] = 'Updated';
-                    $row['message'] = 'Record has been updated';
-                    $returnArray[] = $row;
-                } else {
-                    // Add to successful rows for batch insertion
-                    $row['created_at'] = Carbon::now();
-                    $row['updated_at'] = Carbon::now();
-                    $successRows[] = $row;
-                }
+                $row['created_at'] = Carbon::now();
+                $row['updated_at'] = Carbon::now();
+                $successRows[] = $row;
             }
         }
 
-        // Insert only if there are new successful rows
         if (!empty($successRows)) {
-            PermitsReminder::insert($successRows);
+            PermitsReminder::insert($successRows); // Insert only if there are successful rows
         }
 
         $successCount = count($successRows);

app/Http/Resources/AddressResource.php

@@ -27,11 +27,7 @@ class AddressResource extends JsonResource
         $outstationPostcodeConstant = $outstationPostcodeConstantObject->isEmpty() ? [] : (array)$outstationPostcodeConstantObject->first()->value;
         in_array((String)$this->postcode, $outstationPostcodeConstant) ? $postcodeArea = 'OUTSTATION_POSTCODE' : null;
 
-        // Handle extra fields
-        $extrafields = $this->addressExtraFields->first();
-        $extrafields = $extrafields ? json_decode($extrafields->content, true) : [];
-
-        $returnArray = [
+        return [
             'id' => $this->id,
             'reference' => $this->reference,
             'street_one' => $this->street_one,
@@ -56,12 +52,5 @@ class AddressResource extends JsonResource
             ])
 
         ];
-
-        // Merge extra fields into the return array
-        if ($extrafields) {
-            $returnArray = array_merge($returnArray, $extrafields);
-        }
-
-        return $returnArray;
     }
 }

app/Http/Resources/OrderResource.php

@@ -5,7 +5,6 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\RemarkTypes;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use App\Models\Transaction;
@@ -54,7 +53,7 @@ class OrderResource extends JsonResource
             'invoices' => $this->whenLoaded('packingLists', function() use ($orderId) {
                 return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get());
             }),
-            'remark' => new RemarkResource($this->remarks->first()),
+            'remarks' => RemarkResource::collection($this->remarks),
             'created_at' => $this->created_at->format('d-m-Y')
         ];
 

app/Http/Resources/TransactionWithStorageResource.php

@@ -147,7 +147,7 @@ class TransactionWithStorageResource extends JsonResource
     }
 
     private function getReferenceForGroupPayment($groups){
-        if (is_array($groups) && count($groups) > 0) {
+        if(count($groups)){
             $firstGroup = $groups[0];
             return $firstGroup['reference'];
         }

app/Models/Address.php

@@ -4,7 +4,6 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Contactable;
 use App\Classes\General\Interfaces\Remarkable;
-use App\Classes\ValueObjects\Constants\RemarkTypes;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
@@ -88,14 +87,6 @@ class Address extends AbstractModel implements Contactable, Remarkable
      */
     public function remarks(): morphMany
     {
-        return $this->morphMany(Remark::class, 'owner')->whereNull('type');
-    }
-
-    /**
-     * @return MorphMany
-     */
-    public function addressExtraFields(): MorphMany
-    {
-        return $this->morphMany(Remark::class, 'owner')->where('type', RemarkTypes::ADDRESS_EXTRA_COLUMNS);
+        return $this->morphMany(Remark::class, 'owner');
     }
 }

app/Models/Group.php

@@ -84,12 +84,4 @@ class Group extends Model implements Documentable, Transactionable
     {
         return $this->BelongsTo(Currency::class, 'original_currency_id', 'id');
     }
-
-    /**
-     * @return hasOne
-     */
-    public function payment()
-    {
-        return $this->hasOne(Transaction::class, 'payment_reference', 'reference');
-    }
 }

config/logging.php

@@ -130,11 +130,6 @@ return [
             'path' => storage_path('logs/laravel_perfex_crm.log'),
             'level' => 'info',
         ],
-        'wac_webhook' => [
-            'driver' => 'single',
-            'path' => storage_path('logs/wac_webhook.log'),
-            'level' => 'info',
-        ],
     ],
 
 ];

database/migrations/2024_06_12_110706_add_type_to_remarks_table.php

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

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

@@ -3,6 +3,14 @@
         <div class="col">
             <div class="row" v-if="![7,8].includes($store.getters.getCompanyModuleType)">
                 <div class="col">
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.reference">
+                                <label>Address Reference/Label</label>
+                                <input class="form-control" name="reference" v-model="parameters.reference">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
                     <div class="row m-b-15">
                         <div class="col">
                             <validation-wrapper-component :validator="$v.parameters.street_one">
@@ -33,14 +41,6 @@
                             </validation-wrapper-component>
                         </div>
                     </div>
-                    <div class="row m-b-15">
-                        <div class="col">
-                            <validation-wrapper-component :validator="$v.parameters.reference">
-                                <label>Address Name / Label</label>
-                                <input class="form-control" name="reference" v-model="parameters.reference" placeholder="E.g. Home Address">
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
                     <div class="row">
                         <div class="col">
                             <div class="row">
@@ -59,6 +59,51 @@
                                             </validation-wrapper-component>
                                         </div>
                                     </div>
+                                    <div class="row m-b-15">
+                                        <div class="col">
+                                            <validation-wrapper-component :validator="$v.parameters.remark">
+                                                <label>Delivery Remark</label>
+                                                <input class="form-control" name="remark" v-model="parameters.remark">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-b-15">
+                                <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                                    <validation-wrapper-component :validator="$v.parameters.pickup_time">
+                                        <label>收货时间 Available Hours</label>
+                                        <input type="time" class="form-control" name="pickup_time" v-model="parameters.pickup_time">
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col-12 col-md pl-md-1">
+                                    <validation-wrapper-component :validator="$v.parameters.latest_pickup_time">
+                                        <label>最晚收货时间 Latest Available Hours</label>
+                                        <input type="time" class="form-control" name="latest_pickup_time" v-model="parameters.latest_pickup_time">
+                                    </validation-wrapper-component> 
+                                </div>
+                            </div>
+                            <div class="row m-b-15">
+                                <div class="col-12 col-md pr-md-1 pb-3 pb-md-0">
+                                    <validation-wrapper-component selectable class="m-b-15" :validator="$v.parameters.property_type">
+                                        <label class="text-primary">房型 Receiver's Property Type</label>
+                                        <select-component :options="propertyOptions" v-model="parameters.property_type"></select-component>
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col-12 col-md pl-md-1 ">
+                                        <tools-required-component></tools-required-component>
+                                </div>
+                            </div>
+                            <div class="col no-padding">
+                                <div class="row">
+                                    <div class="col"></div>
+                                    <div class="col-12 col-sm-7">
+                                        <h6 class="text-right fs-12 text-danger m-b-15 text-right">**kindly reply within 2 hours while warehouse contact to arrange for delivery, otherwise, reschedule of delivery date will apply.</h6>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -117,70 +162,16 @@
                             </validation-wrapper-component>
                         </div>
                     </div>
-                </div>
-            </div>
-            <div class="row m-b-15">
-                <div class="col">
-                    <validation-wrapper-component :validator="$v.parameters.remark">
-                        <label>Delivery Remark</label>
-                        <input class="form-control" name="remark" v-model="parameters.remark">
-                    </validation-wrapper-component>
-                </div>
-            </div>
-            <div class="row m-b-15">
-                <div class="col">
-                    <validation-wrapper-component selectable :validator="$v.parameters.property_type">
-                        <label>房型 Receiver's property type</label>
-                        <select-component :options="['住家Landed house', '公寓Condominium (Drop on lobby only)', '工厂Factory', '店面Shop', '商场Shopping Mall (Drop on loading bay only)', 'Others']" v-model="parameters.property_type"></select-component>
-                    </validation-wrapper-component>
-                </div>
-            </div>
-            <div class="row m-b-15">
-                <div class="col">
-                    <div class="form-group no-margin form-group-default p-b-5">
-                        <label>Available to receive goods on: </label> 
-                        <div class="row">
-                            <div class="col-12 col-md pb-3 pb-md-0">
-                                <div class="row justify-content-center m-t-10 m-b-10" @click="parameters.receive_goods_working_hours = !parameters.receive_goods_working_hours">
-                                    <div class="col pointer d-flex justtify-content-center align-items-center">
-                                        <i class="fa fs-20 fa-fw m-r-5" :class="{'fa-square-o': !parameters.receive_goods_working_hours, 'fa-check-square': parameters.receive_goods_working_hours, 'text-primary':parameters.receive_goods_working_hours}" ></i>
-                                        <p class="m-b-0">Working Hours (9am-6pm)</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-12 col-md pb-3 pb-md-0">
-                                <div class="row justify-content-center m-t-10 m-b-10" @click="parameters.receive_goods_after_hours = !parameters.receive_goods_after_hours">
-                                    <div class="col pointer d-flex justtify-content-center align-items-center">
-                                        <i class="fa fs-20 fa-fw m-r-5" :class="{'fa-square-o': !parameters.receive_goods_after_hours, 'fa-check-square': parameters.receive_goods_after_hours, 'text-primary':parameters.receive_goods_after_hours}" ></i>
-                                        <p class="m-b-0">After Working Hours</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-12 col-md pb-3 pb-md-0">
-                                <div class="row justify-content-center m-t-10 m-b-10" @click="parameters.receive_goods_on_saturday = !parameters.receive_goods_on_saturday">
-                                    <div class="col pointer d-flex justtify-content-center align-items-center">
-                                        <i class="fa fs-20 fa-fw m-r-5" :class="{'fa-square-o': !parameters.receive_goods_on_saturday, 'fa-check-square': parameters.receive_goods_on_saturday, 'text-primary':parameters.receive_goods_on_saturday}" ></i>
-                                        <p class="m-b-0">On Saturday</p>
-                                    </div>
-                                </div>
-                            </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.remark">
+                                <label>Remark</label>
+                                <input class="form-control" name="remark" v-model="parameters.remark">
+                            </validation-wrapper-component>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row m-b-15">
-                <div class="col">
-                    <validation-wrapper-component :validator="$v.parameters.additional_request">
-                        <label>Additional Request</label>
-                        <input class="form-control" name="additional_request" v-model="parameters.additional_request">
-                    </validation-wrapper-component>
-                </div>
-            </div>
-            <div class="row justify-content-center allign-items-center">
-                <div class="col-12 col-sm-7">
-                    <h6 class="text-center fs-12 text-danger">**kindly reply within 2 hours while warehouse contact to arrange for delivery, otherwise, reschedule of delivery date will apply</h6>
-                </div>
-            </div>
             <div class="row">
                 <div class="col">
                     <div class="row">
@@ -200,7 +191,7 @@
         props: {
             id: {
                 type: Number,
-                // required: true
+                required: true
             },
             type: {
                 type: Number,
@@ -220,13 +211,19 @@
                     remark: '',
                     phone: '',
                     person_in_charge: '',
+                    pickup_time: '',
+                    latest_pickup_time: '',
                     property_type: '',
-                    additional_request: '',
-                    receive_goods_working_hours: false,
-                    receive_goods_after_hours: false,
-                    receive_goods_on_saturday: false,
-				}
-
+                    tools_required: '',
+				},
+                propertyOptions: [
+                { id: 1, text: '住家-Landed house' },
+                { id: 2, text: '公寓-Condominium (Drop on lobby only)' },
+                { id: 3, text: '工厂-Factory' },
+                { id: 4, text: '店面-Shop' },
+                { id: 5, text: '商场-Shopping Mall (Drop on loading bay only)' },
+                { id: 6, text: 'Others' },
+                ],
             }            
 		},
         created(){
@@ -240,11 +237,6 @@
                 this.parameters.phone = this.data.contact ? this.data.contact.phone : '';
                 this.parameters.person_in_charge = this.data.contact ? this.data.contact.reference : '';
                 this.parameters.remark = this.data.remark ? this.data.remark.content : '';
-                this.parameters.property_type = this.data.property_type ? this.data.property_type : '';
-                this.parameters.additional_request = this.data.additional_request ? this.data.additional_request : '';
-                this.parameters.receive_goods_working_hours = this.data.receive_goods_working_hours ? this.data.receive_goods_working_hours : false;
-                this.parameters.receive_goods_after_hours = this.data.receive_goods_after_hours ? this.data.receive_goods_after_hours : false;
-                this.parameters.receive_goods_on_saturday = this.data.receive_goods_on_saturday ? this.data.receive_goods_on_saturday : false;
             }
         },
         watch: {

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

@@ -1,67 +0,0 @@
-<template>
-    <div class="w-100 multi-select-container">
-        <vue-multi-select ref="multiSelect" v-model="localValue" search :options="settings" :btnLabel="btnLabel" :selectOptions="options" class="w-100" style="height: 25px;" @close="close">
-            <template v-slot:option="{ option }">
-                <div class="d-flex justify-content-start align-items-center">
-                    <input class="m-l-5 m-r-5" type="checkbox" :checked="option.selected" />
-                    <span>{{ option.name }}</span>
-                </div>
-            </template>
-        </vue-multi-select>
-    </div>
-</template>
-
-<script>
-import vueMultiSelect from 'vue-multi-select';
-import 'vue-multi-select/dist/lib/vue-multi-select.css';
-import PerfectScrollbar from 'perfect-scrollbar';
-
-export default {
-    props: {
-        value: {
-            type: Array,
-            required: false,
-            default: () => []
-        },
-        options: {
-            type: Array,
-            required: true
-        }
-    },
-    data() {
-        return {
-            localValue: this.value,
-            settings: {
-                multi: true,
-                groups: false,
-            },
-        };
-    },
-    methods: {
-        btnLabel(localValue) {
-            if (localValue.length === 0) {
-                return 'Please select';
-            }
-            return localValue.join(', ');
-        },
-        close() {
-            this.$emit('input', this.localValue);
-        }
-    },
-    components: {
-        vueMultiSelect,
-        PerfectScrollbar,
-    },
-};
-</script>
-
-<style>
-.multi-select-container .select>button {
-    width: 100%;
-    min-height: unset;
-}
-
-.multi-select-container .select .selectItem {
-    color: black !important;
-}
-</style>

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

@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <label class="text-primary">卸货工具 Tools required to unload goods</label>
+    <vue-multi-select
+      ref="multiSelect"
+      v-model="values"
+      :options="options"
+      :btnLabel="btnLabel"
+      @open="open"
+      @close="close"
+      :selectOptions="data">
+      <template v-slot:option="{ option }">
+        <input type="checkbox" :checked="option.selected"/>
+        <span>{{ option.name }}</span>
+      </template>
+    </vue-multi-select>
+  </div>
+</template>
+
+<script>
+import vueMultiSelect from 'vue-multi-select';
+import 'vue-multi-select/dist/lib/vue-multi-select.css';
+
+export default {
+  data() {
+    return {
+      values: [],
+      data: [{
+        list: [
+          { name: 'Manpower' },
+          { name: 'Forklift' },
+          { name: 'None of the above' }
+        ],
+      }],
+      options: {
+        multi: true,
+        groups: true,
+      },
+    };
+  },
+  methods: {
+    open() {
+      console.log('open');
+    },
+    close() {
+      console.log('close');
+    },
+    btnLabel(values) {
+      if (values.length === 0) {
+        return 'Select Tools required';
+      }
+      return values.map(v => v.name).join(', ');
+    },
+  },
+  components: {
+    vueMultiSelect,
+  },
+};
+</script>

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

@@ -92,22 +92,6 @@
                     </div>
                 </div>
             </div>
-            <div class="row bg-white padding-5" v-if="$store.getters.isSuperAdmin">
-                <div class="col-auto">
-                    <div class="font-heading fs-8 muted all-caps">Payment Method</div>
-                    <div class="font-heading fs-10">
-                        {{ convertPaymentMethodToText(item.payment_method) }}
-                    </div>
-                </div>
-                <div class="col-auto">
-                    <div class="font-heading fs-8 muted all-caps">Created At</div>
-                    <div class="font-heading fs-10">{{ item.created_at }}</div>
-                </div>
-                <div class="col-auto">
-                    <div class="font-heading fs-8 muted all-caps">Updated At</div>
-                    <div class="font-heading fs-10">{{ item.updated_at }}</div>
-                </div>
-            </div>
             <div class="row b-t b-grey" v-if="expandPaymentDetails">
                 <div class="col bg-white padding-15">
                     <!-- <div class="row align-items-end m-b-10 text-success bold">
@@ -214,17 +198,6 @@
                     this.expandPaymentDetails = !this.expandPaymentDetails;
                 }
             },
-            convertPaymentMethodToText(number) {
-                var paymentMethods = {
-                    1: "CASH",
-                    2: "CHEQUE",
-                    3: "BA",
-                    4: "WALLET",
-                    5: "PAYMENT_GATEWAY"
-                };
-                
-                return paymentMethods[number] || "Unknown Payment Method";
-            },
         },
         mixins: [componentHandler]
     }

resources/assets/vue/general/mixins/addresses/validation/addressFormValidation.js

@@ -10,18 +10,19 @@ export default {
             },
             street_one: { required },
             street_two: {
-                required
-                // required: requiredIf(function(){
-                //     return [7,8].includes(this.$store.getters.getCompanyModuleType);
-                // })
+                required: requiredIf(function(){
+                    return [7,8].includes(this.$store.getters.getCompanyModuleType);
+                })
             },
             district_id: { required },
             post_code: { required },
             remark: {},
             phone: {required, numeric},
             person_in_charge: { required },
-            property_type: { required },
-            additional_request: {  },
+            pickup_time: { required },
+            latest_pickup_time: { required },
+            property_type: {},
+            tools_required: {},
         }
     },
     mixins: [addressFormHandler]

routes/api.php

@@ -34,6 +34,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         Route::post('/import/update-debtor/f614e339d7058904a831aad742e24d55', 'Imports\ImportUpdateDebtorController@import')->name('debtor.import');
 
+        Route::post('/import/upload-permits-reminder', 'Imports\ImportPermitsReminderController@import')->name('permits_reminder.upload');
+
         require __DIR__ . '/company.php';
 
         require __DIR__ . '/document.php';

routes/permits_reminder.php

@@ -9,5 +9,3 @@ Route::group(['prefix' => 'permits-reminder', 'as' => 'permits_reminder.', 'name
     Route::post('/{id}/update', 'UpdatePermitsReminderController@update')->name('update');
 });
 
-Route::post('/import/upload-permits-reminder', 'Imports\ImportPermitsReminderController@import')->name('permits_reminder.upload');
-

routes/web.php

@@ -34,7 +34,6 @@ use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Crypt;
 use App\Models\Container;
-use App\Models\Group;
 use App\Models\Transaction;
 use App\Models\Wallet;
 use Illuminate\Support\Facades\DB;
@@ -1272,8 +1271,6 @@ Route::get('/payment-and-billing-2', function () {
 
 Route::get('/show-all-extra-payments', function () {
     ini_set('memory_limit', '-1');
-    ini_set('max_execution_time', 0);
-    $transactionCounter = 0;
 
     $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)
         ->where('status', ApprovalStatus::COMPLETED)
@@ -1303,7 +1300,6 @@ Route::get('/show-all-extra-payments', function () {
         if (($paidAmount <= $invoice->amount) || ($paidAmount - $invoice->amount < 0.01)) {
             continue;
         }
-        $transactionCounter += 1;
 
         echo '<tr>';
         echo '<td>' . $invoice->type . '</td>';
@@ -1314,35 +1310,8 @@ Route::get('/show-all-extra-payments', function () {
         echo '</tr>';
     }
     echo '</table>';
-
-    echo'<br> Total: ' . $transactionCounter;
 });
 
 Route::get('/segments', function (Request $request) {
     return view('pages.segments.index');
 })->name('segments');
-
-Route::get('/group-transaction-with-completed-payments', function () {
-    $groups = Group::whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
-        ->whereHas('payment', function ($query) {
-            $query->whereIn('status', [2, 3]);
-        })->get();
-
-    foreach ($groups as $group) {
-        $groupPayment = $group->payment;
-        $order = $group->groupTransactions->first()->transaction->owner->owner;
-        $companyModule = $order->companyModule;
-
-        $connection = $companyModule->connections()->first();
-        $companyMarking = $connection ? $connection->invitee_reference : '';
-
-        dump([
-            'reference' => $group->reference, 
-            'groupPayment_id' => $groupPayment->id, 
-            'groupPayment_status' => $groupPayment->status, 
-            'order' => $order->reference, 
-            'companyMarking' => $companyMarking, 
-        ]);
-        echo '<tr><td><a target="_blank" href="' . route('customer.payment-and-billing', $companyMarking) . '">' . $companyMarking . '</a><br></td></tr>';
-    }
-});