From: Stephen Cameron <stephen@cubedesigners.com>
Date: Thu, 8 Aug 2019 09:16:12 +0000 (+0200)
Subject: Form handling improvements. WIP #2738 @0.75
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7c3d7204f29ac95eb2e1364797ff06ce84bfce4d;p=pmi.git

Form handling improvements. WIP #2738 @0.75
---

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index c321dfe..b92abf6 100644
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -68,6 +68,10 @@ class AjaxController extends CubistFrontController
                 $subject = '[' . $page->form_prefix . '] ';
             }
 
+            if (isset($validatedData['subject'])) {
+                $subject .= $validatedData['subject'];
+            }
+
             $sender = '';
             if (isset($validatedData['firstname'])) {
                 $sender .= $validatedData['firstname'];
@@ -81,7 +85,7 @@ class AjaxController extends CubistFrontController
             }
 
             $message->replyTo($validatedData['email'], $sender);
-            $message->subject($subject . $validatedData['subject']);
+            $message->subject($subject);
         });
     }
 
diff --git a/resources/js/mailform.js b/resources/js/mailform.js
index 8ed46de..42ef232 100644
--- a/resources/js/mailform.js
+++ b/resources/js/mailform.js
@@ -27,16 +27,16 @@ $(function () {
             type: $(this).attr('method'),
             data: $(this).serialize(),
         }).done(function (response) {
-            $(form).find('.error').removeClass('error');
-            // Todo: make this more customisable from the form
-            $(form).html('<p class="center text-2xl text-center p-8" >' + $(form).data('confirmation') + '</p>');
+            let responseClasses = form.data('confirmation-classes') || 'text-2xl text-center p-8';
+            form.find('.error').removeClass('error');
+            form.html(`<p class="${responseClasses}">${form.data('confirmation')}</p>`);
         }).fail(function (response) {
             button.text(button.data('text')).prop('disabled', false);
-            $(form).find('.error').removeClass('error');
-            $(form).find('.errormessage').remove();
+            form.find('.error').removeClass('error');
+            form.find('.errormessage').remove();
             $.each(response.responseJSON.errors, function (k, v) {
                 if (v.length > 0) {
-                    var field = $(form).find('[name="' + k + '"]');
+                    var field = form.find('[name="' + k + '"]');
                     $(field).addClass('error');
                     $('<span class="errormessage">' + v[0] + '</span>').insertBefore(field);
                 }
diff --git a/resources/views/partials/newsletter-form.blade.php b/resources/views/partials/newsletter-form.blade.php
index 73ef1fe..5075c61 100644
--- a/resources/views/partials/newsletter-form.blade.php
+++ b/resources/views/partials/newsletter-form.blade.php
@@ -6,7 +6,10 @@
     {{ __('Inscription Newsletter') }}
 </h3>
 
-<form action="/ajax/newsletter" method="post" class="ajax-form mailform text-navy" data-confirmation="{{ __('Merci, vous avez été inscrit avec succès') }}" novalidate>
+<form action="/ajax/newsletter" method="post" class="ajax-form mailform text-navy"
+      data-confirmation="{{ __('Merci, vous avez été inscrit avec succès') }}"
+      data-confirmation-classes="text-green-500"
+      novalidate>
     <label for="newsletter_email" class="form-input">{{ __('Email') }}
         <input type="email" name="email" id="newsletter_email" class="py-3 mt-3" required>
     </label>