Berater bestellungen kleine Änderungen
This commit is contained in:
Kevin Adametz
parent
c4ed6b39db
commit
74923859d1
8 changed files with 64 additions and 49 deletions
|
|
@ -112,11 +112,13 @@
|
|||
</div>
|
||||
@else
|
||||
<div class="col-md-6 mb-3">
|
||||
{{--
|
||||
@if(!$shopping_user->is_like)
|
||||
<a href="{{ route('user_order_my_delivery', ['ot', $shopping_user->id]) }}" class="btn btn-sm btn-secondary mt-2">
|
||||
<span class="fa fa-shopping-cart"></span> Bestellung für diesen Kunden aufgeben
|
||||
</a>
|
||||
@endif
|
||||
--}}
|
||||
</div>
|
||||
<div class="col-md-6 mb-3">
|
||||
<div class="text-muted small">Kundenhoheit</div>
|
||||
|
|
|
|||
|
|
@ -196,16 +196,10 @@
|
|||
|
||||
<div class="card mb-2">
|
||||
<h6 class="card-header">
|
||||
{{__('Länder')}}
|
||||
{{__('Land')}}
|
||||
</h6>
|
||||
<div class="card-datatable table-responsive">
|
||||
<table class="datatables-style table table-striped table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{__('Land')}}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($value->countries as $country)
|
||||
<tr>
|
||||
|
|
@ -224,12 +218,14 @@
|
|||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
@if(!$value->countries->count())
|
||||
<div class="mt-4 ml-4">
|
||||
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-country"
|
||||
data-id="new"
|
||||
>{{__('Land hinzufügen')}}</button>
|
||||
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -250,7 +246,7 @@
|
|||
<div class="form-row">
|
||||
<div class="form-group col">
|
||||
<label for="country_ids" class="form-label">{{__('Versandkosten gelten für diese Länder')}}</label>
|
||||
<select class="selectpicker" data-style="btn-default" name="country_ids[]" multiple>
|
||||
<select class="selectpicker" data-style="btn-default" name="country_ids[]">
|
||||
{!! HTMLHelper::getCountriesWithoutUsedShippings() !!}
|
||||
</select>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
@endif
|
||||
<div class="show-is-for-customer">
|
||||
<h4>An diesen Kunde versenden</h4>
|
||||
<p>Sollten unten stehend Angaben nicht korrekt sein oder aktualisiert werden müssen, ändere diese bitte vorerst unter:
|
||||
<p>Sollten unten stehende Angaben nicht korrekt sein oder aktualisiert werden müssen, ändere diese bitte vorerst unter:
|
||||
<a href="{{route('user_customers')}}">Meine Kunden -> Übersicht</a> -> <a href="{{route('user_customer_detail', $shopping_user->id)}}"><i class="fa fa-edit"></i> Kunde</a></a></p>
|
||||
@include('admin.customer._customer_detail')
|
||||
</div>
|
||||
|
|
@ -66,11 +66,21 @@
|
|||
|
||||
</div>
|
||||
@if($shopping_user)
|
||||
<div class="float-right">
|
||||
<div class="" id="hide_for_me">
|
||||
<hr>
|
||||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-2 ">
|
||||
<input type="checkbox" class="custom-control-input" name="check_for_ot" id="checkbox_for_me" required>
|
||||
<span class="custom-control-label secondary">{{__('Mir ist bekannt, dass dieser Bestellvorgang nur für Kundenbestellungen ist und nicht für meine eigenen Bestellungen')}}</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="float-rights">
|
||||
<button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button>
|
||||
</div>
|
||||
@else
|
||||
<div class="float-right" id="hide_for_ot">
|
||||
<div class="float-rights" id="hide_for_ot">
|
||||
<button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button>
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -86,9 +96,16 @@
|
|||
if($(this).val() === 'ot'){
|
||||
$('#show-is-for-customer').show('slow');
|
||||
$('#hide_for_ot').hide('slow');
|
||||
$('#hide_for_me').show('slow');
|
||||
$('#checkbox_for_me').attr('required', true);
|
||||
|
||||
}else{
|
||||
$('#show-is-for-customer').hide('slow');
|
||||
$('#hide_for_ot').show('slow');
|
||||
$('#hide_for_me').hide('slow');
|
||||
$('#checkbox_for_me').attr('required', false);
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -49,8 +49,7 @@
|
|||
|
||||
</style>
|
||||
@if($user->user_level)
|
||||
<p>Die Produktpreise werden entsprechend deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt.<br>
|
||||
Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
|
||||
<p>Die Produktpreise werden entsprechend Deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt. Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
|
||||
@else
|
||||
<p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p>
|
||||
@endif
|
||||
|
|
@ -141,7 +140,7 @@
|
|||
ajax: {
|
||||
url: '{!! route( 'user_order_my_datatable') !!}',
|
||||
data: function(d) {
|
||||
// d.filter_member_id = $('select[name=filter_member_id]').val();
|
||||
d.shipping_is_for = $('input[name=shipping_is_for]').val();
|
||||
// d.filter_customer_member = $('select[name=filter_customer_member]').val();
|
||||
}
|
||||
},
|
||||
|
|
@ -158,7 +157,8 @@
|
|||
{ data: 'action', name: 'action', searchable: false, orderable: false },
|
||||
],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 50,
|
||||
"iDisplayLength": 1000,
|
||||
"paging": false,
|
||||
"language": {
|
||||
"url": "/js/German.json"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@
|
|||
<div class="panel panel-default">
|
||||
<div class="panel-body">
|
||||
<h3>Vielen Dank, </h3>
|
||||
<p>Deine Bestellung ist bei uns eingegangen. In Kürze erhälst du von uns eine Bestellbestätigungsmail.</p>
|
||||
<p>Deine Bestellung ist bei uns eingegangen. In Kürze erhälst Du von uns eine Bestellbestätigungsmail.</p>
|
||||
|
||||
<h4>Deine Bestellnummer ist: {{ $order_reference }}</h4>
|
||||
<hr />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue