From 3ea234c6356d77a92cf7c20ba9f2afb12fd57795 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 17 Jun 2021 00:08:14 +0800 Subject: [PATCH] display announcement on customers dashboard --- .../General/Eloquent/Filters/HasSegments.php | 3 +- .../forms/ViewAnnouncementFormComponent.vue | 52 +- .../customerDashboardSectionComponent.vue | 982 +++++++++--------- .../general/elements/ListComponent.vue | 6 +- resources/views/pages/settings.blade.php | 9 +- 5 files changed, 538 insertions(+), 514 deletions(-) diff --git a/app/Classes/General/Eloquent/Filters/HasSegments.php b/app/Classes/General/Eloquent/Filters/HasSegments.php index 26d94dd8..4d100f4c 100644 --- a/app/Classes/General/Eloquent/Filters/HasSegments.php +++ b/app/Classes/General/Eloquent/Filters/HasSegments.php @@ -2,6 +2,7 @@ namespace App\Classes\General\Eloquent\Filters; +use App\Models\Company; use Illuminate\Database\Eloquent\Builder; class HasSegments implements Filter @@ -15,7 +16,7 @@ class HasSegments implements Filter public static function apply(Builder $builder, $value) { return $builder->whereHas('segments', function ($q) use ($value) { - $q->whereIn('id', $value); + $q->whereIn('id', Auth()->user()->company()->first()->segments()->pluck('segment_id')); }); } } diff --git a/resources/assets/vue/components/announcements/forms/ViewAnnouncementFormComponent.vue b/resources/assets/vue/components/announcements/forms/ViewAnnouncementFormComponent.vue index 6308af30..ee70f8ad 100644 --- a/resources/assets/vue/components/announcements/forms/ViewAnnouncementFormComponent.vue +++ b/resources/assets/vue/components/announcements/forms/ViewAnnouncementFormComponent.vue @@ -1,29 +1,43 @@ diff --git a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue index df33cc3a..6334bb29 100644 --- a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue @@ -1,517 +1,529 @@ \ No newline at end of file +@endsection \ No newline at end of file