diff --git a/app/Http/Controllers/Admin/ReportController.php b/app/Http/Controllers/Admin/ReportController.php index f21aaea..7b46918 100755 --- a/app/Http/Controllers/Admin/ReportController.php +++ b/app/Http/Controllers/Admin/ReportController.php @@ -287,7 +287,9 @@ class ReportController extends Controller $new = false; } }else{ - $total_price += $export->booking->isCanceled() ? $export->booking->getPriceCanceledRaw() : $export->booking->getPriceRaw(); + + //$total_price += $export->booking->isCanceled() ? $export->booking->getPriceCanceledRaw() : $export->booking->getPriceRaw(); + $total_price += $export->isCanceled() ? $export->getPriceCanceledRaw() : $export->getPriceRaw(); $columns[] = array( 'BuchungsID' => $export->id, 'Status' => $export->lead->status->name, diff --git a/app/Http/Controllers/CMS/CMSContentController.php b/app/Http/Controllers/CMS/CMSContentController.php index 2e65d0f..9f1e93c 100755 --- a/app/Http/Controllers/CMS/CMSContentController.php +++ b/app/Http/Controllers/CMS/CMSContentController.php @@ -62,6 +62,9 @@ class CMSContentController extends Controller //store in cms old Datebase \App\Models\Sym\CmsContent::create($data); }else{ + if($data['identifier'] === 'fewo-email-file'){ + $data['integer'] = isset($data['default_travel_info']) ? 1 : 0; + } $model = CMSContent::find($data['id']); $model->fill($data); $model->save(); diff --git a/app/Http/Controllers/LeadController.php b/app/Http/Controllers/LeadController.php index 2908695..b894ced 100755 --- a/app/Http/Controllers/LeadController.php +++ b/app/Http/Controllers/LeadController.php @@ -232,6 +232,24 @@ class LeadController extends Controller ->addColumn('request_date', function (Lead $lead) { return Carbon::parse($lead->request_date)->format(\Util::formatDateDB()); }) + ->addColumn('travel_country', function (Lead $lead) { + $out = ""; + if($lead->bookings->count()){ + $out = ''; + foreach ($lead->bookings as $booking){ + if($booking->travel_country_id && $booking->travel_country) { + $out .= $booking->travel_country->destco; + } + } + $out .= ''; + return $out; + } + if($lead->travel_country){ + return ''.$lead->travel_country->destco.''; + } + return "-"; + }) + ->addColumn('status', function (Lead $lead) { return $lead->getStatusBadge(); }) @@ -292,7 +310,7 @@ class LeadController extends Controller $query->where('customer_id', 'LIKE', '%'.$keyword.'%'); } }) - ->rawColumns(['action_edit', 'customer_id', 'sf_guard_user_id', 'id', 'status', 'last_lead_email', 'lead_notice', 'action_delete']) + ->rawColumns(['action_edit', 'customer_id', 'sf_guard_user_id', 'id', 'status', 'last_lead_email', 'travel_country', 'lead_notice', 'action_delete']) ->make(true); } diff --git a/app/Http/Controllers/Settings/EmailsController.php b/app/Http/Controllers/Settings/EmailsController.php index a754d9b..aac961e 100755 --- a/app/Http/Controllers/Settings/EmailsController.php +++ b/app/Http/Controllers/Settings/EmailsController.php @@ -18,6 +18,8 @@ class EmailsController extends Controller protected $identifier_booking_file; protected $identifier_fewo_file; + protected $identifier_lead_file; + public function __construct() { diff --git a/app/Http/Controllers/TravelContentController.php b/app/Http/Controllers/TravelContentController.php new file mode 100644 index 0000000..e025062 --- /dev/null +++ b/app/Http/Controllers/TravelContentController.php @@ -0,0 +1,154 @@ +middleware(['admin', '2fa']); + } + + public function index($step = false) + { + $data = [ + 'travelProgramOverviews' => Page::whereTemplate('travelProgramOverview')->get(), + 'step' => $step + ]; + return view('travel.content.index', $data); + + + } + + public function detail($id) + { + if($id === "new") { + $id = 'new'; + + }else{ + $page = Page::findOrFail($id); + $id = $page->id; + } + $data = [ + 'model' => $page, + 'id' => $id, + ]; + return view('travel.content.detail', $data); + } + + public function store($id) + { + $data = Request::all(); + if($id === "new") { + //$draft = new Draft(); + }else{ + $page = Page::findOrFail($id); + } + + if(Page::whereSlug($data['slug'])->where('id', '!=', $page->id)->count() > 0){ + $data['slug'] = ""; + } + + $page->title = $data['title']; + $page->title_short = $data['title_short']; + $page->pagetitle = $data['pagetitle']; + $page->slug = $data['slug']; + $page->description = $data['description']; + $page->content_new = $data['content_new']; + $page->status = $data['status']; + $page->show_in_navi = $data['show_in_navi']; + $page->save(); + + + \Session()->flash('alert-save', '1'); + return redirect(route('travel_content_detail', [$page->id])); + } + + public function subDetail($id) + { + if($id === "new") { + $id = 'new'; + + }else{ + $page = Page::findOrFail($id); + $id = $page->id; + } + $data = [ + 'model' => $page, + 'id' => $id, + ]; + return view('travel.content.sub_detail', $data); + } + + public function subStore($id) + { + $data = Request::all(); + if($id === "new") { + //$draft = new Draft(); + }else{ + $page = Page::findOrFail($id); + } + + if(Page::whereSlug($data['slug'])->where('id', '!=', $page->id)->count() > 0){ + $data['slug'] = ""; + } + $page->title = $data['title']; + $page->pagetitle = $data['pagetitle']; + $page->slug = $data['slug']; + $page->description = $data['description']; + $page->status = $data['status']; + $page->show_in_navi = $data['show_in_navi']; + $page->order = $data['order']; + + $page->travel_program = $data['travel_program'] > 0 ? $data['travel_program'] : null; + + $page->save(); + + + \Session()->flash('alert-save', '1'); + return redirect(route('travel_content_sub_detail', [$page->id])); + } + + + public function load(){ + $data = Request::all(); + $ret = ""; + if(Request::ajax()) { + if($data['action'] === "modal-copy-page") { + if($data['id'] > 0){ + $value = Page::findOrFail($data['id']); + $ret = view('travel.content.modal_copy', compact('value'))->render(); + } + } + } + return response()->json(['response' => $data, 'html'=>$ret]); + } + + + + public function update(){ + + $data = Request::all(); + + if($data['action'] === 'page-copy'){ + if($data['page_copy_id'] > 0){ + $model = Page::findOrFail($data['page_copy_id']); + $newModel = $model->replicate(); + $newModel->date = null; + //slug unique + // $newModel->slug + $newModel->created_at = now(); + $newModel->save(); + } + + \Session()->flash('alert-save', '1'); + return redirect(route('travel_content_detail', [$data['id']])); + } + } +} + + diff --git a/app/Http/Controllers/TravelUserBookingFewoController.php b/app/Http/Controllers/TravelUserBookingFewoController.php index 44fd91a..f08f676 100755 --- a/app/Http/Controllers/TravelUserBookingFewoController.php +++ b/app/Http/Controllers/TravelUserBookingFewoController.php @@ -3,21 +3,23 @@ namespace App\Http\Controllers; -use App\Mail\MailSendFeWoInvoice; -use App\Mail\MailSendFeWoService; -use App\Mail\MailSendFeWoInfo; +use Request; +use App\Services\Util; use App\Models\CMSContent; use App\Models\FewoLodging; +use App\Mail\MailSendFeWoInfo; use App\Models\FewoReservation; -use App\Models\TravelBookingFewoChannel; -use App\Models\TravelUserBookingFewo; -use App\Models\TravelUserBookingFewoNotice; -use App\Models\TravelUserBookingFile; -use App\Repositories\BookingFewoFileRepository; -use App\Repositories\TravelUserBookingFewoRepository; -use App\Services\Util; +use App\Models\CustomerFewoFile; +use App\Mail\MailSendFeWoInvoice; +use App\Mail\MailSendFeWoService; use Illuminate\Support\Facades\Mail; -use Request; +use App\Models\TravelUserBookingFewo; +use App\Models\TravelUserBookingFile; +use App\Models\TravelBookingFewoChannel; +use App\Models\TravelUserBookingFewoNotice; +use App\Repositories\BookingFewoFileRepository; +use App\Repositories\CustomerFewoFileRepository; +use App\Repositories\TravelUserBookingFewoRepository; class TravelUserBookingFewoController extends Controller { @@ -147,8 +149,12 @@ class TravelUserBookingFewoController extends Controller if($data['action'] === 'sendInfosMailtoUser') { $travel_user_booking_fewo = TravelUserBookingFewo::findOrFail($id); if($travel_user_booking_fewo->travel_user_id && $travel_user_booking_fewo->travel_user->email){ + $mail_files = []; + if(isset($data['info_mail_files'])){ + $mail_files = $this->setMailInfoFiles($data['info_mail_files'], $travel_user_booking_fewo); + } $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)); + Mail::to($travel_user_booking_fewo->travel_user->email)->bcc($mail_bbc)->send(new MailSendFeWoInfo($travel_user_booking_fewo, $mail_files)); $send_info_mail = $travel_user_booking_fewo->send_info_mail; $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; @@ -195,6 +201,51 @@ class TravelUserBookingFewoController extends Controller } } + private function setMailInfoFiles($info_mail_files, $travel_user_booking_fewo) + { + $files = []; + $ret = []; + //read files + foreach($info_mail_files as $mail_file){ + if($mail_file === 'fewo_instruction_pdf'){ + $files[] = [ + 'target' => route('customer_file_show', ['fewo_instruction_pdf', $travel_user_booking_fewo->fewo_lodging->id, 'stream']), + 'name' => \App\Services\BookingFewo::getFeWoInstructionPDFName($travel_user_booking_fewo->fewo_lodging) + ]; + }else{ + if($file = \App\Models\CMSContent::getModelBySlug($mail_file)){ + $files[] = [ + 'target' => $file->getURL(), + 'name' => $file->name + ]; + } + } + } + //store files + foreach($files as $file){ + $arrContextOptions=array( + "ssl"=>array( + "verify_peer"=>false, + "verify_peer_name"=>false, + ), + ); + $contents = file_get_contents($file['target'], false, stream_context_create($arrContextOptions)); + $mine = Util::getMimeFromHeader($http_response_header); + $extension = Util::getExtensionFromMime($mine); + $fileRepo = new CustomerFewoFileRepository(new CustomerFewoFile()); + $fileRepo->_set('disk', 'travel_user'); + $fileRepo->_set('dir', '/attachment/'.date('Y/m').'/'); + $fileRepo->_set('travel_user_id', $travel_user_booking_fewo->travel_user_id); + $fileRepo->_set('customer_fewo_mail_id', NULL); + $fileRepo->_set('identifier', 'fewo_info_mail_user'); + $fileRepo->_set('originalName', $file['name']); + $fileRepo->_set('mine', $mine); + $fileRepo->_set('extension', $extension); + $ret[] = $fileRepo->storeReturnFile($contents); + } + return $ret; + } + public function getAjaxRequests(){ diff --git a/app/Mail/MailSendFeWoInfo.php b/app/Mail/MailSendFeWoInfo.php index d026520..b7f5182 100644 --- a/app/Mail/MailSendFeWoInfo.php +++ b/app/Mail/MailSendFeWoInfo.php @@ -14,12 +14,15 @@ class MailSendFeWoInfo extends Mailable protected $travel_user_booking_fewo; public $subject; + public $files; - public function __construct(TravelUserBookingFewo $travel_user_booking_fewo) + public function __construct(TravelUserBookingFewo $travel_user_booking_fewo, $files = []) { $this->travel_user_booking_fewo = $travel_user_booking_fewo; $this->subject = __('STERN TOURS Anreiseinfo FEWO'); + $this->files = $files; + } public function build() @@ -40,18 +43,33 @@ class MailSendFeWoInfo extends Mailable 'mine' => 'application/pdf', ); - return $this->view('emails.info') + $message = $this->view('emails.info') ->with([ 'salutation' => $salutation, 'copy1line' => $this->travel_user_booking_fewo->info_mail_text, 'copy2line' => "", 'greetings' => __('Best regards'), 'model' => $this->travel_user_booking_fewo, - ]) - ->attach($file1['path'], [ - 'as' => $file1['name'], - 'mime' => $file1['mine'], - ]) - ; + ]); + $message->attach($file1['path'], [ + 'as' => $file1['name'], + 'mime' => $file1['mine'], + ]); + + foreach ($this->files as $file) { + $message->attach($file->getPath(),[ + 'as' => $file->original_name, + 'mime' => $file->mine, + ]); // attach each file + } + + return $message; } -} \ No newline at end of file + +} + + +//path = \Storage::disk('lead')->path($this->dir.$this->filename); +//name = +//'mine' => 'application/pdf', + diff --git a/app/Models/Booking.php b/app/Models/Booking.php index cba14b3..461f323 100644 --- a/app/Models/Booking.php +++ b/app/Models/Booking.php @@ -222,6 +222,7 @@ class Booking extends Model //'airline_id' => 'int', 'refund' => 'int', 'xx_tkt' => 'int', + 'insurance_offer' => 'int', 'is_rail_fly' => 'bool', 'comfort' => 'bool', 'airline_ids' => 'array', @@ -277,6 +278,7 @@ class Booking extends Model 'final_payment', 'final_payment_date', 'travelagenda_id', + 'insurance_offer', 'paying_out', 'paying_out_status', //'airline_id', @@ -313,6 +315,12 @@ class Booking extends Model 2 => 'erledigt', ]; + public static $insurance_offer_types = [ + 0 => '-', + 1 => 'Nein, keine Reiseversicherung gewünscht', + 2 => 'Ja, ich wünsche ein Reiseversicherungsangebot' + ]; + public static $paying_out_status_types = [ 0 => '-', 1 => 'offen', @@ -921,6 +929,10 @@ class Booking extends Model return isset(self::$paying_out_types[$this->paying_out]) ? self::$paying_out_types[$this->paying_out] : '-'; } + public function getInsuranceOfferType(){ + return isset(self::$insurance_offer_types[$this->insurance_offer]) ? self::$insurance_offer_types[$this->insurance_offer] : '-'; + } + public function getPayingOutStatusType(){ return isset(self::$paying_out_status_types[$this->paying_out_status]) ? self::$paying_out_status_types[$this->paying_out_status] : '-'; } diff --git a/app/Models/Page.php b/app/Models/Page.php index 8dbaaa5..1362c91 100644 --- a/app/Models/Page.php +++ b/app/Models/Page.php @@ -1,12 +1,19 @@ 'int', + 'lvl' => 'int', + 'owner_second' => 'int', + 'catalog_id' => 'int', + 'catalog_index' => 'int', + 'travel_program' => 'int', + 'status' => 'int', + 'show_in_navi' => 'int', + 'order' => 'int', + 'OLD_CatalogID' => 'int', + 'OLD_OwnerID' => 'int', + 'buma_gjr' => 'int', + 'price-tags' => 'bool', + 'country_id' => 'int', + 'lft' => 'int', + 'rgt' => 'int', + 'tree_root' => 'int', + 'parent_id' => 'int', + 'travel_guide_content_id' => 'int', + 'fewo_lodging' => 'int' + ]; + + protected $dates = [ + 'date' + ]; + + protected $fillable = [ + 'owner', + 'model', + 'lvl', + 'owner_second', + 'catalog_id', + 'catalog_index', + 'slug', + 'travel_program', + 'status', + 'show_in_navi', + 'order', + 'title', + 'title_short', + 'before_title', + 'pagetitle', + 'description', + 'keywords', + 'content', + 'content_new', + 'buma_destination', + 'OLD_CatalogID', + 'OLD_OwnerID', + 'buma_gjr', + 'date', + 'price-tags', + 'text_right', + 'keyword', + 'canonical_url', + 'country_id', + 'template', + 'lft', + 'rgt', + 'tree_root', + 'parent_id', + 'real_url_path', + 'travel_guide_content_id', + 'box_body', + 'box_image_url', + 'box_star', + 'box_discount', + 'cms_settings', + 'fewo_lodging' + ]; + + public function sluggable() + { + return [ + 'slug' => [ + 'source' => 'title' + ] + ]; + } + + public function page() + { + return $this->belongsTo(Page::class, 'tree_root'); + } + + public function fewo_lodging() + { + return $this->belongsTo(FewoLodging::class, 'fewo_lodging'); + } + + public function travel_country() + { + return $this->belongsTo(TravelCountry::class, 'country_id'); + } + + public function travel_guide() + { + return $this->belongsTo(TravelGuide::class, 'travel_guide_content_id'); + } + + public function pages() + { + return $this->hasMany(Page::class, 'tree_root'); + } + + public function redirects() + { + return $this->hasMany(Redirect::class); + } + + public function travel_countries() + { + return $this->hasMany(TravelCountry::class, 'feedback_page_id'); + } + + public function child_pages() + { + return $this->hasMany(Page::class, 'owner'); + } + + public function parent_page() + { + return $this->belongsTo(Page::class, 'parent_id'); + } + + public function travel_program_content() + { + return $this->belongsTo(TravelProgram::class, 'travel_program'); + } + + + public function getContentNew() + { + return $this->content_new ? $this->content_new : $this->content; + } } diff --git a/app/Repositories/CustomerFewoFileRepository.php b/app/Repositories/CustomerFewoFileRepository.php index 2afdd72..b45aa1b 100644 --- a/app/Repositories/CustomerFewoFileRepository.php +++ b/app/Repositories/CustomerFewoFileRepository.php @@ -52,4 +52,8 @@ class CustomerFewoFileRepository extends FileRepository { ], 200); } + public function returnFile(){ + return $this->customer_file; + } + } \ No newline at end of file diff --git a/app/Repositories/FileRepository.php b/app/Repositories/FileRepository.php index dce4d3a..0c844d5 100644 --- a/app/Repositories/FileRepository.php +++ b/app/Repositories/FileRepository.php @@ -77,6 +77,15 @@ class FileRepository extends BaseRepository { return $this->response(); } + public function storeReturnFile( $content ) + { + $this->makeFilename(); + $this->store($content); + $this->size = Storage::disk($this->disk)->size($this->dir.$this->allowed_filename); + $this->save(); + return $this->returnFile(); + } + public function store($content){ if(!Storage::disk($this->disk)->exists( $this->dir )){ Storage::disk($this->disk)->makeDirectory($this->dir); //creates directory @@ -88,6 +97,11 @@ class FileRepository extends BaseRepository { } + public function returnFile(){ + + } + + public function response(){ return Response::json([ 'error' => false, diff --git a/app/Repositories/TravelUserBookingFewoRepository.php b/app/Repositories/TravelUserBookingFewoRepository.php index cee9bc7..cd6a658 100644 --- a/app/Repositories/TravelUserBookingFewoRepository.php +++ b/app/Repositories/TravelUserBookingFewoRepository.php @@ -249,11 +249,21 @@ class TravelUserBookingFewoRepository extends BaseRepository { if ($model->is_calendar_stern_tours) { $model->fewo_reservation->from_date = $model->getFromDateRaw(); $model->fewo_reservation->to_date = $model->getToDateRaw(); + $model->fewo_reservation->save(); + } else { - $model->fewo_reservation->from_date = null; - $model->fewo_reservation->to_date = null; + $FewoReservation = FewoReservation::find($model->fewo_reservation_id); + $model->fewo_reservation_id = NULL; + $model->save(); + $FewoReservation->delete(); + + $FewoReservations = FewoReservation::where('lodging_id', $model->fewo_lodging_id)->where('from_date', $model->getFromDateRaw())->where('to_date', $model->getToDateRaw())->get(); + foreach ($FewoReservations as $FewoReservation) { + $FewoReservation->delete(); + } + // $model->fewo_reservation->from_date = null; + // $model->fewo_reservation->to_date = null; } - $model->fewo_reservation->save(); } else { if ($model->is_calendar_stern_tours) { diff --git a/app/Services/BookingImport.php b/app/Services/BookingImport.php index 9bf98d1..acff286 100644 --- a/app/Services/BookingImport.php +++ b/app/Services/BookingImport.php @@ -83,6 +83,7 @@ class BookingImport 'travel_category_id' => isset($travel_booking->selected_travel['travel_category_id']) ? $travel_booking->selected_travel['travel_category_id'] : null, 'travelagenda_id' => isset($travel_booking->selected_travel['travelagenda_id']) ? $travel_booking->selected_travel['travelagenda_id'] : null, 'travel_company_id' => isset($travel_booking->selected_travel['travel_company_id']) ? $travel_booking->selected_travel['travel_company_id'] : 4, + 'insurance_offer' => $travel_booking->insurance_offer, ]; //createBooking diff --git a/app/Services/Model.php b/app/Services/Model.php index 6213f37..def0aa2 100644 --- a/app/Services/Model.php +++ b/app/Services/Model.php @@ -16,10 +16,11 @@ use App\Models\TravelNationality; use App\Models\Sym\TravelCountry as SymTravelCountry; use App\Models\TravelArrivalPoint; use App\Models\TravelGerneralNote; +use App\Models\TravelProgram; class Model { - + public static function getSfGuardUserArray(){ return SfGuardUser::where('is_active', 1)->get()->pluck('fullname', 'id'); } @@ -34,6 +35,11 @@ class Model return $emtpy ? $TravelCountry->prepend('-', 0) : $TravelCountry; } + public static function getTravelProgramArray($emtpy = false){ + $TravelProgram = TravelProgram::where('status', 1)->orderBy('title')->get()->pluck('title', 'id'); + return $emtpy ? $TravelProgram->prepend('-', 0) : $TravelProgram; + } + public static function getTravelCategoryArray($emtpy = false){ $TravelCategory = TravelCategory::where('active', true)->orderBy('name')->get()->pluck('name', 'id'); return $emtpy ? $TravelCategory->prepend('-', 0) : $TravelCategory; diff --git a/config/permissions.php b/config/permissions.php index 17c280a..3dee871 100755 --- a/config/permissions.php +++ b/config/permissions.php @@ -10,6 +10,7 @@ return [ 'crm-tp' => ['name' => 'ADMIN CRM > Reiseprogramme' , 'color' => 'admin'], 'crm-tp-pr' => ['name' => 'ADMIN CRM > Reiseprogramme > Programme' , 'color' => 'admin'], 'crm-tp-dr' => ['name' => 'ADMIN CRM > Reiseprogramme > Vorlagen' , 'color' => 'admin'], + 'crm-tp-tc' => ['name' => 'ADMIN CRM > Reiseprogramme > Inhalte' , 'color' => 'admin'], 'crm-bo' => ['name' => 'ADMIN CRM > Buchungen' , 'color' => 'admin'], 'crm-bo-re' => ['name' => 'ADMIN CRM > Buchungen > Übersicht' , 'color' => 'admin'], 'crm-bo-bo' => ['name' => 'ADMIN CRM > Buchungen > Buchungen' , 'color' => 'admin'], diff --git a/resources/views/booking/_detail_booking.blade.php b/resources/views/booking/_detail_booking.blade.php index 8a87f8e..8d3b04e 100755 --- a/resources/views/booking/_detail_booking.blade.php +++ b/resources/views/booking/_detail_booking.blade.php @@ -93,6 +93,12 @@ {{ Form::select('travel_company_id', \App\Services\Model::getTravelCompanyArray(false) , $booking->travel_company_id, array('class'=>'custom-select', 'id'=>'travel_company_id')) }} +
+
+ {{ $booking->getInsuranceOfferType() }} +
+ +
Status
diff --git a/resources/views/cms/content/all/modal.blade.php b/resources/views/cms/content/all/modal.blade.php index c35f64d..979811c 100755 --- a/resources/views/cms/content/all/modal.blade.php +++ b/resources/views/cms/content/all/modal.blade.php @@ -23,7 +23,6 @@
-
@@ -98,6 +97,20 @@ {{ Form::text('pos', $value->pos, array('class'=>'form-control')) }}
+ @if($value->identifier === 'fewo-email-file') +
+
+ +
+ +
+ + @endif
diff --git a/resources/views/drafts/detail.blade.php b/resources/views/drafts/detail.blade.php index 1a04245..ce50e61 100755 --- a/resources/views/drafts/detail.blade.php +++ b/resources/views/drafts/detail.blade.php @@ -38,7 +38,7 @@

- Vorlage verwalten + Vorlage Reiseprogramme verwalten diff --git a/resources/views/drafts/index.blade.php b/resources/views/drafts/index.blade.php index fc40f59..1aa3839 100755 --- a/resources/views/drafts/index.blade.php +++ b/resources/views/drafts/index.blade.php @@ -2,7 +2,7 @@ @section('content')

- Vorlagen + Vorlagen Reiseprogramme

@endif diff --git a/resources/views/lead/index.blade.php b/resources/views/lead/index.blade.php index a893ec1..791075d 100755 --- a/resources/views/lead/index.blade.php +++ b/resources/views/lead/index.blade.php @@ -19,6 +19,7 @@ {{__('Nachname')}} {{__('E-Mail')}} {{__('Anfrage-Datum')}} + {{__('Reiseland')}} {{__('N.')}} {{__('Sachbearbeiter')}} {{__('Status')}} @@ -45,13 +46,12 @@ { data: 'customer.name', name: 'customer.name' }, { data: 'customer.email', name: 'customer.email' }, { data: 'request_date', name: 'request_date' }, + { data: 'travel_country', name: 'travel_country', orderable: false }, { data: 'lead_notice', name: 'lead_notice', orderable: false }, { data: 'sf_guard_user.last_name', name: 'sf_guard_user.last_name', searchable: false }, { data: 'status', name: 'status' }, { data: 'last_lead_email', name: 'last_lead_email', orderable: true }, { data: 'action_delete', orderable: false, searchable: false}, - - ], "bLengthChange": false, "iDisplayLength": 100, diff --git a/resources/views/settings/emails/index.blade.php b/resources/views/settings/emails/index.blade.php index 12d010c..959e7a5 100755 --- a/resources/views/settings/emails/index.blade.php +++ b/resources/views/settings/emails/index.blade.php @@ -517,6 +517,7 @@ {{__('Name')}} {{__('Slug')}} {{__('Inhalt')}} + {{__('Anreiseinfo')}} {{__('Type')}} @@ -539,6 +540,7 @@ {{ $value->name }} {{ $value->slug }} @if($value->isFile()) {!! $value->getPreviewContent() !!} @else {{ $value->getPreviewContent() }} @endif + {!! get_active_badge($value->integer) !!} default {{ $value->getFieldName() }} diff --git a/resources/views/travel/content/detail.blade.php b/resources/views/travel/content/detail.blade.php new file mode 100644 index 0000000..0a7545d --- /dev/null +++ b/resources/views/travel/content/detail.blade.php @@ -0,0 +1,156 @@ +@extends('layouts.layout-2') + +@section('content') + + {!! Form::open(['url' => route('travel_content_detail', [$id]), 'class' => 'form-horizontal']) !!} + +

