wait #6137 @1:00

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index edb40ba1ce974c2085a9250123952e64036b0018..7da2fce8f7d9470e60c8af8ea315877b79475d03 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -28,6 +28,7 @@ class AjaxController extends CubistFrontController
 {
     protected static $_labels = ['firstname' => 'Prénom',
         'name' => 'Nom',
+        'lastname' => 'Nom',
         'company' => 'Société',
         'sku' => 'Numéro de série',
         'ref' => 'Reference',
@@ -98,7 +99,7 @@ class AjaxController extends CubistFrontController
      * @param PageData $page
      * @param array $appendContents
      */
-    protected function _sendMail($validatedData, $page, $appendContents = [], $action = "quote")
+    protected function _sendMail($validatedData, $page, $appendContents = [], $subject_ = "", $recipient = "")
     {
         $contents = [];
         foreach (self::$_labels as $key => $label) {
@@ -108,12 +109,15 @@ class AjaxController extends CubistFrontController
         }
         $contents = array_merge($contents, $appendContents);
 
-        Mail::raw(implode("\r\n", $contents), function ($message) use ($validatedData, $page, $action) {
+        Mail::raw(implode("\r\n", $contents), function ($message) use ($validatedData, $page, $subject_,$recipient) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->sender(config('mail.from.address'), config('mail.from.name'));
             $message->bcc('test+pmi@cubedesigners.com');
-            //$message->to('soufiane@cubedesigners.com');
-            if (null === $page->form_destination || empty($page->form_destination)) {
+            $message->to('soufiane@cubedesigners.com');
+            if($recipient) {
+                $message->to($recipient);
+            }
+            /*if (null === $page->form_destination || empty($page->form_destination)) {
                 foreach (Settings::getData()->form_default_recipients as $recipient) {
                     $message->to($recipient);
                 }
@@ -121,12 +125,14 @@ class AjaxController extends CubistFrontController
                 foreach ($page->form_destination as $item) {
                     $message->to($item);
                 }
-            }
+            }*/
             $subject = '';
             if ($page->form_prefix) {
                 $subject = '[';
-                $subject .= $action === "quote" ? $page->form_prefix : 'Nouvelle commande';
+                $subject .= $subject_ ?? $page->form_prefix;
                 $subject .= '] ';
+            }else {
+                $subject = '['.$subject_.'] ';
             }
 
             if (isset($validatedData['subject'])) {
@@ -318,7 +324,7 @@ class AjaxController extends CubistFrontController
             $linkTo = 'Voir la commande en ligne : ' . url('/admin/order/' . $save->id . '/edit');
         }
 
-        $this->_sendMail($validatedData, $page, [implode("\r\n", $productsMessage), '', $linkTo],$action);
+        $this->_sendMail($validatedData, $page, [implode("\r\n", $productsMessage), '', $linkTo], "Nouvelle commande");
     }
 
     public function search(Request $request)
@@ -440,6 +446,7 @@ class AjaxController extends CubistFrontController
         ];
 
         $data = $this->validation_form($request, $validation);
+        $page = Page::find($request['page'])->getPageData();
 
         if (!strstr($data['vat'], $data['siren']) || substr($data['vat'], '-9') !== $data['siren']) {
             throw ValidationException::withMessages(['siren' => __('Le numero de siren est incorrect')]);
@@ -472,6 +479,11 @@ class AjaxController extends CubistFrontController
         $client = new Client($data);
         $client->save();
 
+        $data['subject'] = "Cubedesigners";
+
+        $linkTo = "\n".'Valider l\'inscription en ligne : ' . url('/admin/client/' . $client->id . '/edit');
+        $this->_sendMail($data, $page, [$linkTo], "Nouvelle inscription");
+
         return $data;
     }
 
@@ -529,7 +541,6 @@ class AjaxController extends CubistFrontController
         $email = Client::getClientConnected()->email;
         $address = Client::getClientConnected()->address;
 
-
         if($address) {
             $addressToArray = json_decode($address, true);
 

diff --git a/resources/views/pages/sign_in.blade.php b/resources/views/pages/sign_in.blade.php
index 3f139b447cb996e5ed343dbe8c4d5c3c700cfed6..c70f996b0249d11dde4410203f911c232ecdacea 100644 (file)
--- a/resources/views/pages/sign_in.blade.php
+++ b/resources/views/pages/sign_in.blade.php
@@ -104,6 +104,7 @@
 
                 <form id="signup-form" class="form-portal" @submit.prevent="signup()">
                     @csrf
+                    <input type="hidden" name="page" value="{{$page->id}}" />
                     <div class="form-group mb-6">
                         <label class="form-input text-navy">
                             {{ __('Email') }}<span>*</span>