diff --git a/modules/ContactForm/Handlers/ContactForm.php b/modules/ContactForm/Handlers/ContactForm.php index 4cf594ae..f2316480 100644 --- a/modules/ContactForm/Handlers/ContactForm.php +++ b/modules/ContactForm/Handlers/ContactForm.php @@ -43,12 +43,13 @@ class ContactForm extends Handler public static function createNew(Content &$content, Request $request) { $settings = [ - 'phone' => $request->phone, - 'email' => $request->email, - 'companyName' => $request->companyName, - 'address' => $request->address, - 'gpsLat' => $request->gpsLat, - 'gpsLng' => $request->gpsLng, + 'phone' => $request->phone, + 'email' => $request->email, + 'contactEmail' => $request->ContactEmail, + 'companyName' => $request->companyName, + 'address' => $request->address, + 'gpsLat' => $request->gpsLat, + 'gpsLng' => $request->gpsLng, ]; // save settings @@ -70,12 +71,13 @@ class ContactForm extends Handler public static function edit(Content &$content, Request $request, $revisionID) { $fields = [ - 'phone' => 'phone', - 'email' => 'email', - 'companyName' => 'companyName', - 'address' => 'address', - 'gpsLat' => 'gpsLat', - 'gpsLng' => 'gpsLng', + 'phone' => 'phone', + 'email' => 'email', + 'contactEmail' => 'contactEmail', + 'companyName' => 'companyName', + 'address' => 'address', + 'gpsLat' => 'gpsLat', + 'gpsLng' => 'gpsLng', ]; // get data and try to save them @@ -146,7 +148,7 @@ class ContactForm extends Handler $menu->dropdown(trans('contactform::admin/adminMenu.contactForm'), function ($submenu) use ($user) { $submenu->route('content.new', trans('contactform::admin/adminMenu.new'), ['moduleId' => self::getModuleId()], 10, ['icon' => 'fa fa-plus']); $submenu->route('content.overview', trans('contactform::admin/adminMenu.overview'), ['moduleId' => self::getModuleId()], 20, ['icon' => 'fa fa-list']); -// $submenu->route('emails.sent', trans('contactform::admin/adminMenu.sentMessages'), [], 30, ['icon' => 'fa fa-send']); + // $submenu->route('emails.sent', trans('contactform::admin/adminMenu.sentMessages'), [], 30, ['icon' => 'fa fa-send']); }, 25, ['icon' => 'fa fa-envelope-o']); } diff --git a/modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php b/modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php index 1a466551..0afb95f3 100644 --- a/modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php +++ b/modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php @@ -12,7 +12,7 @@ class CreateNewMessage extends Controller { /** * Method for sending emails via contact form - * + * * @param SendNewEmailRequest $request * @param $formId * @@ -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', ''); } } } diff --git a/modules/ContactForm/Providers/ContactFormServiceProvider.php b/modules/ContactForm/Providers/ContactFormServiceProvider.php index e43f3772..43f94d37 100644 --- a/modules/ContactForm/Providers/ContactFormServiceProvider.php +++ b/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'; diff --git a/modules/ContactForm/Resources/lang/en/admin/content.php b/modules/ContactForm/Resources/lang/en/admin/content.php index bf6a8e02..ec01d7fc 100644 --- a/modules/ContactForm/Resources/lang/en/admin/content.php +++ b/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' ]; \ No newline at end of file diff --git a/modules/ContactForm/Resources/lang/en/admin/history.php b/modules/ContactForm/Resources/lang/en/admin/history.php index 59a94453..87225107 100644 --- a/modules/ContactForm/Resources/lang/en/admin/history.php +++ b/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', diff --git a/modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php b/modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php index 50a32f3d..dc7d4a8f 100644 --- a/modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php +++ b/modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php @@ -67,24 +67,18 @@
+ + + -
- -
- -
-
- -
-
+
- +
+
+ +
+
+ +
+
-
\ No newline at end of file +