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

Teilnehmer extra, Emails Anfragen Order

Browse source
This commit is contained in:
Kevin Adametz 2021-09-15 19:11:38 +02:00
parent a718baf971
commit 5e3bd3a1ba
19 changed files with 174 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

37
resources/views/booking/_detail_mails.blade.php
View file

@ -71,19 +71,36 @@
</div>
<div class="badge {{$badge}}">{{$booking->countCustomerMailsBy($customer_mail_dir->pos)}}</div>
</a>
@if($booking->travel_country)
@foreach($booking->travel_country->getMailDirs($customer_mail_dir->pos) as $mail_dir_id)
@php ($mail_dir_name = \App\Services\Booking::getCustomerMailName($customer_mail_dir, $mail_dir_id))
<a href="javascript:void(0)" class="d-flex justify-content-between align-items-center py-1 px-4 sidebox-nav-item sidebox-nav-item_sub"
data-dir="{{$customer_mail_dir->pos}}" data-subdir="{{$mail_dir_id}}" data-icon="{{$customer_mail_dir->getArrayContent('icon')}}" data-name="{{$mail_dir_name}}">
<div class="item pl-2">
<i class="ion {{$customer_mail_dir->getArrayContent('icon')}}"></i> {{$mail_dir_name}}
</div>
<div class="badge {{$badge}}">{{$booking->countCustomerMailsBy($customer_mail_dir->pos, $mail_dir_id)}}</div>
</a>
@endforeach
@php (\App\Services\Booking::setOutputDirs($customer_mail_dir->pos, 0))
@foreach($booking->travel_country->getMailDirs($customer_mail_dir->pos) as $mail_sdir_id)
@php ($mail_dir_name = \App\Services\Booking::getCustomerMailName($customer_mail_dir, $mail_sdir_id))
<a href="javascript:void(0)" class="d-flex justify-content-between align-items-center py-1 px-4 sidebox-nav-item sidebox-nav-item_sub"
data-dir="{{$customer_mail_dir->pos}}" data-subdir="{{$mail_sdir_id}}" data-icon="{{$customer_mail_dir->getArrayContent('icon')}}" data-name="{{$mail_dir_name}}">
<div class="item pl-2">
<i class="ion {{$customer_mail_dir->getArrayContent('icon')}}"></i> {{$mail_dir_name}}
</div>
<div class="badge {{$badge}}">{{$booking->countCustomerMailsBy($customer_mail_dir->pos, $mail_sdir_id)}}</div>
</a>
@php (\App\Services\Booking::setOutputDirs($customer_mail_dir->pos, $mail_sdir_id))
@endforeach
@if($mail_dirs_not_outputs = \App\Services\Booking::getMailDirNotInOutput($booking->id, $customer_mail_dir->pos))
@foreach($mail_dirs_not_outputs as $mail_sdir_id)
@php ($mail_dir_name = \App\Services\Booking::getCustomerMailName($customer_mail_dir, $mail_sdir_id))
<a href="javascript:void(0)" class="d-flex justify-content-between align-items-center py-1 px-4 sidebox-nav-item sidebox-nav-item_sub"
data-dir="{{$customer_mail_dir->pos}}" data-subdir="{{$mail_sdir_id}}" data-icon="{{$customer_mail_dir->getArrayContent('icon')}}" data-name="{{$mail_dir_name}}">
<div class="item pl-2">
<i class="ion {{$customer_mail_dir->getArrayContent('icon')}}"></i> {{$mail_dir_name}}
</div>
<div class="badge {{$badge}}">{{$booking->countCustomerMailsBy($customer_mail_dir->pos, $mail_sdir_id)}}</div>
</a>
@php (\App\Services\Booking::setOutputDirs($customer_mail_dir->pos, $mail_sdir_id))
@endforeach
@endif
@endif
@endforeach
@foreach($booking::$customer_mail_dirs as $dir_id => $customer_mail_dir)
@php($badge = "badge-outline-primary")
<a href="javascript:void(0)" class="d-flex justify-content-between align-items-center py-2 px-4 sidebox-nav-item"

2
resources/views/booking/_detail_participant.blade.php
View file