+ Inhalte Reiseprogramme +
+   + {{ __('back') }} +
+

+ +
+
+

Reiseübersicht

+
+
+ + {{ Form::text('title', $model->title, array('placeholder'=>__('Title'), 'class'=>'form-control', 'id'=>'title', 'required'=>true)) }} +
+
+ + {{ Form::text('title_short', $model->title_short, array('placeholder'=>__('Title Short'), 'class'=>'form-control', 'id'=>'title_short', 'required'=>true)) }} +
+
+ + {{ Form::text('pagetitle', $model->pagetitle, array('placeholder'=>__('Title Short'), 'class'=>'form-control', 'id'=>'pagetitle', 'required'=>true)) }} +
+
+ + {{ Form::text('slug', $model->slug, array('placeholder'=>__('URL der Seite'), 'class'=>'form-control', 'id'=>'slug')) }} +
+
+
+
+
+
+
+ + {{ Form::textarea('description', $model->description, array('class'=>'form-control autoExpand', 'rows'=>2)) }} +
+ +
+ + {{ Form::textarea('content_new', $model->getContentNew(), array('class'=>'form-control autoExpand', 'rows'=>2)) }} +
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+   + {{ __('back') }}
+ {!! Form::close() !!} + + +
+

Unterseiten für Reiseübersicht {{ $model->title }}

