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 @@ +where('reference', 'LIKE', '%'.$value.'%'); + } + +} \ No newline at end of file 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); 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 @@ + + + \ 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 @@
- - - +