Repository: Attendize/Attendize (language: php)

Issue:
[BUG] Messaging from Orders Page is broken
**Describe the bug**
When trying to message persons who created the order from the order management index, it gets the variables mixed up because of he routing of $event_id, thus $order_id, in the function
```php
public function showMessageOrder(Request $request, $order_id)
```
is set to the value of $event_id.
To retrieve the proper $order_id, one has to $request->query('order_id').

**To Reproduce**
Steps to reproduce the behavior:
1. Go Orders.
2. Click on an email.
3. See the issue

**Expected behavior**
Messages should be sent to the correct order(ee)

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Environment the bug happens in (Desktop, Mobile, CLI) (please complete the following information):**
 - OS: [e.g. Mac, iOS, Windows]
 - Browser [e.g. chrome, safari]
 - Version [e.g. 22]

**Version of Attendize you are using**
- Master branch 2.3.1

**Where you are running Attendize**
- in Docker

**What version or Operating System are you using on the above server**


**What version of PHP you are using on the above server**
- PHP 7.4
**What web server are you using Attendize with**
- Nginx

**Additional context**
Add any other context about the problem here.



Discussion / hints:

Fix patch:
diff --git a/SECURITY b/SECURITY
new file mode 100644
index 000000000..4c64a0ce1
--- /dev/null
+++ b/SECURITY
@@ -0,0 +1,2 @@
+Please report (suspected) security vulnerabilities to
+**[support@attendize.com](mailto:support@attendize.com)**. You will receive a response from us within 48 hours. If the issue is confirmed, we will release a patch as soon as possible depending on complexity but usually within a few days.
diff --git a/VERSION b/VERSION
index 2bf1c1ccf..197c4d5c2 100644
--- a/VERSION
+++ b/VERSION
@@ -1,1 +1,1 @@
-2.3.1
+2.4.0
diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php
deleted file mode 100644
index dc0852cc0..000000000
--- a/app/Http/Controllers/Auth/ConfirmPasswordController.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ConfirmsPasswords;
-
-class ConfirmPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Confirm Password Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password confirmations and
-    | uses a simple trait to include the behavior. You're free to explore
-    | this trait and override any functions that require customization.
-    |
-    */
-
-    use ConfirmsPasswords;
-
-    /**
-     * Where to redirect users when the intended url fails.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
-}
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
deleted file mode 100644
index 465c39ccf..000000000
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
-
-class ForgotPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset emails and
-    | includes a trait which assists in sending these notifications from
-    | your application to your users. Feel free to explore this trait.
-    |
-    */
-
-    use SendsPasswordResetEmails;
-}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
deleted file mode 100644
index 191b2b6fe..000000000
--- a/app/Http/Controllers/Auth/LoginController.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
-
-class LoginController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles authenticating users for the application and
-    | redirecting them to your home screen. The controller uses a trait
-    | to conveniently provide its functionality to your applications.
-    |
-    */
-
-    use AuthenticatesUsers;
-
-    /**
-     * Where to redirect users after login.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest')->except('logout');
-    }
-}
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
deleted file mode 100644
index ab7ef6370..000000000
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
-
-class RegisterController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Register Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users as well as their
-    | validation and creation. By default this controller uses a trait to
-    | provide this functionality without requiring any additional code.
-    |
-    */
-
-    use RegistersUsers;
-
-    /**
-     * Where to redirect users after registration.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    protected function validator(array $data)
-    {
-        return Validator::make($data, [
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
-        ]);
-    }
-
-    /**
-     * Create a new user instance after a valid registration.
-     *
-     * @param  array  $data
-     * @return \App\Models\User
-     */
-    protected function create(array $data)
-    {
-        return User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => Hash::make($data['password']),
-        ]);
-    }
-}
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
deleted file mode 100644
index 00d7bccca..000000000
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ResetsPasswords;
-
-class ResetPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset requests
-    | and uses a simple trait to include this behavior. You're free to
-    | explore this trait and override any methods you wish to tweak.
-    |
-    */
-
-    use ResetsPasswords;
-
-    /**
-     * Where to redirect users after resetting their password.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/';
-}
diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php
deleted file mode 100644
index 22aaf0066..000000000
--- a/app/Http/Controllers/Auth/VerificationController.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\VerifiesEmails;
-
-class VerificationController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Email Verification Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling email verification for any
-    | user that recently registered with the application. Emails may also
-    | be re-sent if the user didn't receive the original email message.
-    |
-    */
-
-    use VerifiesEmails;
-
-    /**
-     * Where to redirect users after verification.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-        $this->middleware('signed')->only('verify');
-        $this->middleware('throttle:6,1')->only('verify', 'resend');
-    }
-}
diff --git a/app/Http/Controllers/EventOrdersController.php b/app/Http/Controllers/EventOrdersController.php
index 3c6639e8e..6a58c3801 100644
--- a/app/Http/Controllers/EventOrdersController.php
+++ b/app/Http/Controllers/EventOrdersController.php
@@ -262,7 +262,7 @@ public function showExportOrders($event_id, $export_as = 'xls')
      * @param $order_id
      * @return mixed
      */
-    public function showMessageOrder(Request $request, $order_id)
+    public function showMessageOrder(Request $request, $event_id, $order_id)
     {
         $order = Order::scope()->findOrFail($order_id);
 
@@ -281,7 +281,7 @@ public function showMessageOrder(Request $request, $order_id)
      * @param $order_id
      * @return mixed
      */
-    public function postMessageOrder(Request $request, $order_id)
+    public function postMessageOrder(Request $request, $event_id, $order_id)
     {
         $rules = [
             'subject' => 'required|max:250',
diff --git a/bower.json b/bower.json
index 95ad80944..583e72e60 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "attendize-event-ticketing",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "authors": [
     "daveearley <dave@attendize.com>"
   ],
diff --git a/composer.json b/composer.json
index 3a74b4a71..df292d6dc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "attendize/attendize",
-    "version": "2.3.1",
+    "version": "2.4.0",
     "description": "A free and open-source event management and ticket selling application.",
     "keywords": [
         "event management",
diff --git a/database/migrations/2021_08_27_080923_remove_events_googleplus.php b/database/migrations/2021_08_27_080923_remove_events_googleplus.php
new file mode 100644
index 000000000..fde59837f
--- /dev/null
+++ b/database/migrations/2021_08_27_080923_remove_events_googleplus.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class RemoveEventsGoogleplus extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->dropColumn('social_show_googleplus');
+          });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->boolean('social_show_googleplus')->default(1);
+          });
+    }
+}
diff --git a/package.json b/package.json
index cd3a6ec79..6fb16798b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "attendize",
-    "version": "2.3.1",
+    "version": "2.4.0",
     "description": "Attendize Ticketing Platform",
     "main": "public/index.php",
     "dependencies": {
diff --git a/resources/lang/de/Order_Emails.php b/resources/lang/de/Order_Emails.php
index 8fc570aff..be1670d05 100644
--- a/resources/lang/de/Order_Emails.php
+++ b/resources/lang/de/Order_Emails.php
@@ -1,8 +1,8 @@
 <?php
 return [
-    'received_new_order'             => 'Es ging eine neue Bestllung für die Veranstaltung',
+    'received_new_order'             => 'Es ging eine neue Bestllung für die Veranstaltung ein',
     'order_still_awaiting_payment'   => 'Achtung: Bezahlung ausstehend.',
     'manage_order'                   => 'Du kannst die Bestellung hier verwalten',
     'successful_order'               => 'Deine Bestellung für die Veranstaltung <strong>:name</strong> war erfolgreich.',
     'tickets_attached'               => 'Deine Tickets sind dieser E-Mail beigefügt. Hier kannst Deine Bestellung ansehen und Deine Tickets herunterladen:',
-];
\ No newline at end of file
+];
diff --git a/resources/lang/de/Social.php b/resources/lang/de/Social.php
index 0c8885116..de3370bd8 100644
--- a/resources/lang/de/Social.php
+++ b/resources/lang/de/Social.php
@@ -10,7 +10,6 @@
   //==================================== Translations ====================================//
   'email' => 'Email',
   'facebook' => 'Facebook',
