Skip to content

Commit

Permalink
fixed #96
Browse files Browse the repository at this point in the history
  • Loading branch information
denisdulici committed Nov 27, 2017
1 parent f69531e commit 3894872
Showing 1 changed file with 12 additions and 24 deletions.
36 changes: 12 additions & 24 deletions app/Http/Controllers/Incomes/Customers.php
Expand Up @@ -47,8 +47,8 @@ public function store(Request $request)
if (empty($request->input('create_user'))) {
Customer::create($request->all());
} else {
// Check if user exist
$user = User::where('email', $request['email'])->first();

if (!empty($user)) {
$message = trans('messages.error.customer', ['name' => $user->name]);

Expand All @@ -57,23 +57,16 @@ public function store(Request $request)
return redirect()->back()->withInput($request->except('create_user'))->withErrors(
['email' => trans('customer.error.email')]
);

//$user = User::create($request->input());
}

$customer = Customer::create($request->all());
// Create user first
$user = User::create($request->all());
$user->roles()->attach(['3']);
$user->companies()->attach([session('company_id')]);

$request['user_id'] = $user->id;
$request['roles'] = array('3');
$request['companies'] = array(session('company_id'));

// Attach roles
$user->roles()->attach($request['roles']);

// Attach companies
$user->companies()->attach($request['companies']);

$customer->update($request->all());
Customer::create($request->all());
}

$message = trans('messages.success.added', ['type' => trans_choice('general.customers', 1)]);
Expand Down Expand Up @@ -128,8 +121,8 @@ public function update(Customer $customer, Request $request)
if (empty($request->input('create_user'))) {
$customer->update($request->all());
} else {
// Check if user exist
$user = User::where('email', $request['email'])->first();

if (!empty($user)) {
$message = trans('messages.error.customer', ['name' => $user->name]);

Expand All @@ -138,19 +131,14 @@ public function update(Customer $customer, Request $request)
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');
$request['companies'] = array(session('company_id'));
// Create user first
$user = User::create($request->all());
$user->roles()->attach(['3']);
$user->companies()->attach([session('company_id')]);

// Attach roles
$user->roles()->attach($request['roles']);

// Attach companies
$user->companies()->attach($request['companies']);
$request['user_id'] = $user->id;

$customer->update($request->all());
}
Expand Down

0 comments on commit 3894872

Please sign in to comment.