gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates to 03-2025

Browse source
This commit is contained in:
Kevin Adametz 2025-04-01 10:36:47 +02:00
parent bfa3bb1df4
commit 9ae662f63e
243 changed files with 12580 additions and 12018 deletions
Download patch file Download diff file Expand all files Collapse all files

549
resources/views/emails/checkout.blade.php
View file

@ -145,10 +145,12 @@
{!! nl2br($copy1line) !!}
</td>
</tr>
<tr>
<td class="sub_headline">
<hr><br>
@if($shopping_order->is_abo)
<b>{{ __('abo.abo') }} / </b>
@endif
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<b>{{__('email.checkout_mail_order_for_me')}}</b>
@ -173,7 +175,7 @@
<b>{{__('email.checkout_mail_order_for_extern')}}</b>
@endif
@if($shopping_order->shopping_user->is_from === 'collection')
<b>Berater Sammelrechnung</b><br>
<b>Berater Sammelrechnung</b>
@endif
</td>
</tr>
@ -189,306 +191,317 @@
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
@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%">
@if($send_link)
<tr>
<td>
<center>
<table role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
<tbody>
<tr>
<td style="line-height:1.6em;">
<b>{{__('email.checkout_mail_pay_success')}} </b><br>
@if($shopping_payment)
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
@endif
{{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}<br>
<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>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
</center>
</td>
</tr>
@endif
@if($shopping_order->is_abo)
<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>
{{ $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>{{ $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
<hr><br>
<b>{{ __('abo.checkout_mail_abo_hl') }}</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%">
@php($user_abo = $shopping_order->getUserAbo())
@if($user_abo)
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" 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>
{{ $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> {{ $shopping_order->shopping_user->shipping_phone }}<br>
@endif
@if($shopping_order->abo_interval)
{{__('abo.checkout_mail_abo_start')}}<br>
{{__('tables.start_date')}}: <b>{{ $user_abo->start_date }}</b><br>
@endif
{{__('tables.next_date')}}: <b>{{ $user_abo->next_date }}</b><br>
{{__('tables.abo_delivery_day')}}: <b>{{ \App\Services\HTMLHelper::getAboStrLang($user_abo->abo_interval) }}</b><br>
{{ __('abo.checkout_mail_abo_info') }}
</td>
</tr>
</table>
@endif
</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->api_notice['wp_advertising'])
@endif
<tr>
<td class="sub_headline" style="line-height:1.6em;">
<hr><br>
<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 class="sub_headline">
<b>Werbemittel: {!! $shopping_order->api_notice['wp_advertising'] !!}<br></b>
<hr>
<td style="line-height:1.6em;">
<b>{{__('email.checkout_mail_pay_success')}} </b><br>
@if($shopping_payment)
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
@endif
{{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}<br>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="sub_headline">
<hr><br>
<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>
@endif
@if($shopping_order->api_notice['wp_incentives'])
<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>
{{ $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>{{ $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>
@endif
{{ $shopping_order->shopping_user->shipping_firstname }}
{{ $shopping_order->shopping_user->shipping_lastname }} <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> {{ $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->api_notice['wp_advertising'])
<tr>
<td class="sub_headline">
<b>Incentives: {!! $shopping_order->api_notice['wp_incentives'] !!}<br></b>
<hr>
<b>Werbemittel: {!! $shopping_order->api_notice['wp_advertising'] !!}<br></b>
<hr>
</td>
<tr>
@endif
@endif
@if($shopping_order->api_notice['wp_incentives'])
<tr>
<td class="sub_headline">
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
<b>Incentives: {!! $shopping_order->api_notice['wp_incentives'] !!}<br></b>
<hr>
</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>
Berater-ID: {{ $shopping_order->member->account->m_account }} <br>
@if($shopping_order->member->user_level)
Karriere-Level: {{ $shopping_order->member->user_level->getLang('name') }} <br>
@endif
@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
</td>
</tr>
<tr>
<td><br></td>
</tr>
</table>
</td>
</tr>
{{ $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>
Berater-ID: {{ $shopping_order->member->account->m_account }} <br>
@if($shopping_order->member->user_level)
Karriere-Level: {{ $shopping_order->member->user_level->getLang('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"

59
resources/views/emails/checkout_status.blade.php
View file

@ -145,7 +145,6 @@
{!! nl2br($copy1line) !!}
</td>
</tr>
<tr>
<td class="sub_headline">
<b>{{__('email.checkout_mail_status_info')}}</b>
@ -182,21 +181,31 @@
<b>{{__('email.checkout_mail_pay_invoice_open')}}</b><br>
@else
<b>{{__('email.checkout_mail_system_status')}} {{$txaction}}</b><br>
@endif
{{__('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>
@if($txaction === 'error' && isset($payment_error))
<hr>
<b>
@if(isset($payment_error['errorcode'])) {{ $payment_error['errorcode'] }} | @endif
@if(isset($payment_error['errormessage'])) {{ $payment_error['errormessage'] }} @endif
</b><br>
@if(isset($payment_error['customermessage'])) {{ $payment_error['customermessage'] }} @endif
<br>
@endif
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="sub_headline">
<hr><br>
@if($shopping_order->is_abo)
<b>{{ __('abo.abo') }} / </b>
@endif
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<b>{{__('email.checkout_mail_order_for_me')}}</b>
@ -221,7 +230,7 @@
<b>{{__('email.checkout_mail_order_for_extern')}}</b>
@endif
@if($shopping_order->shopping_user->is_from === 'collection')
<b>Berater Sammelrechnung</b><br>
<b>Berater Sammelrechnung</b>
@endif
</td>
</tr>
@ -236,18 +245,42 @@
@endif
</td>
</tr>
@if($shopping_order->is_abo)
<tr>
<td>
<hr>
<td class="sub_headline">
<hr><br>
<b>{{ __('abo.checkout_mail_abo_hl') }}</b>
</td>
</tr>
<tr>
<td style="color:#37302d;">
@php($user_abo = $shopping_order->getUserAbo())
@if($user_abo)
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->abo_interval)
{{__('abo.checkout_mail_abo_start')}}<br>
{{__('tables.start_date')}}: <b>{{ $user_abo->start_date }}</b><br>
@endif
{{__('tables.next_date')}}: <b>{{ $user_abo->next_date }}</b><br>
{{__('tables.abo_delivery_day')}}: <b>{{ \App\Services\HTMLHelper::getAboStrLang($user_abo->abo_interval) }}</b><br>
{{ __('abo.checkout_mail_abo_info') }}
</td>
</tr>
</table>
@endif
</td>
</tr>
@endif
<tr>
<td class="sub_headline">
<hr><br>
<b>{{__('email.checkout_mail_invoice_addess')}}</b>
</td>
</tr>
<tr>
<td style="color:#37302d; ">
<td style="color:#37302d;">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@ -271,14 +304,9 @@
</table>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
<tr>
<td class="sub_headline">
<hr><br>
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
@ -316,7 +344,6 @@
@endif
</td>
</tr>
</table>
</td>
</tr>

2
resources/views/emails/collection_detail.blade.php
View file

@ -14,7 +14,7 @@
{{ formatNumber($shop_item['user_price_net']) }} &euro;
</td>
<td style="color:#37302d; text-align: center; vertical-align: top; width: 10%;line-height:1.6em;">
{{$shop_item['qty']}}
{{ number_format($shop_item['qty'], 0) }}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ formatNumber($shop_item['user_price_total_net']) }} &euro;

2
resources/views/emails/custom_payment_detail.blade.php
View file

@ -16,7 +16,7 @@
@foreach($yard_shopping_items['items'] as $items)
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $items->name }}
<strong>{{ $items->name }}</strong> @if($items->abo_type) {{ __('abo.abo') }} {{ __('abo.'.$items->abo_type) }} @endif
</td>
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
@if($yard_shopping_items['tax_free'])