-  'g+' => 'Google+',
   'linkedin' => 'LinkedIn',
   'share_buttons_to_show' => 'Share Buttons To Show',
   'social_settings' => 'Social Settings',
diff --git a/resources/lang/de/Ticket.php b/resources/lang/de/Ticket.php
index 5901cb39b..0fe564971 100644
--- a/resources/lang/de/Ticket.php
+++ b/resources/lang/de/Ticket.php
@@ -5,9 +5,9 @@
   // Defined in file C:\\wamp\\www\\attendize\\resources\\views\\ManageEvent\\Tickets.blade.php
   'on_sale' => 'On Sale',
   //==================================== Translations ====================================//
-  'attendee_ref' => 'Attendee Ref.',
+  'attendee_ref' => 'Besucherreferenz',
   'coupon_codes' => 'Coupon Codes',
-  'create_ticket' => 'Create Ticket',
+  'create_ticket' => 'Ticket erstellen',
   'demo_attendee_ref' => '#YLY9U73-1',
   'demo_end_date_time' => 'Mar 18th 5:08PM',
   'demo_event' => 'Demo Event',
@@ -19,34 +19,34 @@
   'demo_ticket_type' => 'General Admission',
   'demo_venue' => 'Demo Location',
   'doesnt_account_for_refunds' => 'Doesn\'t account for refunds.',
-  'end_date_time' => 'End Date / Time',
+  'end_date_time' => 'Enddatum /-zeit',
   'event' => 'Event',
-  'event_tickets' => 'Event Tickets',
-  'footer' => 'Entry ticket looses it\'s validity the moment venue is left and re-entry during event is not permitted.',
-  'n_tickets' => ':num tickets',
+  'event_tickets' => 'Eventtickets',
+  'footer' => 'Die Karte verliert mit dem Verlassen die Gültigkeit',
+  'n_tickets' => ':num Tickets',
   'name' => 'Name',
-  'no_tickets_yet' => 'No Tickets Yet',
-  'no_tickets_yet_text' => 'Create your first ticket by clicking the button below.',
-  'order_ref' => 'Order Ref.',
-  'organiser' => 'Organiser',
+  'no_tickets_yet' => 'Noch keine Tickets',
+  'no_tickets_yet_text' => 'Erstelle dein erstes Ticket mit dem Knopf unterhalb.',
+  'order_ref' => 'Bestellreferenz',
+  'organiser' => 'Organisator',
   'pause' => 'Pause',
-  'price' => 'Price',
-  'questions' => 'Questions',
-  'remaining' => 'Remaining',
-  'resume' => 'Resume',
-  'revenue' => 'Revenue',
-  'search_tickets' => 'Search tickets...',
-  'show_1d_barcode' => 'Show 1D barcode on tickets',
-  'sold' => 'Sold',
-  'start_date_time' => 'Start Date / Time',
-  'this_ticket_is_hidden' => 'This ticket is hidden',
-  'ticket_background_color' => 'Ticket Background Color',
-  'ticket_border_color' => 'Ticket Border Color',
-  'ticket_design' => 'Ticket Design',
-  'ticket_preview' => 'Ticket Preview',
-  'ticket_sales_paused' => 'Sales Paused',
-  'ticket_sub_text_color' => 'Ticket Sub Text Color',
-  'ticket_text_color' => 'Ticket Text Color',
-  'ticket_type' => 'Ticket Type',
-  'venue' => 'Venue',
+  'price' => 'Preis',
+  'questions' => 'Fragen',
+  'remaining' => 'Verbleibend',
+  'resume' => 'Weiterführen',
+  'revenue' => 'Umsatz',
+  'search_tickets' => 'Suche Tickets...',
+  'show_1d_barcode' => '1D Barcode auf Tickets anzeigen',
+  'sold' => 'Verkauft',
+  'start_date_time' => 'Startdatum /-zeit',
+  'this_ticket_is_hidden' => 'Dieses Ticket ist nicht sichtbar',
+  'ticket_background_color' => 'Tickethintergrundfarbe',
+  'ticket_border_color' => 'Ticketrahmenfarbe',
+  'ticket_design' => 'Ticketdesign',
+  'ticket_preview' => 'Ticketvorschau',
+  'ticket_sales_paused' => 'Verkauf eingestellt',
+  'ticket_sub_text_color' => 'Ticketzweittextfarbe',
+  'ticket_text_color' => 'Tickettextfarbe',
+  'ticket_type' => 'Tickettyp',
+  'venue' => 'Veranstaltungsort',
 );
diff --git a/resources/lang/de/messages.php b/resources/lang/de/messages.php
deleted file mode 100644
index 2d78434d6..000000000
--- a/resources/lang/de/messages.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min and :max.',
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
-        'string'  => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
-    ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'filled'               => 'The :attribute field is required.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'image'                => 'The :attribute must be an image.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
-    ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
-    ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
-    ],
-    'unique'               => 'The :attribute has already been taken.',
-    'url'                  => 'The :attribute format is invalid.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'terms_agreed' => [
-            'required' => 'Please agree to our Terms of Service.'
-        ]
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [],
-
-];
diff --git a/resources/lang/en/Social.php b/resources/lang/en/Social.php
index 0c8885116..de3370bd8 100644
--- a/resources/lang/en/Social.php
+++ b/resources/lang/en/Social.php
@@ -10,7 +10,6 @@
   //==================================== Translations ====================================//
   'email' => 'Email',
   'facebook' => 'Facebook',