+
+ + + + + + + + + + + + + + @foreach($model->child_pages as $child_page) + + + + + @if($child_page->travel_program_content) + + @else + + @endif + + + + + + @endforeach + +
 {{__('Title')}}{{__('Pagetitle')}}{{__('Programm')}}{{__('Pos')}}{{__('sichtbar')}}{{__('sichtbar in navi')}}
+ + + + {{ $child_page->title }}{{ $child_page->pagetitle }}{{ $child_page->travel_program_content->title }}-{{ $child_page->order }} + {!! get_active_badge($child_page->status) !!} + + {!! get_active_badge($child_page->show_in_navi) !!} +
+
+ +
+
+ +
+ + + +@endsection \ No newline at end of file diff --git a/resources/views/travel/content/index.blade.php b/resources/views/travel/content/index.blade.php new file mode 100755 index 0000000..e156cdb --- /dev/null +++ b/resources/views/travel/content/index.blade.php @@ -0,0 +1,216 @@ +@extends('layouts.layout-2') + +@section('content') +

+ Inhalte Reiseprogramme +

+
+ + +
+
+
+
+ + + + + + + + + + + + @foreach($travelProgramOverviews as $value) + + + + + + + + @endforeach + +
 {{__('Title')}}{{__('Pagetitle')}}{{__('sichtbar')}}{{__('sichtbar in navi')}}
+ + + + {{ $value->title }}{{ $value->pagetitle }} + {!! get_active_badge($value->status) !!} + + {!! get_active_badge($value->show_in_navi) !!} +
+
+ +
+
+ + {{-- + --}} + +
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/travel/content/modal_copy.blade.php b/resources/views/travel/content/modal_copy.blade.php new file mode 100644 index 0000000..7edbe19 --- /dev/null +++ b/resources/views/travel/content/modal_copy.blade.php @@ -0,0 +1,30 @@ +{!! Form::open([ 'url' => route('travel_content_update'), 'method' => 'post', 'class' => 'modal-content' ]) !!} +{{ Form::hidden('action', 'page-copy') }} +{{ Form::hidden('step', false) }} +{{ Form::hidden('id', $value->id) }} +
+
Neue Unterseite kopieren/anlegen
+ +
+
+ + +
+ + + +
+
+ +
+
+ + +
+{!! Form::close() !!} + + diff --git a/resources/views/travel/content/sub_detail.blade.php b/resources/views/travel/content/sub_detail.blade.php new file mode 100644 index 0000000..1bf7267 --- /dev/null +++ b/resources/views/travel/content/sub_detail.blade.php @@ -0,0 +1,139 @@ +@extends('layouts.layout-2') + +@section('content') + + {!! Form::open(['url' => route('travel_content_sub_detail', [$id]), 'class' => 'form-horizontal']) !!} + +

