23-01-2026
This commit is contained in:
parent
a939cd51ef
commit
a8b395e20d
248 changed files with 29342 additions and 4805 deletions
|
|
@ -109,6 +109,13 @@
|
|||
<div class="text-muted small">{{ __('Phone') }}</div>
|
||||
{{ $shopping_user->shipping_phone }}
|
||||
</div>
|
||||
@if($shopping_user->shipping_postnumber)
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">{{ __('payment.dhl_postnumber') }}</div>
|
||||
<span class="badge badge-info">{{ $shopping_user->shipping_postnumber }}</span>
|
||||
<small class="d-block text-muted">{{ __('payment.packstation_info') }}</small>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<a class="btn btn-sm btn-secondary mt-2" href="{{route('admin_customer_edit', [$shopping_user->id])}}">{{ __('customer.edit_customer_data') }}</a>
|
||||
<a class="btn btn-sm btn-danger mt-2" href="{{route('admin_customer_delete', [$shopping_user->id])}}" onclick="return confirm('{{ __('customer.delete_customer_confirm') }}')">{{ __('customer.delete_customer') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
|
|
@ -201,7 +202,7 @@
|
|||
<small>
|
||||
<span class="text-muted">{{ __('order.content') }}: </span> {{ $shopping_order_item->product->contents }}<br>
|
||||
<span class="text-muted">{{ __('order.weight') }}: </span> {{ $shopping_order_item->product->weight }} g<br>
|
||||
<span class="text-muted">{{ __('order.points') }}: </span> {{ $shopping_order_item->product->points }}
|
||||
<span class="text-muted">{{ __('order.points') }}: </span> {{ $shopping_order_item->product->getFormattedPoints() }}
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -310,10 +311,17 @@
|
|||
@forelse($shopping_user->getAllOrdersByMember() as $shopping_order)
|
||||
<tr>
|
||||
<td>
|
||||
@if($isAdmin)
|
||||
<a href="{{ route('admin_sales_customers_detail', $shopping_order->id) }}"
|
||||
class="btn icon-btn btn-sm btn-primary">
|
||||
<span class="fa fa-edit"></span>
|
||||
</a>
|
||||
@else
|
||||
<a href="{{ route('user_shop_order_detail', $shopping_order->id) }}"
|
||||
class="btn icon-btn btn-sm btn-primary">
|
||||
<span class="fa fa-edit"></span>
|
||||
</a>
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ $shopping_order->created_at->format('d.m.Y') }}</td>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -219,6 +219,30 @@
|
|||
{{ Form::text('shipping_phone', $shopping_user->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'shipping_phone', 'tabindex' => 26)) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="shipping_postnumber">{{ __('payment.dhl_postnumber') }} <small class="text-muted">({{ __('optional') }})</small></label>
|
||||
{{ Form::text('shipping_postnumber', $shopping_user->shipping_postnumber, array('placeholder'=>'12345678', 'class'=>'form-control', 'id'=>'shipping_postnumber', 'maxlength'=>'20', 'tabindex' => 27)) }}
|
||||
<small class="form-text text-muted">{{ __('payment.packstation_info') }}</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{-- Alert-Box für Packstation-Hinweis --}}
|
||||
<div class="alert alert-warning alert-dismissible fade show" id="packstation-alert" style="display: @if($shopping_user->shipping_postnumber) block @else none @endif;">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
<h6 class="alert-heading"><i class="fa fa-exclamation-triangle"></i> <strong>{{ __('payment.packstation_alert_title') }}</strong></h6>
|
||||
<hr>
|
||||
<p class="mb-2"><strong>{{ __('payment.packstation_alert_intro') }}</strong></p>
|
||||
<ul class="mb-2 pl-3">
|
||||
<li><strong>{{ __('Street') }} / {{ __('House number') }}:</strong> {{ __('payment.packstation_alert_street') }} <em>({{ __('payment.packstation_alert_street_example') }})</em></li>
|
||||
<li><strong>{{ __('Postcode') }} / {{ __('City') }}:</strong> {{ __('payment.packstation_alert_location') }} <em>({{ __('payment.packstation_alert_not_home') }})</em></li>
|
||||
</ul>
|
||||
<p class="mb-0 small text-muted">
|
||||
<i class="fa fa-info-circle"></i> {{ __('payment.packstation_alert_footer') }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
|
|
@ -355,6 +379,24 @@
|
|||
});
|
||||
});
|
||||
|
||||
// Packstation Alert show|hide
|
||||
function togglePackstationAlert() {
|
||||
var postnumber = $('#shipping_postnumber').val();
|
||||
if (postnumber && postnumber.trim() !== '') {
|
||||
$('#packstation-alert').slideDown(300);
|
||||
} else {
|
||||
$('#packstation-alert').slideUp(300);
|
||||
}
|
||||
}
|
||||
|
||||
// Bei Eingabe im Postnummer-Feld
|
||||
$('#shipping_postnumber').on('input', function() {
|
||||
togglePackstationAlert();
|
||||
});
|
||||
|
||||
// Bei Seitenladen prüfen
|
||||
togglePackstationAlert();
|
||||
|
||||
$.extend( $.validator.messages, {
|
||||
required: "{{__('account.validator_required')}}",
|
||||
maxlength: $.validator.format( "{{__('account.validator_maxlength')}}" ),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue