gitmedia/mein-sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fewo Mail MA, optimation Fewo, view User Fewos

Browse source
This commit is contained in:
Kevin Adametz 2019-05-08 14:05:35 +02:00
parent e537e47a82
commit 346a7427a5
30 changed files with 915 additions and 963 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/Http/Controllers/API/FewoController.php
View file

@ -3,10 +3,11 @@
namespace App\Http\Controllers\API;
use App\Http\Controllers\Controller;
use App\Models\BookingDraftItem;
use App\Mail\MailSendFeWoService;
use App\Models\TravelUser;
use App\Models\TravelUserBookingFewo;
use Carbon\Carbon;
use Illuminate\Support\Facades\Mail;
use Input;
use Validator;
class FewoController extends Controller
@ -92,9 +93,22 @@ class FewoController extends Controller
return response()->json($validator->messages(), $this->errorStatus);
}
$travel_user_booking_fewo = TravelUserBookingFewo::create($data['travel_user_booking_fewo']);
//mail
if($travel_user_booking_fewo){
$MailEmployee = explode(",", config('mail.mail_fewo_employee'));
$EmployeeMailSubject = $travel_user_booking_fewo->getEmployeeMailSubject();
$EmployeeMailContent = $travel_user_booking_fewo->getEmployeeMailContent();
Mail::to($MailEmployee)->send(new MailSendFeWoService($travel_user_booking_fewo, $EmployeeMailSubject, $EmployeeMailContent));
$send_employee_mail = $travel_user_booking_fewo->send_employee_mail;
$send_employee_mail[] = ['d' => date('H:i d.m.Y'),
'm'=>$MailEmployee,
's'=>$EmployeeMailSubject,
'c'=>$EmployeeMailContent];
$travel_user_booking_fewo->send_employee_mail = $send_employee_mail;
$travel_user_booking_fewo->save();
}
return response()->json(['success' => ['travel_user_booking_fewo_id' => $travel_user_booking_fewo->id, 'crm_url' => route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id])]], $this->successStatus);
}

34
app/Http/Controllers/TravelUserBookingFewoController.php
View file