+ Inhalte Reiseprogramme +
+   + {{ __('back') }} +
+

+ +
+
+

Reiseübersicht

+
+
+ + {{ Form::text('title', $model->title, array('placeholder'=>__('Title'), 'class'=>'form-control', 'id'=>'title', 'required'=>true)) }} +
+
+ + {{ Form::text('pagetitle', $model->pagetitle, array('placeholder'=>__('Title Short'), 'class'=>'form-control', 'id'=>'pagetitle', 'required'=>true)) }} +
+
+ + {{ Form::text('slug', $model->slug, array('placeholder'=>__('URL der Seite'), 'class'=>'form-control', 'id'=>'slug')) }} +
+
+
+
+
+ + {{ Form::select('travel_program', \App\Services\Model::getTravelProgramArray(true) , $model->travel_program, array('class'=>'selectpicker', 'data-style'=>'btn-default', 'data-live-search'=>'true', 'id'=>'travel_program')) }} +
+ +
+
+
+
+
+
+ + {{ Form::textarea('description', $model->description, array('class'=>'form-control autoExpand', 'rows'=>2)) }} +
+
+
+
+
+ +
+
+ +
+
+ +
+
+ + {{ Form::text('order', $model->order, array('placeholder'=>__('pos'), 'class'=>'form-control', 'id'=>'order')) }} +
+
+
+
+ +
+   + {{ __('back') }}
+ {!! Form::close() !!} + +
+