@ -18,6 +18,7 @@
</tr>
</thead>
<tbody>
@if($booking->participant_firstname)
<tr>
<th scope="row">
{{ Form::select('participant_salutation_id', \App\Services\Model::getSalutationArray(false) , $booking->participant_salutation_id, array('class'=>'custom-select', 'id'=>'participant_salutation_id')) }}
@ -42,6 +43,7 @@
&nbsp;
</td>
</tr>
@endif
@if($booking->participants)
@foreach($booking->participants as $item)

2
resources/views/lead/_detail_lead.blade.php
View file

@ -45,7 +45,7 @@
<div class="form-group col-sm-6 col-md-4">
<label for="travelcountry_id" class="form-label">{{ __('Reiseland') }}*</label>
{{ Form::select('travelcountry_id', \App\Services\Model::getTravelCountryArray(true) , $lead->travelcountry_id, array('class'=>'custom-select')) }}
{{ Form::select('travelcountry_id', \App\Services\Model::getTravelCountryCRMArray(true) , $lead->travelcountry_id, array('class'=>'custom-select')) }}
</div>
<div class="form-group col-sm-6 col-md-4">

31
resources/views/lead/_detail_mails.blade.php
View file

@ -13,7 +13,7 @@
<div class="py-3 px-4">
<div class="media align-items-center">
<div class="media-body text-center">
<button type="button" class="btn btn-sm btn-secondary mb-3 btn-compare-customer-mails" data-toggle="modal"
<button type="button" class="btn btn-sm btn-secondary mb-3 btn-compare-lead-mails" data-toggle="modal"
data-target="#modals-load-content"
data-id="new-send"
data-model="LeadMail"
@ -25,7 +25,7 @@
data-lead_mail_subdir="0"
data-route="{{ route('lead_mail_modal_load') }}"><i class="ion ion-md-mail-open"></i>&nbsp;E-Mail schreiben</button>
<button type="button" class="btn btn-sm btn-next btn-compare-customer-mails" data-toggle="modal"
<button type="button" class="btn btn-sm btn-next btn-compare-lead-mails" data-toggle="modal"
data-target="#modals-load-content"
data-id="new-save"
data-model="LeadMail"
@ -69,6 +69,33 @@
</div>
<div class="badge {{$badge}}">{{$lead->countLeadMailsBy($lead_mail_dir->pos)}}</div>
</a>
@if($lead->travel_country)
@php (\App\Services\Lead::setOutputDirs($lead_mail_dir->pos, 0))
@foreach($lead->travel_country->getMailDirs($lead_mail_dir->pos) as $mail_sdir_id)
@php ($mail_dir_name = \App\Services\Lead::getCustomerMailName($lead_mail_dir, $mail_sdir_id))
<a href="javascript:void(0)" class="d-flex justify-content-between align-items-center py-1 px-4 sidebox-nav-item sidebox-nav-item_sub"
data-dir="{{$lead_mail_dir->pos}}" data-subdir="{{$mail_sdir_id}}" data-icon="{{$lead_mail_dir->getArrayContent('icon')}}" data-name="{{$mail_dir_name}}">
<div class="item pl-2">
<i class="ion {{$lead_mail_dir->getArrayContent('icon')}}"></i> {{$mail_dir_name}}
</div>
<div class="badge {{$badge}}">{{$lead->countLeadMailsBy($lead_mail_dir->pos, $mail_sdir_id)}}</div>
</a>
@php (\App\Services\Lead::setOutputDirs($lead_mail_dir->pos, $mail_sdir_id))
@endforeach
@if($mail_dirs_not_outputs = \App\Services\Lead::getMailDirNotInOutput($lead->id, $lead_mail_dir->pos))
@foreach($mail_dirs_not_outputs as $mail_sdir_id)
@php ($mail_dir_name = \App\Services\Lead::getCustomerMailName($lead_mail_dir, $mail_sdir_id))
<a href="javascript:void(0)" class="d-flex justify-content-between align-items-center py-1 px-4 sidebox-nav-item sidebox-nav-item_sub"
data-dir="{{$lead_mail_dir->pos}}" data-subdir="{{$mail_sdir_id}}" data-icon="{{$lead_mail_dir->getArrayContent('icon')}}" data-name="{{$mail_dir_name}}">
<div class="item pl-2">
<i class="ion {{$lead_mail_dir->getArrayContent('icon')}}"></i> {{$mail_dir_name}}
</div>
<div class="badge {{$badge}}">{{$lead->countLeadMailsBy($lead_mail_dir->pos, $mail_sdir_id)}}</div>
</a>
@php (\App\Services\Lead::setOutputDirs($lead_mail_dir->pos, $mail_sdir_id))
@endforeach
@endif
@endif
@endforeach
@foreach($lead::$lead_mail_dirs as $dir_id => $lead_mail_dir)
@php($badge = "badge-outline-primary")

