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

testemich Promotion

Browse source
This commit is contained in:
Kevin Adametz 2022-04-14 13:21:17 +02:00
parent 38e7fd504a
commit a0f4eda6ea
83 changed files with 1690 additions and 504 deletions
Download patch file Download diff file Expand all files Collapse all files

19
resources/views/user/order/delivery.blade.php
View file

@ -15,14 +15,21 @@
<h4>Lieferdaten</h4>
<div class="switchers-stacked">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="me" @if(!$shopping_user) checked="checked" @endif >
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="me" @if(!$shopping_user && $for==='me') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">Ware ist für mich und wird an meine Adresse versandt</span>
</label>
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="mp" @if(!$shopping_user && $for==='mp') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">Ware ist für mich und ich hole die Ware selbst ab</span>
</label>
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="ot" @if($shopping_user) checked="checked" @endif>
<span class="switcher-indicator">
@ -31,6 +38,14 @@
</span>
<span class="switcher-label">Ware ist für einen Kunden und wird an den Kunden versandt</span>
</label>
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="cr" @if(!$shopping_user && $for==='cr') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">Mein Guthaben aufladen</span>
</label>
</div>
<hr>

2
resources/views/user/order/index.blade.php
View file

@ -41,7 +41,7 @@
{ data: 'payment', name: 'payment', orderable: false },
{ data: 'txaction', name: 'txaction' },
{ data: 'shipped', name: 'shipped' },
{ data: 'is_for', name: 'is_for', orderable: false },
{ data: 'payment_for', name: 'payment_for' },
{ 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 },

133
resources/views/user/order/list.blade.php
View file