-  'g+' => 'Google+',
   'linkedin' => 'LinkedIn',
   'share_buttons_to_show' => 'Share Buttons To Show',
   'social_settings' => 'Social Settings',
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
deleted file mode 100644
index 2d78434d6..000000000
--- a/resources/lang/en/messages.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min and :max.',
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
-        'string'  => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
-    ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'filled'               => 'The :attribute field is required.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'image'                => 'The :attribute must be an image.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
-    ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
-    ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
-    ],
-    'unique'               => 'The :attribute has already been taken.',
-    'url'                  => 'The :attribute format is invalid.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'terms_agreed' => [
-            'required' => 'Please agree to our Terms of Service.'
-        ]
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [],
-
-];
diff --git a/resources/lang/es/Social.php b/resources/lang/es/Social.php
index 391c4e8d9..99c187c38 100644
--- a/resources/lang/es/Social.php
+++ b/resources/lang/es/Social.php
@@ -3,7 +3,6 @@
 return array(
     'email'                  => 'Correo electrónico',
     'facebook'               => 'Facebook',
-    'g+'                     => 'Google+',
     'linkedin'               => 'LinkedIn',
     'pinterest'              => 'Pinterest',
     'share_buttons_to_show'  => 'Botones Compartir para mostrar',
diff --git a/resources/lang/es/messages.php b/resources/lang/es/messages.php
deleted file mode 100644
index 22836f9d5..000000000
--- a/resources/lang/es/messages.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted'             => ':attribute debe ser aceptado.',
-    'active_url'           => ':attribute no es una URL válida.',
-    'after'                => ':attribute debe ser una fecha posterior a :date.',
-    'after_or_equal'       => ':attribute debe ser una fecha posterior o igual a :date.',
-    'alpha'                => ':attribute sólo debe contener letras.',
-    'alpha_dash'           => ':attribute sólo debe contener letras, números y guiones.',
-    'alpha_num'            => ':attribute sólo debe contener letras y números.',
-    'array'                => ':attribute debe ser un conjunto.',
-    'before'               => ':attribute debe ser una fecha anterior a :date.',
-    'before_or_equal'      => ':attribute debe ser una fecha anterior o igual a :date.',
-    'between'              => [
-        'numeric' => ':attribute tiene que estar entre :min - :max.',
-        'file'    => ':attribute debe pesar entre :min - :max kilobytes.',
-        'string'  => ':attribute tiene que tener entre :min - :max caracteres.',
-        'array'   => ':attribute tiene que tener entre :min - :max ítems.',
-    ],
-    'boolean'              => 'El campo :attribute debe tener un valor verdadero o falso.',
-    'confirmed'            => 'La confirmación de :attribute no coincide.',
-    'date'                 => ':attribute no es una fecha válida.',
-    'date_format'          => ':attribute no corresponde al formato :format.',
-    'different'            => ':attribute y :other deben ser diferentes.',
-    'digits'               => ':attribute debe tener :digits dígitos.',
-    'digits_between'       => ':attribute debe tener entre :min y :max dígitos.',
-    'dimensions'           => 'Las dimensiones de la imagen :attribute no son válidas.',
-    'distinct'             => 'El campo :attribute contiene un valor duplicado.',
-    'email'                => ':attribute no es un correo válido',
-    'exists'               => ':attribute es inválido.',
-    'file'                 => 'El campo :attribute debe ser un archivo.',
-    'filled'               => 'El campo :attribute es obligatorio.',
-    'gt'                   => [
-        'numeric' => 'El campo :attribute debe ser mayor que :value.',
-        'file'    => 'El campo :attribute debe tener más de :value kilobytes.',
-        'string'  => 'El campo :attribute debe tener más de :value caracteres.',
-        'array'   => 'El campo :attribute debe tener más de :value elementos.',
-    ],
-    'gte'                  => [
-        'numeric' => 'El campo :attribute debe ser como mínimo :value.',
-        'file'    => 'El campo :attribute debe tener como mínimo :value kilobytes.',
-        'string'  => 'El campo :attribute debe tener como mínimo :value caracteres.',
-        'array'   => 'El campo :attribute debe tener como mínimo :value elementos.',
-    ],
-    'image'                => ':attribute debe ser una imagen.',
-    'in'                   => ':attribute es inválido.',
-    'in_array'             => 'El campo :attribute no existe en :other.',
-    'integer'              => ':attribute debe ser un número entero.',
-    'ip'                   => ':attribute debe ser una dirección IP válida.',
-    'ipv4'                 => ':attribute debe ser un dirección IPv4 válida',
-    'ipv6'                 => ':attribute debe ser un dirección IPv6 válida.',
-    'json'                 => 'El campo :attribute debe tener una cadena JSON válida.',
-    'lt'                   => [
-        'numeric' => 'El campo :attribute debe ser menor que :value.',
-        'file'    => 'El campo :attribute debe tener menos de :value kilobytes.',
-        'string'  => 'El campo :attribute debe tener menos de :value caracteres.',
-        'array'   => 'El campo :attribute debe tener menos de :value elementos.',
-    ],
-    'lte'                  => [
-        'numeric' => 'El campo :attribute debe ser como máximo :value.',
-        'file'    => 'El campo :attribute debe tener como máximo :value kilobytes.',
-        'string'  => 'El campo :attribute debe tener como máximo :value caracteres.',
-        'array'   => 'El campo :attribute debe tener como máximo :value elementos.',
-    ],
-    'max'                  => [
-        'numeric' => ':attribute no debe ser mayor a :max.',
-        'file'    => ':attribute no debe ser mayor que :max kilobytes.',
-        'string'  => ':attribute no debe ser mayor que :max caracteres.',
-        'array'   => ':attribute no debe tener más de :max elementos.',
-    ],
-    'mimes'                => ':attribute debe ser un archivo con formato: :values.',
-    'mimetypes'            => ':attribute debe ser un archivo con formato: :values.',
-    'min'                  => [
-        'numeric' => 'El tamaño de :attribute debe ser de al menos :min.',
-        'file'    => 'El tamaño de :attribute debe ser de al menos :min kilobytes.',
-        'string'  => ':attribute debe contener al menos :min caracteres.',
-        'array'   => ':attribute debe tener al menos :min elementos.',
-    ],
-    'not_in'               => ':attribute es inválido.',
-    'not_regex'            => 'El formato del campo :attribute no es válido.',
-    'numeric'              => ':attribute debe ser numérico.',
-    'present'              => 'El campo :attribute debe estar presente.',
-    'regex'                => 'El formato de :attribute es inválido.',
-    'required'             => 'El campo :attribute es obligatorio.',
-    'required_if'          => 'El campo :attribute es obligatorio cuando :other es :value.',
-    'required_unless'      => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
-    'required_with'        => 'El campo :attribute es obligatorio cuando :values está presente.',
-    'required_with_all'    => 'El campo :attribute es obligatorio cuando :values está presente.',
-    'required_without'     => 'El campo :attribute es obligatorio cuando :values no está presente.',
-    'required_without_all' => 'El campo :attribute es obligatorio cuando ninguno de :values estén presentes.',
-    'same'                 => ':attribute y :other deben coincidir.',
-    'size'                 => [
-        'numeric' => 'El tamaño de :attribute debe ser :size.',
-        'file'    => 'El tamaño de :attribute debe ser :size kilobytes.',
-        'string'  => ':attribute debe contener :size caracteres.',
-        'array'   => ':attribute debe contener :size elementos.',
-    ],
-    'string'               => 'El campo :attribute debe ser una cadena de caracteres.',
-    'timezone'             => 'El :attribute debe ser una zona válida.',
-    'unique'               => ':attribute ya ha sido registrado.',
-    'uploaded'             => 'Subir :attribute ha fallado.',
-    'url'                  => 'El formato :attribute es inválido.',
-    'uuid'                 => 'El campo :attribute debe ser un UUID válido.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'terms_agreed' => [
-            'required' => 'Por favor, acepte nuestros Términos de Servicio.'
-        ]
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [],
-
-];
diff --git a/resources/lang/fr/Social.php b/resources/lang/fr/Social.php
index fa174da53..14ae6889d 100644
--- a/resources/lang/fr/Social.php
+++ b/resources/lang/fr/Social.php
@@ -10,7 +10,6 @@
   //==================================== Translations ====================================//
   'email' => 'Courriel',
   'facebook' => 'Facebook',
-  'g+' => 'Google+',
   'linkedin' => 'LinkedIn',
   'share_buttons_to_show' => 'Boutons de partage à montrer',
   'social_settings' => 'Paramètres sociaux',
diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
deleted file mode 100644
index cb4e3908e..000000000
--- a/resources/lang/fr/messages.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted'             => ':attribute doit être accepté.',
-    'active_url'           => ':attribute n\'est pas une URL valide.',
-    'after'                => ':attribute doit être une date après :date.',
-    'alpha'                => ':attribute ne doit contenir que des lettres.',
-    'alpha_dash'           => ':attribute ne peut contenir que des lettres, des chiffres et des tirets.',
-    'alpha_num'            => ':attribute ne peut contenir que des lettres et des chiffres.',
-    'array'                => ':attribute doit être un tableau.',
-    'before'               => ':attribute doit être une date antérieure à :date.',
-    'between'              => [
-        'numeric' => ':attribute doit être entre :min et :max.',
-        'file'    => ':attribute doit être entre :min et :max kilobytes.',
-        'string'  => ':attribute doit être entre :min et :max caractères.',
-        'array'   => ':attribute doit avoir entre :min et :max éléments.',
-    ],
-    'boolean'              => 'Le champ :attribute doit être vrai ou faux.',
-    'confirmed'            => 'La confirmation :attribute ne convient pas.',
-    'date'                 => ':attribute n\'est pas une date valide.',
-    'date_format'          => ':attribute ne correspond pas au format :format.',
-    'different'            => ':attribute et :other ne doivent pas être identiques.',
-    'digits'               => ':attribute doit contenir :digits chiffres.',
-    'digits_between'       => ':attribute doit compter entre :min et :max chiffres.',
-    'email'                => ':attribute doit être une adresse de courriel valide.',
-    'filled'               => 'Le champ :attribute est requis.',
-    'exists'               => 'Le choix :attribute est invalide.',
-    'image'                => ':attribute doit être une image.',
-    'in'                   => 'Le choix :attribute est invalide.',
-    'integer'              => ':attribute doit être un nombre entier.',
-    'ip'                   => ':attribute doit être une adresse IP valide.',
-    'max'                  => [
-        'numeric' => ':attribute ne doit pas être plus grand que :max.',
-        'file'    => ':attribute ne doit pas être plus grand que :max kilobytes.',
-        'string'  => ':attribute ne doit pas contenir plus de :max caractères.',
-        'array'   => ':attribute ne doit pas avoir plus de :max éléments.',
-    ],
-    'mimes'                => ':attribute doit être du type : :values.',
-    'min'                  => [
-        'numeric' => ':attribute doit être au moins :min.',
-        'file'    => ':attribute doit faire au moins :min kilobytes.',
-        'string'  => ':attribute doit contenir au moins :min caractères.',
-        'array'   => ':attribute doit contenir au moins least :min éléments.',
-    ],
-    'not_in'               => 'Le choix :attribute est invalide.',
-    'numeric'              => ':attribute doit être un nombre.',
-    'regex'                => 'Le format de :attribute n\'est pas valide.',
-    'required'             => 'Le champ :attribute est requis.',
-    'required_if'          => 'Le champ :attribute est requis quand :other est :value.',
-    'required_with'        => 'Le champ :attribute est requis quand :values est présent.',
-    'required_with_all'    => 'Le champ :attribute est requis quand :values est présent.',
-    'required_without'     => 'Le champ :attribute est requis quand :values n\'est pas présent.',
-    'required_without_all' => 'Le champ :attribute est requis quand aucun :values n\'est présent.',
-    'same'                 => 'Le champ :attribute et :other doivent correspondre.',
-    'size'                 => [
-        'numeric' => ':attribute doit faire :size.',
-        'file'    => ':attribute doit faire :size kilobytes.',
-        'string'  => ':attribute doit faire :size caractères.',
-        'array'   => ':attribute doit contenir :size éléments.',
-    ],
-    'unique'               => ':attribute a déjà été pris.',
-    'url'                  => 'Le format de :attribute n\'est pas valide.',
-    'timezone'             => ':attribute doit être un fuseau valide.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'terms_agreed' => [
-            'required' => 'Merci d\'accepter nos conditions générales d\'utilisation.'
-        ]
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [],
-
-];
diff --git a/resources/lang/it/Social.php b/resources/lang/it/Social.php
index f65f87045..ae720ddc0 100644
--- a/resources/lang/it/Social.php
+++ b/resources/lang/it/Social.php
@@ -4,7 +4,6 @@
     'pinterest' => 'Pinterest',
     'email' => 'E-mail',
     'facebook' => 'Facebook',
-    'g+' => 'Google+',
     'linkedin' => 'LinkedIn',
     'share_buttons_to_show' => 'Pulsanti di condivisione da mostrare',
     'social_settings' => 'Impostazioni Social',
diff --git a/resources/lang/it/messages.php b/resources/lang/it/messages.php
deleted file mode 100644
index 2db28719b..000000000
--- a/resources/lang/it/messages.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted' => ':attribute deve essere accettata .',
-    'active_url' => ':attribute non è una URL valido.',
-    'after' => ':attribute deve essere una data dopo :date.',
-    'alpha' => ':attribute può contenere solo lettere.',
-    'alpha_dash' => ':attribute può contenere solo lettere, numeri e trattini.',
-    'alpha_num' => ':attribute può contenere solo lettere e numeri.',
-    'array' => ':attribute deve essere una matrice.',
-    'before' => ':attribute deve essere una data anteriore :date.',
-    'between' => [
-        'numeric' => ':attribute deve essere compreso tra :min e :max.',
-        'file' => ':attribute deve essere compreso tra :min e :max kilobyte.',
-        'string' => ':attribute deve essere compreso tra :min e :max caratteri.',
-        'array' => ':attribute deve avere tra :min e :max oggetti.',
-    ],
-    'boolean' => ':attribute attributo deve essere vero o falso.',
-    'confirmed' => ':attribute attributo non corrisponde.',
-    'date' => ':attribute non è una data valida.',
-    'date_format' => ':attribute non corrisponde al formato :format.',
-    'different' => ':attribute e :other devono essere differenti.',
-    'digits' => ':attribute deve essere di :digits cifre.',
-    'digits_between' => ':attribute deve essere compreso tra :min e :max cifre.',
-    'email' => ':attribute deve essere un indirizzo email valido.',
-    'filled' => ':attribute è obbligatorio.',
-    'exists' => ':attribute selezionato non è valido.',
-    'image' => ':attribute deve essere un\'immagine.',
-    'in' => ':attribute selezionato non è valido.',
-    'integer' => ':attribute deve essere un numero intero.',
-    'ip' => ':attribute deve essere un indirizzo IP valido.',
-    'max' => [
-        'numeric' => ':attribute può non essere superiore a :max.',
-        'file' => ':attribute può non essere superiore a :max kilobyte.',
-        'string' => ':attribute può non essere superiore a :max caratteri.',
-        'array' => ':attribute non può avere più di :max oggetti.',
-    ],
-    'mimes' => ':attribute deve essere un file di tipo :values',
-    'min' => [
-        'numeric' => ':attribute deve essere almeno :min.',
-        'file' => ':attribute deve essere almeno :min kilobyte.',
-        'string' => ':attribute deve essere almeno :min caratteri.',
-        'array' => ':attribute deve avere almeno :min oggetti.',
-    ],
-    'not_in' => ':attribute selezionato non è valido.',
-    'numeric' => ':attribute deve essere un numero.',
-    'regex' => 'Il formato :format dell\'attributo non è valido.',
-    'required' => ':attribute è obbligatorio.',
-    'required_if' => ':attribute attributo è richiesto quando :other è :value.',
-    'required_with' => ':attribute attributo è richiesto quando :values è presente.',
-    'required_with_all' => ':attribute attributo è richiesto quando :values è presente.',
-    'required_without' => ':attribute attributo è richiesto quando :values non è presente.',
-    'required_without_all' => ':attribute attributo è richiesto quando nessuno di: valori è presente.',
-    'same' => ':attribute e :other devono combaciare.',
-    'size' => [
-        'numeric' => ':attribute deve essere :size.',
-        'file' => ':attribute deve essere :size kilobyte di dimensione.',
-        'string' => ':attribute deve essere :size caratteri di dimensioni.',
-        'array' => ':attribute deve contenere :items oggetti.',
-    ],
-    'unique' => ':attribute è già stato preso.',
-    'url' => 'Il formato di :attribute non è valido.',
-    'timezone' => ':attribute deve essere un orario valido.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'terms_agreed' => [
-            'required' => 'Per favore accetta i Termini e Condizioni d\'uso.'
-        ]
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [],
-
-];
diff --git a/resources/lang/ja/Social.php b/resources/lang/ja/Social.php
index 5887dec1c..f22c63675 100644
--- a/resources/lang/ja/Social.php
+++ b/resources/lang/ja/Social.php
@@ -7,7 +7,6 @@
     //==================================== Translations ====================================//
     'email'                  => 'Email',
     'facebook'               => 'Facebook',