10
resources/views/lead/modal-show-mail-inner.blade.php
View file

@ -102,21 +102,19 @@
<button type="submit" class="btn btn-xs btn-default float-right mt-1"><i class="ion ion-ios-redo"></i>&nbsp; verschieben</button>
<label for="subdir" class="form-label">&nbsp;</label>
{{-- TODO load subdirs by pos id
@if($lead_mail->booking->travel_country)
@foreach(\App\Services\Booking::getCustomerMailDirs() as $lead_mail_dir)
@if($lead_mail->lead->travel_country)
@foreach(\App\Services\Lead::getCustomerMailDirs() as $lead_mail_dir)
@if($lead_mail_dir->pos > 0)
<select class="custom-select lead_mail_subdir" name="subdir" id="lead_mail_subdir_{{$lead_mail_dir->pos}}">
<option value="0">keinen Unterordner</option>
@foreach($lead_mail->booking->travel_country->getMailDirs($lead_mail_dir->pos) as $mail_dir_id)
@php ($mail_dir_name = \App\Services\Booking::getCustomerMailName($lead_mail_dir, $mail_dir_id))
@foreach($lead_mail->lead->travel_country->getMailDirs($lead_mail_dir->pos) as $mail_dir_id)
@php ($mail_dir_name = \App\Services\Lead::getCustomerMailName($lead_mail_dir, $mail_dir_id))
<option value="{{$mail_dir_id}}" @if($lead_mail->subdir == $mail_dir_id) selected @endif>{{$mail_dir_name}}</option>
@endforeach
</select>
@endif
@endforeach
@endif
--}}
</div>
</div>
{!! Form::close() !!}

7
resources/views/settings/emails/index.blade.php
View file

@ -233,7 +233,7 @@
<div class="tab-pane fade @if($step === 'settings') active show @endif" id="navs-top-settings">
<div class="card">
<h4 class="mt-4 mb-2 ml-4">Ordner für Buchungen/E-Mail Ablage</h4>
<h4 class="mt-4 mb-2 ml-4">Ordner für Buchungen+Anfrage/E-Mail Ablage</h4>
<p class="ml-4">Unterordner werden für das jeweilige Reiseland der Buchung unter <a href="{{route('admin_settings_travel_country')}}">Reiseländer</a> -> Land / E-Mails zugewiesen </p>
<div class="card-datatable table-responsive pt-0">
<table class="datatables-customer-mail-dirs table table-striped table-bordered">
@ -559,7 +559,7 @@
<!-- Lead Anfragen -->
<h4 class="mt-4 mb-2 ml-4">Ordner für Anfragen/E-Mail Ablage</h4>
{{-- <h4 class="mt-4 mb-2 ml-4">Ordner für Anfragen/E-Mail Ablage</h4>
<div class="card-datatable table-responsive pt-0">
<table class="datatables-customer-lead-mail-dirs table table-striped table-bordered">
<thead>
@ -594,7 +594,6 @@
<td>
{!! \App\Services\Util::_implodeLines( $customer_lead_mail_dir->getArrayContent('emails'), "<br>") !!}
</td>
{{-- <td><a class="text-danger" href="" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a></td> --}}
</tr>
@php($next_customer_lead_mail_dir_id = $customer_lead_mail_dir->pos+1)
@endforeach
@ -667,7 +666,7 @@
</form>
</div>
</div>
</div>--}}
<hr>
<h4 class="mt-2 mb-0 ml-4">Allgemeine PDF Dateien für Anfragen/E-Mail-Anhänge</h4>