@ -1,58 +1,69 @@
@extends('layouts.layout-2')
@section('content')
<style>
.btn-md-extra {
padding: 0.3rem 0.6rem;
font-size: 0.8rem;
line-height: 1.5;
border-radius: 0.25rem;
}
.md-btn-extra {
width: calc(1.7rem + 2px) !important;
line-height: 1.5rem;
}
.form-control.input-extra {
padding: 0.28rem 0.6rem;
font-size: 0.8rem;
font-weight: 500;
min-height: calc(1.8rem + 2px);
height: calc(1.8rem + 2px);
width: 44px;
}
.input-group-min-w {
min-width: 102px;
}
.img-extra {
min-width:55px;
max-height: 160px;
}
@media (max-width: 767px) {
.default-style:not([dir=rtl]) div.card-datatable table.dataTable thead th:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tbody td:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tfoot th:first-child {
padding-left: 0.6rem !important;
}
.img-extra {
min-width:35px;
max-height: 160px;
}
}
</style>
@if($for === 'cr')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.my_orders') }} / Mein Guthaben aufladen
<a href="{{ route('user_order_my_delivery', [$for, $delivery_id]) }}" class="btn btn-sm btn-default float-right">zurück</a>
<div class="clearfix"></div>
</h4>
@else
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.my_orders') }} / {{ __('navigation.do_order') }}
<a href="{{ route('user_order_my_delivery', [$for, $delivery_id]) }}" class="btn btn-sm btn-default float-right">zurück</a>
<div class="clearfix"></div>
</h4>
<style>
.btn-md-extra {
padding: 0.3rem 0.6rem;
font-size: 0.8rem;
line-height: 1.5;
border-radius: 0.25rem;
}
.md-btn-extra {
width: calc(1.7rem + 2px) !important;
line-height: 1.5rem;
}
.form-control.input-extra {
padding: 0.28rem 0.6rem;
font-size: 0.8rem;
font-weight: 500;
min-height: calc(1.8rem + 2px);
height: calc(1.8rem + 2px);
width: 44px;
}
.input-group-min-w {
min-width: 102px;
}
.img-extra {
min-width:55px;
max-height: 160px;
}
@media (max-width: 767px) {
.default-style:not([dir=rtl]) div.card-datatable table.dataTable thead th:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tbody td:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tfoot th:first-child {
padding-left: 0.6rem !important;
}
.img-extra {
min-width:35px;
max-height: 160px;
}
}
</style>
@if($user->user_level)
<p>Die Produktpreise werden entsprechend Deiner Rolle: <strong>{{$user->user_level->name}}</strong> angezeigt.<br>
Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
@else
<p>Hinweis: Dir wurde noch keine Rolle zugewisen. Bitte wende dich an serivce@gruene-seele.bio</p>
@if($user->user_level)
<p>Die Produktpreise werden entsprechend Deiner Rolle: <strong>{{$user->user_level->name}}</strong> angezeigt.<br>
Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
@else
<p>Hinweis: Dir wurde noch keine Rolle zugewisen. Bitte wende dich an serivce@gruene-seele.bio</p>
@endif
@endif
@if($errors->has('switchers-comp-product'))
@ -95,19 +106,23 @@
{!! Form::open(['url' => route('user_order_my_payment', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
<input type="hidden" name="shipping_is_for" value="{{$for}}">
<div class="card mt-4">
<div class="card-body">
@if($for === 'ot')
<h4>Lieferland des Kunden</h4>
@include('user.order.shipping_ot')
@endif
@if($for === 'me')
<h4>Mein Lieferland</h4>
@include('user.order.shipping_me')
<i>Kann bei der Zahlung/Checkout nicht mehr geändert werden.</i>
@endif
@if($for === 'cr')
@include('user.order.shipping_credit')
@else
<div class="card mt-4">
<div class="card-body">
@if($for === 'ot')
<h4>Lieferland des Kunden</h4>
@include('user.order.shipping_ot')
@endif
@if($for === 'me' || $for === 'mp')
<h4>Mein Lieferland</h4>
@include('user.order.shipping_me')
<i>Kann bei der Zahlung/Checkout nicht mehr geändert werden.</i>
@endif
</div>
</div>
</div>
@endif
@if($comp_products)
<div id="holder_html_view_comp_product">

27
resources/views/user/order/shipping_credit.blade.php Normal file
View file

@ -0,0 +1,27 @@
@if($user->account)
@if($user->account->same_as_billing)
{{ Form::hidden('shipping_company', $user->account->company) }}
{{ Form::hidden('shipping_salutation', $user->account->salutation) }}
{{ Form::hidden('shipping_firstname', $user->account->first_name) }}
{{ Form::hidden('shipping_lastname', $user->account->last_name) }}
{{ Form::hidden('shipping_address', $user->account->address) }}
{{ Form::hidden('shipping_address_2', $user->account->address_2) }}
{{ Form::hidden('shipping_zipcode', $user->account->zipcode) }}
{{ Form::hidden('shipping_city', $user->account->city) }}
{{ Form::hidden('shipping_phone', $user->account->phone) }}
@else
{{ Form::hidden('shipping_company', $user->account->shipping_company) }}
{{ Form::hidden('shipping_salutation', $user->account->shipping_salutation) }}
{{ Form::hidden('shipping_firstname', $user->account->shipping_firstname) }}
{{ Form::hidden('shipping_lastname', $user->account->shipping_lastname) }}
{{ Form::hidden('shipping_address', $user->account->shipping_address) }}
{{ Form::hidden('shipping_address_2', $user->account->shipping_address_2) }}
{{ Form::hidden('shipping_zipcode', $user->account->shipping_zipcode) }}
{{ Form::hidden('shipping_city', $user->account->shipping_city) }}
{{ Form::hidden('shipping_phone', $user->account->shipping_phone) }}
@endif
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
@else
<h4>Fehler: Keine Adressdaten gefunden!</h4>
@endif

3
resources/views/user/order/shipping_me.blade.php
View file

@ -1,8 +1,6 @@
@if($user->account)
@if($user->account->same_as_billing)
<!-- Billing -->
{{ Form::hidden('shipping_company', $user->account->company) }}
{{ Form::hidden('shipping_salutation', $user->account->salutation) }}
{{ Form::hidden('shipping_firstname', $user->account->first_name) }}
@ -27,7 +25,6 @@
</div>
</div>
</div>
<!-- / Billing -->
@else
{{ Form::hidden('shipping_company', $user->account->shipping_company) }}
{{ Form::hidden('shipping_salutation', $user->account->shipping_salutation) }}

4
resources/views/user/order/yard_view_form.blade.php
View file

@ -218,6 +218,7 @@
<strong>{{ Yard::instance('shopping')->subtotal() }} €*</strong>
</td>
</tr>
{{--
@if(Yard::instance('shopping')->getYardMargin() && Yard::instance('shopping')->getYardMargin()->net_partner_commission > 0)
<tr>
<td class="text-left"><em>Provision Vertriebspartern:</em></td>
@ -226,6 +227,7 @@
</td>
</tr>
@endif
--}}
<tr>
<td class="text-left">Lieferland:</td>
@ -266,7 +268,7 @@
</tr>
@endif
<tr>
<td class="text-left"><strong>Gesamtsumme (Brutto):</strong></td>
<td class="text-left"><strong>Gesamtsumme @if(Yard::instance('shopping')->getGlobalTaxRate() > 0) (Brutto) @endif:</strong></td>
<td>
<strong>{{ Yard::instance('shopping')->totalWithShipping() }} €</strong>
</td>