-    'g+'                     => 'Google+',
     'linkedin'               => 'LinkedIn',
     'share_buttons_to_show'  => '表示する共有ボタン',
     'social_settings'        => 'ソーシャル設定',
diff --git a/resources/lang/ja/messages.php b/resources/lang/ja/messages.php
deleted file mode 100644
index 75170049a..000000000
--- a/resources/lang/ja/messages.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted'             => ':attributeは受け入れられなければなりません。',
-    'active_url'           => ':attributeは有効なURLではありません。',
-    'after'                => ':attributeは:dateより後の日付でなければなりません。',
-    'alpha'                => ':attributeは文字のみを含むことができます。',
-    'alpha_dash'           => ':attributeには文字、数字、およびハイフンだけを含めることができます。',
-    'alpha_num'            => ':attributeは文字と数字だけを含むことができます。',
-    'array'                => ':attributeは配列でなければなりません。',
-    'before'               => ':attributeは:dateより前の日付でなければなりません。',
-    'between'              => [
-        'numeric' => ':attributeは:minと:maxの間になければなりません。',
-        'file'    => ':attributeは:minから:maxキロバイトまででなければなりません。',
-        'string'  => ':attributeは:min文字と:max文字の間になければなりません。',
-        'array'   => ':attributeは:minから:maxまでの間になければなりません。',
-    ],
-    'boolean'              => ':attributeフィールドはtrueまたはfalseでなければなりません。',
-    'confirmed'            => ':attributeの確認が一致しません。',
-    'date'                 => ':attributeは有効な日付ではありません。',
-    'date_format'          => ':attributeがフォーマット:formatと一致しません。',
-    'different'            => ':attributeと:otherは異なる必要があります。',
-    'digits'               => ':attributeは数字でなければなりません。',
-    'digits_between'       => ':attributeは:minと:maxの間になければなりません。',
-    'email'                => ':attributeは有効なメールアドレスでなければなりません。',
-    'filled'               => ':attributeフィールドは必須です。',
-    'exists'               => '選択した:attributeが無効です。',
-    'image'                => ':attributeは画像でなければなりません。',
-    'in'                   => '選択した:attributeが無効です。',
-    'integer'              => ':attributeは整数でなければなりません。',
-    'ip'                   => ':attributeは有効なIPアドレスでなければなりません。',
-    'max'                  => [
-        'numeric' => ':attributeは:maxより大きくてはいけません',
-        'file'    => ':attributeは:maxキロバイトより大きくてはいけません。',
-        'string'  => ':attributeは:max文字より大きくてはいけません。',
-        'array'   => ':attributeは:max個以上の項目を持つことはできません。',
-    ],
-    'mimes'                => ':attributeは:values.型のファイルでなければなりません。',
-    'min'                  => [
-        'numeric' => ':attributeは少なくとも:minでなければなりません。',
-        'file'    => ':attributeは少なくとも:minキロバイトでなければなりません。',
-        'string'  => ':attributeは少なくとも:min文字でなければなりません。',
-        'array'   => ':attributeには少なくとも:min個の項目が必要です。',
-    ],
-    'not_in'               => 'selected:attributeが無効です。',
-    'numeric'              => ':attributeは数字でなければなりません。',
-    'regex'                => ':attributeのフォーマットが無効です。',
-    'required'             => ':attributeフィールドは必須です。',
-    'required_if'          => ':otherフィールドが:valueの場合、:attributeフィールドは必須です。',
-    'required_with'        => ':valuesが存在する場合、:attributeフィールドは必須です。',
-    'required_with_all'    => ':valuesが存在する場合、:attributeフィールドは必須です。',
-    'required_without'     => ':valuesが存在しない場合は:attributeフィールドが必須です。',
-    'required_without_all' => ':attributeフィールドは:valuesがない場合は必須です。',
-    'same'                 => ':attributeと:otherは一致しなければなりません。',
-    'size'                 => [
-        'numeric' => ':attributeは:sizeでなければなりません。',
-        'file'    => ':attributeは:sizeキロバイトなければなりません。',
-        'string'  => ':attributeは:size文字でなければなりません。',
-        'array'   => ':attributeは:sizeつの項目を含まなければなりません。',
-    ],
-    'unique'               => ':attributeは既に使われています。',
-    'url'                  => ':attributeの形式が無効です。',
-    'timezone'             => ':attributeは有効なゾーンでなければなりません。',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'terms_agreed' => [
-            'required' => '利用規約に同意してください。'
-        ]
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [],
-
-];
diff --git a/resources/lang/nl/Social.php b/resources/lang/nl/Social.php
index e56192f23..a50d094cb 100644
--- a/resources/lang/nl/Social.php
+++ b/resources/lang/nl/Social.php
@@ -10,7 +10,6 @@
   //==================================== Translations ====================================//
   'email' => 'E-mail',
   'facebook' => 'Facebook',
-  'g+' => 'Google+',
   'linkedin' => 'LinkedIn',
   'share_buttons_to_show' => 'Deel knoppen voor weergave',
   'social_settings' => 'Socialmedia instellingen',
