From 971a86abf4c0c2b8a4f1619b37d72fb2b47ce744 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Mon, 27 Nov 2017 12:44:50 +0300
Subject: [PATCH] create user from customer page

---
 app/Http/Controllers/Incomes/Customers.php       |  4 ++--
 public/css/app.css                               |  4 ++++
 resources/lang/en-GB/customer.php                |  9 ---------
 resources/lang/en-GB/customers.php               | 11 +++++++++++
 resources/lang/en-GB/general.php                 |  2 --
 .../views/incomes/customers/create.blade.php     |  9 ++-------
 resources/views/incomes/customers/edit.blade.php | 16 ++++++----------
 7 files changed, 25 insertions(+), 30 deletions(-)
 delete mode 100644 resources/lang/en-GB/customer.php
 create mode 100644 resources/lang/en-GB/customers.php

diff --git a/app/Http/Controllers/Incomes/Customers.php b/app/Http/Controllers/Incomes/Customers.php
index 02b744a26..753af4e7a 100644
--- a/app/Http/Controllers/Incomes/Customers.php
+++ b/app/Http/Controllers/Incomes/Customers.php
@@ -55,7 +55,7 @@ class Customers extends Controller
                 flash($message)->error();
 
                 return redirect()->back()->withInput($request->except('create_user'))->withErrors(
-                    ['email' => trans('customer.error.email')]
+                    ['email' => trans('customers.error.email')]
                 );
             }
 
@@ -129,7 +129,7 @@ class Customers extends Controller
                 flash($message)->error();
 
                 return redirect()->back()->withInput($request->except('create_user'))->withErrors(
-                    ['email' => trans('customer.error.email')]
+                    ['email' => trans('customers.error.email')]
                 );
             }
 
diff --git a/public/css/app.css b/public/css/app.css
index 26a2151b6..78f922c22 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -453,6 +453,10 @@ ul.add-new.nav.navbar-nav.pull-left {
     overflow-x: visible;
 }
 
+.margin-top {
+    margin-top: 20px;
+}
+
 @media only screen and (max-width : 768px) {
     .main-header .add-new.nav.navbar-nav i {
         margin-top: 3px;
diff --git a/resources/lang/en-GB/customer.php b/resources/lang/en-GB/customer.php
deleted file mode 100644
index e0a68b0c5..000000000
--- a/resources/lang/en-GB/customer.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-return [
-    'all' => 'All Customers',
-
-    'error' => [
-        'email' => 'The email has already been taken.'
-    ]
-];
diff --git a/resources/lang/en-GB/customers.php b/resources/lang/en-GB/customers.php
new file mode 100644
index 000000000..cad4bc8b9
--- /dev/null
+++ b/resources/lang/en-GB/customers.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'allow_login'           => 'Allow Login?',
+    'user_created'          => 'User Created',
+
+    'error' => [
+        'email'             => 'The email has already been taken.'
+    ]
+];
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index f761c2d09..954e19688 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -83,8 +83,6 @@ return [
     'search'                => 'Search',
     'search_placeholder'    => 'Type to search..',
     'filter'                => 'Filter',
-    'create_user'           => 'Create User',
-    'created_user'          => 'Created User',
     'help'                  => 'Help',
     'all'                   => 'All',
     'all_type'              => 'All :type',
diff --git a/resources/views/incomes/customers/create.blade.php b/resources/views/incomes/customers/create.blade.php
index 3bc9c5aa8..e0cd1a24d 100644
--- a/resources/views/incomes/customers/create.blade.php
+++ b/resources/views/incomes/customers/create.blade.php
@@ -24,18 +24,13 @@
 
             {{ Form::radioGroup('enabled', trans('general.enabled')) }}
 
-            <div class="form-group col-md-12">
-                {!! Form::label('create_user', trans('general.create_user'), ['class' => 'control-label']) !!}
-                <br/>
-                <div class="col-md-12">
-                    {{ Form::checkbox('create_user', '1') }} &nbsp; {{ trans('general.create_user') }}
-                </div>
+            <div class="form-group col-md-12 margin-top">
+                <strong>{{ trans('customers.allow_login') }}</strong> &nbsp;  {{ Form::checkbox('create_user', '1', null, ['id' => 'create_user']) }}
             </div>
 
             {{ Form::passwordGroup('password', trans('auth.password.current'), 'key', [], null, 'col-md-6 password hidden') }}
 
             {{ Form::passwordGroup('password_confirmation', trans('auth.password.current_confirm'), 'key', [], null, 'col-md-6 password hidden') }}
-
         </div>
         <!-- /.box-body -->
 
diff --git a/resources/views/incomes/customers/edit.blade.php b/resources/views/incomes/customers/edit.blade.php
index 7f9ac8934..739af59f8 100644
--- a/resources/views/incomes/customers/edit.blade.php
+++ b/resources/views/incomes/customers/edit.blade.php
@@ -28,16 +28,12 @@
 
         {{ Form::radioGroup('enabled', trans('general.enabled')) }}
 
-        <div class="form-group col-md-12">
-            {!! Form::label('create_user', trans('general.create_user'), ['class' => 'control-label']) !!}
-            <br/>
-            <div class="col-md-12">
-                @if ($customer->user_id)
-                    {{ Form::checkbox('create_user', '1', 1, array('disabled')) }} &nbsp; {{ trans('general.created_user') }}
-                @else
-                    {{ Form::checkbox('create_user', '1') }} &nbsp; {{ trans('general.create_user') }}
-                @endif
-            </div>
+        <div class="form-group col-md-12 margin-top">
+            @if ($customer->user_id)
+                <strong>{{ trans('customers.user_created') }}</strong> &nbsp; {{ Form::checkbox('create_user', '1', 1, ['id' => 'create_user', 'disabled' => 'disabled']) }}
+            @else
+                <strong>{{ trans('customers.allow_login') }}</strong> &nbsp; {{ Form::checkbox('create_user', '1', null, ['id' => 'create_user']) }}
+            @endif
         </div>
 
         {{ Form::passwordGroup('password', trans('auth.password.current'), 'key', [], null, 'col-md-6 password hidden') }}