From dac859ea9a6c417803cf95f0b30578a034707c60 Mon Sep 17 00:00:00 2001 From: sayliraut Date: Fri, 7 Jun 2024 11:44:25 +0530 Subject: [PATCH] change --- .../Admin/ManageCustomerController.php | 123 ++++++------ ..._02_02_061343_create_feedback_reaction.php | 30 +++ ...02_063443_create_manage_feedback_table.php | 44 +++++ ..._31_095128_create_notification_details.php | 2 +- .../manage_customer/customer.blade.php | 15 +- .../manage_customer/edit_customer.blade.php | 180 ++++++++++-------- 6 files changed, 244 insertions(+), 150 deletions(-) create mode 100644 database/migrations/2024_02_02_061343_create_feedback_reaction.php create mode 100644 database/migrations/2024_02_02_063443_create_manage_feedback_table.php diff --git a/app/Http/Controllers/Admin/ManageCustomerController.php b/app/Http/Controllers/Admin/ManageCustomerController.php index c90af54..93b0a7d 100644 --- a/app/Http/Controllers/Admin/ManageCustomerController.php +++ b/app/Http/Controllers/Admin/ManageCustomerController.php @@ -14,10 +14,12 @@ use App\Exports\customer_export; use App\Exports\customer_export_selected; use App\Exports\CustomerExportSelected; use App\Models\ManageRestaurant; +use App\Models\ManageState; use App\Models\RedeemRestaurant; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; use Barryvdh\DomPDF\PDF as DomPDFPDF; +use Carbon\Carbon; use Exception; use PDF; @@ -27,7 +29,7 @@ use PDF; class ManageCustomerController extends Controller { - /* + /* Created By : Sayali Parab Created at : 28 May 2024 Use : To Get User Page. @@ -47,7 +49,7 @@ class ManageCustomerController extends Controller return jsonResponseWithErrorMessage(__('auth.something_went_wrong'), 500); } } -/* + /* Created By : Sayali Parab Created at : 28 May 2024 Use : To Get Passport Page. @@ -64,7 +66,7 @@ class ManageCustomerController extends Controller return jsonResponseWithErrorMessage(__('auth.something_went_wrong'), 500); } } -/* + /* Created By : Sayali Parab Created at : 28 May 2024 Use : To Get Customer data. @@ -74,69 +76,84 @@ class ManageCustomerController extends Controller { try { - $customers_data = IamPrincipal::findOrFail($id); - return view('Admin.pages.manage_users.manage_customer.edit_customer', compact('customers_data')); + $customers_data = IamPrincipal::with('state')->findOrFail($id); + $state = ManageState::where('is_active', 1)->get(); + return view('Admin.pages.manage_users.manage_customer.edit_customer', compact('customers_data', 'state')); } catch (Exception $e) { Log::error("Manage Voucher Page Not Load " . $e->getMessage()); return jsonResponseWithErrorMessage(__('auth.something_went_wrong'), 500); } } - /* + /* Created By : Sayali Parab Created at : 28 May 2024 Use : To Update Customer Form. */ - public function update(Request $request) - { - // Validation rules - $rules = [ - 'email_address' => [ - 'required', - 'string', - 'email', - 'max:100', - Rule::unique('iam_principal')->where(function ($query) use ($request) { - return $query->where('principal_type_xid', 3) - ->whereNull('deleted_at') - ->where('id', '!=', $request->customer_id); - }), - ], - ]; + public function update(Request $request) + { + // Validation rules + $rules = [ + 'email_address' => [ + 'required', + 'string', + 'email', + 'max:100', + Rule::unique('iam_principal')->where(function ($query) use ($request) { + return $query->where('principal_type_xid', 3) + ->whereNull('deleted_at') + ->where('id', '!=', $request->customer_id); + }), + ], + 'date_of_birth' => [ + 'required', + 'date', + function ($attribute, $value, $fail) { + $dob = Carbon::parse($value); + $age = $dob->age; + if ($age < 21) { + $fail('You must be at least 21 years old.'); + } + }, + ], + ]; - $messages = [ + $messages = [ + 'email_address.required' => 'Enter email address', + 'email_address.email' => 'Please enter a valid email address', + 'email_address.unique' => 'This email is already registered', + 'date_of_birth.required' => 'Date of Birth is required', + 'date_of_birth.date' => 'Please enter a valid date', + ]; - 'email_address.required' => 'Enter email address', - 'email_address.email' => 'Please enter a valid email address', - 'email_address.unique' => 'This email is already registered', - ]; + $validator = Validator::make($request->all(), $rules, $messages); - $validator = Validator::make($request->all(), $rules, $messages); - - if ($validator->fails()) { - return response()->json(['errors' => $validator->errors()], 422); - } - - try { - DB::beginTransaction(); - - $customer_data = IamPrincipal::where('id', $request->customer_id)->first(); - $customer_data->first_name = $request->input('name'); - $customer_data->last_name = $request->input('last_name'); - $customer_data->phone_number = $request->input('phone'); - $customer_data->email_address = $request->input('email_address'); - $customer_data->save(); - - DB::commit(); - - return jsonResponseWithSuccessMessage(__('success.update_data')); - } catch (Exception $e) { - DB::rollBack(); - Log::error("updateCustomerNewsArticle Services Page Load Failed " . $e->getMessage()); - return jsonResponseWithErrorMessage(__('auth.something_went_wrong'), 500); - } + if ($validator->fails()) { + return response()->json(['errors' => $validator->errors()], 422); } + try { + DB::beginTransaction(); + + $customer_data = IamPrincipal::where('id', $request->customer_id)->first(); + $customer_data->first_name = $request->input('name'); + $customer_data->last_name = $request->input('last_name'); + $customer_data->phone_number = $request->input('phone'); + $customer_data->email_address = $request->input('email_address'); + $customer_data->date_of_birth = $request->input('date_of_birth'); + $customer_data->state_xid = $request->input('state_xid'); + $customer_data->save(); + + DB::commit(); + + return jsonResponseWithSuccessMessage(__('success.update_data')); + } catch (Exception $e) { + DB::rollBack(); + Log::error("updateCustomerNewsArticle Services Page Load Failed " . $e->getMessage()); + return jsonResponseWithErrorMessage(__('auth.something_went_wrong'), 500); + } + } + public function archive_customer() { /* @@ -180,7 +197,7 @@ class ManageCustomerController extends Controller return response()->json(['success' => false, 'status' => 500, 'message' => __('auth.something_went_wrong')]); } } - /* + /* Created By : Sayali Parab Created at : 28 May 2024 Use : To Get pdf. @@ -220,7 +237,7 @@ class ManageCustomerController extends Controller // } // } - /* + /* Created By : Sayali Parab Created at : 28 May 2024 Use : To Deleted Data Restore. diff --git a/database/migrations/2024_02_02_061343_create_feedback_reaction.php b/database/migrations/2024_02_02_061343_create_feedback_reaction.php new file mode 100644 index 0000000..44cfd9b --- /dev/null +++ b/database/migrations/2024_02_02_061343_create_feedback_reaction.php @@ -0,0 +1,30 @@ +id(); + $table->integer('feedback_reaction_xid')->nullable(); + $table->integer('created_by')->nullable(); + $table->integer('modified_by')->nullable(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('feedback_reaction'); + } +}; diff --git a/database/migrations/2024_02_02_063443_create_manage_feedback_table.php b/database/migrations/2024_02_02_063443_create_manage_feedback_table.php new file mode 100644 index 0000000..53b62b4 --- /dev/null +++ b/database/migrations/2024_02_02_063443_create_manage_feedback_table.php @@ -0,0 +1,44 @@ +id(); + + // Foreign key references for principal + $table->unsignedBigInteger('principal_xid'); + $table->foreign('principal_xid')->references('id')->on('iam_principal')->onDelete('cascade'); + + // Feedback reaction and comment columns + + $table->unsignedBigInteger('feedback_reaction_xid'); + $table->foreign('feedback_reaction_xid')->references('id')->on('feedback_reaction')->onDelete('cascade'); + + $table->longtext('comment')->nullable(); + + // Soft deletes, timestamps, and additional columns + $table->softDeletes(); + $table->timestamps(); + $table->boolean('is_active')->default(1)->comment('1=Active, 0=Deactive'); + $table->integer('created_by')->nullable(); + $table->integer('modified_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('manage_feedback'); + } +}; diff --git a/database/migrations/2024_05_31_095128_create_notification_details.php b/database/migrations/2024_05_31_095128_create_notification_details.php index ba5adff..35b6eba 100644 --- a/database/migrations/2024_05_31_095128_create_notification_details.php +++ b/database/migrations/2024_05_31_095128_create_notification_details.php @@ -15,7 +15,7 @@ return new class extends Migration $table->id(); $table->unsignedBigInteger('principal_xid'); $table->foreign('principal_xid')->references('id')->on('iam_principal')->onDelete('cascade'); - $table->integer('type'); + $table->string('type'); $table->longText('description'); $table->string('image')->nullable(); $table->timestamp('date_added')->useCurrent(); diff --git a/resources/views/Admin/pages/manage_users/manage_customer/customer.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/customer.blade.php index 2e4dee3..562c368 100644 --- a/resources/views/Admin/pages/manage_users/manage_customer/customer.blade.php +++ b/resources/views/Admin/pages/manage_users/manage_customer/customer.blade.php @@ -79,12 +79,7 @@ --> - -
- -
- + Sr no Full Name User ID @@ -102,13 +97,7 @@ @foreach ($customers as $customer) - -
- -
- + {{ $loop->iteration }} {{ $customer->first_name }} {{ $customer->last_name }} diff --git a/resources/views/Admin/pages/manage_users/manage_customer/edit_customer.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/edit_customer.blade.php index f915b7b..db96b56 100644 --- a/resources/views/Admin/pages/manage_users/manage_customer/edit_customer.blade.php +++ b/resources/views/Admin/pages/manage_users/manage_customer/edit_customer.blade.php @@ -1,101 +1,115 @@ @extends('Admin.layouts.master') @section('content') -@php - $currentPage = 'manage-patient'; -@endphp - -
-
-
-
-
-
- - - -
Edit Manage Customers
- -
-
+ form .error-message { + color: red; + } + +
+
+
+
+
+
+ + + +
Edit Manage Customers
+ +
+
+
-
-
-
-
-
- -
-
-
- - +
+
+
+ + +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ + {{--
+
+ + +
+
--}} +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
- + +
-
+
-
- @endsection @section('section_script') - + @endsection