diff --git a/resources/lang/nl/messages.php b/resources/lang/nl/messages.php
deleted file mode 100644
index a0acc7271..000000000
--- a/resources/lang/nl/messages.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/****************************************************************************************
-*    Title: Validation Language Lines (Dutch)
-*    Author: Johnhout
-*    Date: Feb 3, 2015
-*    Availability: https://gist.github.com/johnhout/055d2c039cfb7574d657
-*
-***************************************************************************************/
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-	'accepted'             => ':attribute dient te worden geaccepteerd.',
-	'active_url'           => ':attribute is geen geldige URL.',
-	'after'                => ':attribute dient een datum te zijn na :date.',
-	'alpha'                => ':attribute mag alleen letters bevatten.',
-	'alpha_dash'           => ':attribute mag alleen letters, nummers, and strepen bevatten.',
-	'alpha_num'            => ':attribute mag alleen letters en nummers bevatten.',
-	'array'                => ':attribute moet een array zijn.',
-	'before'               => ':attribute moet een datum zijn eerder dan :date.',
-	'between'              => [
-		'numeric' => ':attribute moet tussen :min en :max liggen.',
-		'file'    => ':attribute moet tussen :min en :max kilobytes zijn.',
-		'string'  => ':attribute moet tussen :min en :max karakters lang zijn.',
-		'array'   => ':attribute moet tussen :min en :max items bevatten.',
-	],
-	'boolean'              => ':attribute kan enkel true of false zijn.',
-	'confirmed'            => ':attribute bevestiging komt niet overeen.',
-	'date'                 => ':attribute is geen geldige datum.',
-	'date_format'          => ':attribute komt niet overeen met het formaat :format.',
-	'different'            => ':attribute en :other dienen verschillend te zijn.',
-	'digits'               => ':attribute moet :digits cijfers zijn.',
-	'digits_between'       => ':attribute moet tussen :min en :max cijfers zijn.',
-	'email'                => ':attribute dient een geldig emailadres te zijn.',
-	'filled'               => ':attribute veld is verplicht.',
-	'exists'               => 'Het geselecteerde :attribute is ongeldig.',
-	'image'                => ':attribute dient een afbeelding te zijn.',
-	'in'                   => 'Het geselecteerde :attribute is ongeldig.',
-	'integer'              => ':attribute dient een geheel getal te zijn.',
-	'ip'                   => ':attribute dient een geldig IP adres te zijn.',
-	'max'                  => [
-		'numeric' => ':attribute mag niet groter zijn dan :max.',
-		'file'    => ':attribute mag niet groter zijn dan :max kilobytes.',
-		'string'  => ':attribute mag niet groter zijn dan :max karakters.',
-		'array'   => ':attribute mag niet meer dan :max items bevatten.',
-	],
-	'mimes'                => ':attribute dient een bestand te zijn van het type: :values.',
-	'min'                  => [
-		'numeric' => ':attribute dient minimaal :min te zijn.',
-		'file'    => ':attribute dient minimaal :min kilobytes te zijn.',
-		'string'  => ':attribute dient minimaal :min karakters te bevatten.',
-		'array'   => ':attribute dient minimaal :min items te bevatten.',
-	],
-	'not_in'               => 'Het geselecteerde :attribute is ongeldig.',
-	'numeric'              => 'Het :attribute dient een nummer te zijn.',
-	'regex'                => 'Het :attribute formaat is ongeldig.',
-	'required'             => 'Het :attribute veld is verplicht.',
-	'required_if'          => 'Het :attribute veld is verplicht wanneer :other is :value.',
-	'required_with'        => 'Het :attribute veld is verplicht wanneer :values aanwezig is.',
-	'required_with_all'    => 'Het :attribute veld is verplicht wanneer :values aanwezig is.',
-	'required_without'     => 'Het :attribute veld is verplicht wanneer :values niet aanwezig is.',
-	'required_without_all' => 'Het :attribute veld is verplicht wanneer geen van :values aanwezig is.',
-	'same'                 => 'Het :attribute en :other moeten hetzelfde zijn.',
-	'size'                 => [
-		'numeric' => ':attribute moet :size zijn.',
-		'file'    => ':attribute moet :size kilobytes groot zijn.',
-		'string'  => ':attribute moet :size karakters lang zijn.',
-		'array'   => ':attribute moet :size items bevatten.',
-	],
-	'unique'               => ':attribute is al bezet.',
-	'url'                  => ':attribute formaat is ongeldig.',
-	'timezone'             => ':attribute moet een geldige tijdszone zijn.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention 'attribute.rule' to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'terms_agreed' => [
-            'required' => 'Accepteren van de algemene voorwaarde verplicht.'
-        ]
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of 'email'. This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [],
-
-];
diff --git a/resources/lang/pl/Social.php b/resources/lang/pl/Social.php
index d6e20532e..166986252 100644
--- a/resources/lang/pl/Social.php
+++ b/resources/lang/pl/Social.php
@@ -10,7 +10,6 @@
   //==================================== Translations ====================================//
   'email' => 'Email',
   'facebook' => 'Facebook',
-  'g+' => 'Google+',
   'linkedin' => 'LinkedIn',
   'share_buttons_to_show' => 'Przyciski Udostępniania do Wyświetlenia',
   'social_settings' => 'Ustawienia Społeczności',
diff --git a/resources/lang/ru/Social.php b/resources/lang/ru/Social.php
index 4585da510..9e5bf8f0f 100644
--- a/resources/lang/ru/Social.php
+++ b/resources/lang/ru/Social.php
@@ -10,7 +10,6 @@
   //==================================== Translations ====================================//
   'email' => 'Email',
   'facebook' => 'Facebook',
-  'g+' => 'Google+',
   'linkedin' => 'LinkedIn',
   'share_buttons_to_show' => 'Какие кнопки соцсетей показывать',
   'social_settings' => 'Настройки соцсетей',
diff --git a/resources/lang/ru/messages.php b/resources/lang/ru/messages.php
deleted file mode 100644
index badb035df..000000000
--- a/resources/lang/ru/messages.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted'             => ':attribute должен быть принят.',
-    'active_url'           => ':attribute содержит некорректный URL.',
-    'after'                => ':attribute должен быть датой после :date.',
-    'alpha'                => ':attribute может содержать только буквы.',
-    'alpha_dash'           => ':attribute может содержать только буквы, цифры и символ подчеркивания.',
-    'alpha_num'            => ':attribute может содержать только буквы и цифры.',
-    'array'                => ':attribute должен быть массивом',
-    'before'               => ':attribute должен быть датой до :date.',
-    'between'              => [
-        'numeric' => ':attribute должен быть между :min и :max.',
-        'file'    => ':attribute должен быть между :min и :max килобайт.',
-        'string'  => ':attribute должен быть между :min и :max символов.',
-        'array'   => ':attribute должен быть между :min и :max элементов.',
-    ],
-    'boolean'              => ':attribute должен быть в значении true или false.',
-    'confirmed'            => ':attribute не совпадает.',
-    'date'                 => ':attribute некорректная дата.',
-    'date_format'          => ':attribute должен быть отформатирован как :format.',
-    'different'            => ':attribute и :other должны различаться.',
-    'digits'               => ':attribute должны быть :digits цифр.',
-    'digits_between'       => ':attribute должен быть между :min and :max цифрами.',
-    'email'                => ':attribute должен быть правильным email адресом.',
-    'filled'               => ':attribute поле обязательно.',
-    'exists'               => 'выбранное значение :attribute неверно.',
-    'image'                => ':attribute должен быть изображением.',
-    'in'                   => 'Выбранный атрибут :attribute неверен.',
-    'integer'              => ':attribute должен быть целым числом.',
-    'ip'                   => ':attribute должен быть правильным IP адресом.',
-    'max'                  => [
-        'numeric' => ':attribute не может быть больше чем :max.',
-        'file'    => ':attribute не может быть больше чем :max килобайт.',
-        'string'  => ':attribute не может быть больше чем :max символов.',
-        'array'   => ':attribute не может быть больше чем :max элементов.',
-    ],
-    'mimes'                => ':attribute должен быть файлом типа: :values.',
-    'min'                  => [
-        'numeric' => ':attribute must be at least :min.',
-        'file'    => ':attribute must be at least :min kilobytes.',
-        'string'  => ':attribute must be at least :min characters.',
-        'array'   => ':attribute must have at least :min items.',
-    ],
-    'not_in'               => 'выбранное значение :attribute неверно.',
-    'numeric'              => ':attribute должен быть числом.',
-    'regex'                => ':attribute формат неверен.',
-    'required'             => ':attribute поле обязательно.',
-    'required_if'          => ':attribute поле обязательно, когда :other содержит :value.',
-    'required_with'        => ':attribute поле обязательно, когда :values заполнено.',
-    'required_with_all'    => ':attribute поле обязательно, когда :values заполнено.',
-    'required_without'     => ':attribute поле обязательно, когда :values не заполнено.',
-    'required_without_all' => ':attribute поле обязательно, когда ни одно из :values не заполнены.',
-    'same'                 => ':attribute и :other должны совпадать.',
-    'size'                 => [
-        'numeric' => ':attribute должен быть размера :size.',
-        'file'    => ':attribute должен быть :size килобайт.',
-        'string'  => ':attribute must be :size символов.',
-        'array'   => ':attribute должен содержать :size элементов.',
-    ],
-    'unique'               => ':attribute уже был введен ранее.',
-    'url'                  => ':attribute неверный формат.',
-    'timezone'             => ':attribute должен содержать корректную временную зону.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'terms_agreed' => [
-            'required' => 'Пожалуйста, согласитесь с нашими Условиями предоставления услуг.'
-        ]
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [],
-
-];
diff --git a/resources/views/ManageEvent/Customize.blade.php b/resources/views/ManageEvent/Customize.blade.php
index 9d600c43f..bff3f4760 100644
--- a/resources/views/ManageEvent/Customize.blade.php
+++ b/resources/views/ManageEvent/Customize.blade.php
@@ -306,10 +306,6 @@ class="{{$tab == 'ticket_design' ? 'active' : ''}}"><a href="#ticket_design" dat
                             {!! Form::checkbox('social_show_email', 1, $event->social_show_email, ['id' => 'social_show_email', 'data-toggle' => 'toggle']) !!}
                             {!! Form::label('social_show_email', trans("Social.email")) !!}
                         </div>
