From d9ac2bacef5b4a60425951fc951dc4625aac2b89 Mon Sep 17 00:00:00 2001 From: soufiane Date: Tue, 25 Jul 2023 11:15:56 +0200 Subject: [PATCH] wait #6165 @0:30 --- app/Http/Controllers/AjaxController.php | 8 ++------ resources/js/mailform.js | 1 + resources/views/pages/cart.blade.php | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index aa0d9f3..3d3bac5 100644 --- a/app/Http/Controllers/AjaxController.php +++ b/app/Http/Controllers/AjaxController.php @@ -109,7 +109,7 @@ class AjaxController extends CubistFrontController * @param PageData $page * @param array $appendContents */ - protected function _sendMail($validatedData, $page, $appendContents = [], $subject_ = "", $recipient = "") + protected function _sendMail($validatedData, $page, $appendContents = [], $subject_ = "Cubedesigners", $recipient = "") { $contents = []; @@ -141,15 +141,11 @@ class AjaxController extends CubistFrontController } } - $subject = ''; + if ($page->form_prefix) { $subject = '['; $subject .= $subject_ ?? $page->form_prefix; $subject .= '] '; - }else { - if($subject_) { - $subject = '[' . $subject_ . '] '; - } } if (isset($validatedData['subject'])) { diff --git a/resources/js/mailform.js b/resources/js/mailform.js index a6bfab9..0384faa 100644 --- a/resources/js/mailform.js +++ b/resources/js/mailform.js @@ -28,6 +28,7 @@ $(function () { let responseClasses = $(form).data('confirmation-classes') || 'text-2xl text-center p-8'; $(form).find('.error').removeClass('error'); $(form).html(`

${$(form).data('confirmation')}

`); + $(".form-info").remove() cubistga.handleGtag($(form).get(0)); }).catch((error) => { $(button).text(button.data('text')).prop('disabled', false); diff --git a/resources/views/pages/cart.blade.php b/resources/views/pages/cart.blade.php index 43aae7c..b412006 100644 --- a/resources/views/pages/cart.blade.php +++ b/resources/views/pages/cart.blade.php @@ -22,7 +22,7 @@ @endif -
+
@form([ 'action' => '/ajax/request_quote', -- 2.39.5