last corrections for payments

This commit is contained in:
Kevin Adametz 2019-03-19 15:45:46 +01:00
parent 044a6bf253
commit 6db007fc82
53 changed files with 1514 additions and 1177 deletions

View file

@ -227,7 +227,7 @@
Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340</p>
<a href="{{route('data_protected')}}">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
© 2018 All Rights Reserved <br>
<br>
</td>

View file

@ -117,7 +117,7 @@
<tr class="">
<td align="center" valign="top" style="font-size: 0px;" class="">
<picture class="">
<img src="https://mein.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
</picture>
</td>
@ -188,7 +188,7 @@
<td style="color:#37302d;">
<br>
{{ $copy2line }}<br>
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;">{{ $url }}</span>
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
<br><br>
{{ $copy3line }}
<br><br>
@ -208,13 +208,12 @@
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto">
bgcolor="#f8f8f8">
<tr>
<td style="color:#7B7B7E; font-size:14px;">
<p>
mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach<br>
Telefon: +49 (0) 8333 946 98 90 | Fax: +49 (0) 8333 7268<br>
E-Mail: info@mivita.care<br></p>
{{__('email.footer_copy1')}}
</p>
<br>
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;">www.mivita.care</a>
<br>
@ -222,12 +221,10 @@
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px;">
<p>Geschäftsinhaber: Alois Ried | Registergericht: Memmingen<br>
Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340</p>
<a href="{{route('data_protected')}}">Datenschutzerklärung</a> <br>
© 2018 All Rights Reserved <br>
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>
</td>
</tr>

View file

