23-01-2026

This commit is contained in:
Kevin Adametz 2026-01-23 17:35:23 +01:00
parent a939cd51ef
commit a8b395e20d
248 changed files with 29342 additions and 4805 deletions

View file

@ -337,6 +337,9 @@
@if($shopping_order->shopping_user->shipping_address_2)
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
@endif
@if($shopping_order->shopping_user->shipping_postnumber)
<strong>DHL {{ __('payment.dhl_postnumber') }}: {{ $shopping_order->shopping_user->shipping_postnumber }}</strong><br>
@endif
{{ $shopping_order->shopping_user->shipping_zipcode }}
{{ $shopping_order->shopping_user->shipping_city }} <br>
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>
@ -455,6 +458,9 @@
@if($shopping_order->shopping_user->shipping_address_2)
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
@endif
@if($shopping_order->shopping_user->shipping_postnumber)
<strong>DHL {{ __('payment.dhl_postnumber') }}: {{ $shopping_order->shopping_user->shipping_postnumber }}</strong><br>
@endif
{{ $shopping_order->shopping_user->shipping_zipcode }}
{{ $shopping_order->shopping_user->shipping_city }} <br>

View file

@ -158,21 +158,58 @@
@if($txaction === 'failed')
<b>{{__('email.checkout_mail_pay_error')}}</b><br>
@elseif($txaction === 'appointed')
@if($shopping_payment->clearingtype === "vor")
<b>{{__('email.checkout_mail_pay_pre')}}</b><br>
{{__('email.checkout_mail_pay_pre_c1')}} {{ number_format( floatval($shopping_payment->amount/100), 2, ",", ".") }} {{__('email.checkout_mail_pay_pre_c2')}}<br>
<p>
@php($pay_trans = $shopping_payment->payment_transactions->where('request', 'authorization')->last())
@if(isset($pay_trans->transmitted_data) && is_array($pay_trans->transmitted_data))
<b>{{__('email.checkout_mail_bank_holder')}}</b> @if(isset($pay_trans->transmitted_data['clearing_bankaccountholder'])){{ $pay_trans->transmitted_data['clearing_bankaccountholder'] }} @endif <br>
<b>{{__('email.checkout_mail_bank_iban')}}</b> @if(isset($pay_trans->transmitted_data['clearing_bankiban'])) {{ $pay_trans->transmitted_data['clearing_bankiban'] }} @endif<br>
<b>{{__('email.checkout_mail_bank_bic')}}</b> @if(isset($pay_trans->transmitted_data['clearing_bankbic'])) {{ $pay_trans->transmitted_data['clearing_bankbic'] }} @endif<br>
<b>{{__('email.checkout_mail_bank_name')}}</b> @if(isset($pay_trans->transmitted_data['clearing_bankname'])) {{ $pay_trans->transmitted_data['clearing_bankname'] }} @endif<br>
<b>{{__('email.checkout_mail_bank_total')}}</b> @if(isset($pay_trans->shopping_payment->amount)) {{ number_format( (float) ($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR @endif<br>
<b>{{__('email.checkout_mail_bank_code')}}</b> @if(isset($pay_trans->transmitted_data['txid'])) {{ $pay_trans->transmitted_data['txid'] }} @endif
@if(isset($shopping_payment) && $shopping_payment && $shopping_payment->clearingtype === "vor")
@php($pay_trans = $shopping_payment->payment_transactions->where('request', 'authorization')->last())
@php($txid = $pay_trans->transmitted_data['txid'] ?? ($pay_trans->txid ?? null))
{{-- Prominenter Vorkasse-Hinweis mit Bankdaten und TXID --}}
<div style="background: #fff8e1; border: 3px solid #ffc107; padding: 20px; margin: 10px 0;">
<h3 style="color: #856404; margin: 0 0 15px 0; font-size: 18px;">{{ __('payment.prepayment_important_notice') }}</h3>
{{-- Bankdaten zuerst --}}
<h4 style="margin: 0 0 10px 0; font-size: 16px;">{{ __('payment.prepayment_bank_details') }}:</h4>
<div style="background: #fff; border-radius: 8px; padding: 15px; margin-bottom: 15px;">
@if(isset($pay_trans->transmitted_data) && is_array($pay_trans->transmitted_data))
<table style="width: 100%; border-collapse: collapse;">
<tr>
<td style="padding: 5px 10px 5px 0; width: 140px;"><strong>{{ __('payment.account_holder') }}:</strong></td>
<td style="padding: 5px 0;">@if(isset($pay_trans->transmitted_data['clearing_bankaccountholder'])){{ $pay_trans->transmitted_data['clearing_bankaccountholder'] }} @endif</td>
</tr>
<tr>
<td style="padding: 5px 10px 5px 0;"><strong>{{ __('payment.IBAN') }}:</strong></td>
<td style="padding: 5px 0; font-family: monospace; letter-spacing: 1px;">@if(isset($pay_trans->transmitted_data['clearing_bankiban'])){{ $pay_trans->transmitted_data['clearing_bankiban'] }} @endif</td>
</tr>
<tr>
<td style="padding: 5px 10px 5px 0;"><strong>{{ __('payment.BIC') }}:</strong></td>
<td style="padding: 5px 0; font-family: monospace;">@if(isset($pay_trans->transmitted_data['clearing_bankbic'])){{ $pay_trans->transmitted_data['clearing_bankbic'] }} @endif</td>
</tr>
<tr>
<td style="padding: 5px 10px 5px 0;"><strong>{{ __('payment.bank') }}:</strong></td>
<td style="padding: 5px 0;">@if(isset($pay_trans->transmitted_data['clearing_bankname'])){{ $pay_trans->transmitted_data['clearing_bankname'] }} @endif</td>
</tr>
<tr style="border-top: 1px solid #ffc107;">
<td style="padding: 10px 10px 5px 0;"><strong>{{ __('payment.total_amount') }}:</strong></td>
<td style="padding: 10px 0 5px 0; font-size: 18px; font-weight: bold; color: #d35400;">@if(isset($pay_trans->shopping_payment->amount)){{ number_format( (float) ($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR @endif</td>
</tr>
</table>
@endif
</div>
<hr style="border: none; border-top: 1px solid #ffc107; margin: 15px 0;">
{{-- Dann TXID Hinweis --}}
<p style="margin-bottom: 10px;">{{ __('payment.prepayment_reference_notice') }}</p>
@if($txid)
<div style="background: #fff; border: 3px dashed #ffc107; padding: 20px; text-align: center; margin: 15px 0; border-radius: 8px;">
<strong style="font-size: 16px; color: #333;">{{ __('payment.prepayment_txid') }}:</strong><br>
<span style="font-size: 28px; font-weight: bold; color: #d35400; letter-spacing: 3px; display: block; margin-top: 10px;">{{ $txid }}</span>
</div>
@endif
</p>
<p style="margin: 15px 0;"><strong>{{ __('payment.prepayment_reference_only') }}</strong></p>
<p style="margin: 0; color: #666; font-style: italic;">{{ __('payment.prepayment_waiting_payment') }}</p>
</div>
<hr />
@else
<b>{{__('email.checkout_mail_pay_approved')}}</b><br>
@ -339,6 +376,9 @@
@if($shopping_order->shopping_user->shipping_address_2)
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
@endif
@if($shopping_order->shopping_user->shipping_postnumber)
<strong>DHL {{ __('payment.dhl_postnumber') }}: {{ $shopping_order->shopping_user->shipping_postnumber }}</strong><br>
@endif
{{ $shopping_order->shopping_user->shipping_zipcode }}
{{ $shopping_order->shopping_user->shipping_city }} <br>
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>

View file

@ -261,6 +261,9 @@
@if($shopping_user->shipping_phone)
<br> {{ $shopping_user->shipping_phone }}<br>
@endif
@if($shopping_user->shipping_postnumber)
<strong>DHL {{ __('payment.dhl_postnumber') }}: {{ $shopping_user->shipping_postnumber }}</strong><br>
@endif
@endif
</td>
</tr>

View file

@ -0,0 +1,241 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>{{ __('email.dhl_tracking_subject') }}</title>
<style type="text/css">
img {
max-width: 600px;
outline: none;
text-decoration: none;
-ms-interpolation-mode: bicubic;
}
a {
text-decoration: none;
border: 0;
outline: none;
color: #919f7a;
}
a:hover {
color: #b6b600;
}
a img {
border: none;
}
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
font-weight: 400;
}
td {
text-align: left;
}
body {
-webkit-font-smoothing: antialiased;
-webkit-text-size-adjust: none;
width: 100%;
height: 100%;
color: #37302d;
background: #ffffff;
font-size: 15px;
line-height: 26px
}
table {
border-collapse: separate !important;
}
.headline {
color: #37302d;
font-size: 18px;
}
.sub_headline {
color: #788662;
font-size: 15px;
}
.force-full-width {
width: 100% !important;
}
hr {
border: none;
border-top: 1px solid #b7c59e;
}
.tracking-box {
background-color: #f6fdf5;
border: 2px solid #b5c49b;
border-radius: 8px;
padding: 20px;
text-align: center;
margin: 20px 0;
}
.tracking-number {
font-size: 20px;
font-weight: bold;
color: #37302d;
letter-spacing: 2px;
margin: 10px 0;
}
</style>
<style type="text/css" media="screen">
@media screen {
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
@media only screen and (max-width: 480px) {
table[class="w320"] {
width: 320px !important;
}
}
</style>
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
<div style="display: none; mso-hide: all; width: 0px; height: 0px; max-width: 0px; max-height: 0px; font-size: 0px; line-height: 0px;">
{{ __('email.dhl_tracking_preview', ['number' => $trackingNumber]) }}
</div>
<table align="left" cellpadding="0" cellspacing="0" width="100%" height="100%">
<tr>
<td align="left" valign="top" bgcolor="#f8f8f8" width="100%">
<br>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="700" class="w320">
<tr>
<td align="left" valign="top">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style=" text-align:center;">
<center>
<table width="100%" cellpadding="0" cellspacing="0" border="0" class="">
<tbody class="">
<tr class="">
<td align="center" valign="middle" style="font-size: 0px;" class="">
<center>
<picture style="text-align: center">
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
</picture>
</center>
</td>
</tr>
<tr>
<td><br></td>
</tr>
</tbody>
</table>
</center>
</td>
</tr>
</table>
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
<tr>
<td class="headline">
<b>{{ __('email.dhl_tracking_title') }}</b>
</td>
</tr>
<tr>
<td style="color:#37302d;line-height:1.6em;">
{{ $salutation }},
<br><br>
@if($shipments->count() > 1)
{{ __('email.dhl_tracking_message_multiple', ['count' => $shipments->count()]) }}
@else
{{ __('email.dhl_tracking_message') }}
@endif
</td>
</tr>
@foreach($shipments as $index => $singleShipment)
<tr>
<td>
<table style="background-color: #f6fdf5; border: 2px solid #b5c49b; border-radius: 8px; padding: 20px; text-align: center; margin: 20px 0;" cellpadding="15" cellspacing="0" width="100%">
@if($shipments->count() > 1)
<tr>
<td style="text-align: center; color: #37302d; font-size: 16px; font-weight: bold;">
{{ __('email.dhl_tracking_package_label', ['number' => $index + 1]) }}
</td>
</tr>
@endif
<tr>
<td style="text-align: center; color: #788662; font-size: 14px;">
{{ __('email.dhl_tracking_number_label') }}
</td>
</tr>
<tr>
<td style="text-align: center; font-size: 20px; font-weight: bold; color: #37302d; letter-spacing: 2px;">
{{ $singleShipment->dhl_shipment_no }}
</td>
</tr>
<tr>
<td style="text-align: center; color: #788662; font-size: 13px;">
{{ __('email.dhl_tracking_order_ref', ['order' => $orderNumber]) }}
</td>
</tr>
<tr>
<td style="text-align: center; padding-top: 10px;">
<a href="{{ $singleShipment->getTrackingUrl() }}" style="display: inline-block; background: #FFCC00; color: #37302d; padding: 10px 20px; text-decoration: none; border-radius: 5px; font-weight: bold; font-size: 13px;">
{{ __('email.dhl_tracking_button') }}
</a>
</td>
</tr>
</table>
</td>
</tr>
@endforeach
<tr>
<td style="color:#37302d;line-height:1.6em;">
<br>
{{ __('email.dhl_tracking_info') }}
<br><br>
{{ $greetings }}<br>
{{ $sender }}
</td>
</tr>
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center;line-height:1.6em;">
<tr>
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
<p>
{{__('email.footer_copy1')}}
</p>
<br>
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;">www.mivita.care</a>
<br>
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>
</td>
</tr>
</table>
</center>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>

View file

@ -0,0 +1,252 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>mivita.care</title>
<style type="text/css">
img {
max-width: 600px;
outline: none;
text-decoration: none;
-ms-interpolation-mode: bicubic;
}
a {
text-decoration: none;
border: 0;
outline: none;
color: #919f7a;
}
a:hover {
color: #b6b600;
}
a img {
border: none;
}
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
font-weight: 400;
}
td {
text-align: left;
}
body {
-webkit-font-smoothing: antialiased;
-webkit-text-size-adjust: none;
width: 100%;
height: 100%;
color: #37302d;
background: #ffffff;
font-size: 15px;
line-height: 26px
}
table {
border-collapse: separate !important;
}
.headline {
color: #37302d;
font-size: 18px;
}
.sub_headline {
color: #788662;
font-size: 15px;
}
.force-full-width {
width: 100% !important;
}
hr {
border: none;
border-top: 1px solid #b7c59e;
}
</style>
<style type="text/css" media="screen">
@media screen {
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
@media only screen and (max-width: 480px) {
table[class="w320"] {
width: 320px !important;
}
}
</style>
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
@if(isset($copy1line))
<div style="display: none; mso-hide: all; width: 0px; height: 0px; max-width: 0px; max-height: 0px; font-size: 0px; line-height: 0px;">
{{ $copy1line }}
</div>
@endif
<table align="left" cellpadding="0" cellspacing="0" width="100%" height="100%">
<tr>
<td align="left" valign="top" bgcolor="#f8f8f8" width="100%">
<br>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="700" class="w320">
<tr>
<td align="left" valign="top">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style=" text-align:center;">
<center>
<table width="100%" cellpadding="0" cellspacing="0" border="0" class="">
<tbody class="">
<tr class="">
<td align="center" valign="middle" style="font-size: 0px;" class="">
<center>
<picture style="text-align: center">
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
</picture>
</center>
</td>
</tr>
<tr>
<td><br></td>
</tr>
</tbody>
</table>
</center>
</td>
</tr>
</table>
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
@if(isset($title))
<tr>
<td class="headline">
<b>{{ $title }}</b>
</td>
</tr>
@endif
@if(isset($greeting))
<tr>
<td style="color:#37302d;line-height:1.6em;">
{!! $greeting !!}
</td>
</tr>
@endif
@if(isset($copy1line))
<tr>
<td style="color:#37302d;line-height:1.6em;">
{!! nl2br($copy1line) !!}
</td>
</tr>
@endif
@if(isset($payment_account_date))
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #e8f5e9;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
<strong>{{ __('email.user_restore_account_valid') }}</strong><br>
<span style="font-size: 18px; color: #2e7d32;">{{ $payment_account_date }}</span>
</td>
</tr>
</table>
</td>
</tr>
@endif
@if(isset($copy2line))
<tr>
<td style="color:#37302d;line-height:1.6em;">
{!! nl2br($copy2line) !!}
</td>
</tr>
@endif
@if(isset($reset_password_url))
<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="{{ $reset_password_url }}" style="color:#ffffff;font-size:14px;font-weight:bold;text-align:center;text-decoration:none;-webkit-text-size-adjust:none;">{{ __('email.user_restore_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;">{{ $reset_password_url }}</span>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</center>
</td>
<tr>
@endif
@if(isset($copy3line))
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #fff3e0;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
<strong>{{ __('email.user_restore_important') }}</strong><br>
{!! nl2br($copy3line) !!}
</td>
</tr>
</table>
</td>
</tr>
@endif
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center;line-height:1.6em;">
<tr>
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
<p>
{{__('email.footer_copy1')}}
</p>
<br>
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;">www.mivita.care</a>
<br>
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>
</td>
</tr>
</table>
</center>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>