diff --git a/app/Classes/General/Helper.php b/app/Classes/General/Helper.php index 2474624e..267ee401 100644 --- a/app/Classes/General/Helper.php +++ b/app/Classes/General/Helper.php @@ -30,7 +30,7 @@ class Helper * @return array */ static function debugLoggerForPerfexCRM($log){ - if($log){ + if($log && isset($log['message'])){ $message = $log['message']; $substring = 'No data were found'; if (isset($message)) { diff --git a/app/Classes/Jobs/UpdatePerfexCRMInvoice.php b/app/Classes/Jobs/UpdatePerfexCRMInvoice.php index 0d7b093e..8c047eb5 100644 --- a/app/Classes/Jobs/UpdatePerfexCRMInvoice.php +++ b/app/Classes/Jobs/UpdatePerfexCRMInvoice.php @@ -65,7 +65,8 @@ class UpdatePerfexCRMInvoice implements ShouldQueue $invoiceId = $result->payload['id']; } else { // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed')); - Helper::debugLoggerForPerfexCRM('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'); + $log['message'] = 'UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'; + Helper::debugLoggerForPerfexCRM($log); } } else{ 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]); diff --git a/app/Http/Controllers/Imports/ImportHoneyTrapController.php b/app/Http/Controllers/Imports/ImportHoneyTrapController.php index 81ef237b..f19cbcd4 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) { @@ -111,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' } } diff --git a/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue b/resources/assets/vue/components/segments/elements/SegmentCompanyComponent.vue index 864c5887..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, - recency: '2022-02-15', - frequency: 15, - business_type: 2, - with_bookings: true, - order_by: { column: 'total_payments', DESC: true }, + // with_total_payments: true, + // recency: '2022-02-15', + // frequency: 15, + // business_type: 2, + // with_bookings: true, + // order_by: { column: 'total_payments', DESC: true }, }" >