Übersichtseite für {{ $model->title }}

+
+ + + + + + + + + + + + @if($model->parent_page) + + + + + + + + + @endif + +
 {{__('Title')}}{{__('Pagetitle')}}{{__('sichtbar')}}{{__('sichtbar in navi')}}
+ + + + {{ $model->parent_page->title }}{{ $model->parent_page->pagetitle }} + {!! get_active_badge($model->parent_page->status) !!} + + {!! get_active_badge($model->parent_page->show_in_navi) !!} +
+
+
+ + + +@endsection \ No newline at end of file diff --git a/resources/views/travel/user/booking/_detail_invoice.blade.php b/resources/views/travel/user/booking/_detail_invoice.blade.php index 02fbec1..49e3f9f 100755 --- a/resources/views/travel/user/booking/_detail_invoice.blade.php +++ b/resources/views/travel/user/booking/_detail_invoice.blade.php @@ -91,6 +91,38 @@
+ + @php($info_mail_files_count = 1) + +
+
+ + + @if($travel_user_booking_fewo->fewo_lodging) + + @endif + + @foreach(\App\Services\BookingFewo::contentFiles() as $content_file) + @if($file = \App\Models\CMSContent::getModelBySlug($content_file)) + + @endif + @endforeach +
+
@if($travel_user_booking_fewo->send_info_mail) @@ -103,6 +135,7 @@
@endif +
 
