shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #72 Fixed: Validation for create customer

Browse Source
This commit is contained in:
cuneytsenturk
2017-11-23 13:38:43 +03:00
parent b95414b921
commit 73a7b21c25
9 changed files with 113 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/Auth/Users.php
View File

@ -4,6 +4,7 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\User as Request;
use Illuminate\Http\Request as ARequest;
use App\Models\Auth\User;
use App\Models\Auth\Role;
@ -226,4 +227,31 @@ class Users extends Controller
// Redirect to items
return redirect('items/items');
}
public function autocomplete(ARequest $request)
{
$user = false;
$column = $request['column'];
$value = $request['value'];
if (!empty($column) && !empty($value)) {
switch ($column) {
case 'id':
$user = User::find();
break;
case 'email':
$user = User::where('email', $value)->first();
break;
default:
$user = User::where($column, $value)->first();
}
}
return response()->json([
'errors' => ($user) ? false: true,
'success' => ($user) ? true: false,
'data' => $user
]);
}
}

38
app/Http/Controllers/Incomes/Customers.php
View File

@ -44,10 +44,24 @@ class Customers extends Controller
*/
public function store(Request $request)
{
$customer = Customer::create($request->all());
if (empty($request->input('create_user'))) {
Customer::create($request->all());
} else {
$user = User::where('email', $request['email'])->first();
if (!empty($request->input('create_user'))) {
$user = User::create($request->input());
if (!empty($user)) {
$message = trans('messages.error.customer', ['name' => $user->name]);
flash($message)->error();
return redirect()->back()->withInput($request->except('create_user'))->withErrors(
['email' => trans('customer.error.email')]
);
//$user = User::create($request->input());
}
$customer = Customer::create($request->all());
$request['user_id'] = $user->id;
$request['roles'] = array('3');
@ -93,10 +107,22 @@ class Customers extends Controller
*/
public function update(Customer $customer, Request $request)
{
$customer->update($request->all());
if (empty($request->input('create_user'))) {
$customer->update($request->all());
} else {
$user = User::where('email', $request['email'])->first();
if (!empty($request->input('create_user'))) {
$user = User::create($request->input());
if (!empty($user)) {
$message = trans('messages.error.customer', ['name' => $user->name]);
flash($message)->error();
return redirect()->back()->withInput($request->except('create_user'))->withErrors(
['email' => trans('customer.error.email')]
);
//$user = User::create($request->input());
}
$request['user_id'] = $user->id;
$request['roles'] = array('3');

1
app/Http/Controllers/Settings/Modules.php
View File

@ -58,5 +58,4 @@ class Modules extends Controller
return redirect('settings/apps/' . $alias);
}
}