Berater Bestellung / online
This commit is contained in:
Kevin Adametz
parent
16fe2fa363
commit
ecc71c616f
26 changed files with 828 additions and 240 deletions
|
|
@ -49,6 +49,8 @@
|
|||
'checkout_mail_hl1' => 'Du hast folgende Artikel bestellt:',
|
||||
'checkout_mail_shipping' => 'Verpackungs- u. Versandkosten',
|
||||
'checkout_mail_status_info' => 'Statusinfo:',
|
||||
'checkout_mail_subtotal_ws' => 'Summe ohne MwSt.',
|
||||
'checkout_mail_tax' => 'zzgl. MwSt',
|
||||
'checkout_mail_total' => 'Gesamtpreis',
|
||||
'checkout_mail_tax_info' => 'Preis inkl. MwSt',
|
||||
'checkout_mail_pay_info' => 'Zahlungsinfo:',
|
||||
|
|
@ -58,6 +60,11 @@
|
|||
'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_order_for_me' => 'Beraterbestellung für Dich:',
|
||||
'checkout_mail_order_for_ot' => 'Beraterbestellung für Deinen Kunden:',
|
||||
'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',
|
||||
'checkout_mail_pay_error' => 'Die Zahlung ist fehlgeschlagen!',
|
||||
'checkout_mail_pay_pre' => 'Bezahlung per Vorkasse:',
|
||||
|
|
|
|||
|
|
@ -2,11 +2,32 @@
|
|||
<div class="card">
|
||||
<!-- Status -->
|
||||
<div class="card-body">
|
||||
<strong class="mr-2">Status:</strong>
|
||||
<span class="text-big">
|
||||
{!! \App\Services\Payment::getShoppingOrderBadge($shopping_order); !!}
|
||||
</span>
|
||||
<span class="text-muted ml-1">{{$shopping_order->created_at->format("d.m.Y")}}</span>
|
||||
<div class="row">
|
||||
<div class="col-md-6 mb-1">
|
||||
<strong class="mr-2">Status:</strong>
|
||||
<span class="text-big">
|
||||
{!! \App\Services\Payment::getShoppingOrderBadge($shopping_order); !!}
|
||||
</span>
|
||||
</div>
|
||||
<div class="col-md-6 mb-1">
|
||||
<strong class="mr-2">Versand:</strong>
|
||||
|
||||
@if($isAdmin)
|
||||
<button type="button" class="btn btn-sm btn-{{$shopping_order->getShippedColor()}}" data-toggle="modal" data-target="#modals-shipped"
|
||||
data-id="{{ $shopping_order->id }}"
|
||||
data-shipped="{{ $shopping_order->shipped }}"
|
||||
data-back="{{url()->current()}}"
|
||||
data-action="store_shipped">
|
||||
<span class="far fa-edit"></span> <strong>{{$shopping_order->getShippedType()}}</strong>
|
||||
</button>
|
||||
@else
|
||||
<span class="text-big">
|
||||
<span class="badge badge-pill badge-{{$shopping_order->getShippedColor()}}">{{$shopping_order->getShippedType()}}</span>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
<!-- / Status -->
|
||||
|
|
@ -14,18 +35,22 @@
|
|||
<!-- Info -->
|
||||
<div class="card-body pb-1">
|
||||
<div class="row">
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Bestelldatum</div>
|
||||
{{$shopping_order->created_at->format("d.m.Y H:i")}}
|
||||
</div>
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Anzahl Artikel</div>
|
||||
{{$shopping_order->getItemsCount()}}
|
||||
</div>
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Preis gesamt</div>
|
||||
{{$shopping_order->getFormattedTotalShipping()}} €
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Points gesamt</div>
|
||||
{{ $shopping_order->points }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
|
|
@ -47,7 +72,6 @@
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="text-muted small">Zugewiesener Berater</div>
|
||||
@if($isView === 'sales_user')
|
||||
@if($shopping_order->user_shop)
|
||||
|
|
@ -78,7 +102,6 @@
|
|||
@endif
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 mb-3">
|
||||
<div class="text-muted small">Gekauft im Shop</div>
|
||||
@if($shopping_order->user_shop->user->isActive() && $shopping_order->user_shop->user->isActiveShop())
|
||||
|
|
@ -96,7 +119,11 @@
|
|||
<!-- Billing -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Rechnungsadresse
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
Rechnungsadresse des Kunden
|
||||
@else
|
||||
Rechnungsadresse des Berater
|
||||
@endif
|
||||
</h6>
|
||||
<div class="row">
|
||||
@if($shopping_order->shopping_user->billing_company)
|
||||
|
|
@ -156,7 +183,22 @@
|
|||
<!-- Shipping -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Lieferadresse
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
Lieferadresse des Berater
|
||||
@else
|
||||
Lieferadresse des Kunden
|
||||
@endif
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'wizard')
|
||||
Lieferadresse des Berater
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'membership')
|
||||
Lieferadresse des Berater
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
Lieferadresse des Kunden
|
||||
@endif
|
||||
</h6>
|
||||
@if($shopping_order->shopping_user->same_as_billing)
|
||||
{{__('email.checkout_mail_same_address')}}
|
||||
|
|
@ -220,18 +262,52 @@
|
|||
<!-- Items -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Artikel
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
@if($shopping_order->shopping_user->is_for === 'me')
|
||||
<strong>Bestellung für Berater</strong>
|
||||
@else
|
||||
<strong>Bestellung für Kunde</strong>
|
||||
@endif
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'wizard')
|
||||
<strong>Beraterbestellung für Registrierung</strong>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'membership')
|
||||
<strong>Beraterbestellung für Mitgliedschaft</strong>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
<strong>Kundenbestellung über Shop</strong>
|
||||
@endif
|
||||
</h6>
|
||||
<style>
|
||||
table.table-product, table.table-product tr td, table.table-product tr th {
|
||||
border:none;
|
||||
}
|
||||
table.table-product tr.border-top td {
|
||||
border-top: 1px solid #b8b8b9;
|
||||
}
|
||||
table.table-product tr.border-bottom td, table.table-product tr.border-bottom th {
|
||||
border-bottom: 1px solid #b8b8b9;
|
||||
}
|
||||
|
||||
</style>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered m-0" style="min-width:550px;">
|
||||
<table class="table table-product m-0" style="">
|
||||
<tbody>
|
||||
<tr>
|
||||
<tr class="border-bottom">
|
||||
<th>Produkt</th>
|
||||
<th>Anzahl</th>
|
||||
<th>Preis</th>
|
||||
<th class="text-right">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
Netto-Preis
|
||||
@else
|
||||
Preis
|
||||
@endif
|
||||
</th>
|
||||
<th class="text-right">Anzahl</th>
|
||||
<th class="text-right">Summe</th>
|
||||
</tr>
|
||||
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
|
||||
<tr>
|
||||
<tr class="border-bottom">
|
||||
<td class="px-3 py-2">
|
||||
<div class="media align-items-center">
|
||||
@if($shopping_order_item->product->images)
|
||||
|
|
@ -251,17 +327,70 @@
|
|||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td class="align-middle px-3 py-2 nowrap text-right" style="min-width:100px;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
<!-- Set column width -->
|
||||
<td class="align-middle px-3 py-2" style="width: 66px;">
|
||||
<td class="align-middle px-3 py-2 text-right" style="min-width: 60px;">
|
||||
{{ $shopping_order_item->qty }}
|
||||
</td>
|
||||
<!-- Set column width -->
|
||||
<td class="text-right font-weight-semibold align-middle px-3 py-2" style="width: 100px;">
|
||||
{{ $shopping_order_item->getFormattedPrice() }} €
|
||||
<td class="font-weight-semibold align-middle px-3 py-2 text-right" style="min-width:120px;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedTotalPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedTotalPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr class="border-bottom">
|
||||
<td colspan="3">
|
||||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@else
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
<td colspan="3">
|
||||
{{__('email.checkout_mail_subtotal_ws')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedSubtotalWs() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="border-bottom">
|
||||
<td colspan="3">
|
||||
{{__('email.checkout_mail_tax')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedTax() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<b>{{__('email.checkout_mail_total')}}</b>
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} €</b>
|
||||
<br>
|
||||
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -279,10 +408,10 @@
|
|||
<tr>
|
||||
<th style="min-width: 60px">#</th>
|
||||
<th>Zahlungsart</th>
|
||||
@if($isAdmin)<th>Referenznummer</th>@endif
|
||||
<th>Gesamt</th>
|
||||
<th>Status</th>
|
||||
<th>Datum</th>
|
||||
<th>Referenznummer</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -291,10 +420,23 @@
|
|||
<tr>
|
||||
<th scope="row">{{++$count}}</th>
|
||||
<td>{{$shopping_payment->getPaymentType()}}</td>
|
||||
@if($isAdmin)<td>{{$shopping_payment->reference}}</td>@endif
|
||||
<td>{{$shopping_payment->getPaymentAmount()}}</td>
|
||||
<td>{!! \App\Services\Payment::getShoppingPaymentBadge($shopping_payment) !!}</td>
|
||||
<td>
|
||||
@if($isAdmin && $shopping_payment->clearingtype === 'fnc' && $shopping_payment->onlinebanktransfertype === 'MIV')
|
||||
<button type="button" class="btn btn-sm btn-{{ \App\Services\Payment::getFormattedTxactionColor($shopping_payment->txaction)}}" data-toggle="modal" data-target="#modals-txaction"
|
||||
data-id="{{ $shopping_order->id }}"
|
||||
data-payment_id="{{ $shopping_payment->id }}"
|
||||
data-txaction="{{ $shopping_payment->txaction }}"
|
||||
data-back="{{url()->current()}}"
|
||||
data-action="store_txaction">
|
||||
<span class="far fa-edit"></span> <strong>{{ \App\Services\Payment::getFormattedTxaction($shopping_payment->txaction)}}</strong>
|
||||
</button>
|
||||
@else
|
||||
{!! \App\Services\Payment::getShoppingPaymentBadge($shopping_payment) !!}
|
||||
@endif
|
||||
</td>
|
||||
<td>{{$shopping_payment->created_at->format("d.m.Y H:i")}}</td>
|
||||
<td>{{$shopping_payment->reference}}</td>
|
||||
</tr>
|
||||
@if($isAdmin && $shopping_payment->payment_transactions)
|
||||
@php($ccount=0)
|
||||
|
|
@ -329,5 +471,78 @@
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@if($isAdmin)
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modals-shipped">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
|
||||
@csrf
|
||||
<input type="hidden" name="id" value="{{$shopping_order->id}}">
|
||||
<input type="hidden" name="action" value="store_shipped">
|
||||
<input type="hidden" name="back" value="{{url()->current()}}">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">{{__('Bestellung')}} {{__('Versand')}} </h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="form-label" for="shipped">{{ __('Versand') }}</label>
|
||||
{{ Form::select('shipped', \App\Models\ShoppingOrder::$shippedTypes, $shopping_order->shipped, array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modals-txaction">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
|
||||
@csrf
|
||||
<input type="hidden" name="id" value="{{$shopping_order->id}}">
|
||||
<input type="hidden" name="payment_id">
|
||||
<input type="hidden" name="action" value="store_txaction">
|
||||
<input type="hidden" name="back" value="{{url()->current()}}">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">{{__('Bestellung')}} {{__('Rechnung')}} </h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="form-label" for="txaction">{{ __('Rechnung') }}</label>
|
||||
{{ Form::select('txaction', \App\Services\Payment::$txaction_invoice, 'invoice_paid', array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
$('#modals-txaction').on('show.bs.modal', function (event) {
|
||||
var button = $(event.relatedTarget);
|
||||
$(this).find(".modal-content input[name='payment_id']").val(button.data('payment_id'));
|
||||
$(this).find(".modal-body select[name='txaction']").val(button.data('txaction'));
|
||||
$('.selectpicker').selectpicker('refresh');
|
||||
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@endif
|
||||
|
|
@ -49,14 +49,17 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Zahlung')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Versand')}}</th>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('zugewiesener Berater')}}</th>
|
||||
<th>{{__('Rf-Nr.')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Gekauft im Shop')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -78,15 +81,18 @@
|
|||
},
|
||||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', name: 'id', searchable: false },
|
||||
{ data: 'id', searchable: false },
|
||||
{ data: 'created_at', name: 'shopping_orders.created_at' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'payment', name: 'payment', orderable: false },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'shipped', name: 'shipped' },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },
|
||||
{ data: 'created_at', name: 'created_at' },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'shopping_user.orders', name: 'shopping_user.orders' },
|
||||
{ data: 'member_id', name: 'member_id', searchable: false, orderable: false },
|
||||
{ data: 'reference', name: 'reference' },
|
||||
{ data: 'shopping_user.orders', name: 'shopping_user.orders' },
|
||||
{ data: 'user_shop_id', name: 'user_shop_id', searchable: false, orderable: true },
|
||||
],
|
||||
"bLengthChange": false,
|
||||
|
|
|
|||
|
|
@ -15,12 +15,20 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Zahlung')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Versand')}}</th>
|
||||
<th>{{__('Für')}}</th>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>B.{{__('First name')}}</th>
|
||||
<th>B.{{__('Last name')}}</th>
|
||||
<th>B.{{__('E-Mail')}}</th>
|
||||
|
||||
<th>{{__('Rf-Nr.')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Berater-Shop')}}</th>
|
||||
</tr>
|
||||
|
|
@ -37,12 +45,19 @@
|
|||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', searchable: false },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },
|
||||
{ data: 'created_at', name: 'shopping_orders.created_at' },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'payment', name: 'payment', orderable: false },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'shipped', name: 'shipped' },
|
||||
{ data: 'is_for', name: 'is_for', orderable: false },
|
||||
{ data: 'shopping_user.shipping_firstname', name: 'shopping_user.shipping_firstname', orderable: false },
|
||||
{ data: 'shopping_user.shipping_lastname', name: 'shopping_user.shipping_lastname', orderable: false },
|
||||
{ data: 'shopping_user.shipping_email', name: 'shopping_user.shipping_email', orderable: false },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname', orderable: false },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname', orderable: false },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email', orderable: false },
|
||||
{ data: 'reference', name: 'reference' },
|
||||
{ data: 'shopping_user.orders', name: 'shopping_user.orders' },
|
||||
{ data: 'auth_user_shop', name: 'auth_user_shop' },
|
||||
],
|
||||
|
|
|
|||
|
|
@ -149,60 +149,113 @@
|
|||
<tr>
|
||||
<td class="sub_headline">
|
||||
<hr><br>
|
||||
<b>{{__('email.checkout_mail_hl1')}}</b>
|
||||
@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>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_order_for_ot')}}</b>
|
||||
@endif
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'wizard')
|
||||
<b>{{__('email.checkout_mail_order_for_wizard')}}</b>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'membership')
|
||||
<b>{{__('email.checkout_mail_order_for_membership')}}</b>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
<b>{{__('email.checkout_mail_hl1')}}</b>
|
||||
@endif
|
||||
</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%">
|
||||
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }} x
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->product->name }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->getFormattedPrice() }} EUR
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedShipping() }} EUR
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_total')}}</b>
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
|
||||
<br>
|
||||
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<th style="color:#43413f; text-align: left; vertical-align: top;line-height:1.2em;">Produkt</th>
|
||||
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
Netto-Preis
|
||||
@else
|
||||
Preis
|
||||
@endif
|
||||
</th>
|
||||
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">Anzahl</th>
|
||||
<th style="color:#43413f; text-align: right; vertical-align: top;line-height:1.2em;">Summe</th>
|
||||
</tr>
|
||||
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->product->name }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: center; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedTotalPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedTotalPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@else
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_subtotal_ws')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedSubtotalWs() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_tax')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedTax() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_total')}}</b>
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} €</b>
|
||||
<br>
|
||||
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
|
@ -311,7 +364,15 @@
|
|||
|
||||
<tr>
|
||||
<td class="sub_headline" style="line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
|
||||
@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>
|
||||
|
|
|
|||
|
|
@ -182,7 +182,6 @@
|
|||
<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>
|
||||
|
|
@ -196,55 +195,108 @@
|
|||
<tr>
|
||||
<td class="sub_headline">
|
||||
<hr><br>
|
||||
<b>{{__('email.checkout_mail_hl1')}}</b>
|
||||
@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>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_order_for_ot')}}</b>
|
||||
@endif
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'wizard')
|
||||
<b>{{__('email.checkout_mail_order_for_wizard')}}</b>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'membership')
|
||||
<b>{{__('email.checkout_mail_order_for_membership')}}</b>
|
||||
@endif
|
||||
@if($shopping_order->shopping_user->is_from === 'shopping')
|
||||
<b>{{__('email.checkout_mail_hl1')}}</b>
|
||||
@endif
|
||||
</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>
|
||||
<th style="color:#43413f; text-align: left; vertical-align: top;line-height:1.2em;">Produkt</th>
|
||||
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
Netto-Preis
|
||||
@else
|
||||
Preis
|
||||
@endif
|
||||
</th>
|
||||
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">Anzahl</th>
|
||||
<th style="color:#43413f; text-align: right; vertical-align: top;line-height:1.2em;">Summe</th>
|
||||
</tr>
|
||||
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }} x
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->product->name }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: center; vertical-align: top; width: 10%;line-height:1.6em;">
|
||||
{{ $shopping_order_item->qty }}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order_item->getFormattedPrice() }} EUR
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order_item->getFormattedTotalPriceNet() }} €
|
||||
@else
|
||||
{{ $shopping_order_item->getFormattedTotalPrice() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<td colspan="4">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedShipping() }} EUR
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@else
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3">
|
||||
<td colspan="4">
|
||||
<hr>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
|
||||
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_subtotal_ws')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedSubtotalWs() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
{{__('email.checkout_mail_tax')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
{{ $shopping_order->getFormattedTax() }} €
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{__('email.checkout_mail_total')}}</b>
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
|
||||
<b>{{ $shopping_order->getFormattedTotalShipping() }} €</b>
|
||||
<br>
|
||||
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
|
||||
</td>
|
||||
|
|
@ -264,7 +316,6 @@
|
|||
</td>
|
||||
<tr>
|
||||
<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;">
|
||||
|
|
@ -301,7 +352,15 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td class="sub_headline">
|
||||
<b>{{__('email.checkout_mail_deliver_addess')}}:</b>
|
||||
@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>
|
||||
|
|
@ -312,7 +371,6 @@
|
|||
@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
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="text-left" style="display: none" id="show-button-without-email">
|
||||
<p class="mt-2">Hinweis: Der Kunden bekommt eine Platzhalter E-Mail (...@faker-mivita.care), da die E-Mail das primäre Feld für die Kundenhoheit ist.<br>
|
||||
<p class="mt-2">Hinweis: Der Kunden bekommt eine Platzhalter E-Mail (...-faker@mivita.care), da die E-Mail das primäre Feld für die Kundenhoheit ist.<br>
|
||||
Wird der Kunden mit seiner E-Mail von einem anderen Berater angelegt oder bestellt in einem anderen Beratershop, wird dem Berater der Kunde zugewiesen.</p>
|
||||
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_without_email">{{ __('weiter ohne E-Mail') }}</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -12,13 +12,16 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Zahlung')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Versand')}}</th>
|
||||
<th>{{__('Für')}}</th>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Rf-Nr.')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
|
|
@ -33,13 +36,16 @@
|
|||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', searchable: false },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },
|
||||
{ data: 'created_at', name: 'shopping_orders.created_at' },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'shopping_user.orders', name: 'shopping_user.orders' },
|
||||
{ data: 'payment', name: 'payment', orderable: false },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'shipped', name: 'shipped' },
|
||||
{ data: 'is_for', name: 'is_for', orderable: false },
|
||||
{ data: 'shopping_user.shipping_firstname', name: 'shopping_user.shipping_firstname', orderable: false },
|
||||
{ data: 'shopping_user.shipping_lastname', name: 'shopping_user.shipping_lastname', orderable: false },
|
||||
{ data: 'shopping_user.shipping_email', name: 'shopping_user.shipping_email', orderable: false },
|
||||
{ data: 'reference', name: 'reference' },
|
||||
],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 100,
|
||||
|
|
|
|||
|
|
@ -176,6 +176,7 @@
|
|||
<!-- BILLING -->
|
||||
<fieldset class="mb-0 box-border-shadow p-20">
|
||||
<h4>Rechnung & Versand</h4>
|
||||
|
||||
<hr />
|
||||
@if($is_from === 'shopping')
|
||||
<div class="is_from_shopping">
|
||||
|
|
@ -287,24 +288,6 @@
|
|||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<hr>
|
||||
<label class="checkbox {{ ($errors->has('accepted_data_checkbox') ? 'error' : '') }}" for="accepted_data_checkbox" style="font-size: 14px;line-height: 22px; font-weight: 400">
|
||||
{!! Form::checkbox('accepted_data_checkbox', 1, $shopping_user->accepted_data_checkbox, ['id'=>'accepted_data_checkbox', 'class' => 'form-control '.($errors->has('accepted_data_checkbox') ? 'error' : '')]) !!}
|
||||
|
||||
@if($shopping_user->auth_user_id)
|
||||
<i></i> Mit Klick auf "Jetzt kaufen" akzeptiere ich die Allgemeinen Geschäftsbedingungen und die Datenschutzbelehrung, damit für die Bestellung meine Daten verarbeitet werden können.
|
||||
@else
|
||||
<i></i> Mit Klick auf "Jetzt kaufen" akzeptiere ich die <a href="{{ url('/agb') }}">Allgemeinen Geschäftsbedingungen</a>, die <a target="_blank" href="{{ asset('download/mivita_widerruf_formular.pdf') }}">Widerrufsbelehrung</a> und die <a href="{{ url('/datenschutz') }}">Datenschutzerklärung</a>, damit für die Bestellung meine Daten verarbeitet werden können.
|
||||
@endif
|
||||
</label>
|
||||
@if ($errors->has('accepted_data_checkbox'))
|
||||
<label for="accepted_data_checkbox" class="error text-danger small" style="display: block;">{{ $errors->first('accepted_data_checkbox') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<div class="is_from_user">
|
||||
|
|
@ -372,7 +355,7 @@
|
|||
{{ $shopping_user->billing_email }}
|
||||
</div>
|
||||
</div>
|
||||
<p class="text-muted small mb-0">Hinterlegte Rechnungsdaten von Beratern können nur im Salescenter geändert werden.</p>
|
||||
<p class="text-muted small mb-0"><i>Deine hinterlegten Rechnungsdaten können nur im Salescenter geändert werden.</i></p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
|
@ -412,7 +395,16 @@
|
|||
<!-- SHIPPING -->
|
||||
<fieldset id="shipping" class="softhide mt-40">
|
||||
<div class="box-border-shadow p-20">
|
||||
<h4>Versand Adresse</h4>
|
||||
|
||||
@if($shopping_user->is_from === 'user_order')
|
||||
@if($shopping_user->is_for === 'me')
|
||||
<h4>Meine Lieferadresse</h4>
|
||||
@else
|
||||
<h4>Lieferadresse des Kunden</h4>
|
||||
@endif
|
||||
@else
|
||||
<h4>Versand Adresse</h4>
|
||||
@endif
|
||||
|
||||
<hr />
|
||||
|
||||
|
|
@ -555,6 +547,7 @@
|
|||
|
||||
@if(($shopping_user->abo_options === 1) && (Util::getUserPaymentFor() >= 3))
|
||||
|
||||
|
||||
@if(array_key_exists('SEPA', $payment_methods_active) && in_array($payment_methods_active['SEPA'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
|
|
@ -567,7 +560,7 @@
|
|||
<p>Zahlungsmethode nicht freigeschaltet, bitte wende dich an {{ config('app.default_mail') }}</p>
|
||||
@endif
|
||||
@else
|
||||
@if(array_key_exists('PP', $payment_methods_active) && in_array($payment_methods_active['PP'], $payment_methods))
|
||||
@if(array_key_exists('PP', $payment_methods_active) && in_array($payment_methods_active['PP'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-0 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'wlt#PPE', (!old('payment_method') ? '1' : '')) !!}
|
||||
|
|
@ -576,6 +569,7 @@
|
|||
</label>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if(array_key_exists('CC', $payment_methods_active) && in_array($payment_methods_active['CC'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
|
||||
|
|
@ -615,7 +609,7 @@
|
|||
@if(array_key_exists('FNC', $payment_methods_active) && in_array($payment_methods_active['FNC'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
<input name="payment_method" type="radio" value="fnc#MIV" />
|
||||
{!! Form::radio('payment_method', 'fnc#MIV', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Rechnungskauf</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/fnc.png')}}" alt="Vorkasse">
|
||||
</label>
|
||||
|
|
@ -671,18 +665,18 @@
|
|||
<label class="mt-0 fs-14 fw-400">Inhaber*</label>
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
{!! Form::text('elv_bankaccountholder', '', ['class' => 'form-control', 'id'=>'elv_bankaccountholder', 'placeholder'=>'Vorname Nachname']) !!}
|
||||
{!! Form::text('elv_bankaccountholder', (isset($payment_data['bankaccountholder']) ? $payment_data['bankaccountholder'] : ''), ['class' => 'form-control', 'id'=>'elv_bankaccountholder', 'placeholder'=>'Vorname Nachname']) !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400">IBAN*</label>
|
||||
{!! Form::text('elv_iban', '', ['class' => 'form-control', 'id'=>'elv_iban', 'placeholder'=>'Beisp.: DE02120300000000202051']) !!}
|
||||
{!! Form::text('elv_iban', (isset($payment_data['iban']) ? $payment_data['iban'] : ''), ['class' => 'form-control', 'id'=>'elv_iban', 'placeholder'=>'Beisp.: DE02120300000000202051']) !!}
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400">BIC*</label>
|
||||
{!! Form::text('elv_bic', '', ['class' => 'form-control', 'id'=>'elv_bic', 'placeholder'=>'Beisp.: PBNKDEFF']) !!}
|
||||
{!! Form::text('elv_bic', (isset($payment_data['bic']) ? $payment_data['bic'] : ''), ['class' => 'form-control', 'id'=>'elv_bic', 'placeholder'=>'Beisp.: PBNKDEFF']) !!}
|
||||
</div>
|
||||
@if($shopping_user->abo_options)
|
||||
<p>Automatische Verlängerung wurde ausgewählt. Dein SEPA-Mandart wird gespeichert und die jährliche Zahlung automatisch ausgeführt.</p>
|
||||
|
|
@ -771,18 +765,31 @@
|
|||
<div class="toggle-transparent toggle-bordered-full clearfix">
|
||||
<div class="toggle active">
|
||||
<div class="toggle-content">
|
||||
|
||||
@if($is_from === 'user_order')
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right">{{ Yard::instance('shopping')->total() }} €</span>
|
||||
<span class="pull-right">{{ Yard::instance('shopping')->subtotal() }} €</span>
|
||||
<strong class="pull-left">Zwischensumme:</strong>
|
||||
</div>
|
||||
|
||||
<hr class="mt-4 mb-4">
|
||||
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small">{{ Yard::instance('shopping')->shipping() }} € </span>
|
||||
<span class="pull-right small">{{ Yard::instance('shopping')->shippingNet() }} € </span>
|
||||
<span class="pull-left small">Versandkosten:</span>
|
||||
</div>
|
||||
@else
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right">{{ Yard::instance('shopping')->total() }} €</span>
|
||||
<strong class="pull-left">Zwischensumme:</strong>
|
||||
</div>
|
||||
|
||||
<hr class="mt-4 mb-4">
|
||||
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small">{{ Yard::instance('shopping')->shipping() }} € </span>
|
||||
<span class="pull-left small">Versandkosten:</span>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small">{{ Yard::instance('shopping')->getShippingCountryName() }}</span>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue