From ad776d972e4136c57ae9c1f1f4bed150f5874cc5 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 20 Mar 2023 22:55:58 +0800
Subject: [PATCH 1/2] fix bug - delete seasonalSegment and add date after
 current month

---
 .../Companies/ControllersLogic/AssignCompanyToSegmentLogic.php  | 2 +-
 .../ControllersLogic/RemoveCompanyFromSegmentLogic.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
index 56ccfc00..f814057f 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
@@ -65,7 +65,7 @@ class AssignCompanyToSegmentLogic extends AbstractControllerLogic
 
         if ($request->input('ending_on')) {
 
-            if ($request->input('ending_on') && $request->input('ending_on') <= Carbon::now()) {
+            if ($request->input('ending_on') && Carbon::parse($request->input('ending_on')) <= Carbon::now()) {
                 throw new MalformedRequestException('The Ending Date must be equal to or later than today\'s date.');
             }
 
diff --git a/app/Classes/Modules/Companies/ControllersLogic/RemoveCompanyFromSegmentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/RemoveCompanyFromSegmentLogic.php
index fa08ff55..22c89a45 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/RemoveCompanyFromSegmentLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/RemoveCompanyFromSegmentLogic.php
@@ -57,7 +57,7 @@ class RemoveCompanyFromSegmentLogic extends AbstractControllerLogic
 
         $segment = $this->fetchesSegment->execute(['id' => $request->route('segment_id')]);
 
-        $company->seasonalSegments()->where('id', $request->route('segment_id'))->delete();
+        $company->seasonalSegments()->where('segment_id', $request->route('segment_id'))->delete();
         
         $this->removesCompanyFromSegment->execute($company, $segment);
 

From e29109b834275f0de6c2303f4547ff9fef0ea1df Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 20 Mar 2023 23:14:56 +0800
Subject: [PATCH 2/2] update honey trap with search

---
 .../Eloquent/Filters/ReferenceLike.php        | 20 ++++++
 .../SeasonalSegmentSectionComponent.vue       | 61 +++++++++++++++++++
 resources/views/pages/settings.blade.php      |  6 +-
 3 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/ReferenceLike.php
 create mode 100644 resources/assets/vue/components/companies/sections/SeasonalSegmentSectionComponent.vue

diff --git a/app/Classes/General/Eloquent/Filters/ReferenceLike.php b/app/Classes/General/Eloquent/Filters/ReferenceLike.php
new file mode 100644
index 00000000..25f8373c
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ReferenceLike.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ReferenceLike implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('reference', 'LIKE', '%'.$value.'%');
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/sections/SeasonalSegmentSectionComponent.vue b/resources/assets/vue/components/companies/sections/SeasonalSegmentSectionComponent.vue
new file mode 100644
index 00000000..03ef8bba
--- /dev/null
+++ b/resources/assets/vue/components/companies/sections/SeasonalSegmentSectionComponent.vue
@@ -0,0 +1,61 @@
+<template>
+    <div class="row parentContainer" @keyup.enter="search">
+        <div class="col">
+            <div class="row m-b-15">
+                <div class="col">
+                    <div class="row">
+                        <div class="col p-r-0">
+                            <div class="form-group no-margin form-group-default b-rad-none">
+                                <!-- <label class="text-primary">Marking</label> -->
+                                <label class="font-heading all-caps fs-8 muted">Marking</label>
+                                <input type="text" class="form-control" v-model="marking" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-auto p-l-0 p-r-0">
+                    <div class="btn btn-primary b-rad-none" @click="search">
+                        <i class="fa fa-search lh-40"></i>
+                    </div>
+                </div>
+                <div class="col-auto p-l-0">
+                    <div class="btn btn-secondary b-rad-none" @click="reset">
+                        <i class="fa fa-remove lh-40"></i>
+                    </div>
+                </div>
+            </div>
+            <list-component :key="currentKey" section="seasonalSegment" :endpoint="route('api.company.list')" :options="options">
+                <template slot="list" slot-scope="{data}">
+                    <seasonal-segment-component :data="data"></seasonal-segment-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                marking: '',
+                currentKey: 1,
+                options: {'per_page': 5, 'where_has_seasonal_segment': true},
+            }
+        },
+        methods: {
+            search() {
+                console.log('sd');
+                this.options['reference_like'] = this.marking;
+                console.log(this.options);
+                this.currentKey+=1;
+            },
+            reset() {
+                this.marking = '';
+                delete(this.options['reference_like']);
+                this.currentKey+=1;
+            },
+        },  
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
index 7db89c75..a242eec7 100644
--- a/resources/views/pages/settings.blade.php
+++ b/resources/views/pages/settings.blade.php
@@ -318,11 +318,7 @@
                                         </div>
                                         <div class="row m-b-20">
                                             <div class="col">
-                                                <list-component section="seasonalSegment" :endpoint="route('api.company.list')" :options="{'where_has_seasonal_segment': true}">
-                                                    <template slot="list" slot-scope="{data}">
-                                                        <seasonal-segment-component :data="data"></seasonal-segment-component>
-                                                    </template>
-                                                </list-component>
+                                                <seasonal-segment-section-component></seasonal-segment-section-component>
                                             </div>
                                         </div>
                                     </div>