gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

User Order all Margins / Checkout

Browse source
This commit is contained in:
Kevin Adametz 2021-01-22 15:54:51 +01:00
parent a96d7d5c77
commit 224bf9e951
92 changed files with 3551 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

89
resources/views/admin/sales/_detail.blade.php
View file

@ -73,7 +73,7 @@
</div>
</div>
@endif
<div class="text-muted small">Zugewiesener Berater</div>
<div class="text-muted small">Zugewiesener Vertriebspartner</div>
@if($isView === 'sales_user')
{{-- @if($shopping_order->user_shop)
{{$shopping_order->user_shop->title}}
@ -88,7 +88,7 @@
data-action="shopping-user-is-like-member"
data-back="{{route('admin_sales_customers_detail', [$shopping_order->id])}}"
data-modal="modal-xl"
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Berater zuordnen</button>
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Vertriebspartner zuordnen</button>
@else
@if($shopping_order->member)
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_order->member->id])}}"><i class="ion ion-ios-contacts"></i></a>
@ -121,7 +121,7 @@
@if($shopping_order->shopping_user->is_from === 'shopping' || $shopping_order->shopping_user->is_from === 'extern')
Rechnungsadresse des Kunden
@else
Rechnungsadresse des Beraters
Rechnungsadresse des Vertriebspartners
@endif
</h6>
<div class="row">
@ -186,16 +186,16 @@
<h6 class="small font-weight-semibold">
@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
Lieferadresse des Vertriebspartner
@else
Lieferadresse des Kunden
@endif
@endif
@if($shopping_order->shopping_user->is_from === 'wizard')
Lieferadresse des Berater
Lieferadresse des Vertriebspartner
@endif
@if($shopping_order->shopping_user->is_from === 'membership')
Lieferadresse des Berater
Lieferadresse des Vertriebspartner
@endif
@if($shopping_order->shopping_user->is_from === 'shopping')
Lieferadresse des Kunden
@ -266,22 +266,22 @@
<h6 class="small font-weight-semibold">
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<strong>Bestellung für Berater</strong>
<strong>Bestellung für Vertriebspartner</strong>
@else
<strong>Bestellung für Kunde</strong>
@endif
@endif
@if($shopping_order->shopping_user->is_from === 'wizard')
<strong>Beraterbestellung für Registrierung</strong>
<strong>Vertriebspartnerbestellung für Registrierung</strong>
@endif
@if($shopping_order->shopping_user->is_from === 'membership')
<strong>Beraterbestellung für Mitgliedschaft</strong>
<strong>Vertriebspartnerbestellung für Mitgliedschaft</strong>
@endif
@if($shopping_order->shopping_user->is_from === 'shopping')
<strong>Kundenbestellung über Shop</strong>
@endif
@if($shopping_order->shopping_user->is_from === 'homeparty')
<h5>Beraterbestellung für eine Homeparty</h5>
<h5>Vertriebspartnerbestellung für eine Homeparty</h5>
<hr>
@endif
</h6>
@ -360,43 +360,92 @@
</tbody>
<tfoot>
<style>
.table_small_td {
padding-top: 0.125rem !important;
}
</style>
@if($shopping_order->shopping_user->is_from === 'user_order')
<tr class="">
<td colspan="3">
Zwischensumme
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
{{ $shopping_order->getFormattedSubtotalFull() }} &euro;*
</td>
</tr>
<tr class="">
<td class="table_small_td" colspan="3">
Handelspanne
</td>
<td class="table_small_td" style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
- {{ $shopping_order->getFormattedDiscount() }} &euro;*
</td>
</tr>
<tr class="border-bottom">
<td class="table_small_td" colspan="3">
<strong>Summe (Netto)</strong>
</td>
<td class="table_small_td" style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
<strong>{{ $shopping_order->getFormattedSubtotal() }} &euro;*</strong>
</td>
</tr>
@endif
<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;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.4em;">
@if($shopping_order->shopping_user->is_from === 'user_order')
{{ $shopping_order->getFormattedShippingNet() }} &euro;
{{ $shopping_order->getFormattedShippingNet() }} &euro;*
@else
{{ $shopping_order->getFormattedShipping() }} &euro;
@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() }} &euro;
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
{{ $shopping_order->getFormattedSubtotalShipping() }} &euro;*
</td>
</tr>
<tr class="border-bottom">
<td colspan="3">
<td class="table_small_td" colspan="3">
{{__('email.checkout_mail_tax')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<td class="table_small_td" style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
{{ $shopping_order->getFormattedTax() }} &euro;
</td>
</tr>
@if($shopping_order->shopping_user->is_from === 'user_order' && $shopping_order->payment_credit > 0)
<tr>
<td colspan="3">
<b> Summe (Brutto):</b>
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
<b> {{ $shopping_order->getFormattedTotalWithoutCredit() }} &euro;</b>
</td>
</tr>
<tr class="border-bottom">
<td class="table_small_td" colspan="3">
aus Guthaben (Brutto):
</td>
<td class="table_small_td" style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
{{ $shopping_order->getFormattedPaymentCredit() }} &euro;
</td>
</tr>
@endif
<tr>
<td colspan="3">
<b>{{__('email.checkout_mail_total')}}</b>
<b>Gesamtsumme (Brutto):</b>
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.4em;">
<b>{{ $shopping_order->getFormattedTotalShipping() }} &euro;</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
<span style="font-size: 0.9em"><em>* Nettobeträge</em></span>
</td>
</tr>
</tfoot>

4
resources/views/admin/sales/customers.blade.php
View file

@ -10,7 +10,7 @@
<div class="card-header">
<div class="form-row align-items-center">
<div class="col-sm-4 mb-2">
<label class="form-label" for="filter_member_id">Filter zugewiesener Berater</label>
<label class="form-label" for="filter_member_id">Filter zugewiesener Vertriebspartner</label>
<select class="custom-select" name="filter_member_id" id="filter_member_id">
<option value="">Filter aus</option>
@foreach($filter_members as $member)
@ -51,7 +51,7 @@
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('zugewiesener Berater')}}</th>
<th>{{__('zugewiesener Vertriebspartner')}}</th>
<th>{{__('Rf-Nr.')}}</th>
<th>{{__('Käufe')}}</th>
</tr>

2
resources/views/admin/sales/user_detail.blade.php
View file

@ -4,7 +4,7 @@
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('admin_sales_users')}}" class="btn btn-sm btn-default float-right">zurück</a>
{{ __('Bestellung Berater') }} <span class="text-muted">#{{$shopping_order->id}}</span>
{{ __('Bestellung Vertriebspartner') }} <span class="text-muted">#{{$shopping_order->id}}</span>
</h4>
@include('admin.sales._detail')
<a href="{{route('admin_sales_users')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>

2
resources/views/admin/sales/users.blade.php
View file

@ -4,7 +4,7 @@
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Bestellungen Berater') }}
{{ __('Bestellungen Vertriebspartner') }}
</h4>