From 631a401e8c50045699ad0963ec08f0c42d8d2bf9 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 28 Feb 2017 20:15:55 +0200
Subject: [PATCH] Users: Send invitation only #1333

---
 app/Http/Controllers/UserController.php |  2 +-
 resources/lang/en/texts.php             |  4 +++-
 resources/views/users/edit.blade.php    | 20 +++++++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 70f1780d4f18..7ea94be5721d 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -210,7 +210,7 @@ class UserController extends BaseController
 
             $user->save();
 
-            if (! $user->confirmed) {
+            if (! $user->confirmed && Input::get('action') === 'email') {
                 $this->userMailer->sendConfirmation($user, Auth::user());
                 $message = trans('texts.sent_invite');
             } else {
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index c94a14ab034f..a81830cc26b1 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -354,7 +354,7 @@ $LANG = array(
     'charge_taxes' => 'Charge taxes',
     'user_management' => 'User Management',
     'add_user' => 'Add User',
-    'send_invite' => 'Send invitation',
+    'send_invite' => 'Send Invitation',
     'sent_invite' => 'Successfully sent invitation',
     'updated_user' => 'Successfully updated user',
     'invitation_message' => 'You\'ve been invited by :invitor. ',
@@ -2388,6 +2388,8 @@ $LANG = array(
     'created_payment_term' => 'Successfully created payment term',
     'updated_payment_term' => 'Successfully updated payment term',
     'archived_payment_term' => 'Successfully archived payment term',
+    'resend_invite' => 'Resend Invitation',
+
 );
 
 return $LANG;
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 979370a8b195..216f10267724 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -4,7 +4,7 @@
   @parent
   @include('accounts.nav', ['selected' => ACCOUNT_USER_MANAGEMENT])
 
-  {!! Former::open($url)->method($method)->addClass('warn-on-exit')->rules(array(
+  {!! Former::open($url)->method($method)->addClass('warn-on-exit user-form')->rules(array(
       'first_name' => 'required',
       'last_name' => 'required',
       'email' => 'required|email',
@@ -18,6 +18,10 @@
     {{ Former::populateField('permissions[edit_all]', intval($user->hasPermission('edit_all'))) }}
   @endif
 
+  <div style="display:none">
+      {!! Former::text('action') !!}
+  </div>
+
 <div class="panel panel-default">
 <div class="panel-heading">
     <h3 class="panel-title">{!! trans('texts.user_details') !!}</h3>
@@ -39,7 +43,7 @@
 
     @if ( ! Utils::hasFeature(FEATURE_USER_PERMISSIONS))
       <div class="alert alert-warning">{{ trans('texts.upgrade_for_permissions') }}</div>
-      <script>
+      <script type="text/javascript">
           $(function() {
               $('input[type=checkbox]').prop('disabled', true);
           })
@@ -75,11 +79,21 @@
 
   {!! Former::actions(
       Button::normal(trans('texts.cancel'))->asLinkTo(URL::to('/settings/user_management'))->appendIcon(Icon::create('remove-circle'))->large(),
-      Button::success(trans($user && $user->confirmed ? 'texts.save' : 'texts.send_invite'))->submit()->large()->appendIcon(Icon::create($user && $user->confirmed ? 'floppy-disk' : 'send'))
+      ($user) ? Button::success(trans('texts.save'))->withAttributes(['onclick' => 'submitAction("save")'])->large()->appendIcon(Icon::create('floppy-disk')) : false,
+      (! $user || ! $user->confirmed) ? Button::info(trans($user ? 'texts.resend_invite' : 'texts.send_invite'))->withAttributes(['onclick' => 'submitAction("email")'])->large()->appendIcon(Icon::create('send')) : false
   )!!}
 
   {!! Former::close() !!}
 
+  <script type="text/javascript">
+
+      function submitAction(value) {
+          $('#action').val(value);
+          $('.user-form').submit();
+      }
+
+  </script>
+
 @stop
 
 @section('onReady')