User Groups and Rights, Fewo
This commit is contained in:
parent
c0c2a1822c
commit
26ecb09cdc
22 changed files with 1316 additions and 787 deletions
|
|
@ -22,8 +22,6 @@ class FewoController extends Controller
|
|||
public function action($action)
|
||||
{
|
||||
|
||||
|
||||
|
||||
if ($action == "create_travel_users") {
|
||||
$data = \Input::all();
|
||||
if(!isset($data['travel_user']) && !is_array($data['travel_user'])) {
|
||||
|
|
|
|||
|
|
@ -6,11 +6,13 @@ namespace App\Http\Controllers;
|
|||
|
||||
use App\Models\Account;
|
||||
use App\Repositories\UserRepository;
|
||||
use App\Services\HTMLHelper;
|
||||
use App\User;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Input;
|
||||
use Illuminate\Http\Request;
|
||||
use Request;
|
||||
use Validator;
|
||||
use DataTables;
|
||||
|
||||
|
||||
|
||||
|
|
@ -58,7 +60,7 @@ class AdminUserController extends Controller
|
|||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$data = Input::all();
|
||||
/* $data = Input::all();
|
||||
$user = User::findOrFail($data['id']);
|
||||
|
||||
$user->admin = $data['admin'];
|
||||
|
|
@ -68,6 +70,7 @@ class AdminUserController extends Controller
|
|||
|
||||
|
||||
\Session()->flash('alert-save', true);
|
||||
*/
|
||||
return redirect('/admin/users');
|
||||
|
||||
}
|
||||
|
|
@ -82,4 +85,72 @@ class AdminUserController extends Controller
|
|||
|
||||
}
|
||||
|
||||
public function loadModal($id){
|
||||
|
||||
if(Request::ajax()) {
|
||||
$user = User::findOrFail($id);
|
||||
|
||||
|
||||
$data = [
|
||||
'user' => $user,
|
||||
'groups' => config('permissions.groups'),
|
||||
'roles' => config('permissions.roles')
|
||||
];
|
||||
return view("admin.user_modal", $data )->render();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public function updateModal($step = false){
|
||||
|
||||
if($step == 'user'){
|
||||
$data = Input::all();
|
||||
$user = User::findOrFail($data['id']);
|
||||
|
||||
$user->permissions = isset($data['permissions']) ? $data['permissions'] : [];
|
||||
$user->admin = $data['admin'];
|
||||
$user->confirmed = isset($data['confirmed']) ? true : false;
|
||||
$user->active = isset($data['active']) ? true : false;
|
||||
$user->save();
|
||||
|
||||
}
|
||||
|
||||
\Session()->flash('alert-save', true);
|
||||
return redirect('/admin/users');
|
||||
}
|
||||
|
||||
|
||||
|
||||
//
|
||||
public function getUsers()
|
||||
{
|
||||
//confirmation_code_remider is delete 2
|
||||
$query = User::where('deleted_at', '=', null);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('action_edit', function (User $user) {
|
||||
return '<a href="' . route('admin_user_edit', [$user->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
|
||||
})
|
||||
->addColumn('admin', function (User $user) {
|
||||
return '<a href="#" data-url="'.route('admin_user_load_modal', $user->id).'" data-data="'.$user->id.'" class="update_modal_data_show">'.HTMLHelper::getRoleLabel($user->admin).'</a>';
|
||||
})
|
||||
->addColumn('confirmed', function (User $user) {
|
||||
return $user->confirmed ? '<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>';
|
||||
})
|
||||
->addColumn('active', function (User $user) {
|
||||
return $user->active ? ' <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>';
|
||||
})
|
||||
->addColumn('action_delete', function (User $user) {
|
||||
return '<a href="' . route('admin_user_delete', [$user->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="far fa-trash"></span></a>';
|
||||
})
|
||||
->orderColumn('confirmed', 'confirmed $1')
|
||||
->orderColumn('active', 'active $1')
|
||||
->orderColumn('admin', 'active $1')
|
||||
->rawColumns(['action_edit', 'admin', 'confirmed', 'active', 'action_delete'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -44,34 +44,6 @@ class DataTableController extends Controller
|
|||
->make(true);
|
||||
}*/
|
||||
|
||||
public function getUsers()
|
||||
{
|
||||
//confirmation_code_remider is delete 2
|
||||
$query = User::where('deleted_at', '=', null);
|
||||
|
||||
return \DataTables::eloquent($query)
|
||||
->addColumn('action_edit', function (User $user) {
|
||||
return '<a href="' . route('admin_user_edit', [$user->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="far fa-edit"></span></a>';
|
||||
})
|
||||
->addColumn('admin', function (User $user) {
|
||||
return '<a href="#" data-toggle="modal" data-target="#modals-default" data-id="'.$user->id.'" data-email="'.$user->email.'" data-admin="'.$user->admin.'" data-active="'.$user->active.'" data-confirmed="'.$user->confirmed.'">'.HTMLHelper::getRoleLabel($user->admin).'</a>';
|
||||
})
|
||||
->addColumn('confirmed', function (User $user) {
|
||||
return $user->confirmed ? '<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>';
|
||||
})
|
||||
->addColumn('active', function (User $user) {
|
||||
return $user->active ? ' <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>';
|
||||
})
|
||||
->addColumn('action_delete', function (User $user) {
|
||||
return '<a href="' . route('admin_user_delete', [$user->id]) . '" class="btn icon-btn btn-sm btn-danger" onclick="return confirm(\''.__('Really delete entry?').'\');"><span class="far fa-trash"></span></a>';
|
||||
})
|
||||
->orderColumn('confirmed', 'confirmed $1')
|
||||
->orderColumn('active', 'active $1')
|
||||
->orderColumn('admin', 'active $1')
|
||||
->rawColumns(['action_edit', 'admin', 'confirmed', 'active', 'action_delete'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
public function getBookings()
|
||||
{
|
||||
//confirmation_code_remider is delete 2
|
||||
|
|
|
|||
|
|
@ -3,9 +3,12 @@
|
|||
namespace App\Http\Controllers;
|
||||
|
||||
|
||||
use App\Models\FewoPrice;
|
||||
use App\Models\FewoReservation;
|
||||
use App\Models\FewoSeason;
|
||||
use App\Models\TravelUser;
|
||||
use App\Models\TravelUserBookingFewo;
|
||||
use Carbon\Carbon;
|
||||
use Input;
|
||||
use Validator;
|
||||
|
||||
|
|
@ -29,16 +32,21 @@ class TravelUserBookingFewoController extends Controller
|
|||
|
||||
public function detail($id)
|
||||
{
|
||||
$max_adults = 10;
|
||||
$max_children = 10;
|
||||
if($id == "new") {
|
||||
$travel_user_booking_fewo = new TravelUserBookingFewo();
|
||||
$id = 'new';
|
||||
|
||||
}else{
|
||||
$travel_user_booking_fewo = TravelUserBookingFewo::findOrFail($id);
|
||||
$max_adults = isset($travel_user_booking_fewo->fewo_lodging->maximum_adults) ? $travel_user_booking_fewo->fewo_lodging->maximum_adults : 10;
|
||||
$max_children = isset($travel_user_booking_fewo->fewo_lodging->maximum_childs) ? $travel_user_booking_fewo->fewo_lodging->maximum_childs : 10;;
|
||||
$id = $travel_user_booking_fewo->id;
|
||||
}
|
||||
$data = [
|
||||
'travel_user_booking_fewo' => $travel_user_booking_fewo,
|
||||
'max_adults' => $max_adults,
|
||||
'max_children' => $max_children,
|
||||
'id' => $id,
|
||||
];
|
||||
return view('travel.user.booking.detail', $data);
|
||||
|
|
@ -49,6 +57,39 @@ class TravelUserBookingFewoController extends Controller
|
|||
{
|
||||
$data = Input::all();
|
||||
|
||||
//check for data
|
||||
$check_for_reservation = true;
|
||||
$fewo_reservation_id = 0;
|
||||
if($id > 0) {
|
||||
$model = TravelUserBookingFewo::findOrFail($id);
|
||||
if($data['from_date'] == $model->from_date && $data['to_date'] == $model->to_date){
|
||||
$check_for_reservation = false;
|
||||
}
|
||||
$fewo_reservation_id = $model->fewo_reservation_id;
|
||||
|
||||
}
|
||||
if($check_for_reservation){
|
||||
$from_date = Carbon::parse($data['from_date'])->format('Y-m-d');
|
||||
$to_date = Carbon::parse($data['to_date'])->format('Y-m-d');
|
||||
echo "<br>";
|
||||
$fewos = FewoReservation::where('lodging_id', $data['fewo_lodging_id'])
|
||||
->where('id', '!=', $fewo_reservation_id)
|
||||
->where('from_date', '<', $to_date)
|
||||
->where('to_date', '>', $from_date)
|
||||
->get();
|
||||
if($fewos->count()){
|
||||
$error = [];
|
||||
foreach ($fewos as $fewo){
|
||||
$error[] = "Reservierung gefunden: ".$fewo->from_date->format('d.m.Y')." - ".$fewo->to_date->format('d.m.Y');
|
||||
}
|
||||
return back()->withInput(Input::all())->withErrors($error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
//check for
|
||||
|
||||
$rules = array(
|
||||
'travel_user_id' => 'required',
|
||||
|
|
@ -57,27 +98,158 @@ class TravelUserBookingFewoController extends Controller
|
|||
'to_date'=>'required',
|
||||
'travel_booking_fewo_channel_id' => 'required',
|
||||
'status' => 'required'
|
||||
|
||||
);
|
||||
|
||||
$validator = Validator::make(Input::all(), $rules);
|
||||
|
||||
/* $message = 'my custom validation rule message' . $data['from_date'];
|
||||
Validator::extend('my_custom_validation_rule', function ($attribute, $value, $parameters) {
|
||||
//
|
||||
}, $message);
|
||||
*/
|
||||
if ($validator->fails()) {
|
||||
return back()->withInput(Input::all())->withErrors($validator);
|
||||
}
|
||||
|
||||
$set_price = true;
|
||||
$data['is_calendar_fewo_direct'] = isset($data['is_calendar_fewo_direct']) ? true : false;
|
||||
$data['is_calendar_hrs'] = isset($data['is_calendar_hrs']) ? true : false;
|
||||
$data['is_calendar_stern_tours'] = isset($data['is_calendar_stern_tours']) ? true : false;
|
||||
|
||||
|
||||
if($id == "new") {
|
||||
$model = TravelUserBookingFewo::create($data);
|
||||
|
||||
}else{
|
||||
$model = TravelUserBookingFewo::findOrFail($id);
|
||||
if($data['from_date'] == $model->from_date && $data['to_date'] == $model->to_date){
|
||||
$set_price = false;
|
||||
}
|
||||
$model->fill($data)->save();
|
||||
}
|
||||
|
||||
$res = $this->calculatePriceNew($model);
|
||||
$model->daily_prices = $res['season'];
|
||||
if($set_price){
|
||||
$model->price_travel = $res['price_travel'];
|
||||
$model->price_service = $res['price_service'];
|
||||
$model->price_deposit = $res['price_deposit'];
|
||||
$model->price_total = $res['price_total'] + $model->getPriceBalanceRaw();
|
||||
|
||||
if($fewo_reservation = $model->fewo_reservation){
|
||||
$model->fewo_reservation->from_date = $model->getFromDateRaw();
|
||||
$model->fewo_reservation->to_date = $model->getToDateRaw();
|
||||
$model->fewo_reservation->save();
|
||||
|
||||
}
|
||||
}
|
||||
if($fewo_reservation = $model->fewo_reservation){
|
||||
if($model->is_calendar_stern_tours){
|
||||
$model->fewo_reservation->from_date = $model->getFromDateRaw();
|
||||
$model->fewo_reservation->to_date = $model->getToDateRaw();
|
||||
}else{
|
||||
$model->fewo_reservation->from_date = null;
|
||||
$model->fewo_reservation->to_date = null;
|
||||
}
|
||||
$model->fewo_reservation->save();
|
||||
}else{
|
||||
if($model->is_calendar_stern_tours){
|
||||
|
||||
$res = FewoReservation::create([
|
||||
'lodging_id' => $model->fewo_lodging_id,
|
||||
'from_date' => $model->getFromDateRaw(),
|
||||
'to_date' => $model->getToDateRaw(),
|
||||
'status' => 0,
|
||||
'type' => 0]);
|
||||
$model->fewo_reservation_id = $res->id;
|
||||
$model->save();
|
||||
}
|
||||
}
|
||||
|
||||
$model->save();
|
||||
|
||||
\Session()->flash('alert-save', '1');
|
||||
return redirect(route('travel_user_booking_fewo_detail', [$model->id]));
|
||||
|
||||
}
|
||||
|
||||
private function calculatePriceNew(TravelUserBookingFewo $travel_user_booking_fewo){
|
||||
|
||||
$FewoSeasons = FewoSeason::where('from_date', '<', $travel_user_booking_fewo->getToDateRaw())
|
||||
->where('to_date', '>=', $travel_user_booking_fewo->getFromDateRaw())
|
||||
->get();
|
||||
$seasons = [];
|
||||
foreach ($FewoSeasons as $fewoSeason){
|
||||
$FewoPrices = FewoPrice::where('lodging_id', $travel_user_booking_fewo->fewo_lodging_id)->where('season_id', $fewoSeason->id)->get();
|
||||
$price = [];
|
||||
foreach ($FewoPrices as $fewoPrice){
|
||||
$price = $fewoPrice;
|
||||
}
|
||||
$seasons[] = [
|
||||
'name' => $fewoSeason->name,
|
||||
'fromDay' => $fewoSeason->from_date->format("Y-m-d"),
|
||||
'toDay' => $fewoSeason->to_date->format("Y-m-d"),
|
||||
'minimum_stay' => $fewoSeason->minimum_stay,
|
||||
'price' => $price,
|
||||
];
|
||||
|
||||
}
|
||||
$fromDate = Carbon::parse($travel_user_booking_fewo->getFromDateRaw());
|
||||
$toDate = Carbon::parse($travel_user_booking_fewo->gettoDateRaw());
|
||||
|
||||
$interval = \DateInterval::createFromDateString('1 day');
|
||||
$period = new \DatePeriod($fromDate, $interval, $toDate);
|
||||
$check_days = array();
|
||||
|
||||
|
||||
$result = [];
|
||||
$result['price_total'] = 0;
|
||||
$result['price_travel'] = 0;
|
||||
$result['price_deposit'] = $travel_user_booking_fewo->getPriceDepositRaw();
|
||||
$result['price_service'] = 0;
|
||||
$result['days'] = 0;
|
||||
$result['season'] = [];
|
||||
$frist_day = false;
|
||||
|
||||
//days
|
||||
foreach ($period as $dt) {
|
||||
|
||||
foreach ($seasons as $season) {
|
||||
if($dt->format("Y-m-d") >= $season['fromDay'] && $dt->format("Y-m-d") <= $season['toDay']){
|
||||
$check_days[] = $dt->format("d.m.Y");
|
||||
$price = $season['price'];
|
||||
$name = $season['name'];
|
||||
|
||||
if(!isset($result['season'][$name])){
|
||||
$result['season'][$name]['fromDay'] = $dt->format("d.m.Y");
|
||||
$result['price_service'] = $price->flat_price;
|
||||
$result['season'][$name]['price'] = 0;
|
||||
$result['season'][$name]['numberDays'] = 0;
|
||||
$result['season'][$name]['perNight'] = $price->per_night;
|
||||
$result['season'][$name]['minimumStay'] = $season['minimum_stay'];
|
||||
}
|
||||
|
||||
if(!$frist_day){
|
||||
$result['season'][$name]['price'] += $price->per_night;
|
||||
$result['season'][$name]['numberDays'] ++;
|
||||
$result['season'][$name]['toDay'] = $dt->format("d.m.Y");
|
||||
$result['price_travel'] += $price->per_night;
|
||||
|
||||
$result['days'] ++;
|
||||
|
||||
}else{
|
||||
$frist_day = true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
$result['price_total'] = $result['price_deposit'] + $result['price_travel'] + $result['price_service'];
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
||||
public function delete($id){
|
||||
$model = TravelUserBookingFewo::findOrFail($id);
|
||||
$FewoReservations = FewoReservation::where('lodging_id', $model->fewo_lodging_id)->where('from_date', $model->getFromDateRaw())->where('to_date', $model->getToDateRaw())->get();
|
||||
|
|
|
|||
|
|
@ -82,6 +82,9 @@ class TravelUserController extends Controller
|
|||
$model = TravelUser::findOrFail($id);
|
||||
$model->email = time()."@delete.de";
|
||||
$model->save();
|
||||
foreach ($model->travel_user_booking_fewos as $travel_user_booking_fewo) {
|
||||
$travel_user_booking_fewo->delete();
|
||||
}
|
||||
$model->delete();
|
||||
\Session()->flash('alert-success', __('Vorlage gelöscht'));
|
||||
return redirect(route('travel_users'));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue