gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tickets #4, #5, #6

Browse source
This commit is contained in:
Kevin Adametz 2020-01-02 19:22:30 +01:00
parent f03862b523
commit 1a43060996
42 changed files with 1160 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/Http/Controllers/LeadController.php
View file

@ -34,7 +34,7 @@ class LeadController extends Controller
$data = [
'values' => User::where('admin', '=', 0)->where('confirmation_code_remider', '!=', 2)->get(),
];
return view('admin.leads', $data);
return view('admin.lead.index', $data);
}
@ -44,7 +44,7 @@ class LeadController extends Controller
*/
public function edit($id)
{
if($id == "new"){
if($id === "new"){
$user = new User();
$user->account = new UserAccount();
$user->account->same_as_billing = 1;
@ -61,7 +61,7 @@ class LeadController extends Controller
'user' => $user,
'can_change_mail' => true,
];
return view('admin.lead_edit', $data);
return view('admin.lead.edit', $data);
}
/**
@ -72,7 +72,7 @@ class LeadController extends Controller
{
$data = Input::all();
if ($data['user_id'] == "new" || $data['user_id'] == 0) {
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
$rules = array(
'salutation' => 'required',
'first_name'=>'required',
@ -108,7 +108,7 @@ class LeadController extends Controller
$validator = Validator::make(Input::all(), $rules);
if ($validator->fails()) {
if ($data['user_id'] == "new" || $data['user_id'] == 0) {
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
$user_id = "new";
}else{
$user = User::findOrFail($data['user_id']);
@ -117,7 +117,7 @@ class LeadController extends Controller
return redirect(route('admin_lead_edit', [$user_id]))->withErrors($validator)->withInput(Input::all());
}else{
if ($data['user_id'] == "new" || $data['user_id'] == 0) {
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
$user = new User();
$user->id = "new";
$user->account = new UserAccount();
@ -129,8 +129,12 @@ class LeadController extends Controller
}
}
$user->m_level = isset($data['m_level']) ? $data['m_level'] : NULL;
$user->save();
$this->userRepo->update($data);
if(isset($data['contact_verify'])){
$user = $this->userRepo->getModel();
@ -150,10 +154,13 @@ class LeadController extends Controller
Mail::to($user->email)->send(new MailVerifyContact($confirmation_code, $user));
\Session()->flash('alert-save', true);
return redirect(route('admin_leads'));
}
\Session()->flash('alert-save', true);
return redirect(route('admin_leads'));
return redirect(route('admin_lead_edit', [$user->id]));