From abd7a2f072fc395439cd5a646abb170114249c06 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 16 Aug 2023 00:57:23 +0800 Subject: [PATCH] update upload-honey-trap --- .../Imports/ImportHoneyTrapController.php | 14 +++++++++++--- .../elements/UploadHoneyTrapCsvComponent.vue | 16 +++++++++++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Imports/ImportHoneyTrapController.php b/app/Http/Controllers/Imports/ImportHoneyTrapController.php index f19cbcd4..8f016ed4 100644 --- a/app/Http/Controllers/Imports/ImportHoneyTrapController.php +++ b/app/Http/Controllers/Imports/ImportHoneyTrapController.php @@ -34,12 +34,20 @@ class ImportHoneyTrapController $excelRows = $excelRows->toArray(); $returnArray = []; - $segment_name = 'honey trap campaign'; - $segment = Segment::where('name', $segment_name)->first(); + // $segment_name = 'honey trap campaign'; + // $segment = Segment::where('name', $segment_name)->first(); + $input_segment_id = $request->input('segment_id'); + if (!$input_segment_id) { + $row['status'] = 'Failed'; + $row['message'] = 'segment_id cannot be empty'; + $returnArray[] = $row; + return response()->json($returnArray); + } + $segment = Segment::where('id', $input_segment_id)->first(); if (!$segment) { $row['status'] = 'Failed'; - $row['message'] = '"' . $segment_name . '"' . ' not found'; + $row['message'] = 'Segment not found'; $returnArray[] = $row; return response()->json($returnArray); } diff --git a/resources/assets/vue/components/companies/elements/UploadHoneyTrapCsvComponent.vue b/resources/assets/vue/components/companies/elements/UploadHoneyTrapCsvComponent.vue index 6b3a6569..ff270669 100644 --- a/resources/assets/vue/components/companies/elements/UploadHoneyTrapCsvComponent.vue +++ b/resources/assets/vue/components/companies/elements/UploadHoneyTrapCsvComponent.vue @@ -12,6 +12,14 @@ +
+
+ + + + +
+
@@ -59,12 +67,17 @@ return { files: [], parameters: {}, + segment_id: null, + options: null, returnData: null } }, validations: { files: { required + }, + segment_id: { + required } }, computed: { @@ -75,7 +88,8 @@ methods: { submitForm(){ this.parameters = { - files: this.files + files: this.files, + segment_id: this.segment_id, }; this.submit(this.route('api.honey_trap.upload'), 'post', this.section, true, false); },