@ -125,7 +125,7 @@
<td align="center" valign="middle" style="font-size: 0px;" class="">
<center>
<picture style="text-align: center">
<img src="https://mein.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
</picture>
</center>
@ -156,7 +156,7 @@
<tr>
<td class="sub_headline">
<hr><br>
<b> Du hast folgende Artikel bestellt:</b>
<b>{{__('email.checkout_mail_hl1')}}</b>
</td>
</tr>
<tr>
@ -185,7 +185,7 @@
&nbsp;
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
Verpackungs- u. Versandkosten
{{__('email.checkout_mail_shipping')}}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
{{ $shopping_order->getFormattedShipping() }} EUR
@ -201,7 +201,7 @@
&nbsp;
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<b>Gesamtpreis</b>
<b>{{__('email.checkout_mail_total')}}</b>
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
@ -218,7 +218,7 @@
</tr>
<tr>
<td class="sub_headline">
<b>Zahlungsinfo:</b>
<b>{{__('email.checkout_mail_pay_info')}}</b>
</td>
</tr>
<tr>
@ -226,10 +226,10 @@
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
<b> Zahlung ist bestätigt!</b><br>
Zahlung mit: {{$shopping_payment->getPaymentType()}}<br>
Zahlungsreferenz: {{$shopping_payment->reference}}<br>
Deine E-Mai: {{ $shopping_order->shopping_user->billing_email }}<br>
<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>
@ -242,7 +242,7 @@
</tr>
<tr>
<td class="sub_headline">
<b>Deine Rechnungsadresse:</b>
<b>{{__('email.checkout_mail_invoice_addess')}}</b>
</td>
<tr>
<td style="color:#37302d; ">
@ -279,7 +279,7 @@
<tr>
<td class="sub_headline">
<b>Deine Lieferadresse:</b>
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
</td>
</tr>
<tr>
@ -288,7 +288,7 @@
<tr>
<td style="color:#37302d;">
@if($shopping_order->shopping_user->same_as_billing)
Lieferadresse ist gleich Rechnungsadresse
{{__('email.checkout_mail_same_address')}}
@else
@if($shopping_order->shopping_user->shipping_company)
@ -309,7 +309,6 @@
{{ $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
@ -332,7 +331,6 @@
<td style="color:#37302d;">
{{ $copy3line }}
<br>
@if($shopping_order->user_shop)
@if($shopping_order->user_shop->title)
<b>{{ $shopping_order->user_shop->title }}</b><br>
@ -343,8 +341,6 @@
<a href="{{ $shopping_order->user_shop->getSubdomain() }}">{{ $shopping_order->user_shop->getSubdomain() }}</a>
@endif
<hr><br>
{{ $greetings }} <br><b>{{ $sender }}</b>
<br>
@ -357,30 +353,30 @@
</td>
</tr>
</table>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8">
<tr>
<td style="color:#7B7B7E; font-size:12px; line-height: 16px; text-align: center">
<p>
mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach<br>
Telefon: +49 (0) 8333 946 98 90 | Fax: +49 (0) 8333 7268<br>
E-Mail: info@mivita.care<br></p>
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;">www.mivita.care</a>
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; line-height: 16px; text-align: center">
<p>Geschäftsinhaber: Alois Ried | Registergericht: Memmingen<br>
Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340</p>
<a href="{{ Util::getUserCardBackUrl('/datenschutz') }}">Datenschutzerklärung</a><br>
<a href="{{ Util::getUserCardBackUrl('/impressum') }}">Impressum</a><br>
© 2019 All Rights Reserved<br>
<br>
</td>
</tr>
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
<tr>
<td style="color:#7B7B7E; font-size:14px; text-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">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>
</td>
</tr>
</table>
</center>
</td>
</tr>
</table>

View file

@ -125,7 +125,7 @@
<td align="center" valign="middle" style="font-size: 0px;" class="">
<center>
<picture style="text-align: center">
<img src="https://mein.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
</picture>
</center>
@ -155,7 +155,7 @@
<tr>
<td class="sub_headline">
<b>Statusinfo:</b>
<b>{{__('email.checkout_mail_status_info')}}</b>
</td>
</tr>
<tr>
@ -164,35 +164,33 @@
<tr>
<td>
@if($txaction == 'failed')
<b> Die Zahlung ist fehlgeschlagen!</b><br>
<b>{{__('email.checkout_mail_pay_error')}}</b><br>
@elseif($txaction == 'appointed')
@if($shopping_payment->clearingtype == "vor")
<b>Bezahlung per Vorkasse:</b><br>
Bitte überweise {{ number_format( floatval($shopping_payment->amount/100), 2, ",", ".") }} EUR auf die folgende Kontoverbindung, um den Kauf abzuschließen.<br>
<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', 'preauthorization')->last())
<b>Kontoinhaber:</b> {{ $pay_trans->transmitted_data['clearing_bankaccountholder'] }} <br>
<b>IBAN:</b> {{ $pay_trans->transmitted_data['clearing_bankiban'] }} <br>
<b>BIC:</b> {{ $pay_trans->transmitted_data['clearing_bankbic'] }} <br>
<b>Bank:</b> {{ $pay_trans->transmitted_data['clearing_bankname'] }} <br>
<b>Gesamtbetrag:</b> {{ number_format( floatval($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR<br>
<b>Verwendungszweck:</b> {{ $pay_trans->transmitted_data['clearing_bankcode'] }}
<b>{{__('email.checkout_mail_bank_holder')}}</b> {{ $pay_trans->transmitted_data['clearing_bankaccountholder'] }} <br>
<b>{{__('email.checkout_mail_bank_iban')}}</b> {{ $pay_trans->transmitted_data['clearing_bankiban'] }} <br>
<b>{{__('email.checkout_mail_bank_bic')}}</b> {{ $pay_trans->transmitted_data['clearing_bankbic'] }} <br>
<b>{{__('email.checkout_mail_bank_name')}}</b> {{ $pay_trans->transmitted_data['clearing_bankname'] }} <br>
<b>{{__('email.checkout_mail_bank_total')}}</b> {{ number_format( floatval($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR<br>
<b>{{__('email.checkout_mail_bank_code')}}</b> {{ $pay_trans->transmitted_data['clearing_bankcode'] }}
</p>
<hr />
@else
<b>Deine Zahlung wurde genehmigt, eine Bestätigung der Zahlung wird automatisch erstellt.</b><br>
<b>{{__('email.checkout_mail_pay_approved')}}</b><br>
@endif
@else
<b> SystemStatus: {{$txaction}}</b><br>
<b>{{__('email.checkout_mail_system_status')}} {{$txaction}}</b><br>
@endif
Zahlung mit: {{$shopping_payment->getPaymentType()}}<br>
Zahlungsreferenz: {{$shopping_payment->reference}}<br>
Deine E-Mai: {{ $shopping_order->shopping_user->billing_email }}<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>
@ -203,7 +201,7 @@
<tr>
<td class="sub_headline">
<hr><br>
<b> Du hast folgende Artikel bestellt:</b>
<b>{{__('email.checkout_mail_hl1')}}</b>
</td>
</tr>
<tr>
@ -232,7 +230,7 @@
&nbsp;
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
Verpackungs- u. Versandkosten
{{__('email.checkout_mail_shipping')}}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
{{ $shopping_order->getFormattedShipping() }} EUR
@ -248,7 +246,7 @@
&nbsp;
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<b>Gesamtpreis</b>
<b>{{__('email.checkout_mail_total')}}</b>
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
@ -265,7 +263,7 @@
</tr>
<tr>
<td class="sub_headline">
<b>Deine Rechnungsadresse:</b>
<b>{{__('email.checkout_mail_invoice_addess')}}</b>
</td>
<tr>
<td style="color:#37302d; ">
@ -306,7 +304,7 @@
</tr>
<tr>
<td class="sub_headline">
<b>Deine Lieferadresse:</b>
<b>{{__('email.checkout_mail_deliver_addess')}}:</b>
</td>
</tr>
<tr>
@ -315,7 +313,7 @@
<tr>
<td style="color:#37302d;">
@if($shopping_order->shopping_user->same_as_billing)
Lieferadresse ist gleich Rechnungsadresse
{{__('email.checkout_mail_same_address')}}
@else
@if($shopping_order->shopping_user->shipping_company)
@ -336,7 +334,6 @@
{{ $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
@ -370,8 +367,6 @@
<a href="{{ $shopping_order->user_shop->getSubdomain() }}">{{ $shopping_order->user_shop->getSubdomain() }}</a>
@endif
<hr><br>
{{ $greetings }} <br><b>{{ $sender }}</b>
<br>
@ -384,30 +379,30 @@
</td>
</tr>
</table>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8">
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
<tr>
<td style="color:#7B7B7E; font-size:12px; line-height: 16px; text-align: center">
<td style="color:#7B7B7E; font-size:14px; text-align: center">
<p>
mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach<br>
Telefon: +49 (0) 8333 946 98 90 | Fax: +49 (0) 8333 7268<br>
E-Mail: info@mivita.care<br></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; line-height: 16px; text-align: center">
<p>Geschäftsinhaber: Alois Ried | Registergericht: Memmingen<br>
Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340</p>
<a href="{{ Util::getUserCardBackUrl('/datenschutz') }}">Datenschutzerklärung</a><br>
<a href="{{ Util::getUserCardBackUrl('/impressum') }}">Impressum</a><br>
© 2019 All Rights Reserved<br>
<td style="color:#bbbbbb; font-size:12px; text-align: center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>
</td>
</tr>
</table>
</center>
</td>
</tr>
</table>

View file

@ -117,7 +117,7 @@
<tr class="">
<td align="center" valign="top" style="font-size: 0px;" class="">
<picture class="">
<img src="https://mein.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
</picture>
</td>
@ -200,31 +200,30 @@
</td>
</tr>
</table>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto">
<tr>
<td style="color:#7B7B7E; font-size:14px;">
<p>
mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach<br>
Telefon: +49 (0) 8333 946 98 90 | Fax: +49 (0) 8333 7268<br>
E-Mail: info@mivita.care<br></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;">
<p>Geschäftsinhaber: Alois Ried | Registergericht: Memmingen<br>
Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340</p>
<a href="{{route('data_protected')}}">Datenschutzerklärung</a> <br>
© 2018 All Rights Reserved <br>
<br>
</td>
</tr>
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
<tr>
<td style="color:#7B7B7E; font-size:14px; text-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">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>
</td>
</tr>
</table>
</center>
</td>
</tr>
</table>