-                        <div class="custom-checkbox mb5">
-                            {!! Form::checkbox('social_show_googleplus', 1, $event->social_show_googleplus, ['id' => 'social_show_googleplus', 'data-toggle' => 'toggle']) !!}
-                            {!! Form::label('social_show_googleplus', trans("Social.g+")) !!}
-                        </div>
                         <div class="custom-checkbox mb5">
                             {!! Form::checkbox('social_show_linkedin', 1, $event->social_show_linkedin, ['id' => 'social_show_linkedin', 'data-toggle' => 'toggle']) !!}
                             {!! Form::label('social_show_linkedin', trans("Social.linkedin")) !!}
diff --git a/resources/views/ManageEvent/Dashboard.blade.php b/resources/views/ManageEvent/Dashboard.blade.php
index 05ada15bd..c5201f7e4 100644
--- a/resources/views/ManageEvent/Dashboard.blade.php
+++ b/resources/views/ManageEvent/Dashboard.blade.php
@@ -240,38 +240,6 @@ class="popup">
                             </a>
                         </li>
 
-                        <li class="rrssb-googleplus">
-                            <a href="https://plus.google.com/share?url={{$event->event_url}}?utm_source=googleplus"
-                               class="popup">
-                            <span class="rrssb-icon">
-                                <svg version="1.1" xmlns="http://www.w3.org/2000/svg"
-                                     xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px"
-                                     height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28"
-                                     xml:space="preserve">
-                                <g>
-                                    <g>
-                                        <path d="M14.703,15.854l-1.219-0.948c-0.372-0.308-0.88-0.715-0.88-1.459c0-0.748,0.508-1.223,0.95-1.663
-                                      c1.42-1.119,2.839-2.309,2.839-4.817c0-2.58-1.621-3.937-2.399-4.581h2.097l2.202-1.383h-6.67c-1.83,0-4.467,0.433-6.398,2.027
-                                      C3.768,4.287,3.059,6.018,3.059,7.576c0,2.634,2.022,5.328,5.604,5.328c0.339,0,0.71-0.033,1.083-0.068
-                                      c-0.167,0.408-0.336,0.748-0.336,1.324c0,1.04,0.551,1.685,1.011,2.297c-1.524,0.104-4.37,0.273-6.467,1.562
-                                      c-1.998,1.188-2.605,2.916-2.605,4.137c0,2.512,2.358,4.84,7.289,4.84c5.822,0,8.904-3.223,8.904-6.41
-                                      c0.008-2.327-1.359-3.489-2.829-4.731H14.703z M10.269,11.951c-2.912,0-4.231-3.765-4.231-6.037c0-0.884,0.168-1.797,0.744-2.511
-                                      c0.543-0.679,1.489-1.12,2.372-1.12c2.807,0,4.256,3.798,4.256,6.242c0,0.612-0.067,1.694-0.845,2.478
-                                      c-0.537,0.55-1.438,0.948-2.295,0.951V11.951z M10.302,25.609c-3.621,0-5.957-1.732-5.957-4.142c0-2.408,2.165-3.223,2.911-3.492
-                                      c1.421-0.479,3.25-0.545,3.555-0.545c0.338,0,0.52,0,0.766,0.034c2.574,1.838,3.706,2.757,3.706,4.479
-                                      c-0.002,2.073-1.736,3.665-4.982,3.649L10.302,25.609z"/>
-                                        <polygon points="23.254,11.89 23.254,8.521 21.569,8.521 21.569,11.89 18.202,11.89 18.202,13.604 21.569,13.604 21.569,17.004
-                                         23.254,17.004 23.254,13.604 26.653,13.604 26.653,11.89      "/>
-                                    </g>
-                                </g>
-                                </svg>
-                            </span>
-                                <span class="rrssb-text">@lang("Social.g+")</span>
-                            </a>
-                        </li>
-
-
-
                         <li class="rrssb-email">
                             <a href="mailto:?subject=Check This Out&body={{urlencode($event->event_url)}}?utm_source=email">
                             <span class="rrssb-icon">
diff --git a/resources/views/ManageEvent/Modals/MessageOrder.blade.php b/resources/views/ManageEvent/Modals/MessageOrder.blade.php
index 5b1aa9488..dfa54bdfe 100644
--- a/resources/views/ManageEvent/Modals/MessageOrder.blade.php
+++ b/resources/views/ManageEvent/Modals/MessageOrder.blade.php
@@ -1,5 +1,5 @@
 <div role="dialog"  class="modal fade" style="display: none;">
-   {!! Form::open(array('url' => route('postMessageOrder', array('event_id' => $event->id, 'attendee_id' => $order->id)), 'class' => 'ajax reset closeModalAfter')) !!}
+   {!! Form::open(array('url' => route('postMessageOrder', array('event_id' => $event->id, 'order_id' => $order->id)), 'class' => 'ajax reset closeModalAfter')) !!}
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header text-center">
@@ -9,7 +9,7 @@
                     {{ @trans("ManageEvent.message_order", ["order"=>$order->full_name]) }}
                     <br>
                     <span style="font-size: 17px;">
-                    {{ @trans("ManageEvent.order_ref", ["order_ref"=>$order->reference]) }}
+                    {{ @trans("ManageEvent.order_ref", ["order_ref"=>$order->order_reference]) }}
                     </span>
                 </h3>
             </div>
diff --git a/resources/views/Public/ViewEvent/Partials/EventShareSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventShareSection.blade.php
index dd2b94916..40a12012f 100644
--- a/resources/views/Public/ViewEvent/Partials/EventShareSection.blade.php
+++ b/resources/views/Public/ViewEvent/Partials/EventShareSection.blade.php
@@ -1,4 +1,4 @@
-@if($event->social_show_facebook || $event->social_show_linkedin || $event->social_show_twitter || $event->social_show_googleplus || $event->social_show_whatsapp || $event->social_show_email)
+@if($event->social_show_facebook || $event->social_show_linkedin || $event->social_show_twitter || $event->social_show_whatsapp || $event->social_show_email)
 <section id="share" class="container">
     <div class="row">
         <h1 class="section_head">
@@ -57,33 +57,6 @@
                     </a>
                 </li>
                 @endif
