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

Customers Add+Edit, API WP

Browse source
This commit is contained in:
Kevin Adametz 2020-06-12 14:46:51 +02:00
parent dc63fa9fb2
commit 75a0f9a38a
120 changed files with 11894 additions and 6134 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,6 @@
namespace App\Http\Controllers;
use App\Mail\MailCustomMessage;
use App\Mail\MailVerifyAccount;
use App\Mail\MailVerifyContact;
@ -15,12 +13,9 @@ use App\Repositories\UserRepository;
use App\Services\UserService;
use App\User;
use Illuminate\Support\Facades\Mail;
use Input;
use Illuminate\Http\Request;
use Request;
use Validator;
class LeadController extends Controller
{
protected $userRepo;
@ -64,7 +59,7 @@ class LeadController extends Controller
}
}
$data = [
'show' => Input::get('show'),
'show' => Request::get('show'),
'user' => $user,
'can_change_mail' => true,
'm_data_load' => false,
@ -120,8 +115,8 @@ class LeadController extends Controller
public function store(Request $request)
{
$data = Input::all();
$show = Input::get('show');
$data = Request::all();
$show = Request::get('show');
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
$rules = array(
@ -142,7 +137,7 @@ class LeadController extends Controller
'email' => 'required|string|email|max:255|exists:users,email',
'email-confirm' => 'required|same:email',
);
if(!Input::get('same_as_billing')){
if(!Request::get('same_as_billing')){
$rules = array_merge($rules, [
'shipping_firstname'=>'required',
'shipping_lastname'=>'required',
@ -161,7 +156,7 @@ class LeadController extends Controller
}
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
@ -170,7 +165,7 @@ class LeadController extends Controller
$user = User::findOrFail($data['user_id']);
$user_id = $user->id;
}
return redirect(route('admin_lead_edit', [$user_id])."?show=".$show)->withErrors($validator)->withInput(Input::all());
return redirect(route('admin_lead_edit', [$user_id])."?show=".$show)->withErrors($validator)->withRequest(Request::all());
}
if ($data['user_id'] === "new" || $data['user_id'] == 0) {
@ -224,7 +219,7 @@ class LeadController extends Controller
$user = User::findOrFail($id);
if($action === 'completed'){
$validator = Validator::make(Input::all(), []);
$validator = Validator::make(Request::all(), []);
if(!$user->m_sponsor){
$validator->errors()->add('m_sponsor', __('Berater hat keinen Sponsor.'));
}
@ -238,7 +233,7 @@ class LeadController extends Controller
$validator->errors()->add('m_account', __('Berater hat keine Account ID'));
}
if ($validator->errors()->count()) {
return back()->withErrors($validator)->withInput(Input::all());
return back()->withErrors($validator)->withRequest(Request::all());
}
//create PDF
@ -276,7 +271,7 @@ class LeadController extends Controller
$user->release_account = null;
$user->save();
$input = Input::all();
$input = Request::all();
$data = [
'subject' => $input['account_incomplete_subject'],
'message' => $input['account_incomplete_message'],
@ -340,7 +335,7 @@ class LeadController extends Controller
public function getLeads()
{
$query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null);
$query = User::with('account')->select('users.*')->where('users.deleted_at', '=', null)->where('users.admin', "<", 4);
return \DataTables::eloquent($query)
->addColumn('first_name', function (User $user) {