This commit is contained in:
Kevin Adametz 2021-02-10 10:56:40 +01:00
parent 32595ab5a1
commit 13fb2cfe98
70 changed files with 3614 additions and 401 deletions

View file

@ -1,163 +0,0 @@
{
"MR": "Herr",
"MS": "Frau",
"please select": "Bitte wählen",
"further countries": "weitere Länder",
"no": "Keine",
"Company data": "Firmendaten",
"Company name": "Firmenname",
"Street": "Straße",
"House number": "Hausnummer",
"City": "Ort",
"Postcode": "PLZ",
"Country": "Land",
"Phone": "Telefon",
"Homepage": "Homepage",
"Industry": "Branche",
"Industries": "Branchen",
"Main Industry": "Hauptbranche",
"Personal Data": "Ihre Daten",
"Function": "Funktion",
"Salutation": "Anrede",
"Title": "Titel",
"First name": "Vorname",
"Last Name": "Nachname",
"Mobile Phone": "Mobiltelefon",
"Your interests": "Ihre Interessen",
"Your contact person": "Ihr Ansprechpartner",
"Name": "Name",
"Consent & Privacy": "Einwilligung & Datenschutz",
"New Password": "Neues Passwort",
"Old Password": "Altes Passwort",
"Change Password": "Passwort ändern",
"Confirm new Password": "Neues Passwort wiederholen",
"Confirm Password": "Passwort bestätigen",
"Confirm E-Mail": "E-Mail wiederholen",
"E-Mail Address": "E-Mail Adresse",
"Forgot your Password?": "Passwort vergessen?",
"Login": "Einloggen",
"Logout": "Ausloggen",
"Password": "Passwort",
"Register": "Registrieren",
"Remember Me": "Angemeldet bleiben",
"Reset Password": "Passwort zurücksetzen",
"Send Password Reset Link": "Link zum Zurücksetzen des Passworts senden",
"save": "speichern",
"save changes": "Änderungen speichern",
"abort": "abbrechen",
"This field is required.": "Dieses Feld ist ein Pflichtfeld.",
"Please enter a valid email address.": "Bitte geben Sie eine gültige E-Mail-Adresse ein.",
"This E-mail is already in use.": "Diese E-Mail wird bereits verwendet.",
"Please enter the same value again.": "Die E-Mail Adressen sind nicht gleich.",
"a valid e-mail address": "Geben Sie bitte eine gültige E-Mail-Adresse ein.",
"Already have an account?": "Sie haben schon einen Account?",
"Login to your account": "Melden Sie sich in Ihrem Account an",
"Dont have an account yet?": "Sie haben noch keinen Account?",
"We keep you up to date on product news": "Gerne informieren wir Sie über Produktneuheiten, Relevantes aus der Branche und Beispiele zu unseren Anwendungen: ",
"Registration": "Registrierung",
"thats how its done": "so gehts",
"Just register": "Einfach registrieren",
"Just fill out the fields": " Füllen Sie einfach die Felder in der Eingabemaske aus. Danach erhalten Sie von uns per E-Mail einen Link. Mit einen Klick auf den Link bestätigen Sie die Registrierung.",
"Changeable at any time": "Jederzeit änderbar",
"With your e-mail address and password": " Mit Ihrer E-Mailadresse und Ihrem Passwort können Sie jederzeit Ihre Daten einsehen oder ändern.",
"Absolutely safe": "Absolut sicher",
"Your data will be stored on": "Ihre Daten werden auf deutschen Servern unter Berücksichtigung aktueller Sicherheitsstandards gespeichert.",
"now register data": "jetzt Daten registieren",
"Required fields": "Pflichtfelder",
"You will receive an e-mail for confirmation": "Sie erhalten eine E-Mail zur Bestätigung, über den Link in der E-Mail schalten Sie Ihren Daten frei.",
"Industry sectors": "Branchen",
"Interests": "Interessen",
"Leads": "Kontakte",
"Your Data": "Ihre Daten",
"Change password": "Passwort ändern",
"Edit your data": "Ihre Daten bearbeiten",
"I have read the :link and accept it.*": "Ich habe die :link gelesen und akzeptiere diese.*",
"data protection": "Datenschutzerklärung",
"Yes, I agree that will send me more information.": "Ja, ich bin damit einverstanden, dass mir weitere Informationen zusendet werden. Die Einwilligung ist jederzeit über diese Webseite widerrufbar.",
"saved": "Gespeichert",
"The changes have been saved.": "Die Änderungen wurden gespeichert.",
"error": "Fehler",
"Delete Account": "Account löschen",
"account deleted": "Account gelöschen",
"Here you can adjust your data.": "Hier können Sie Ihre Daten anpassen.",
"Overview": "Übersicht",
"Adjust data": "Daten anpassen",
"Login & Security": "Anmeldung & Sicherheit",
"Sign in with your e-mail:": "Anmeldung mit Ihrer E-Mail:",
"Change your password here to access your account.": "Ändern Sie hier Ihr Passwort für den Zugriff auf Ihren Account.",
"Activities": "Aktivitäten",
"Delete": "Löschen",
"If you no longer want to use our offer, you can delete your account here.": "Wenn Sie unser Angebot nicht mehr nutzen möchten, können Sie hier Ihren Account löschen.",
"Confirm your identity with your password before proceeding.": "Bestätigen Sie mit Ihrem Passwort Ihre Identität, bevor Sie fortfahren.",
"Dear Mrs": "Sehr geehrte Frau",
"Dear Sir": "Sehr geehrter Herr",
"Dear customer": "Sehr geehrter Kunde",
"Dear Customer you will receive this e-mail because we have received a request to reset the password for your account.": "Sie erhalten diese E-Mail, weil wir eine Anfrage zum Zurücksetzen des Passworts für Ihren Account erhalten haben.",
"Or copy this link into the address bar of your browser.": "Oder kopieren Sie diesen Link in die Adressleiste Ihres Browsers.",
"Best regards": "Mit freundlichen Grüßen",
"imprint": "Impressum",
"data protections": "Datenschutz",
"E-Mail address can not be changed!": "E-Mail Adresse ist nicht änderbar!",
"E-Mail address can not be changed here!": "E-Mail Adresse kann hier nicht geändert werden!",
"Thank you for your registration!": "Vielen Dank für Ihre Registrierung!",
"We have sent you an e-mail with a link to activate your data.": "Wir haben Ihnen eine E-Mail mit einem Link zur Freischaltung Ihrer Daten geschickt.",
"back to the homepage": "zurück zur Startseite",
"Verify Your Email Address": "Bestätigen Sie Ihre E-Mail-Adresse",
"Thank you for creating an account. Please follow the link below to confirm your email address.": "Vielen Dank für die Erstellung eines Accounts. Bitte folgen Sie dem unten stehenden Link, um Ihre E-Mail-Adresse zu bestätigen.",
"You have successfully verified your account!": "Sie haben Ihr Konto erfolgreich verifiziert!",
"Now check your data and release the data.": "Überprüfen Sie jetzt Ihre Daten und geben Sie die Daten frei.",
"Check and release data": "Daten überprüfen und freigeben",
"Check data": "Daten überprüfen",
"Page not available": "Seite nicht verfügbar",
"Data released": "Daten freigeben",
"Data released now": "Daten jetzt freigeben",
"E-Mail verified": "E-Mail verifiziert",
"Privacy policy approved": "Datenschutzerklärung zugestimmt",
"Consent for further information": "Einwilligung für weitere Informationen",
"at": "am",
"Assign a password for your account.": "Vergeben Sie ein Passwort für Ihren Account.",
"Create Password": "Passwort erstellen",
"back": "zurück",
"If you have checked your data, share your data here!": "Wenn Sie Ihre Daten überprüft haben, geben Sie Ihre Daten hier frei!",
"Contacts all": "gesamte Kontakte",
"Contacts verify": "Kontakte verifiziert",
"Contacts active": "Kontakte freigeschaltet",
"We have data about you stored in our System. Please follow the link below to verify your email address.You can also change or delete your data.": "Wir haben Daten über Sie in unserem System gespeichert. Bitte folgen Sie dem unten stehenden Link um Ihre E-Mail-Adresse zu bestätigen. Weitherhin können Sie Ihre Daten ändern oder auch löschen.",
"Verify your Data and E-Mail Address": "Bestätigen Sie Ihre Daten und E-Mail-Adresse",
"This website uses cookies in order to guarantee the best possible service. With your visit to this site you agree to our use of cookies.": "Diese Webseite verwendet Cookies, um Ihnen den bestmöglichen Service zu gewährleisten. Mit Ihrem Besuch auf dieser Seite stimmen Sie der Verwendung von Cookies zu.",
"OK": "OK",
"Contacts": "Kontake",
"active": "aktiviert",
"verified": "verifiziert",
"'E-Mail": "'E-Mail",
"create new Contact": "Neuen Kontakt erstellen",
"Create/Edit Contact": "Kontakt bearbeiten/erstellen",
"Pos": "Pos",
"Description": "Bezeichnung",
"Translate": "Übersetzung",
"Status": "Status",
"create/edit": "erstellen/bearbeiten",
"when active, the interest in the selection is displayed": "wenn aktiv, wird das Interesse in der Aushwahl angezeigt",
"close": "schließen",
"Number to move the position if necessary": "Zahl um ggf. die Postion zu verschieben",
"Create new interest": "Neues Interesse erstellen",
"Really delete entry?": "Eintrag wirklich löschen?",
"Create a new industry": "Neue Branche erstellen",
"Your e-mail has been changed.": "Ihre E-Mail wurde geändert.",
"We sent you an activation code. Check your email!": "Wir haben Ihnen einen Aktivierungscode gesendet. Überprüfen Sie Ihre E-Mails!",
"An activation code was sent to the account by e-mail!": "An den Kontkat wurde per E-Mail ein Aktivierungscode gesendet!",
"New E-Mail Address": "Neue E-Mail Adresse",
"Confirm new E-Mail": "Neue E-Mail Adresse wiederholen",
"Change E-Mail": "E-Mail Adresse ändern",
"Change your e-mail address here. We will send you a new activation link to your new e-mail address to verify it.": "Ändern Sie hier Ihre E-Mail-Adresse. Wir senden Ihnen einen neuen Aktivierungslink an Ihre neue E-Mail-Adresse, um diese zu verifizieren.",
"Change the e-mail address of the contact here. We will send the contact a new activation link to the new e-mail address to verify it.": "Ändern Sie hier die E-Mail-Adresse des Kontakts. Wir senden dem Kontakt einen neuen Aktivierungslink an die neue E-Mail-Adresse, um diese zu verifizieren.",
"Dear Customer you will receive this e-mail because we have received a request to change your E-Mail Address for your account.": "Sie erhalten diese E-Mail, weil wir eine Anfrage zur Änderung Ihrer E-Mail-Adresse für Ihr Konto erhalten haben.",
"business":"geschäftlich",
"private":"privat",
"business or private": "geschäftlich oder privat",
"use":"Nutzung",
"Country code":"Ländervorwahl",
"Contact":"Kontakt",
"waiting for activation since":"wartet auf Aktivierung seit",
"": ""
}

