From 4b9d5922b1717b65f8aa388d33dba5c8bc65c70c Mon Sep 17 00:00:00 2001 From: d9it Date: Tue, 12 Mar 2024 17:28:46 +0530 Subject: [PATCH] Fix types of services and other routes issue --- .../frontEnd/ExploreController.php | 7 +++-- .../frontEnd/ServiceController.php | 6 ++-- app/Providers/ComposerServiceProvider.php | 1 - app/Services/TaxonomyService.php | 2 +- resources/views/layouts/sidebar.blade.php | 11 -------- routes/web.php | 28 ++++++++----------- 6 files changed, 21 insertions(+), 34 deletions(-) diff --git a/app/Http/Controllers/frontEnd/ExploreController.php b/app/Http/Controllers/frontEnd/ExploreController.php index f425f863..cf06b3c3 100644 --- a/app/Http/Controllers/frontEnd/ExploreController.php +++ b/app/Http/Controllers/frontEnd/ExploreController.php @@ -376,7 +376,7 @@ public function filter(Request $request) // $response = $geocoder->getCoordinatesForAddress($chip_address); // $lat = $response['lat']; // $lng = $response['lng']; - if(isset($lat) && isset($lng)){ + if (isset($lat) && isset($lng)) { $avarageLatitude = $lat; $avarageLongitude = $lng; @@ -974,8 +974,9 @@ public function filter(Request $request) array_push($taxonomy_tree, $taxonomy_data); } } else { - $serviceCategoryId = TaxonomyType::orderBy('order')->where('type', 'internal')->where('name', 'Service Category')->first(); - $parent_taxonomies = Taxonomy::whereNull('taxonomy_parent_name')->where('taxonomy', $serviceCategoryId ? $serviceCategoryId->taxonomy_type_recordid : ''); + // $serviceCategoryId = TaxonomyType::orderBy('order')->where('type', 'internal')->where('name', 'Service Category')->first(); + // $parent_taxonomies = Taxonomy::whereNull('taxonomy_parent_name')->where('taxonomy', $serviceCategoryId ? $serviceCategoryId->taxonomy_type_recordid : ''); + $parent_taxonomies = Taxonomy::whereNull('taxonomy_parent_name'); $taxonomy_recordids = Taxonomy::getTaxonomyRecordids(); if (count($taxonomy_recordids) > 0) { $parent_taxonomies->whereIn('taxonomy_recordid', $taxonomy_recordids); diff --git a/app/Http/Controllers/frontEnd/ServiceController.php b/app/Http/Controllers/frontEnd/ServiceController.php index 28c2ba08..be91709a 100644 --- a/app/Http/Controllers/frontEnd/ServiceController.php +++ b/app/Http/Controllers/frontEnd/ServiceController.php @@ -332,14 +332,16 @@ public function index() array_push($taxonomy_tree, $taxonomy_data); } } else { - $serviceCategoryId = TaxonomyType::orderBy('order')->where('type', 'internal')->where('name', 'Service Category')->first(); - $parent_taxonomies = Taxonomy::whereNull('taxonomy_parent_name')->where('taxonomy', $serviceCategoryId ? $serviceCategoryId->taxonomy_type_recordid : ''); + $serviceCategoryId = TaxonomyType::orderBy('order')->first(); + $parent_taxonomies = Taxonomy::whereNull('taxonomy_parent_name'); $taxonomy_recordids = Taxonomy::getTaxonomyRecordids(); if (count($taxonomy_recordids) > 0) { $parent_taxonomies->whereIn('taxonomy_recordid', $taxonomy_recordids); } + $taxonomy_tree['parent_taxonomies'] = $parent_taxonomies->get(); } + $organizationStatus = OrganizationStatus::orderBy('order')->pluck('status', 'id'); return view('frontEnd.services.services', compact('services', 'locations', 'map', 'parent_taxonomy', 'child_taxonomy', 'checked_organizations', 'checked_insurances', 'checked_ages', 'checked_languages', 'checked_settings', 'checked_culturals', 'checked_transportations', 'checked_hours', 'meta_status', 'grandparent_taxonomies', 'sort_by_distance_clickable', 'service_taxonomy_info_list', 'service_taxonomy_badge_color_list', 'organization_tagsArray', 'layout', 'service_tagsArray', 'sdoh_codes_category_Array', 'sdoh_codes_Array', 'organizationStatus'))->with('taxonomy_tree', $taxonomy_tree); } diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 20ff017e..6c2d54c9 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -140,7 +140,6 @@ public function boot() $organization_tagsArray = OrganizationTag::get(); $organization_tagsArray = json_encode($organization_tagsArray); - // $parent_taxonomies = Taxonomy::whereNull('taxonomy_parent_name')->whereNotNull('taxonomy_services')->get(); $layout = Layout::first(); $view->with(compact('layout', 'taxonomy_tree', 'organization_tagsArray')); }); diff --git a/app/Services/TaxonomyService.php b/app/Services/TaxonomyService.php index b1ced25f..13258405 100644 --- a/app/Services/TaxonomyService.php +++ b/app/Services/TaxonomyService.php @@ -60,7 +60,7 @@ public function import_airtable_v3(string $access_token, string $base_url) foreach ($parent_names as $key => $parent_name) { $parent_name_ids[] = $strtointclass->string_to_int($parent_name); } - $taxonomy->taxonomy_parent_name = implode(',', $parent_name_ids); + $taxonomy->taxonomy_parent_name = count($parent_name_ids) > 0 ? implode(',', $parent_name_ids) : null; // $taxonomy->taxonomy_vocabulary = isset($record['fields']['vocabulary']) ? $record['fields']['vocabulary'] : null; // $taxonomyName = isset($record['fields']['taxonomy']) ? $record['fields']['taxonomy'] : '[]'; diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index 2bb41df4..ba83d8f8 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -113,17 +113,6 @@ {{--