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 @@ - '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 @@ + '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')) }} -