@ -52,7 +52,6 @@ class TravelUserBookingFewoController extends Controller
$replace_info_text['fewo_user_anrede'] = $travel_user_booking_fewo->getUserSalutation();
$replace_info_text['fewo_adresse'] = $travel_user_booking_fewo->getNameAddressLocation(", ");
}
if(!$travel_user_booking_fewo->info_mail_text) {
$travel_user_booking_fewo->info_mail_text = CMSContent::getContentBySlug('pdf-vorlage-anreiseinfo-fewo');
$travel_user_booking_fewo->info_mail_text = Util::replacePlaceholders($travel_user_booking_fewo->info_mail_text, $replace_info_text);
@ -60,6 +59,7 @@ class TravelUserBookingFewoController extends Controller
$data = [
'travel_user_booking_fewo' => $travel_user_booking_fewo,
'send_mail_employee_mail' => config('mail.mail_fewo_employee'),
'max_adults' => $max_adults,
'max_children' => $max_children,
'id' => $id,
@ -112,13 +112,12 @@ class TravelUserBookingFewoController extends Controller
$mail_bbc = config('mail.mail_bbc');
Mail::to($travel_user_booking_fewo->travel_user->email)->bcc($mail_bbc)->send(new MailSendFeWoInvoice($travel_user_booking_fewo, Input::get('send_mail_user_notice')));
$send_user_mail = $travel_user_booking_fewo->send_user_mail;
$send_user_mail[] = [date('H:i d.m.Y') => Input::get('send_mail_user_notice')];
$send_user_mail[] = [date('H:i d.m.Y') => $travel_user_booking_fewo->travel_user->email." ".Input::get('send_mail_user_notice')];
$travel_user_booking_fewo->send_user_mail = $send_user_mail;
$travel_user_booking_fewo->save();
\Session()->flash('alert-success', __('E-mail wurde an den Mieter versendet.'));
\Session()->flash('alert-success', __('E-Mail wurde an den Mieter versendet.'));
return redirect(route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id]));
}
}
if($data['action'] == 'sendInfosMailtoUser') {
@ -127,13 +126,12 @@ class TravelUserBookingFewoController extends Controller
$mail_bbc = config('mail.mail_bbc');
Mail::to($travel_user_booking_fewo->travel_user->email)->bcc($mail_bbc)->send(new MailSendFeWoInfo($travel_user_booking_fewo));
$send_info_mail = $travel_user_booking_fewo->send_info_mail;
$send_info_mail[] = [date('H:i d.m.Y') => ''];
$send_info_mail[] = [date('H:i d.m.Y') => $travel_user_booking_fewo->travel_user->email];
$travel_user_booking_fewo->send_info_mail = $send_info_mail;
$travel_user_booking_fewo->save();
\Session()->flash('alert-success', __('E-mail wurde an den Mieter versendet.'));
\Session()->flash('alert-success', __('E-Mail wurde an den Mieter versendet.'));
return redirect(route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id]));
}
}
if($data['action'] == 'sendMailtoService') {
@ -149,14 +147,28 @@ class TravelUserBookingFewoController extends Controller
$travel_user_booking_fewo->send_service_mail = $send_service_mail;
$travel_user_booking_fewo->save();
\Session()->flash('alert-success', __('E-mail wurde an den Dienstleister versendet.'));
\Session()->flash('alert-success', __('E-Mail wurde an den Dienstleister versendet.'));
return redirect(route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id]));
}
}
if($data['action'] == 'sendMailtoEmployee') {
$travel_user_booking_fewo = TravelUserBookingFewo::findOrFail($id);
if($travel_user_booking_fewo){
$mails = explode(",", Input::get('send_mail_employee_mail'));
Mail::to($mails)->send(new MailSendFeWoService($travel_user_booking_fewo, Input::get('send_mail_employee_subject'), Input::get('send_mail_employee_content')));
$send_employee_mail = $travel_user_booking_fewo->send_employee_mail;
$send_employee_mail[] = ['d' => date('H:i d.m.Y'),
'm'=>Input::get('send_mail_employee_mail'),
's'=>Input::get('send_mail_employee_subject'),
'c'=>Input::get('send_mail_employee_content')];
$travel_user_booking_fewo->send_employee_mail = $send_employee_mail;
$travel_user_booking_fewo->save();
\Session()->flash('alert-success', __('E-Mail wurde an die Mitarbeiter versendet.'));
return redirect(route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id]));
}
}
}
public function delete($id){
@ -188,7 +200,6 @@ class TravelUserBookingFewoController extends Controller
return '<a href="' . route('travel_user_detail', [$travel_user_booking_fewo->travel_user_id]) . '">'.$travel_user_booking_fewo->travel_user->first_name.' '.$travel_user_booking_fewo->travel_user->last_name.'</a>';
})
->addColumn('is_calendar', function (TravelUserBookingFewo $travel_user_booking_fewo) {
$back = "";
$back .= $travel_user_booking_fewo->is_calendar_fewo_direct ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
$back .= $travel_user_booking_fewo->is_calendar_hrs ? ' <span class="badge badge-pill badge-success"><i class="far fa-check"></i></span>' : ' <span class="badge badge-pill badge-danger"><i class="far fa-times"></i></span>';
@ -198,7 +209,6 @@ class TravelUserBookingFewoController extends Controller
->addColumn('status_name', function (TravelUserBookingFewo $travel_user_booking_fewo) {
return $travel_user_booking_fewo->getStatuesName();
})
->addColumn('action_delete', function (TravelUserBookingFewo $travel_user_booking_fewo) {
return '<a href="' . route('travel_user_booking_fewo_delete', [$travel_user_booking_fewo->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="far fa-trash"></span></a>';
})

2
app/Http/Controllers/TravelUserController.php
View file

@ -21,8 +21,6 @@ class TravelUserController extends Controller
'step' => $step
];
return view('travel.user.index', $data);
}
public function detail($id)