From 1f105421a121a5406bd1d68b3498d6513751f962 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Tue, 30 May 2023 12:32:29 +0800 Subject: [PATCH 1/7] xpo 04-2023 --- .../Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php index bc837878..617691e8 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php @@ -65,7 +65,7 @@ class AutoPurchaseOrderFillLogic extends AbstractControllerLogic public function logic(Request $request) : JsonResponse { $bookings = Booking::where('service_id', '!=', 4)->where(function($query){ - return $query->whereMonth('created_at', '<', 03)->whereYear('created_at', 2023); + return $query->whereMonth('created_at', '=', 04)->whereYear('created_at', 2023); })->whereDoesntHave('transactions', function($q){ $q->where('type', TransactionType::PURCHASE_ORDER); $q->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]); From 839cce332081e28b741b843fbf72764637ea8480 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 30 May 2023 18:09:20 +0800 Subject: [PATCH 2/7] honey trap changes --- .../Imports/ImportHoneyTrapController.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Imports/ImportHoneyTrapController.php b/app/Http/Controllers/Imports/ImportHoneyTrapController.php index 81ef237b..fda686f4 100644 --- a/app/Http/Controllers/Imports/ImportHoneyTrapController.php +++ b/app/Http/Controllers/Imports/ImportHoneyTrapController.php @@ -33,9 +33,18 @@ class ImportHoneyTrapController $excelRows = $import->rows; $excelRows = $excelRows->toArray(); - $returnArray = []; + $returnArray = []; + $segment_name = 'honey trap campaign'; + $segment = Segment::where('name', $segment_name)->first(); - $segment_id = Segment::where('name', 'honey trap platinum')->first()->id; + if (!$segment) { + $row['status'] = 'Failed'; + $row['message'] = '"' . $segment_name . '"' . ' not found'; + $returnArray[] = $row; + return response()->json($returnArray); + } + + $segment_id = $segment->id; foreach ($excelRows as $row) { From f37d775e97e536ce312d722b7f2cf6e7dc7a4a6d Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 30 May 2023 19:06:28 +0800 Subject: [PATCH 3/7] honey trap changes --- app/Http/Controllers/Imports/ImportHoneyTrapController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Imports/ImportHoneyTrapController.php b/app/Http/Controllers/Imports/ImportHoneyTrapController.php index fda686f4..f19cbcd4 100644 --- a/app/Http/Controllers/Imports/ImportHoneyTrapController.php +++ b/app/Http/Controllers/Imports/ImportHoneyTrapController.php @@ -120,6 +120,6 @@ class ImportHoneyTrapController { $unixTime = (($date - 25569) * 86400); $date = new DateTime("@$unixTime"); - return $date->format('d/m/Y'); + return $date->format('Y-m-d'); // Change the format to 'Y-m-d' } } From 4bd28e3ccad9cb08a385a66d3249a058be9cd803 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 30 May 2023 19:38:45 +0800 Subject: [PATCH 4/7] add company id in support --- resources/views/pages/customer_support.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/pages/customer_support.blade.php b/resources/views/pages/customer_support.blade.php index bebb4a15..dbb0885b 100644 --- a/resources/views/pages/customer_support.blade.php +++ b/resources/views/pages/customer_support.blade.php @@ -36,6 +36,7 @@ @endphp

Customer Account

+

Company Id: {{$company->id}}

Marking: {{$company->reference}}

Account Type: {{$company->type === 1 ? 'Business' : 'Personal'}}

@if($company->type === 1)

Company's Name: {{$company->name}}

@endif From 672bcde0ee11177fc2474f8d917792f92d8884cd Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 31 May 2023 17:54:01 +0800 Subject: [PATCH 5/7] update SegmentCompanyComponent --- .../segments/elements/SegmentCompanyComponent.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue index 864c5887..929b5101 100644 --- a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue +++ b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue @@ -27,10 +27,10 @@ :options="{ segments_in: [parameters.id], with_total_payments: true, - recency: '2022-02-15', - frequency: 15, - business_type: 2, - with_bookings: true, + // recency: '2022-02-15', + // frequency: 15, + // business_type: 2, + // with_bookings: true, order_by: { column: 'total_payments', DESC: true }, }" > From 619ebc726908bac489609c201943c94f6fa6a2f3 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 31 May 2023 17:56:25 +0800 Subject: [PATCH 6/7] update SegmentCompanyComponent --- .../components/segments/elements/SegmentCompanyComponent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue index 929b5101..3c516ac8 100644 --- a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue +++ b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue @@ -26,12 +26,12 @@ :endpoint="route('api.company.list')" :options="{ segments_in: [parameters.id], - with_total_payments: true, + // with_total_payments: true, // recency: '2022-02-15', // frequency: 15, // business_type: 2, // with_bookings: true, - order_by: { column: 'total_payments', DESC: true }, + // order_by: { column: 'total_payments', DESC: true }, }" >