API work
This commit is contained in:
Kevin Adametz
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>
|
||||
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@
|
|||
</table>
|
||||
|
||||
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
|
||||
@if($mode === 'test')
|
||||
@if($mode === 'test' || $mode === 'dev')
|
||||
<tr>
|
||||
<td class="headline">
|
||||
<b>##### TEST MODE ##### TEST MODE ##### TEST MODE #####</b>
|
||||
|
|
@ -169,13 +169,14 @@
|
|||
<b>{{ __('navigation.my_homeparty') }} / {{ $shopping_order->homeparty->name }} - {{ $shopping_order->homeparty->date }}</b><br>
|
||||
<b>{{__('email.checkout_mail_hl1')}}</b>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'extern')
|
||||
<b>{{__('email.checkout_mail_order_for_extern')}}</b>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
@if($shopping_order->shopping_user->is_from === 'homeparty')
|
||||
|
||||
|
||||
@php($homeparty = $shopping_order->homeparty)
|
||||
@if($homeparty->homeparty_host)
|
||||
<p><strong>Bestellung Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong></p>
|
||||
|
|
@ -191,7 +192,6 @@
|
|||
@endforeach
|
||||
@endif
|
||||
<hr>
|
||||
|
||||
@include('emails.homeparty_detail_total', ['homeparty' => $homeparty])
|
||||
@else
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
|
|
@ -290,190 +290,311 @@
|
|||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
@if($send_link)
|
||||
<tr>
|
||||
<td>
|
||||
<center>
|
||||
<table role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
|
||||
<tbody>
|
||||
@if($shopping_order->shopping_user->is_from !== 'extern')
|
||||
|
||||
@if($send_link)
|
||||
<tr>
|
||||
<td>
|
||||
<center>
|
||||
<table role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="word-wrap:break-word;background:transparent;font-size:0px;padding:10px 25px;padding-top:15px;padding-bottom:15px;padding-right:40px;padding-left:40px;" align="center" valign="top" background="data:image/gif;base64,">
|
||||
<table role="presentation" cellpadding="0" cellspacing="0" align="center" border="0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="border:none;border-radius:20px;color:#ffffff;cursor:auto;padding:15px 25px;" align="center" valign="middle" bgcolor="#b5c49b">
|
||||
<p style="text-decoration:none;background:#b5c49b;color:#ffffff;font-family:Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;text-transform:none;margin:0px;text-align: center">
|
||||
<a href="{{ $url }}" style="color:#ffffff;font-size:14px;font-weight:bold;text-align:center;text-decoration:none;-webkit-text-size-adjust:none;">{{ $button }}</a>
|
||||
</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;text-align: center">
|
||||
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</center>
|
||||
</td>
|
||||
<tr>
|
||||
<tr>
|
||||
<td>
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td class="sub_headline" style="line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_pay_info')}}</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="word-wrap:break-word;background:transparent;font-size:0px;padding:10px 25px;padding-top:15px;padding-bottom:15px;padding-right:40px;padding-left:40px;" align="center" valign="top" background="data:image/gif;base64,">
|
||||
<table role="presentation" cellpadding="0" cellspacing="0" align="center" border="0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="border:none;border-radius:20px;color:#ffffff;cursor:auto;padding:15px 25px;" align="center" valign="middle" bgcolor="#b5c49b">
|
||||
<p style="text-decoration:none;background:#b5c49b;color:#ffffff;font-family:Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;text-transform:none;margin:0px;text-align: center">
|
||||
<a href="{{ $url }}" style="color:#ffffff;font-size:14px;font-weight:bold;text-align:center;text-decoration:none;-webkit-text-size-adjust:none;">{{ $button }}</a>
|
||||
</p>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;text-align: center">
|
||||
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<td style="line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_pay_success')}} </b><br>
|
||||
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
|
||||
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
|
||||
{{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}<br>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</center>
|
||||
</td>
|
||||
<tr>
|
||||
<tr>
|
||||
<td>
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td class="sub_headline" style="line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_pay_info')}}</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_pay_success')}} </b><br>
|
||||
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
|
||||
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
|
||||
{{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}<br>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<b>{{__('email.checkout_mail_invoice_addess')}}</b>
|
||||
</td>
|
||||
<tr>
|
||||
<td style="color:#37302d; ">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<b>{{__('email.checkout_mail_invoice_addess')}}</b>
|
||||
</td>
|
||||
<tr>
|
||||
<td style="color:#37302d; ">
|
||||
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->billing_company)
|
||||
{{ $shopping_order->shopping_user->billing_company }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->billing_firstname }}
|
||||
{{ $shopping_order->shopping_user->billing_lastname }} <br>
|
||||
<br>
|
||||
|
||||
{{ $shopping_order->shopping_user->billing_address }} <br>
|
||||
@if($shopping_order->shopping_user->billing_address_2)
|
||||
{{ $shopping_order->shopping_user->billing_address_2 }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->billing_zipcode }}
|
||||
{{ $shopping_order->shopping_user->billing_city }} <br>
|
||||
{{ $shopping_order->shopping_user->billing_country->getLocated() }} <br>
|
||||
|
||||
@if($shopping_order->shopping_user->billing_phone)
|
||||
<br><br> {{ $shopping_order->shopping_user->billing_phone }}<br>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<td class="sub_headline" style="line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
|
||||
@endif
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->same_as_billing)
|
||||
{{__('email.checkout_mail_same_address')}}
|
||||
@else
|
||||
|
||||
@if($shopping_order->shopping_user->shipping_company)
|
||||
{{ $shopping_order->shopping_user->shipping_company }}<br>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->billing_company)
|
||||
{{ $shopping_order->shopping_user->billing_company }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_firstname }}
|
||||
{{ $shopping_order->shopping_user->shipping_lastname }} <br>
|
||||
{{ $shopping_order->shopping_user->billing_firstname }}
|
||||
{{ $shopping_order->shopping_user->billing_lastname }} <br>
|
||||
<br>
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_address }} <br>
|
||||
@if($shopping_order->shopping_user->shipping_address_2)
|
||||
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
|
||||
{{ $shopping_order->shopping_user->billing_address }} <br>
|
||||
@if($shopping_order->shopping_user->billing_address_2)
|
||||
{{ $shopping_order->shopping_user->billing_address_2 }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_zipcode }}
|
||||
{{ $shopping_order->shopping_user->shipping_city }} <br>
|
||||
{{ $shopping_order->shopping_user->billing_zipcode }}
|
||||
{{ $shopping_order->shopping_user->billing_city }} <br>
|
||||
{{ $shopping_order->shopping_user->billing_country->getLocated() }} <br>
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>
|
||||
|
||||
@if($shopping_order->shopping_user->shipping_phone)
|
||||
<br><br> {{ $shopping_order->shopping_user->shipping_phone }}<br>
|
||||
@if($shopping_order->shopping_user->billing_phone)
|
||||
<br><br> {{ $shopping_order->shopping_user->billing_phone }}<br>
|
||||
@endif
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;font-size: 14px;line-height:1.6em;">
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
{{ $copy3line }}
|
||||
<br>
|
||||
@if($shopping_order->member)
|
||||
@if($shopping_order->member->shop && $shopping_order->member->isActiveShop())
|
||||
@if($shopping_order->member->shop->title)
|
||||
<b>{{ $shopping_order->member->shop->title }}</b><br>
|
||||
@endif
|
||||
@if($shopping_order->member->shop->contact)
|
||||
{!! nl2br($shopping_order->member->shop->contact) !!}<br>
|
||||
@endif
|
||||
<a href="{{ $shopping_order->member->shop->getSubdomain(true) }}">{{ $shopping_order->member->shop->getSubdomain(true) }}</a>
|
||||
@else
|
||||
Dein Berater: {{$shopping_order->member->getFullName()}}
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sub_headline" style="line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
|
||||
@endif
|
||||
<hr><br>
|
||||
{{ $greetings }} <br><b>{{ $sender }}</b>
|
||||
<br>
|
||||
</td>
|
||||
</tr>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->same_as_billing)
|
||||
{{__('email.checkout_mail_same_address')}}
|
||||
@else
|
||||
|
||||
@if($shopping_order->shopping_user->shipping_company)
|
||||
{{ $shopping_order->shopping_user->shipping_company }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_firstname }}
|
||||
{{ $shopping_order->shopping_user->shipping_lastname }} <br>
|
||||
<br>
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_address }} <br>
|
||||
@if($shopping_order->shopping_user->shipping_address_2)
|
||||
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_zipcode }}
|
||||
{{ $shopping_order->shopping_user->shipping_city }} <br>
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>
|
||||
|
||||
@if($shopping_order->shopping_user->shipping_phone)
|
||||
<br><br> {{ $shopping_order->shopping_user->shipping_phone }}<br>
|
||||
@endif
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;font-size: 14px;line-height:1.6em;">
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
{{ $copy3line }}
|
||||
<br>
|
||||
@if($shopping_order->member)
|
||||
@if($shopping_order->member->shop && $shopping_order->member->isActiveShop())
|
||||
@if($shopping_order->member->shop->title)
|
||||
<b>{{ $shopping_order->member->shop->title }}</b><br>
|
||||
@endif
|
||||
@if($shopping_order->member->shop->contact)
|
||||
{!! nl2br($shopping_order->member->shop->contact) !!}<br>
|
||||
@endif
|
||||
<a href="{{ $shopping_order->member->shop->getSubdomain(true) }}">{{ $shopping_order->member->shop->getSubdomain(true) }}</a>
|
||||
@else
|
||||
Dein Berater: {{$shopping_order->member->getFullName()}}
|
||||
@endif
|
||||
@endif
|
||||
<hr><br>
|
||||
{{ $greetings }} <br><b>{{ $sender }}</b>
|
||||
<br>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><br></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
@else
|
||||
@if($shopping_order->wp_invoice_path)
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<b>Rechnung: <a href="{{$shopping_order->wp_invoice_path}}">{{$shopping_order->wp_invoice_path}}</a></b><br>
|
||||
<hr>
|
||||
</td>
|
||||
<tr>
|
||||
@endif
|
||||
@if($shopping_order->wp_notice['wp_advertising'])
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<b>Werbemittel: {!! $shopping_order->wp_notice['wp_advertising'] !!}<br></b>
|
||||
<hr>
|
||||
</td>
|
||||
<tr>
|
||||
@endif
|
||||
@if($shopping_order->wp_notice['wp_incentives'])
|
||||
<tr>
|
||||
<td><br></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<td class="sub_headline">
|
||||
<b>Incentives: {!! $shopping_order->wp_notice['wp_incentives'] !!}<br></b>
|
||||
<hr>
|
||||
</td>
|
||||
<tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
|
||||
</td>
|
||||
<tr>
|
||||
|
||||
<tr>
|
||||
<td style="color:#37302d; ">
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->same_as_billing)
|
||||
@if($shopping_order->shopping_user->billing_company)
|
||||
{{ $shopping_order->shopping_user->billing_company }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->billing_firstname }}
|
||||
{{ $shopping_order->shopping_user->billing_lastname }} <br>
|
||||
<br>
|
||||
|
||||
{{ $shopping_order->shopping_user->billing_address }} <br>
|
||||
@if($shopping_order->shopping_user->billing_address_2)
|
||||
{{ $shopping_order->shopping_user->billing_address_2 }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->billing_zipcode }}
|
||||
{{ $shopping_order->shopping_user->billing_city }} <br>
|
||||
{{ $shopping_order->shopping_user->billing_country->getLocated() }} <br>
|
||||
|
||||
@if($shopping_order->shopping_user->billing_phone)
|
||||
<br><br> {{ $shopping_order->shopping_user->billing_phone }}<br>
|
||||
@endif
|
||||
@else
|
||||
@if($shopping_order->shopping_user->shipping_company)
|
||||
{{ $shopping_order->shopping_user->shipping_company }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_firstname }}
|
||||
{{ $shopping_order->shopping_user->shipping_lastname }} <br>
|
||||
<br>
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_address }} <br>
|
||||
@if($shopping_order->shopping_user->shipping_address_2)
|
||||
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
|
||||
@endif
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_zipcode }}
|
||||
{{ $shopping_order->shopping_user->shipping_city }} <br>
|
||||
|
||||
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>
|
||||
|
||||
@if($shopping_order->shopping_user->shipping_phone)
|
||||
<br><br> {{ $shopping_order->shopping_user->shipping_phone }}<br>
|
||||
@endif
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<b>{{__('email.checkout_copy3line_extern')}}</b>
|
||||
</td>
|
||||
<tr>
|
||||
<tr>
|
||||
<td style="color:#37302d;font-size: 14px;line-height:1.6em;">
|
||||
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="color:#37302d;line-height:1.6em;">
|
||||
|
||||
@if($shopping_order->member)
|
||||
Berater: {{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->member->account->m_salutation) }} {{ $shopping_order->member->account->m_first_name }} {{ $shopping_order->member->account->m_last_name }}
|
||||
<br>
|
||||
Account ID: {{ $shopping_order->member->account->m_account }} <br>
|
||||
@if($shopping_order->member->user_level)
|
||||
Karriere-Level: {{ $shopping_order->member->user_level->name }} <br>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><br></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@endif
|
||||
|
||||
</table>
|
||||
<center>
|
||||
<table cellpadding="0" cellspacing="0" class="force-full-width"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@
|
|||
<title>{{ config('app.name') }}</title>
|
||||
|
||||
<!-- Main font -->
|
||||
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i,900" rel="stylesheet">
|
||||
|
||||
<link rel="stylesheet" href="{{ asset('/fonts/roboto.css') }}">
|
||||
<!-- Icons. Uncomment required icon fonts -->
|
||||
<link rel="stylesheet" href="{{ mix('/vendor/fonts/fontawesome.css') }}">
|
||||
<link rel="stylesheet" href="{{ mix('/vendor/fonts/ionicons.css') }}">
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
{{ __('Kunden Details') }}
|
||||
</h4>
|
||||
|
||||
|
||||
|
||||
@if(Session::has('custom-error'))
|
||||
<div class="alert alert-dark-warning alert-dismissible fade show">
|
||||
<button type="button" class="close" data-dismiss="alert">×</button>
|
||||
|
|
|
|||
11
resources/views/user/shop/sales/order_detail.blade.php
Normal file
11
resources/views/user/shop/sales/order_detail.blade.php
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
@extends('layouts.layout-2')
|
||||
|
||||
@section('content')
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('user_shop_orders')}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
{{ __('Bestellung Kunde') }} <span class="text-muted">#{{$shopping_order->id}}</span>
|
||||
</h4>
|
||||
@include('admin.sales._detail')
|
||||
<a href="{{route('user_shop_orders')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
|
||||
@endsection
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
<div class="row contact-row">
|
||||
<div class="form-group col-md-12">
|
||||
{!! Form::label('first_name', __('Salutation').'*') !!}
|
||||
{!! Form::label('salutation', __('Salutation').'*') !!}
|
||||
{!! Form::select('salutation', [''=>'Bitte wählen', 'mr'=>'Herr', 'ms'=>'Frau'], '', ['class' => 'form-control '.($errors->has('salutation') ? 'error is-invalid' : '')]) !!}
|
||||
@if ($errors->has('salutation'))
|
||||
<div class="alert alert-danger error"><!-- DANGER -->
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue