diff --git a/app/Http/Controllers/Admin/AttenderCrudController.php b/app/Http/Controllers/Admin/AttenderCrudController.php index 99a3989..fa19552 100644 --- a/app/Http/Controllers/Admin/AttenderCrudController.php +++ b/app/Http/Controllers/Admin/AttenderCrudController.php @@ -45,6 +45,10 @@ protected function setupListOperation() 'name' => 'name', 'type' => 'text' ], + [ + 'name' => 'city', + 'type' => 'text' + ], [ 'name' => 'email', 'type' => 'email' diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 8007b63..b85f7b2 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -28,7 +28,7 @@ public function apply($id){ } public function submit(Request $request){ - $data = $request->only(['name', 'surname', 'email', 'file', 'organization', 'is_attending', 'consent_form', 'consent_form_second', 'consent_form_third']); + $data = $request->only(['name', 'city', 'email', 'file', 'organization', 'is_attending', 'consent_form', 'consent_form_second', 'consent_form_third']); $data['attended'] = 0; $data['is_attending'] = (bool)$data['is_attending']; $data['consent_form'] = $data['consent_form'] ?? false; diff --git a/app/Models/Attender.php b/app/Models/Attender.php index bdb26bb..2415f86 100644 --- a/app/Models/Attender.php +++ b/app/Models/Attender.php @@ -29,7 +29,8 @@ class Attender extends Model 'attended', 'consent_form', 'consent_form_second', - 'consent_form_third' + 'consent_form_third', + 'city' ]; // protected $hidden = []; // protected $dates = []; diff --git a/database/migrations/2023_05_03_061520_add_city_to_attenders_table.php b/database/migrations/2023_05_03_061520_add_city_to_attenders_table.php new file mode 100644 index 0000000..8674f71 --- /dev/null +++ b/database/migrations/2023_05_03_061520_add_city_to_attenders_table.php @@ -0,0 +1,28 @@ +string('city')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('attenders', function (Blueprint $table) { + // + }); + } +}; diff --git a/public/qr/6451fc89de083.png b/public/qr/6451fc89de083.png new file mode 100644 index 0000000..d1cc371 Binary files /dev/null and b/public/qr/6451fc89de083.png differ diff --git a/resources/views/emails/qr.blade.php b/resources/views/emails/qr.blade.php index a4209c4..9ef16b3 100644 --- a/resources/views/emails/qr.blade.php +++ b/resources/views/emails/qr.blade.php @@ -49,7 +49,7 @@

- Dear {{ $attender->name }} {{ $attender->surname }}!
+ Dear {{ $attender->name }}!
Here is your QR code for your registered event!

diff --git a/resources/views/signup.blade.php b/resources/views/signup.blade.php index 9161005..31d296e 100644 --- a/resources/views/signup.blade.php +++ b/resources/views/signup.blade.php @@ -31,13 +31,13 @@
- - + +
- - + +
@@ -87,17 +87,17 @@
-
+
-
+
-
+
@@ -107,7 +107,7 @@
-
+
@@ -141,7 +141,7 @@
- +