diff --git a/app/Exports/RestaurantExport.php b/app/Exports/RestaurantExport.php index 46c7f92..ed6a936 100644 --- a/app/Exports/RestaurantExport.php +++ b/app/Exports/RestaurantExport.php @@ -15,6 +15,7 @@ class RestaurantExport implements FromCollection, WithHeadings public function collection() { return ManageRestaurant::select( + 'id', 'name', 'description', 'phone_number', @@ -36,6 +37,7 @@ class RestaurantExport implements FromCollection, WithHeadings public function headings(): array { return [ + 'Id', 'Restaurant Name', 'Description', 'Phone Number', diff --git a/app/Exports/RestaurantExportSelected.php b/app/Exports/RestaurantExportSelected.php index 270b86e..bd7a593 100644 --- a/app/Exports/RestaurantExportSelected.php +++ b/app/Exports/RestaurantExportSelected.php @@ -27,6 +27,7 @@ class RestaurantExportSelected implements FromCollection, WithHeadings $selected_restaurant = ManageRestaurant::whereIn('id', $selectedCareIds) ->orderBy('id', 'Desc') ->select( + 'id', 'name', 'description', 'phone_number', @@ -50,6 +51,7 @@ class RestaurantExportSelected implements FromCollection, WithHeadings public function headings(): array { return [ + 'Id', 'Restaurant Name', 'Description', 'Phone Number', diff --git a/app/Exports/customer_export.php b/app/Exports/customer_export.php index 9f48382..9c7a37f 100644 --- a/app/Exports/customer_export.php +++ b/app/Exports/customer_export.php @@ -13,11 +13,12 @@ class customer_export implements FromCollection , WithHeadings /** * @return \Illuminate\Support\Collection */ - + public function collection(){ return IamPrincipal::where('principal_type_xid',3) - ->select('first_name', + ->select('id', + 'first_name', 'last_name', 'email_address', 'date_of_birth', @@ -27,6 +28,7 @@ class customer_export implements FromCollection , WithHeadings ->get() ->map(function ($customer) { return [ + 'id' => $customer->id, 'first_name' => $customer->first_name, 'last_name' => $customer->last_name, 'email_address' => $customer->email_address, @@ -35,7 +37,7 @@ class customer_export implements FromCollection , WithHeadings 'phone_number' => $customer->phone_number, ]; }); - + } @@ -43,18 +45,19 @@ class customer_export implements FromCollection , WithHeadings public function headings(): array { return [ + 'User Id', 'first_name', 'last_name', - 'email_address', - 'date_of_birth', + 'email_address', + 'date_of_birth', 'state_name', - 'phone_number' + 'phone_number' ]; } - - - + + + } diff --git a/app/Exports/customer_export_selected.php b/app/Exports/customer_export_selected.php index 4643cbc..e44c203 100644 --- a/app/Exports/customer_export_selected.php +++ b/app/Exports/customer_export_selected.php @@ -29,6 +29,7 @@ class customer_export_selected implements FromCollection, WithHeadings ->with('state:id,name') // Eager load the state relationship ->orderBy('id', 'desc') ->select( + 'id', 'first_name', 'last_name', 'email_address', @@ -39,6 +40,7 @@ class customer_export_selected implements FromCollection, WithHeadings ->get() ->map(function ($customer) { return [ + 'id' => $customer->id, 'first_name' => $customer->first_name, 'last_name' => $customer->last_name, 'email_address' => $customer->email_address, @@ -57,6 +59,7 @@ class customer_export_selected implements FromCollection, WithHeadings public function headings(): array { return [ + 'User Id', 'First Name', 'Last Name', 'Email Address', diff --git a/app/Http/Controllers/Admin/ManageRestrauntController.php b/app/Http/Controllers/Admin/ManageRestrauntController.php index 9782f7e..b0b9cb0 100644 --- a/app/Http/Controllers/Admin/ManageRestrauntController.php +++ b/app/Http/Controllers/Admin/ManageRestrauntController.php @@ -248,7 +248,7 @@ class ManageRestrauntController extends Controller return view('Admin.pages.manage_restaurants.view_restaurant', compact('restaurantItem', 'operating_hours')); } catch (Exception $e) { - Log::error("view Voucher Load Failed" . $e->getMessage()); + Log::error("view Voucher Load Failed" . $e->getMessage()) ; return jsonResponseWithErrorMessage(__('auth.something_went_wrong'), 500); } } diff --git a/resources/views/Admin/pages/manage_restaurants/view_restaurant.blade.php b/resources/views/Admin/pages/manage_restaurants/view_restaurant.blade.php index 769da52..f57a6cf 100644 --- a/resources/views/Admin/pages/manage_restaurants/view_restaurant.blade.php +++ b/resources/views/Admin/pages/manage_restaurants/view_restaurant.blade.php @@ -5,12 +5,23 @@ $currentPage = 'restraunt'; @endphp @@ -52,12 +63,11 @@ Saturday : Sunday : Image : - {{ $restaurantItem->name }} {{ $restaurantItem->restaurant_id }} - {{ $restaurantItem->bio }} + {{ $restaurantItem->bio }} @foreach (['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'] as $day) {{ isset($operating_hours[$day]) ? $operating_hours[$day]->start_time . ' - ' . $operating_hours[$day]->end_time : 'N/A' }} @@ -75,7 +85,7 @@
- + {{-- --}} @@ -87,15 +97,15 @@ - + {{-- --}} - - - - - - + + + + + + @@ -110,6 +120,7 @@ + @endsection diff --git a/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php index 0ca6500..f456906 100644 --- a/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php +++ b/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php @@ -63,7 +63,7 @@ $currentPage = 'manage-customer'; - +
Description :Description :Status : Address : Try on 1 :Longitude :
{!! $restaurantItem->description !!}{!! $restaurantItem->description !!}{{ $restaurantItem->is_active == 1 ? 'Active' : 'Expired' }} {{ $restaurantItem->address }}{{ $restaurantItem->try_on_1 }}{{ $restaurantItem->try_on_2 }}{{ $restaurantItem->try_on_3 }}{{ $restaurantItem->try_on_4 }}{{ $restaurantItem->exclusion }}{{ $restaurantItem->address }}{{ $restaurantItem->try_on_1 }}{{ $restaurantItem->try_on_2 }}{{ $restaurantItem->try_on_3 }}{{ $restaurantItem->try_on_4 }}{{ $restaurantItem->exclusion }} {{ $restaurantItem->latitude }} {{ $restaurantItem->longtitude }}
{{ $customers_data->first_name }} {{ $customers_data->last_name }} {{ $customers_data->id }}{{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('d/m/Y') }}{{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('m/d/Y') }} {{ $customers_data->phone_number }}