API work
This commit is contained in:
parent
32595ab5a1
commit
13fb2cfe98
70 changed files with 3614 additions and 401 deletions
|
|
@ -20,8 +20,8 @@
|
|||
<th>{{__('Name')}}</th>
|
||||
<th>{{__('Artikelnummer')}}</th>
|
||||
<th>{{__('Kategorie')}}</th>
|
||||
<th>{{__('Points')}}</th>
|
||||
<th>{{__('Preis')}}</th>
|
||||
<th>{{__('Points')}}</th>
|
||||
<th>{{__('Inhalt')}}</th>
|
||||
<th>{{__('Einheit')}}</th>
|
||||
<th>{{__('Grundpreis')}}</th>
|
||||
|
|
|
|||
|
|
@ -118,8 +118,9 @@
|
|||
|
||||
<!-- Billing -->
|
||||
<div class="card-body">
|
||||
|
||||
<h6 class="small font-weight-semibold">
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping' || $shopping_order->shopping_user->is_from === 'extern')
|
||||
Rechnungsadresse des Kunden
|
||||
@else
|
||||
Rechnungsadresse des Beraters
|
||||
|
|
@ -185,7 +186,7 @@
|
|||
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order' || $shopping_order->shopping_user->is_from === 'extern')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
Lieferadresse des Berater
|
||||
@else
|
||||
|
|
@ -319,21 +320,23 @@
|
|||
<tr class="border-bottom">
|
||||
<td class="px-3 py-2">
|
||||
<div class="media align-items-center">
|
||||
@if($shopping_order_item->product->images)
|
||||
@if($image = $shopping_order_item->product->images->first())
|
||||
<img src="{{ route('product_image', [$image->slug]) }}" class="d-block ui-w-80 mr-4" alt>
|
||||
@if($shopping_order_item->product)
|
||||
@if($shopping_order_item->product->images)
|
||||
@if($image = $shopping_order_item->product->images->first())
|
||||
<img src="{{ route('product_image', [$image->slug]) }}" class="d-block ui-w-80 mr-4" alt>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<div class="media-body">
|
||||
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->name }}
|
||||
<span class="text-muted">#{{ $shopping_order_item->product->number }}</span></a>
|
||||
<small>
|
||||
<span class="text-muted">Inhalt: </span> {{ $shopping_order_item->product->contents }}<br>
|
||||
<span class="text-muted">Gewicht: </span> {{ $shopping_order_item->product->weight }} g<br>
|
||||
<span class="text-muted">Points: </span> {{ $shopping_order_item->product->points }}
|
||||
</small>
|
||||
</div>
|
||||
<div class="media-body">
|
||||
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->name }}
|
||||
<span class="text-muted">#{{ $shopping_order_item->product->number }}</span></a>
|
||||
<small>
|
||||
<span class="text-muted">Inhalt: </span> {{ $shopping_order_item->product->contents }}<br>
|
||||
<span class="text-muted">Gewicht: </span> {{ $shopping_order_item->product->weight }} g<br>
|
||||
<span class="text-muted">Points: </span> {{ $shopping_order_item->product->points }}
|
||||
</small>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</td>
|
||||
<td class="align-middle px-3 py-2 nowrap text-right" style="min-width:100px;">
|
||||
|
|
@ -504,13 +507,40 @@
|
|||
</div>
|
||||
<hr class="m-0">
|
||||
|
||||
@if($shopping_order->txaction === 'extern')
|
||||
<div class="card-body">
|
||||
@if($shopping_order->wp_invoice_path)
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<a href="{{$shopping_order->wp_invoice_path}}" target="_blank" class="btn btn-secondary btn-sm">Link zur Rechnung</a>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($shopping_order->wp_notice['wp_advertising'])
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<b>Werbemittel: {!! $shopping_order->wp_notice['wp_advertising'] !!}<br></b>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($shopping_order->wp_notice['wp_incentives'])
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<b>Incentives: {!! $shopping_order->wp_notice['wp_incentives'] !!}<br></b>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
@endif
|
||||
|
||||
<!-- / Payment -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Zahlung
|
||||
</h6>
|
||||
@if($shopping_order->txaction !== 'extern')
|
||||
<div class="table-responsive">
|
||||
|
||||
<table class="table table-bordered table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -578,6 +608,17 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@else
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="alert alert-info p-2 mt-2">
|
||||
<ul>
|
||||
<li>Bestellung über externen SHOP</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue