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

main system

Browse source
This commit is contained in:
Kevin Adametz 2021-01-15 18:16:31 +01:00
parent 0baac018a2
commit a96d7d5c77
115 changed files with 4589 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,9 +49,11 @@
</style>
@if($user->user_level)
<p>Die Produktpreise werden entsprechend Deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt. Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
<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>
<strong>Prozente noch nicht eingebaut, müssen über Produkte eingestellt werden</strong>
@else
<p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p>
<p>Hinweis: Dir wurde noch keine Rolle zugewisen. Bitte wende dich an serivce@gruene-seele.bio</p>
@endif
@if($errors->has('switchers-comp-product'))
@ -78,7 +80,7 @@
<th>{{__('Produkt')}}</th>
<th>{{__('Mein Preis netto')}}</th>
<th>{{__('Mein Preis brutto')}}</th>
<th>{{__('Points')}}</th>
<th>{{__('Gewicht')}}</th>
<th>{{__('VK-Preis brutto')}}</th>
<th><span class="no-line-break">{{__('Inhalt (ml)')}}</span></th>
<th>{{__('Artikelnummer')}}</th>
@ -109,9 +111,10 @@
</div>
@if($for === 'me')
<div id="holder_html_view_comp_product">
{{-- <div id="holder_html_view_comp_product">
@include('user.order.comp_product')
</div>
--}}
@endif
<div class="card mt-4">
@ -150,7 +153,7 @@
{ data: 'product', name: 'product' },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },
{ data: 'price_gross', name: 'price_gross', searchable: false, orderable: false },
{ data: 'points', name: 'points', searchable: false },
{ data: 'weight', name: 'weight', searchable: false },
{ data: 'price_vk_gross', name: 'price_vk_gross', searchable: false },
{ data: 'contents_total', name: 'contents_total', searchable: false },
{ data: 'number', name: 'number' },

5
resources/views/user/order/shipping_ot.blade.php
View file

@ -1,11 +1,10 @@
@if($shopping_user->same_as_billing)
<!-- Billing -->
{{ Form::hidden('shipping_company', $shopping_user->billing_company) }}
{{ Form::hidden('shipping_salutation', $shopping_user->billing_salutation) }}
{{ Form::hidden('shipping_firstname', $shopping_user->billing_first_name) }}
{{ Form::hidden('shipping_lastname', $shopping_user->billing_last_name) }}
{{ Form::hidden('shipping_firstname', $shopping_user->billing_firstname) }}
{{ Form::hidden('shipping_lastname', $shopping_user->billing_lastname) }}
{{ Form::hidden('shipping_address', $shopping_user->billing_address) }}
{{ Form::hidden('shipping_address_2', $shopping_user->billing_address_2) }}
{{ Form::hidden('shipping_zipcode', $shopping_user->billing_zipcode) }}

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

@ -128,8 +128,10 @@
</div>
</div>
<div class="options">
@if(!$row->options->comp)
<a href="#" class="auto-delete-product remove_item_form_cart product-tooltip" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}"><i class="fa fa-times"></i> Artikel entfernen</a>
{{--
@if(!$row->options->comp)
@else
@if(Yard::instance('shopping')->getNumComp() > 1)
{{$row->options->comp}}. Kompensationsprodukt
@ -138,6 +140,7 @@
@endif
@endif
--}}
</div>
</div>
@ -147,11 +150,13 @@
<div class="col-6 col-sm-3 col-md-3 quantity">
<div class="quantity-select">
<input type="number" class="form-control text-center cart-input-event-onchange" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}" value="{{ $row->qty }}" name="quantity[{{$row->rowId}}]" maxlength="3" max="999" min="1">
{{--
@if($row->options->comp)
<span class="text-right product-tooltip" data-toggle="tooltip" title="Kompensationsprodukt">1 x</span>
@else
<input type="number" class="form-control text-center cart-input-event-onchange" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}" value="{{ $row->qty }}" name="quantity[{{$row->rowId}}]" maxlength="3" max="999" min="1">
@endif
--}}
</div>
<div class="price-total text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->rowSubtotalNet($row) }} &euro;</div>
@ -170,7 +175,7 @@
<div class="d-flex flex-wrap justify-content-between pb-4">
<div class="mt-2">
<p class="small mb-2">Du hast {{ Yard::instance('shopping')->compCount() }} Artikel in Deinem Warenkorb</p>
<p>Gesamte Points: {{ Yard::instance('shopping')->points() }}</p>
{{-- <p>Gesamte Points: {{ Yard::instance('shopping')->points() }}</p> --}}
<button type="button" class="btn btn-default btn-sm" id="clear-products-basket"><i class="ion ion-ios-trash"></i> Warenkorb löschen</button>
</div>
<div class="d-flex">