diff --git a/routes/web.php b/routes/web.php index 9f5b1ba..eaba5ef 100755 --- a/routes/web.php +++ b/routes/web.php @@ -165,6 +165,36 @@ Route::group(['middleware' => ['admin', '2fa']], function() Route::get('/draft/load/old', 'DraftController@loadOld')->name('draft_load_old'); Route::post('/draft/load/old', 'DraftController@loadOldAction')->name('draft_load_old'); }); + + Route::group(['middleware' => ['auth.permission:crm-tp-tc']], function() { + //Reiseprogramme Vorlagen + Route::get('/travel_content/{step?}', 'TravelContentController@index')->name('travel_content'); + + Route::get('/travel_content/detail/{id}', 'TravelContentController@detail')->name('travel_content_detail'); + Route::post('/travel_content/detail/{id}', 'TravelContentController@store')->name('travel_content_detail'); + + + Route::get('/travel_content/sub_detail/{id}', 'TravelContentController@subDetail')->name('travel_content_sub_detail'); + Route::post('/travel_content/sub_detail/{id}', 'TravelContentController@subStore')->name('travel_content_sub_detail'); + + Route::post('/travel_content/load', 'TravelContentController@load')->name('travel_content_load'); + Route::post('/travel_content/update', 'TravelContentController@update')->name('travel_content_update'); + + /*Route::get('/draft/item/delete/{id}', 'DraftController@itemDelete')->name('draft_item_delete'); + Route::get('/draft/delete/{id}', 'DraftController@delete')->name('draft_delete'); + + Route::post('/draft/type/update', 'DraftController@typeUpdate')->name('draft_type_update'); + Route::get('/draft/type/delete/{id}', 'DraftController@typeDelete')->name('draft_type_delete'); + + Route::get('/draft/load/new', 'DraftController@loadNew')->name('draft_load_new'); + Route::post('/draft/load/new', 'DraftController@loadNewAction')->name('draft_load_new'); + + Route::get('/draft/load/old', 'DraftController@loadOld')->name('draft_load_old'); + Route::post('/draft/load/old', 'DraftController@loadOldAction')->name('draft_load_old');*/ + }); + + + Route::group(['middleware' => ['auth.permission:crm-bo-re']], function() { //Buchungen > Anfragen Route::get('/requests/{step?}', 'RequestController@index')->name('requests'); diff --git a/storage/app/fewo/infos/2022/Anreiseinfo-2356865.pdf b/storage/app/fewo/infos/2022/Anreiseinfo-2356865.pdf new file mode 100644 index 0000000..68a96c7 Binary files /dev/null and b/storage/app/fewo/infos/2022/Anreiseinfo-2356865.pdf differ diff --git a/storage/app/public/cms_files/2020/05/5ec2473b9fe718.25439666_stern-tours-mietbedingungen.pdf b/storage/app/public/cms_files/2020/05/5ec2473b9fe718.25439666_stern-tours-mietbedingungen.pdf new file mode 100644 index 0000000..54243aa Binary files /dev/null and b/storage/app/public/cms_files/2020/05/5ec2473b9fe718.25439666_stern-tours-mietbedingungen.pdf differ diff --git a/storage/app/public/cms_files/2020/05/5ec8db2f4884b5.58595068_medizinische_info_für_gäste.pdf b/storage/app/public/cms_files/2020/05/5ec8db2f4884b5.58595068_medizinische_info_für_gäste.pdf new file mode 100644 index 0000000..65d6f63 Binary files /dev/null and b/storage/app/public/cms_files/2020/05/5ec8db2f4884b5.58595068_medizinische_info_für_gäste.pdf differ diff --git a/storage/app/public/cms_files/2020/05/5ec8dca2d37126.44645024_handlungsempfehlungen_für_gäste.pdf b/storage/app/public/cms_files/2020/05/5ec8dca2d37126.44645024_handlungsempfehlungen_für_gäste.pdf new file mode 100644 index 0000000..2d90903 Binary files /dev/null and b/storage/app/public/cms_files/2020/05/5ec8dca2d37126.44645024_handlungsempfehlungen_für_gäste.pdf differ diff --git a/storage/app/public/cms_files/2020/08/5f2516dc82fc04.98770833_bedienungsanleitung-waschmaschine.pdf b/storage/app/public/cms_files/2020/08/5f2516dc82fc04.98770833_bedienungsanleitung-waschmaschine.pdf new file mode 100644 index 0000000..0572103 Binary files /dev/null and b/storage/app/public/cms_files/2020/08/5f2516dc82fc04.98770833_bedienungsanleitung-waschmaschine.pdf differ diff --git a/storage/app/public/cms_files/2021/02/60226b51998306.33582024_formblatt11.pdf b/storage/app/public/cms_files/2021/02/60226b51998306.33582024_formblatt11.pdf new file mode 100644 index 0000000..2b9a6d9 Binary files /dev/null and b/storage/app/public/cms_files/2021/02/60226b51998306.33582024_formblatt11.pdf differ diff --git a/storage/app/public/cms_files/2021/02/6022bf883f57f6.03067196_datenschutzhinweise.pdf b/storage/app/public/cms_files/2021/02/6022bf883f57f6.03067196_datenschutzhinweise.pdf new file mode 100644 index 0000000..ba89de0 Binary files /dev/null and b/storage/app/public/cms_files/2021/02/6022bf883f57f6.03067196_datenschutzhinweise.pdf differ diff --git a/storage/app/public/cms_files/2021/10/615dfa1ecfc5c5.55026414_arbsterntours.pdf b/storage/app/public/cms_files/2021/10/615dfa1ecfc5c5.55026414_arbsterntours.pdf new file mode 100644 index 0000000..6135f69 Binary files /dev/null and b/storage/app/public/cms_files/2021/10/615dfa1ecfc5c5.55026414_arbsterntours.pdf differ diff --git a/storage/app/public/cms_files/2021/10/615dfc4cede360.44779262_arbsterntours.pdf b/storage/app/public/cms_files/2021/10/615dfc4cede360.44779262_arbsterntours.pdf new file mode 100644 index 0000000..6135f69 Binary files /dev/null and b/storage/app/public/cms_files/2021/10/615dfc4cede360.44779262_arbsterntours.pdf differ diff --git a/storage/app/public/cms_files/2021/11/618d8b1fd91757.95811280_sicherungsscheinnachsis651rmhb.pdf b/storage/app/public/cms_files/2021/11/618d8b1fd91757.95811280_sicherungsscheinnachsis651rmhb.pdf new file mode 100644 index 0000000..a12cfd2 Binary files /dev/null and b/storage/app/public/cms_files/2021/11/618d8b1fd91757.95811280_sicherungsscheinnachsis651rmhb.pdf differ diff --git a/storage/app/public/cms_files/2022/09/63248b3b5bfea4.18330648_schluesselkasten.jpg b/storage/app/public/cms_files/2022/09/63248b3b5bfea4.18330648_schluesselkasten.jpg new file mode 100644 index 0000000..b5f59c9 Binary files /dev/null and b/storage/app/public/cms_files/2022/09/63248b3b5bfea4.18330648_schluesselkasten.jpg differ diff --git a/storage/app/travel_user/attachment/2023/05/645e655e8505e5.58973531_hinweise-ferienwohnung-strandstra.pdf b/storage/app/travel_user/attachment/2023/05/645e655e8505e5.58973531_hinweise-ferienwohnung-strandstra.pdf new file mode 100644 index 0000000..ffa322d Binary files /dev/null and b/storage/app/travel_user/attachment/2023/05/645e655e8505e5.58973531_hinweise-ferienwohnung-strandstra.pdf differ diff --git a/storage/app/travel_user/attachment/2023/05/645e6560d208a1.06511915_hinweise-ferienwohnung-strandstra.pdf b/storage/app/travel_user/attachment/2023/05/645e6560d208a1.06511915_hinweise-ferienwohnung-strandstra.pdf new file mode 100644 index 0000000..28047d9 Binary files /dev/null and b/storage/app/travel_user/attachment/2023/05/645e6560d208a1.06511915_hinweise-ferienwohnung-strandstra.pdf differ diff --git a/storage/app/travel_user/attachment/2023/05/645e6aa4a46512.74267085_hinweise-ferienwohnung-strandstra.pdf b/storage/app/travel_user/attachment/2023/05/645e6aa4a46512.74267085_hinweise-ferienwohnung-strandstra.pdf new file mode 100644 index 0000000..26ffc14 Binary files /dev/null and b/storage/app/travel_user/attachment/2023/05/645e6aa4a46512.74267085_hinweise-ferienwohnung-strandstra.pdf differ diff --git a/storage/app/travel_user/attachment/2023/05/645e6e013f1ce9.34549806_stern-tours-mietbedingunge.html b/storage/app/travel_user/attachment/2023/05/645e6e013f1ce9.34549806_stern-tours-mietbedingunge.html new file mode 100644 index 0000000..a7aedac --- /dev/null +++ b/storage/app/travel_user/attachment/2023/05/645e6e013f1ce9.34549806_stern-tours-mietbedingunge.html @@ -0,0 +1,45 @@ + + + diff --git a/storage/app/travel_user/attachment/2023/05/645e6e03431f43.74857762_hinweise-ferienwohnung-strandstra.pdf b/storage/app/travel_user/attachment/2023/05/645e6e03431f43.74857762_hinweise-ferienwohnung-strandstra.pdf new file mode 100644 index 0000000..bfa0e40 Binary files /dev/null and b/storage/app/travel_user/attachment/2023/05/645e6e03431f43.74857762_hinweise-ferienwohnung-strandstra.pdf differ diff --git a/storage/app/travel_user/attachment/2023/05/645f6fa4d00912.47267406_hinweise-ferienwohnung-strandstra.pdf b/storage/app/travel_user/attachment/2023/05/645f6fa4d00912.47267406_hinweise-ferienwohnung-strandstra.pdf new file mode 100644 index 0000000..7d2bc3b Binary files /dev/null and b/storage/app/travel_user/attachment/2023/05/645f6fa4d00912.47267406_hinweise-ferienwohnung-strandstra.pdf differ diff --git a/storage/app/travel_user/attachment/2023/05/645f6fa503d001.48410376_stern-tours-mietbedingunge.html b/storage/app/travel_user/attachment/2023/05/645f6fa503d001.48410376_stern-tours-mietbedingunge.html new file mode 100644 index 0000000..69d694a --- /dev/null +++ b/storage/app/travel_user/attachment/2023/05/645f6fa503d001.48410376_stern-tours-mietbedingunge.html @@ -0,0 +1,45 @@ + + + diff --git a/storage/app/travel_user/attachment/2023/05/645f6fa5280109.31058434_bedienungsanleitung-waschmaschin.html b/storage/app/travel_user/attachment/2023/05/645f6fa5280109.31058434_bedienungsanleitung-waschmaschin.html new file mode 100644 index 0000000..7f30d24 --- /dev/null +++ b/storage/app/travel_user/attachment/2023/05/645f6fa5280109.31058434_bedienungsanleitung-waschmaschin.html @@ -0,0 +1,45 @@ + + + diff --git a/storage/app/travel_user/attachment/2023/05/645f7002c592a2.71576493_hinweise-ferienwohnung-strandstra.pdf b/storage/app/travel_user/attachment/2023/05/645f7002c592a2.71576493_hinweise-ferienwohnung-strandstra.pdf new file mode 100644 index 0000000..9294929 Binary files /dev/null and b/storage/app/travel_user/attachment/2023/05/645f7002c592a2.71576493_hinweise-ferienwohnung-strandstra.pdf differ diff --git a/storage/app/travel_user/attachment/2023/05/645f7002ea70e0.99459491_stern-tours-mietbedingunge.html b/storage/app/travel_user/attachment/2023/05/645f7002ea70e0.99459491_stern-tours-mietbedingunge.html new file mode 100644 index 0000000..21c55e7 --- /dev/null +++ b/storage/app/travel_user/attachment/2023/05/645f7002ea70e0.99459491_stern-tours-mietbedingunge.html @@ -0,0 +1,45 @@ + + + diff --git a/storage/app/travel_user/attachment/2023/05/645f700318fb08.84756518_bedienungsanleitung-waschmaschin.html b/storage/app/travel_user/attachment/2023/05/645f700318fb08.84756518_bedienungsanleitung-waschmaschin.html new file mode 100644 index 0000000..ca7e8d2 --- /dev/null +++ b/storage/app/travel_user/attachment/2023/05/645f700318fb08.84756518_bedienungsanleitung-waschmaschin.html @@ -0,0 +1,45 @@ + + + diff --git a/storage/app/travel_user/attachment/2023/05/645f70c290f4f4.89933685_hinweise-ferienwohnung-strandstra.pdf b/storage/app/travel_user/attachment/2023/05/645f70c290f4f4.89933685_hinweise-ferienwohnung-strandstra.pdf new file mode 100644 index 0000000..a894b45 Binary files /dev/null and b/storage/app/travel_user/attachment/2023/05/645f70c290f4f4.89933685_hinweise-ferienwohnung-strandstra.pdf differ diff --git a/storage/app/travel_user/attachment/2023/05/645f70c2b67532.82531181_stern-tours-mietbedingungen.pdf b/storage/app/travel_user/attachment/2023/05/645f70c2b67532.82531181_stern-tours-mietbedingungen.pdf new file mode 100644 index 0000000..54243aa Binary files /dev/null and b/storage/app/travel_user/attachment/2023/05/645f70c2b67532.82531181_stern-tours-mietbedingungen.pdf differ diff --git a/storage/app/travel_user/attachment/2023/05/645f70c2ddc457.51551381_bedienungsanleitung-waschmaschine.pdf b/storage/app/travel_user/attachment/2023/05/645f70c2ddc457.51551381_bedienungsanleitung-waschmaschine.pdf new file mode 100644 index 0000000..0572103 Binary files /dev/null and b/storage/app/travel_user/attachment/2023/05/645f70c2ddc457.51551381_bedienungsanleitung-waschmaschine.pdf differ