minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'module_contact_form' into dev

Browse Source
This commit is contained in:
Michal Kváček
2016-04-04 20:29:24 +02:00
parent f27ad7c421 2d25e00d76
commit aff8e992d6
6 changed files with 62 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ContactForm/Handlers/ContactForm.php
+15 -13
View File
@@ -43,12 +43,13 @@ class ContactForm extends Handler
public static function createNew(Content &$content, Request $request) public static function createNew(Content &$content, Request $request)
{ {
$settings = [ $settings = [
'phone' => $request->phone, 'phone' => $request->phone,
'email' => $request->email, 'email' => $request->email,
'companyName' => $request->companyName, 'contactEmail' => $request->ContactEmail,
'address' => $request->address, 'companyName' => $request->companyName,
'gpsLat' => $request->gpsLat, 'address' => $request->address,
'gpsLng' => $request->gpsLng, 'gpsLat' => $request->gpsLat,
'gpsLng' => $request->gpsLng,
]; ];
// save settings // save settings
@@ -70,12 +71,13 @@ class ContactForm extends Handler
public static function edit(Content &$content, Request $request, $revisionID) public static function edit(Content &$content, Request $request, $revisionID)
{ {
$fields = [ $fields = [
'phone' => 'phone', 'phone' => 'phone',
'email' => 'email', 'email' => 'email',
'companyName' => 'companyName', 'contactEmail' => 'contactEmail',
'address' => 'address', 'companyName' => 'companyName',
'gpsLat' => 'gpsLat', 'address' => 'address',
'gpsLng' => 'gpsLng', 'gpsLat' => 'gpsLat',
'gpsLng' => 'gpsLng',
]; ];
// get data and try to save them // 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) { $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.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('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']); }, 25, ['icon' => 'fa fa-envelope-o']);
} }
modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php
+17 -9
View File
@@ -12,7 +12,7 @@ class CreateNewMessage extends Controller
{ {
/** /**
* Method for sending emails via contact form * Method for sending emails via contact form
* *
* @param SendNewEmailRequest $request * @param SendNewEmailRequest $request
* @param $formId * @param $formId
* *
@@ -33,18 +33,26 @@ class CreateNewMessage extends Controller
$status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) { $status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
$message->from($request->email, $request->name); $message->from($request->email, $request->name);
$message->to($form->module_settings->email) $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 // inform user about success or failure
if ($status) { $this->sendResponse($status, $request, $form);
return redirect() }
->route('page.content', ['url' => $form->url])
->with('success', ''); 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 { } else {
return redirect() // redirect user to previous form
->route('page.content', ['url' => $form->url]) $response = redirect()->route('page.content', ['url' => $form->url]);
->with('error', '');
return $status ? $response->with('success', '') : $response->with('error', '');
} }
} }
} }
modules/ContactForm/Providers/ContactFormServiceProvider.php
+1 -1
View File
@@ -60,7 +60,7 @@ class ContactFormServiceProvider extends ServiceProvider
$viewPath = base_path('resources'.DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.'contactform'); $viewPath = base_path('resources'.DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.'contactform');
$sourcePath = __DIR__ . DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'Resources'.DIRECTORY_SEPARATOR.'views'; $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) { $this->loadViewsFrom(array_merge(array_map(function ($path) {
return $path . DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.'contactform'; return $path . DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.'contactform';
modules/ContactForm/Resources/lang/en/admin/content.php
+1
View File
@@ -7,6 +7,7 @@ return [
'gpsLng' => 'GPS longitude', 'gpsLng' => 'GPS longitude',
'compName' => 'Name displayed above address', 'compName' => 'Name displayed above address',
'phone' => 'Contact phone', 'phone' => 'Contact phone',
'email' => 'E-mail',
'contactEmail' => 'E-mail, where messages from this form will be delivered', 'contactEmail' => 'E-mail, where messages from this form will be delivered',
'contactInformation' => 'Contact information' 'contactInformation' => 'Contact information'
]; ];
modules/ContactForm/Resources/lang/en/admin/history.php
+1
View File
@@ -3,6 +3,7 @@ return [
'columnPhone' => 'Phone', 'columnPhone' => 'Phone',
'columnAddress' => 'Address', 'columnAddress' => 'Address',
'columnEmail' => 'E-mail', 'columnEmail' => 'E-mail',
'columnContactEmail' => 'Contact E-mail',
'columnCompanyName' => 'Company name', 'columnCompanyName' => 'Company name',
'columnGpsLat' => 'GPS Latitude', 'columnGpsLat' => 'GPS Latitude',
'columnGpsLng' => 'Gps Longitude', 'columnGpsLng' => 'Gps Longitude',
modules/ContactForm/Resources/views/admin/form/basicInfo.blade.php
+27 -20
View File
@@ -67,24 +67,18 @@
<div class="row"> <div class="row">
<div class="column large-6"> <div class="column large-6">
<label>
@lang('contactform::admin/content.email')
<input type="email" name="email" value="{{$page->module_settings->email or ""}}" />
</label>
<label> <label>
@lang('contactform::admin/content.phone') @lang('contactform::admin/content.phone')
<input type="tel" name="phone" value="{{$page->module_settings->phone or ""}}" /> <input type="tel" name="phone" value="{{$page->module_settings->phone or ""}}" />
</label> </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> <label>
@lang('contactform::admin/content.compName') @lang('contactform::admin/content.compName')
@@ -98,16 +92,29 @@
<textarea rows="3" name="address">{{$page->module_settings->address or ""}}</textarea> <textarea rows="3" name="address">{{$page->module_settings->address or ""}}</textarea>
</label> </label>
</div> </div>
<div class="column large-6"> <div class="column large-6">
<label> <label>
@lang('contactform::admin/content.gpsLat') @lang('contactform::admin/content.contactEmail')
<input type="text" value="{{$page->module_settings->gpsLat or ""}}" name="gpsLat" /> <input type="email" name="contactEmail" value="{{$page->module_settings->contactEmail or \Auth::user()->email}}" />
</label> </label>
<label>
@lang('contactform::admin/content.gpsLng')
<input type="text" value="{{$page->module_settings->gpsLng or ""}}" name="gpsLng" /> <div class="row">
</label> <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')
<input type="text" value="{{$page->module_settings->gpsLng or ""}}" name="gpsLng" />
</label>
</div>
</div>
</div> </div>
</div> </div>