View file

@ -15,6 +15,7 @@
'your_request_from' => 'Deine Anfrage von',
'checkout_subject' => 'Deine Bestellung bei',
'checkout_subject_paid' => 'Zahlungsbestätigung - Deine Bestellung bei',
'checkout_subject_extern' => 'Neue Bestellung',
'change_e_mail' => 'E-Mail Adresse ändern',
'salutation' => 'Anrede',
'first_name' => 'Vorname',
@ -38,10 +39,11 @@
'email_verify_copy1line' => 'Vielen Dank für Deine Registrierung. Bitte folge dem unten stehenden Link, um Deine E-Mail-Adresse zu bestätigen.',
'copy_to_browser' => 'Oder kopiere diesen Link in die Adressleiste Deines Browsers.',
'activate_copy' => 'Bitte bestätige Deine E-Mail und aktiviere Deinen Account über diesen Link:',
'account_active_copy1line' => 'Dein Account wurde nach erfolgreicher Prüfung freigeschaltet. Deinen Beratervertag findest du auf der Startseite im Loginbereich von my.mivita.care. Melde dich mit deinen Benutzerdaten an, um weitere Schritte zu unternehmen.',
'account_active_copy1line' => 'Dein Account wurde nach erfolgreicher Prüfung freigeschaltet. Deinen Beratervertag findest Du auf der Startseite im Loginbereich von my.mivita.care. Melde dich mit deinen Benutzerdaten an, um weitere Schritte zu unternehmen.',
'reset_pass_copy1line' => 'Du erhälst diese E-Mail, weil wir eine Anfrage zum Zurücksetzen Deines Passworts für Dein Konto erhalten haben.',
'checkout_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend haben wir zur Kontrolle Deine Bestellung noch einmal aufgelistet.',
'checkout_copy3line' => 'Bei Fragen sind wir jederzeit für Dich da.',
'checkout_copy3line_extern' => 'Bestellung über Berater:',
'status_copy1line' => 'Status zu Deiner Bestellung auf mivita.care',
'footer_copy1' => 'mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach | Telefon: +49 (0) 8333 946 98 90 | Fax: +49 (0) 8333 7268 E-Mail: info@mivita.care',
'footer_copy2' => 'Geschäftsinhaber: Alois Ried | Registergericht: Memmingen | Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340',
@ -60,9 +62,10 @@
'checkout_mail_your_mail' => 'Deine E-Mai:',
'checkout_mail_invoice_addess' => 'Deine Rechnungsadresse:',
'checkout_mail_deliver_addess' => 'Deine Lieferadresse:',
'checkout_mail_deliver_customer' => 'Lieferadresse des Kunde:',
'checkout_mail_deliver_customer' => 'Lieferadresse des Kunden:',
'checkout_mail_order_for_me' => 'Beraterbestellung für Dich:',
'checkout_mail_order_for_ot' => 'Beraterbestellung für Deinen Kunden:',
'checkout_mail_order_for_extern' => 'Kundenbestellung über externen Shop:',
'checkout_mail_order_for_wizard' => 'Beraterbestellung zur Deiner Registrierung:',
'checkout_mail_order_for_membership' => 'Beraterbestellung für Deine Mitgliedschaft:',
'checkout_mail_same_address' => 'Lieferadresse ist gleich Rechnungsadresse',

