Merge branch 'module_contact_form' into dev

modules/ContactForm/Handlers/ContactForm.php

@@ -45,6 +45,7 @@ class ContactForm extends Handler
         $settings = [
             'phone'        => $request->phone,
             'email'        => $request->email,
+            'contactEmail' => $request->ContactEmail,
             'companyName'  => $request->companyName,
             'address'      => $request->address,
             'gpsLat'       => $request->gpsLat,
@@ -72,6 +73,7 @@ class ContactForm extends Handler
         $fields = [
             'phone'        => 'phone',
             'email'        => 'email',
+            'contactEmail' => 'contactEmail',
             'companyName'  => 'companyName',
             'address'      => 'address',
             'gpsLat'       => 'gpsLat',

modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php

@@ -33,18 +33,26 @@ class CreateNewMessage extends Controller
         $status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
             $message->from($request->email, $request->name);
             $message->to($form->module_settings->email)
-                    ->subject('Your Reminder!');
+                    ->subject('Nejaky predmet - nastavovat v administraci, nebo nechavat vyplnovat uzivatele?');
         });
 
         // inform user about success or failure
-        if ($status) {
-            return redirect()
-                ->route('page.content', ['url' => $form->url])
-                ->with('success', '');
+        $this->sendResponse($status, $request, $form);
+    }
+
+    private function sendResponse($status, SendNewEmailRequest $request, $form)
+    {
+        // send response for ajax
+        if ($request->ajax()) {
+            return response()->json([
+                                        'status'      => $status ? 'success' : 'failed',
+                                        'redirectUrl' => $form->url
+                                    ]);
         } else {
-            return redirect()
-                ->route('page.content', ['url' => $form->url])
-                ->with('error', '');
+            // redirect user to previous form
+            $response = redirect()->route('page.content', ['url' => $form->url]);
+
+            return $status ? $response->with('success', '') : $response->with('error', '');
         }
     }
 }

modules/ContactForm/Providers/ContactFormServiceProvider.php

@@ -60,7 +60,7 @@ class ContactFormServiceProvider extends ServiceProvider
         $viewPath = base_path('resources'.DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.'contactform');
         $sourcePath = __DIR__ . DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'views';
 
-        $this->publishes([$sourcePath => $viewPath]);
+        $this->publishes([$sourcePath => $viewPath], 'module-views');
 
         $this->loadViewsFrom(array_merge(array_map(function ($path) {
             return $path . DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.'contactform';

modules/ContactForm/Resources/lang/en/admin/content.php

@@ -7,6 +7,7 @@ return [
     'gpsLng'             => 'GPS longitude',
     'compName'           => 'Name displayed above address',
     'phone'              => 'Contact phone',
+    'email'              => 'E-mail',
     'contactEmail'       => 'E-mail, where messages from this form will be delivered',
     'contactInformation' => 'Contact information'
 ];

modules/ContactForm/Resources/lang/en/admin/history.php

@@ -3,6 +3,7 @@ return [
     'columnPhone'       => 'Phone',
     'columnAddress'     => 'Address',
     'columnEmail'       => 'E-mail',
+    'columnContactEmail'       => 'Contact E-mail',
     'columnCompanyName' => 'Company name',
     'columnGpsLat'      => 'GPS Latitude',
     'columnGpsLng'      => 'Gps Longitude',

modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php

@@ -67,24 +67,18 @@
 
 <div class="row">
     <div class="column large-6">
+
+        <label>
+            @lang('contactform::admin/content.email')
+
+            <input type="email" name="email" value="{{$page->module_settings->email or ""}}" />
+        </label>
+
         <label>
             @lang('contactform::admin/content.phone')
 
             <input type="tel" name="phone" value="{{$page->module_settings->phone or ""}}" />
         </label>
-    </div>
-
-    <div class="column large-6">
-        <label>
-            @lang('contactform::admin/content.contactEmail')
-
-            <input type="email" name="email" value="{{$page->module_settings->email or \Auth::user()->email}}" />
-        </label>
-    </div>
-</div>
-
-<div class="row">
-    <div class="column large-6">
 
         <label>
             @lang('contactform::admin/content.compName')
@@ -98,12 +92,23 @@
             <textarea rows="3" name="address">{{$page->module_settings->address or ""}}</textarea>
         </label>
     </div>
+
+    <div class="column large-6">
+        <label>
+            @lang('contactform::admin/content.contactEmail')
+
+            <input type="email" name="contactEmail" value="{{$page->module_settings->contactEmail or \Auth::user()->email}}" />
+        </label>
+
+        <div class="row">
             <div class="column large-6">
                 <label>
                     @lang('contactform::admin/content.gpsLat')
 
                     <input type="text" value="{{$page->module_settings->gpsLat or ""}}" name="gpsLat" />
                 </label>
+            </div>
+            <div class="column large-6">
                 <label>
                     @lang('contactform::admin/content.gpsLng')
 
@@ -111,3 +116,5 @@
                 </label>
             </div>
         </div>
+    </div>
+</div>