Merge branch 'test.customwristbands.cz' of binarity.cz:/opt/git/internal/cms/minicms into test.customwristbands.cz

app/Http/Controllers/Admin/EditContent.php

@@ -221,6 +221,11 @@ class EditContent extends Controller
                 ->with('error', trans('admin/contents.invalidPage'));
         }
 
+        // change url to something unique
+        $oldURL = $page->url;
+        $page->url = uniqid($page->url.'_deleted');
+        $page->save();
+
         list ($revision, $changedColumns) = $page->updateWithHistory(['status' => 'status'], ['status' => Content::STATUS_DELETED]);
 
         // was something changed?
@@ -238,7 +243,7 @@ class EditContent extends Controller
             ->route('content.overview')
             ->with('success', trans('admin/contents.pageDeleted', [
                 'name' => $page->title,
-                'url'  => $page->url
+                'url'  => $oldURL
             ]));
     }
 

app/Widgets/Menu/Presenters/Menu.php

@@ -56,6 +56,9 @@ class Menu implements WidgetRenderer
         $code = '<ul class="menu ' . $settings->containerClass . '">';
 
         foreach ($links as $pageId => $link) {
+            if (!isset($pages[$pageId])) {
+                continue;
+            }
             $page = $pages[$pageId];
 
             $active = false;

modules/ContactForm/Handlers/ContactForm.php

@@ -46,6 +46,7 @@ class ContactForm extends Handler
             'phone'        => $request->phone,
             'email'        => $request->email,
             'contactEmail' => $request->ContactEmail,
+            'subject'      => $request->subject,
             'companyName'  => $request->companyName,
             'address'      => $request->address,
             'gpsLat'       => $request->gpsLat,
@@ -78,6 +79,7 @@ class ContactForm extends Handler
             'address'      => 'address',
             'gpsLat'       => 'gpsLat',
             'gpsLng'       => 'gpsLng',
+            'subject'      => 'subject'
         ];
 
         // get data and try to save them

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

@@ -30,14 +30,22 @@ class CreateNewMessage extends Controller
         $template = isset($form->module_settings->emailTemplate) ? $form->module_settings->emailTemplate : 'contactform::emails.default';
 
         // send email
-        $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('Nejaky predmet - nastavovat v administraci, nebo nechavat vyplnovat uzivatele?');
-        });
+//        try {
+            $status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
+                $message->from($request->email, $request->name);
+
+                // get message subject
+                $subject = isset($form->module_settings->subject) ? $form->module_settings->subject : trans('contactform::admin/contents.defaultSubject');
+
+                $message->to($form->module_settings->email)
+                        ->subject($subject);
+            });
+//        } catch (\Exception $e) {
+//            return $this->cannotSend($request, $form, $e->getMessage());
+//        }
 
         // inform user about success or failure
-        $this->sendResponse($status, $request, $form);
+        return $this->sendResponse($status, $request, $form);
     }
 
     private function sendResponse($status, SendNewEmailRequest $request, $form)
@@ -55,4 +63,21 @@ class CreateNewMessage extends Controller
             return $status ? $response->with('success', '') : $response->with('error', '');
         }
     }
+
+    private function cannotSend(SendNewEmailRequest $request, $form, $message)
+    {
+        // send response for ajax
+        if ($request->ajax()) {
+            return response()->json([
+                                        'status'      => 'failed',
+                                        'exception'   => $message,
+                                        'redirectUrl' => $form->url
+                                    ]);
+        } else {
+            // redirect user to previous form
+            $response = redirect()->route('page.content', ['url' => $form->url]);
+
+            return $response->with('error', '');
+        }
+    }
 }

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

@@ -9,5 +9,7 @@ return [
     'phone'              => 'Contact phone',
     'email'              => 'E-mail',
     'contactEmail'       => 'E-mail, where messages from this form will be delivered',
-    'contactInformation' => 'Contact information'
+    'contactInformation' => 'Contact information',
+    'subject'            => 'Subject',
+    'defaultSubject'     => 'New message from contact form'
 ];

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

@@ -1,11 +1,12 @@
 <?php
 return [
-    'columnPhone'       => 'Phone',
-    'columnAddress'     => 'Address',
-    'columnEmail'       => 'E-mail',
-    'columnContactEmail'       => 'Contact E-mail',
-    'columnCompanyName' => 'Company name',
-    'columnGpsLat'      => 'GPS Latitude',
-    'columnGpsLng'      => 'Gps Longitude',
+    'columnPhone'        => 'Phone',
+    'columnAddress'      => 'Address',
+    'columnEmail'        => 'E-mail',
+    'columnContactEmail' => 'Contact E-mail',
+    'columnSubject'      => 'Subject',
+    'columnCompanyName'  => 'Company name',
+    'columnGpsLat'       => 'GPS Latitude',
+    'columnGpsLng'       => 'Gps Longitude',
 ];
 

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

@@ -100,6 +100,12 @@
             <input type="email" name="contactEmail" value="{{$page->module_settings->contactEmail or \Auth::user()->email}}" />
         </label>
 
+        <label>
+            @lang('contactform::admin/content.subject')
+
+            <input type="text" name="subject" value="{{$page->module_settings->subject or trans('contactform::admin/content.defaultSubject')}}" />
+        </label>
+
         <div class="row">
             <div class="column large-6">
                 <label>