View file

@ -6,7 +6,7 @@ return [
'reg_hl' => 'Registrierung',
'reg_line_1' => 'Dieses Formular ist für die Registrierung neuer Vertriebspartner. Nach dem Absenden des Formulars erhälst du eine E Mail mit weiteren Informationen sowie den Freischaltlink.',
'reg_checked' => 'Hiermit willige ich in die im Rahmen der <a target="_blank" href=":link">Datenschutzerklärung</a> genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann',
'reg_finisch_hl' => 'Vielen Dank für Ihre Registrierung!',
'reg_finisch_hl' => 'Vielen Dank für Deine Registrierung!',
'reg_finisch_line_1' => 'Wir haben Dir eine E-Mail mit einem Link zur Freischaltung Deines Accounts gesendet.',
'reg_finisch_line_2' => 'Bitte rufe Deine E-Mails ab und bestätige den Link.',
'wizard_verification_hl' => 'Verifizierung (Personalausweis oder Pass; PDF, JPG, PNG)',
@ -18,7 +18,7 @@ return [
'wizard_create_release_hl' => 'Vielen Dank',
'wizard_create_release_line_1' => 'Deine Registrierung und Buchung der Mitgliedschaft ist abgeschlossen!<br>Sobald die Zahlung bei uns eingegangen ist, erhälst Du automatisch eine E-Mail und Deine Mitgliedschaft wird automatisch freigeschaltet.',
'wizard_reg_release_hl' => 'Wartet auf Überprüfung',
'wizard_reg_release_line_1' => 'Deine Registrierung ist abgeschlossen, Deine Daten werden geprüft.<br> Nach erfolgreicher Prüfung wird dein Account freigeschaltet und Du erhälst Du eine E-Mail.',
'wizard_reg_release_line_1' => 'Deine Registrierung ist abgeschlossen, Deine Daten werden geprüft.<br> Nach erfolgreicher Prüfung wird Dein Account freigeschaltet und Du erhälst eine E-Mail.',
'sender' => 'Dein Team von mivita.care',
'required_fields' => 'Pflichtfelder',
'business_license_now' => 'Gewerbeschein jetzt hochladen',

View file

@ -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>

View file

@ -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>

View file

@ -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"

View file

@ -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') }}">

View file

@ -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>

View 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

View file

@ -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 -->