-                @if($event->social_show_googleplus)
-                <li class="rrssb-googleplus">
-                    <a href="https://plus.google.com/share?url={{$event->event_url}}" class="popup">
-                        <span class="rrssb-icon">
-                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
-                                <g>
-                                    <g>
-                                        <path d="M14.703,15.854l-1.219-0.948c-0.372-0.308-0.88-0.715-0.88-1.459c0-0.748,0.508-1.223,0.95-1.663
-                                              c1.42-1.119,2.839-2.309,2.839-4.817c0-2.58-1.621-3.937-2.399-4.581h2.097l2.202-1.383h-6.67c-1.83,0-4.467,0.433-6.398,2.027
-                                              C3.768,4.287,3.059,6.018,3.059,7.576c0,2.634,2.022,5.328,5.604,5.328c0.339,0,0.71-0.033,1.083-0.068
-                                              c-0.167,0.408-0.336,0.748-0.336,1.324c0,1.04,0.551,1.685,1.011,2.297c-1.524,0.104-4.37,0.273-6.467,1.562
-                                              c-1.998,1.188-2.605,2.916-2.605,4.137c0,2.512,2.358,4.84,7.289,4.84c5.822,0,8.904-3.223,8.904-6.41
-                                              c0.008-2.327-1.359-3.489-2.829-4.731H14.703z M10.269,11.951c-2.912,0-4.231-3.765-4.231-6.037c0-0.884,0.168-1.797,0.744-2.511
-                                              c0.543-0.679,1.489-1.12,2.372-1.12c2.807,0,4.256,3.798,4.256,6.242c0,0.612-0.067,1.694-0.845,2.478
-                                              c-0.537,0.55-1.438,0.948-2.295,0.951V11.951z M10.302,25.609c-3.621,0-5.957-1.732-5.957-4.142c0-2.408,2.165-3.223,2.911-3.492
-                                              c1.421-0.479,3.25-0.545,3.555-0.545c0.338,0,0.52,0,0.766,0.034c2.574,1.838,3.706,2.757,3.706,4.479
-                                              c-0.002,2.073-1.736,3.665-4.982,3.649L10.302,25.609z"/>
-                                        <polygon points="23.254,11.89 23.254,8.521 21.569,8.521 21.569,11.89 18.202,11.89 18.202,13.604 21.569,13.604 21.569,17.004
-                                                 23.254,17.004 23.254,13.604 26.653,13.604 26.653,11.89      "/>
-                                    </g>
-                                </g>
-                            </svg>
-                        </span>
-                        <span class="rrssb-text">google+</span>
-                    </a>
-                </li>
-                @endif
                 @if($event->social_show_whatsapp)
                 <li class="rrssb-whatsapp">
                    <a style="background-color: #43d854;" href="whatsapp://send?text={{urlencode($event->title . ' - ' . $event->event_url)}}" data-action="share/whatsapp/share">
diff --git a/resources/views/Public/ViewOrganiser/Partials/OrganiserSocialSection.blade.php b/resources/views/Public/ViewOrganiser/Partials/OrganiserSocialSection.blade.php
index 9b4a69e20..54b07c400 100644
--- a/resources/views/Public/ViewOrganiser/Partials/OrganiserSocialSection.blade.php
+++ b/resources/views/Public/ViewOrganiser/Partials/OrganiserSocialSection.blade.php
@@ -51,33 +51,6 @@
                     </a>
                 </li>
                 @endif
-                @if($event->social_show_googleplus)
-                <li class="rrssb-googleplus">
-                    <a href="https://plus.google.com/share?url={{$event->event_url}}?utm_source=googleplus" class="popup">
-                        <span class="rrssb-icon">
-                            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
-                                <g>
-                                    <g>
-                                        <path d="M14.703,15.854l-1.219-0.948c-0.372-0.308-0.88-0.715-0.88-1.459c0-0.748,0.508-1.223,0.95-1.663
-                                              c1.42-1.119,2.839-2.309,2.839-4.817c0-2.58-1.621-3.937-2.399-4.581h2.097l2.202-1.383h-6.67c-1.83,0-4.467,0.433-6.398,2.027
-                                              C3.768,4.287,3.059,6.018,3.059,7.576c0,2.634,2.022,5.328,5.604,5.328c0.339,0,0.71-0.033,1.083-0.068
-                                              c-0.167,0.408-0.336,0.748-0.336,1.324c0,1.04,0.551,1.685,1.011,2.297c-1.524,0.104-4.37,0.273-6.467,1.562
-                                              c-1.998,1.188-2.605,2.916-2.605,4.137c0,2.512,2.358,4.84,7.289,4.84c5.822,0,8.904-3.223,8.904-6.41
-                                              c0.008-2.327-1.359-3.489-2.829-4.731H14.703z M10.269,11.951c-2.912,0-4.231-3.765-4.231-6.037c0-0.884,0.168-1.797,0.744-2.511
-                                              c0.543-0.679,1.489-1.12,2.372-1.12c2.807,0,4.256,3.798,4.256,6.242c0,0.612-0.067,1.694-0.845,2.478
-                                              c-0.537,0.55-1.438,0.948-2.295,0.951V11.951z M10.302,25.609c-3.621,0-5.957-1.732-5.957-4.142c0-2.408,2.165-3.223,2.911-3.492
-                                              c1.421-0.479,3.25-0.545,3.555-0.545c0.338,0,0.52,0,0.766,0.034c2.574,1.838,3.706,2.757,3.706,4.479
-                                              c-0.002,2.073-1.736,3.665-4.982,3.649L10.302,25.609z"/>
-                                        <polygon points="23.254,11.89 23.254,8.521 21.569,8.521 21.569,11.89 18.202,11.89 18.202,13.604 21.569,13.604 21.569,17.004
-                                                 23.254,17.004 23.254,13.604 26.653,13.604 26.653,11.89      "/>
-                                    </g>
-                                </g>
-                            </svg>
-                        </span>
-                        <span class="rrssb-text">@lang("Social.g+")</span>
-                    </a>
-                </li>
-                @endif
                 @if($event->social_show_pinterest)
                 @if(false)
                 <li class="rrssb-pinterest">
diff --git a/routes/web.php b/routes/web.php
index c2f8af4a7..efa11e77e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -72,7 +72,7 @@
          */
         Route::get('/login',
             [UserLoginController::class, 'showLogin']
-        )->name('login');
+        )->name('login')->middleware('throttle:10,1');
 
         Route::post('/login',
             [UserLoginController::class, 'postLogin']
@@ -87,7 +87,7 @@
 
         Route::post('login/forgot-password',
             [RemindersController::class, 'postRemind']
-        )->name('postForgotPassword');
+        )->name('postForgotPassword')->middleware('throttle:3,1');
 
         /*
          * Reset Password
@@ -98,7 +98,7 @@
 
         Route::post('login/reset-password',
             [RemindersController::class, 'postReset']
-        )->name('postResetPassword');
+        )->name('postResetPassword')->middleware('throttle:3,1');
 
         /*
          * Registration / Account creation
@@ -108,14 +108,14 @@
         )->name('showSignup');
 
         Route::post('/signup',
-            [UserSignupController::class, 'postSignup']);
+            [UserSignupController::class, 'postSignup'])->middleware('throttle:3,1');
 
         /*
          * Confirm Email
          */
         Route::get('signup/confirm_email/{confirmation_code}',
             [UserSignupController::class, 'confirmEmail']
-        )->name('confirmEmail');
+        )->name('confirmEmail')->middleware('throttle:3,1');
     });
 
     /*
@@ -486,11 +486,11 @@
                 [EventOrdersController::class, 'showExportOrders']
             )->name('showExportOrders');
 
-            Route::get('{event_id}/orders/message',
+            Route::get('{event_id}/orders/message/{order_id}',
                 [EventOrdersController::class, 'showMessageOrder']
             )->name('showMessageOrder');
 
-            Route::post('{event_id}/orders/message',
+            Route::post('{event_id}/orders/message/{order_id}',
                 [EventOrdersController::class, 'postMessageOrder']
             )->name('postMessageOrder');
 


Test patch: