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

01 2022 Microsite Promotion

Browse source
This commit is contained in:
Kevin Adametz 2022-01-18 18:30:14 +01:00
parent 3f1fb9377d
commit 38e7fd504a
39 changed files with 761 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/views/admin/category/edit.blade.php
View file

@ -23,6 +23,7 @@
{!! Form::open(['url' => route('admin_product_category_store'), 'class' => 'form-horizontal', 'id'=>'']) !!}
<input type="hidden" name="id" id="id" value="@if($category->id>0){{$category->id}}@else new @endif">
<input type="hidden" name="action" value="save-form">
<div class="text-left mt-0 mb-2">
<button type="submit" class="btn btn-submit">{{ __('save') }}</button>&nbsp;
@ -38,6 +39,7 @@
{!! Form::close() !!}
@include('admin.category.products')
@include('admin.category.images')

10
resources/views/admin/category/form.blade.php
View file

@ -27,12 +27,20 @@
</div>
<div class="form-row">
<div class="form-group col-8">
<div class="form-group col">
<label class="form-label" for="show_on">{{ __('Kategorie anzeigen (Mehrfachauswahl)') }}</label>
{{ Form::select('show_on[]', \App\Services\Type::$showONs, $category->show_on, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_on', 'multiple') ) }}
</div>
</div>
<div class="form-row">
{{--<div class="form-group col-8">
<label for="parent_id" class="form-label">{{__('Hauptkategorie')}}</label>
<select class="selectpicker" data-style="btn-default" name="">
{!! HTMLHelper::getCategoriesWithoutParents($category->parent_id) !!}
</select>
</div>
--}}
<div class="form-group col-sm-4">
<label class="form-label" for="pos">{{ __('pos') }}</label>
{{ Form::text('pos', $category->pos, array('placeholder'=>__('pos'), 'class'=>'form-control', 'id'=>'pos')) }}

59
resources/views/admin/category/index.blade.php
View file

@ -11,32 +11,39 @@
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Pos')}}</th>
<th>{{__('Hauptkategorie')}}</th>
<th>{{__('Kategorie')}}</th>
{{--<th>{{__('Kategorie')}}</th>--}}
<th>{{__('Headline')}}</th>
<th>{{__('Translate') }}</th>
<th>{{__('Headline')}}</th>
<th>{{__('Produkte')}}</th>
<th>{{__('sichbar')}}</th>
{{-- <th>__('Translate') </th>--}}
<th>{{__('Status')}}</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach($values as $value)
<tr>
<td>
<a href="{{route('admin_product_category_edit', [$value->id])}}" class="btn icon-btn btn-sm btn-primary">
<span class="far fa-edit"></span>
</a>
</td>
<td>{{ $value->pos }}</td>
<td>@if($value->parent) {{ $value->parent->name }} @else {{ $value->name }} @endif</td>
<td>@if($value->parent) {{ $value->name }} @else - @endif</td>
<td>{{ $value->headline }}</td>
<!-- <td>{{ $value->getTranNames() }}</td> -->
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<td><a class="text-danger" href="{{ route('admin_product_category_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
@foreach($values as $value)
<tr>
<td>
<a href="{{route('admin_product_category_edit', [$value->id])}}" class="btn icon-btn btn-sm btn-primary">
<span class="far fa-edit"></span>
</a>
</td>
<td>{{ $value->pos }}</td>
<td>@if($value->parent) {{ $value->parent->name }} @else {{ $value->name }} @endif</td>
{{-- <td>@if($value->parent) {{ $value->name }} @else - @endif</td>--}}
<td>{{ $value->headline }}</td>
<td>{{ $value->product_categories->count() }}</td>
<td>{!! implode($value->getShowOnTypes(), '<br>') !!}</td>
</tr>
@endforeach
</tbody>
{{-- <td>{{ $value->getTranNames() }}</td> --}}
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<td><a class="text-danger" href="{{ route('admin_product_category_delete', ['category', $value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
<div class="mt-4 ml-4">
<a href="{{route('admin_product_category_edit', ['new'])}}" class="btn btn-sm btn-primary">
@ -49,21 +56,11 @@
<script>
$( document ).ready(function() {
$('.datatables-style').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,
"order": [[ 1, "asc" ]],
"aoColumns": [
{ "sWidth": "8%" },
{ "sWidth": "8%" },
{ "sWidth": "19%" },
{ "sWidth": "19%" },
{ "sWidth": "30%" },
{ "sWidth": "10%" },
{ "sWidth": "8%" },
],
"order": [[ 1, "desc" ]],
"language": {
"url": "/js/German.json"
}

118
resources/views/admin/category/products.blade.php Normal file
View file

@ -0,0 +1,118 @@
<div class="card mb-2">
<h6 class="card-header">
{{__('Produktliste')}} / {{ $category->name }}
</h6>
<div class="mt-3 ml-3">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-categorie-products"
data-id="new"
data-pos="0"
data-produkt_id=""
>{{__('Produkt hinzufügen')}}</button>
</div>
<div class="card-datatable table-responsive">
<table class="datatables-style table table-striped table-bordered">
<thead>
<tr>
<th>ID</th>
<th>Pos</th>
<th>Produkt</th>
<th>#</th>
</tr>
</thead>
<tbody>
@foreach($category->product_categories as $product_category)
<tr>
<td>
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-categorie-products"
data-id="{{ $product_category->id }}"
data-pos="{{ $product_category->pos }}"
data-product_id="{{ $product_category->product_id }}">
<span class="far fa-edit"></span>
</button>
</td>
<td>
{{ $product_category->pos }}
</td>
<td>
@if($product_category->product)
{{ $product_category->product->name }}
@if($product_category->product->active)
&nbsp; | &nbsp;<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>
@else
&nbsp; | &nbsp;<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>
@endif
&nbsp; | &nbsp;<span class="small">{!! implode($product_category->product->getShowOnTypes(), ' / ') !!}</span>
&nbsp; | &nbsp;<a href="{{ route('admin_product_edit', [$product_category->product->id]) }}" class="btn btn-xs btn-secondary"><i class="fa fa-eye"></i></a>
@else
-
@endif
</td>
<td>
<a class="text-danger" href="{{ route('admin_product_category_delete', ['product_category', $product_category->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
<div class="mt-3 ml-3">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-categorie-products"
data-id="new"
data-pos="0"
data-produkt_id=""
>{{__('Produkt hinzufügen')}}</button>
</div>
</div>
</div>
<!-- Modal template -->
<div class="modal fade" id="modals-categorie-products">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_product_category_store') }}" method="post">
@csrf
<input type="hidden" name="id">
<input type="hidden" name="category_id" value="{{ $category->id }}">
<div class="modal-header">
<h5 class="modal-title"> {{__('Produkt')}} <span class="font-weight-light">{{__('create/edit')}}</span></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="pos">{{ __('pos') }}</label>
{{ Form::text('pos', $category->pos, array('placeholder'=>__('pos'), 'class'=>'form-control')) }}
</div>
<div class="form-group col-md-12">
<label for="country_ids" class="form-label">{{__('Produkt')}}</label>
<select class="selectpicker" name="product_id" id="product_id" data-style="btn-light" data-live-search="true" required>
{!! HTMLHelper::getProductsOptions() !!}
</select>
</div>
</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" name="action" value="save-product_category">{{__('save')}}</button>
</div>
</form>
</div>
</div>
<script>
$( document ).ready(function() {
$('#modals-categorie-products').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget);
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='pos']").val(button.data('pos'));
$(this).find(".modal-body select[name='product_id']").val(button.data('product_id'));
$('.selectpicker').selectpicker('refresh');
});
});
</script>

4
resources/views/admin/modal/show_product.blade.php
View file

@ -102,7 +102,8 @@
<div class="tab-pane fade" id="shop-product-full-ingredients">
<div class="card borderless">
<div class="card-body">
<div class="card-body p-1">
<div class="table-responsive">
<table class="datatables-style table table-striped table-bordered">
<thead>
<tr>
@ -121,6 +122,7 @@
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>

30
resources/views/admin/payment_method/index.blade.php
View file

@ -26,7 +26,7 @@
data-pos="{{ $value->pos }}"
data-name="{{ $value->name }}"
data-short="{{ $value->short }}"
data-show_at="{{ $value->show_at }}"
data-show_on="{{ json_encode($value->show_on) }}"
data-max_price="{{ $value->getFormattedMaxPrice() }}"
data-default="{{ $value->default }}"
data-active="{{ $value->active }}">
@ -35,7 +35,7 @@
</td>
<td>{{ $value->pos }}</td>
<td>{{ $value->name }} ({{ $value->short }})</td>
<td>{{ $value->getShowAtType() }}</td>
<td>{!! implode($value->getShowOnTypes(), '<br>') !!}</td>
<td data-sort="{{ $value->default }}">{!! get_active_badge($value->default) !!}</td>
<td data-sort="{{ $value->active }}">{!! get_active_badge($value->active) !!}</td>
</tr>
@ -49,7 +49,7 @@
data-name=""
data-short=""
data-max_price=""
data-show_at="9"
data-show_on="[]"
data-default="1"
data-active="1"
>{{__('Neue Zahlungsart hinzufügen')}}</button>
@ -85,17 +85,25 @@
<input type="text" class="form-control" name="short" placeholder="{{__('Abkürzung')}}">
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-6">
<label class="form-label" for="show_at">{{ __('Produkt anzeigen') }}</label>
{{ Form::select('show_at', \App\Models\PaymentMethod::$showATs, 9, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_at') ) }}
<div class="form-group">
<label class="form-label" for="show_on">{{ __('Produkt anzeigen (Mehrfachauswahl)') }}</label>
{{ Form::select('show_on[]', \App\Services\Type::$payShowONs, 10, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_on', 'multiple') ) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-6">
<label class="form-label" for="max_price">{{ __('Max. Preis für Zahlung') }}</label>
<input type="text" class="form-control" name="max_price" placeholder="{{__('Aktiv wenn Preis > 0')}}">
</div>
<div class="form-group col-sm-6">
<label class="form-label" for="pos">{{ __('Pos.') }}</label>
<input type="text" class="form-control" name="pos" placeholder="{{__('Number to move the position if necessary')}}">
</div>
</div>
<div class="form-row">
@ -105,9 +113,7 @@
<span class="custom-control-label">{{__('active')}}</span>
</label>
</div>
<div class="form-group col-6">
<input type="text" class="form-control" name="pos" placeholder="{{__('Number to move the position if necessary')}}">
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
@ -137,7 +143,7 @@
$(this).find(".modal-body input[name='short']").val(button.data('short'));
$(this).find(".modal-body input[name='max_price']").val(button.data('max_price'));
$(this).find(".modal-body input[name='pos']").val(button.data('pos'));
$(this).find(".modal-body select[name='show_at']").val(button.data('show_at'));
$(this).find(".modal-body select[name='show_on[]']").val(button.data('show_on'));
$(this).find(".modal-body input[name='active']").prop( "checked", button.data('active'));
$(this).find(".modal-body input[name='default']").prop( "checked", button.data('default'));

7
resources/views/admin/product/form.blade.php
View file

@ -16,12 +16,13 @@
<label class="form-label" for="name">{{ __('Produktname / Titel') }}*</label>
{{ Form::text('name', $product->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }}
</div>
<div class="form-row">
{{-- <div class="form-row">
<div class="form-group col-sm-5">
<label class="form-label" for="show_at">{{ __('Produkt anzeigen') }}</label>
{{ Form::select('show_at', $product->showATs, $product->show_at, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_at') ) }}
{{ Form::select('show_at', \App\Services\Type::$showATs, $product->show_at, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_at') ) }}
</div>
</div>
--}}
<div class="form-row">
<div class="form-group col-sm-10">
@ -38,7 +39,7 @@
<div class="form-row">
<div class="form-group col-md-10">
<label class="form-label" for="show_on">{{ __('Produkt anzeigen (Mehrfachauswahl)') }}</label>
{{ Form::select('show_on[]', $product->showONs, $product->show_on, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_on', 'multiple') ) }}
{{ Form::select('show_on[]', \App\Services\Type::$showONs, $product->show_on, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_on', 'multiple') ) }}
</div>
</div>
<div class="form-group">

5
resources/views/layouts/includes/layout-sidenav.blade.php
View file

@ -91,14 +91,11 @@
</li>
@endif
{{-- TODO Remove isAdmin --}}
@if(Auth::user()->isActiveAccount() && Auth::user()->isAdmin())
@if(Auth::user()->isActiveAccount())
<li class="sidenav-item @if(Request::is('user/promotions', '/user/promotion/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-md-rocket"></i>
<div>{{ __('navigation.my_promotions') }}</div>
<div class="pl-1 ml-auto">
<div class="badge badge-secondary">Admin</div>
</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('user/promotions') ? ' active' : '' }}">

2
resources/views/pdf/credit.blade.php
View file

@ -264,7 +264,7 @@
</head>
<body>
<div id="address_box">
<div id="address_box_top">GRÜNE SEELE GbR • Hauptstr. 174 • 51143 Köln</div>
<div id="address_box_top">GRÜNE SEELE GmbH • Hauptstr. 174 • 51143 Köln</div>
@if($user->account)
@if($user->account->company)
{{ $user->account->company }}<br>

2
resources/views/pdf/invoice.blade.php
View file

@ -264,7 +264,7 @@
</head>
<body>
<div id="address_box">
<div id="address_box_top">GRÜNE SEELE GbR • Hauptstr. 174 • 51143 Köln</div>
<div id="address_box_top">GRÜNE SEELE GmbH • Hauptstr. 174 • 51143 Köln</div>
@if($shopping_order->shopping_user->billing_company)
{{ $shopping_order->shopping_user->billing_company }}<br>

2
resources/views/user/profile.blade.php
View file

@ -30,7 +30,7 @@
<div class="form-group col-md-4">
@if ($user->hasProfileImage())
<div class="text-center" style="border: 1px solid #eee;">
<img src="{{ route('response_file', ['user', $user->getProfileImage()]) }}" alt="">
<img src="{{ route('response_file', ['user', $user->getProfileImage()]) }}?{{ time() }}" alt="" class=" img-fluid">
<br>
<a href="{{ route('user_profile_image_delete', ['avatar']) }}"
class="btn btn-sm btn-primary mt-2 mb-2"

2
resources/views/web/layouts/includes/layout-footer.blade.php
View file

@ -34,6 +34,6 @@
</div>
<div class="container py-2 px-2">
<hr>
<div class="text-center pl-2 mt-2">Copyright since 2019 • GRÜNE SEELE GbR</div>
<div class="text-center pl-2 mt-2">Copyright since 2019 • GRÜNE SEELE GmbH</div>
</div>
</nav>

4
resources/views/web/promotion/_free_product.blade.php
View file

@ -7,7 +7,7 @@
@foreach ($promotion_user->promotion_user_products_active as $promotion_user_product)
@if ($promotion_user_product->isShow())
<div class="col-md-6 col-lg-4 text-center">
<div class="col-md-6 col-lg-4 text-center mb-4">
@if ($promotion_user_product->product->images)
@if ($image = $promotion_user_product->product->images->first())
<img src="{{ route('product_image', [$image->slug]) }}" class="mb-2 img-fluid" alt="">
@ -51,7 +51,7 @@
@endforeach
<div class="col-12">
<div id="error-free_product_id" class="text-center"></div>
<hr class="">
<hr class="mt-0">
</div>
</div>
</section>

19
resources/views/web/promotion/_intro.blade.php
View file

@ -1,18 +1,21 @@
<div class="container flex-grow-1 container-p-y pb-0">
<style>
</style>
<div class="container intro-media flex-grow-1 container-p-y pb-0">
<div class="media align-items-top py-3 mb-3">
@if($promotion_user->user->hasProfileImage())
<img src="{{ route('response_file', ['user', $promotion_user->user->getProfileImage()]) }}" alt="" class="d-block ui-w-100 rounded-circle mt-3">
<img src="{{ route('response_file', ['user', $promotion_user->user->getProfileImage()]) }}?{{ time() }}" alt="" class="d-block ui-w-150 rounded-circle mt-3">
@endif
<div class="media-body ml-4">
<h1 class="text-left">{{ $promotion_user->name }}</h1>
<p class="text-left">{!! nl2br($promotion_user->description) !!}</p>
<h6 class="card-header bg-light py-2">
<a href="#" class="" style="text-decoration: none" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-down"></i> mehr über mich
<p class="text-left mb-2">{!! nl2br($promotion_user->description) !!}</p>
<h6 class="card-header no-border py-2 text-left px-0">
<a href="#" class="collapsed" style="text-decoration: none" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-collapse"></i> Weitere persönliche Infos ...
</a>
</h6>
<div class="collapse" id="collapsePaymentForm">
<p class="text-left">{!! nl2br($promotion_user->about_you) !!}</p>
<div class="collapse mt-1" id="collapsePaymentForm">
<p class="text-left"><i>{!! nl2br($promotion_user->about_you) !!}</i></p>
</div>
</div>
</div>

90
resources/views/web/promotion/_invoice_details.blade.php
View file

@ -1,5 +1,35 @@
<h2 class="mt-3">Rechnungsdetails</h2>
<div class="row">
<div class="col-12">
<div class="form-group">
<label class="switcher switcher-success">
{!! Form::checkbox('is_invoice_details_private', 1, true, ['id' => 'switch_invoice_details_private', 'class' => 'switcher-input']) !!}
<span class="switcher-indicator">
<span class="switcher-yes">
<span class="ion ion-md-checkmark"></span>
</span>
<span class="switcher-no">
</span>
</span>
<span class="switcher-label">Privat (keine Firma)</span>
</label>
</div>
</div>
<div class="col-12">
<div class="form-group">
<label class="switcher switcher-success">
{!! Form::checkbox('is_invoice_details_germany', 1, (Yard::instance('shopping')->getShippingCountryId() == 1 ? true : false), ['id' => 'switch_invoice_details_germany', 'class' => 'switcher-input']) !!}
<span class="switcher-indicator">
<span class="switcher-yes">
<span class="ion ion-md-checkmark"></span>
</span>
<span class="switcher-no">
</span>
</span>
<span class="switcher-label">aus Deutschland</span>
</label>
</div>
</div>
<div class="col-12">
<div class="form-group {{ $errors->has('billing_salutation') ? 'error' : '' }}">
<label for="billing_salutation">Anrede <span class="required">*</span></label>
@ -34,18 +64,18 @@
@endif
</div>
</div>
<div class="col-12">
<div class="col-12 not-show show_invoice_details_private">
<div class="form-group">
<label for="billing_company">Firmenname (optional)</label>
{!! Form::text('billing_company', '', ['class' => 'form-control', 'id' => 'billing_company']) !!}
</div>
</div>
<div class="col-12">
<div class="col-12 not-show show_invoice_details_germany">
<div class="form-group">
<label for="billing_state">Land / Region <span class="required">*</span></label>
<select id="billing_state" name="billing_state" class="form-control selectpicker"
data-style="btn-default" required>
{!! HTMLHelper::getCountriesForShipping(1) !!}
data-style="btn-default">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId(), false, 2) !!}
</select>
</div>
</div>
@ -62,7 +92,7 @@
</div>
<div class="col-12">
<div class="form-group">
{!! Form::text('billing_address_2', '', ['placeholder' => 'Wohnung, Suite, Zimmer usw. (optional)', 'class' => 'form-control ' . ($errors->has('billing_address_2') ? 'error' : ''), 'id' => 'billing_address_2']) !!}
{!! Form::text('billing_address_2', '', ['placeholder' => 'Zusätzliche Angaben / Hinweise (optional)', 'class' => 'form-control ' . ($errors->has('billing_address_2') ? 'error' : ''), 'id' => 'billing_address_2']) !!}
@if ($errors->has('billing_address_2'))
<label for="billing_address_2" class="error text-danger small"
style="display: block;">{{ $errors->first('billing_address_2') }}</label>
@ -89,16 +119,6 @@
@endif
</div>
</div>
<div class="col-12">
<div class="form-group">
<label for="billing_phone">Telefon (optional)</label>
{!! Form::text('billing_phone', '', ['class' => 'form-control ' . ($errors->has('billing_phone') ? 'error' : ''), 'id' => 'billing_phone']) !!}
@if ($errors->has('billing_phone'))
<label for="billing_phone" class="error text-danger small"
style="display: block;">{{ $errors->first('billing_phone') }}</label>
@endif
</div>
</div>
<div class="col-12">
<div class="form-group">
<label for="billing_email">E-Mail <span class="required">*</span></label>
@ -167,18 +187,18 @@
@endif
</div>
</div>
<div class="col-12">
<div class="col-12 not-show show_invoice_details_private">
<div class="form-group">
<label for="shipping_company">Firmenname (optional)</label>
{!! Form::text('shipping_company', '', ['class' => 'form-control', 'id' => 'shipping_company']) !!}
</div>
</div>
<div class="col-12">
<div class="col-12 not-show show_invoice_details_germany">
<div class="form-group">
<label for="shipping_state">Land / Region <span class="required">*</span></label>
<select id="shipping_state" name="shipping_state" class="form-control selectpicker"
data-style="btn-default" required>
{!! HTMLHelper::getCountriesForShipping(1) !!}
data-style="btn-default">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId(), false, 2) !!}
</select>
</div>
</div>
@ -195,7 +215,7 @@
</div>
<div class="col-12">
<div class="form-group">
{!! Form::text('shipping_address_2', '', ['placeholder' => 'Wohnung, Suite, Zimmer usw. (optional)', 'class' => 'form-control ' . ($errors->has('shipping_address_2') ? 'error' : ''), 'id' => 'shipping_address_2']) !!}
{!! Form::text('shipping_address_2', '', ['placeholder' => 'Zusätzliche Angaben / Hinweise (optional)', 'class' => 'form-control ' . ($errors->has('shipping_address_2') ? 'error' : ''), 'id' => 'shipping_address_2']) !!}
@if ($errors->has('shipping_address_2'))
<label for="shipping_address_2" class="error text-danger small"
style="display: block;">{{ $errors->first('shipping_address_2') }}</label>
@ -222,16 +242,6 @@
@endif
</div>
</div>
<div class="col-12">
<div class="form-group">
<label for="shipping_phone">Telefon (optional)</label>
{!! Form::text('shipping_phone', '', ['class' => 'form-control ' . ($errors->has('shipping_phone') ? 'error' : ''), 'id' => 'shipping_phone']) !!}
@if ($errors->has('shipping_phone'))
<label for="shipping_phone" class="error text-danger small"
style="display: block;">{{ $errors->first('shipping_phone') }}</label>
@endif
</div>
</div>
</div>
<script>
@ -289,8 +299,24 @@
validator.element($(this));
});
function switch_invoice_details_germany(){
if($('input#switch_invoice_details_germany').is(':checked')){
$('.show_invoice_details_germany').hide('slow');
}else{
$('.show_invoice_details_germany').show('slow');
}
}
switch_invoice_details_germany();
$('input#switch_invoice_details_private').on('change', function () {
if($(this).is(':checked')){
$('.show_invoice_details_private').hide('slow');
}else{
$('.show_invoice_details_private').show('slow');
}
});
$('input#switch_invoice_details_germany').on('change', function () {
switch_invoice_details_germany();
});
// Shipping Address show|hide
$("#shipping_address_switch").bind("change", function() {

2
resources/views/web/promotion/_invoice_details_quick.blade.php
View file

@ -25,7 +25,7 @@
<label for="billing_state">Land / Region <span class="required">*</span></label>
<select id="billing_state" name="billing_state" class="form-control selectpicker"
data-style="btn-default" required>
{!! HTMLHelper::getCountriesForShipping(1) !!}
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId(), false, 2) !!}
</select>
</div>
</div>

14
resources/views/web/promotion/_promotion_cart.blade.php
View file

@ -32,15 +32,14 @@
<img src="{{ asset('/assets/images/1x1.png') }}" class="d-block ui-w-80 ui-bordered mr-4" alt="">
@endif
</div>
<div class="col-9 col-sm-10">
<div class="row">
<div class="col-12 col-sm-6 col-md-7 description">
<div class="media-body">
<div class="d-block text-body"
style="font-size: 15px; font-weight: 500;">{{ $row->name }}
style="">{{ $row->name }}
</div>
<div class="text-body">
<div class="text-body" style="font-size: 0.9em">
<div>Inhalt: {{ $product->contents }}</div>
<div>Art.-Nr.: {{ $product->number }}</div>
</div>
@ -53,7 +52,7 @@
data-product-id="{{ $product->id }}"><i
class="fa fa-times"></i> Artikel entfernen</a>
@else
gratis Produkt
gratis
@endif
</div>
</div>
@ -90,10 +89,13 @@
<div class="clearfix"></div>
</div>
</div>
<div class="mt-2 col-12">
<p class="small mb-2">Du hast {{ Yard::instance('shopping')->count() }} Artikel in Deinem Warenkorb</p>
<div class="mt-0 col-12">
<p class="small mt-0 mb-2">Du hast {{ Yard::instance('shopping')->count() }} Artikel in Deinem Warenkorb
<span class="float-right">* Preis inkl. gesetzl. MwSt. | zzgl. Versandkosten</span>
</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>
<p class="small mt-2 mb-2"></p>
<hr class="">
</div>
</div>

16
resources/views/web/promotion/_shipping.blade.php
View file

@ -13,20 +13,8 @@
</span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">0,00 &euro; - Ich hole die Ware bei {{ $promotion_user->user->getFullName() }} persönlich ab</span>
<span class="switcher-label">0,00 &euro; - Ich hole die Ware bei {{ $promotion_user->user->getFullName(false) }} persönlich ab (Abholadresse beachten)</span>
</label>
{{-- <label class="switcher switcher-success">
<input type="radio" class="switcher-input" name="switchers_shipping" data-error="#error-switchers_shipping" value="dhl_slow">
<span class="switcher-indicator">
<span class="switcher-yes">
<span class="ion ion-md-checkmark"></span>
</span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">3,50 &euro; - Bücher-/Warensendung mit Deutsche Post (4-6
Werktage)</span>
</label>
--}}
<label class="switcher switcher-success">
<input type="radio" class="switcher-input" name="switchers_shipping" data-error="#error-switchers_shipping" value="dhl_shipping"
@if($shipping_option === 'dhl_shipping') checked @endif>
@ -36,7 +24,7 @@
</span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">ab {{ \App\Services\PromotionCart::getLowestShippingPrice() }} &euro; - Versand mit DHL (1-3 Werktage)</span>
<span class="switcher-label"><span id="shipping_price_holder">{{ \App\Services\PromotionCart::getLowestShippingPrice() }}</span> &euro; - Versand mit DHL (1-3 Werktage)</span>
</label>
</div>
<div id="error-switchers_shipping" class="text-left"></div>

92
resources/views/web/promotion/_shop_products.blade.php
View file

@ -1,90 +1,20 @@
<section>
<h2 class="text-center mt-3">zusätzlich Einkaufen</h2>
<h2 class="text-center mt-3">Möchtest Du zusätzlich etwas einkaufen?</h2>
<p class="text-center">Vielleicht sagt Dir ja jetzt schon ein Produkt zu und Du nimmst es gleich mit ...</p>
<div class="swiper mySwiper">
<div class="swiper-wrapper">
@foreach ($shop_products as $product)
@php($cartItem = Yard::instance('shopping')->getCartItemByProduct($product->id, false, false))
@php($qty = isset($cartItem->qty) ? "x".$cartItem->qty : 0)
@php($rowId = isset($cartItem->rowId) ? $cartItem->rowId : '')
<div class="swiper-slide">
<div class="text-center">
@if ($product->images)
@if ($image = $product->images->first())
<img src="{{ route('product_image', [$image->slug]) }}" class="mb-2 img-fluid" alt="">
@endif
@endif
<h4 class="product-title px-4">
{{ $product->name }}
</h4>
<div class="mb-2 product-description px-4">
{{ $product->getShortCopy(true, 110) }}
</div>
<div class="more_details">
<a href="" class="" data-modal="modal-lg" data-toggle="modal"
data-target="#modals-load-content" data-id="{{ $product->id }}"
data-route="{{ route('web_promotion_modal_load') }}"
data-action="web-show-product" data-view="with-price">
<i class="fa fa-search"></i> Mehr Details</a>
</div>
<div class="product-item-price mt-2 mt-2">
{{ $product->getFormattedPrice() }} &euro;*
<br><span class="small text-muted">{{ $product->getBasePriceFormattedFull() }} &euro;</span>
</div>
<div class="mt-2 pb-3">
<button type="button" class="btn btn-primary btn-add-product-shop" data-product_id="{{ $product->id }}" data-row-id="{{ $cartItem->rowId }}">
In den Warenkorb &nbsp; <i class="ion ion-md-basket navbar-icon align-middle"></i>
<span class="badge badge-cart indicator" id="badge_cart_indicator_{{ $product->id }}">{{ $qty }}</span>
</button>
<div class="p-4"></div>
</div>
</div>
</div>
@endforeach
<div class="row justify-content-center">
<div class="form-group col-12 col-md-8 col-lg-6">
<select id="show_products_filter" name="show_products_filter" class="form-control selectpicker" data-style="btn-default">
{!! HTMLHelper::getCategoriesOptionsByShowOn([], 'Kategorie filtern', ['3']) !!}
</select>
</div>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
<div class="swiper-pagination"></div>
</div>
<div id="show_products_holder">
@include('web.promotion._shop_products_inner')
</div>
<div class="m2-4 text-center small">
* Preis inkl. gesetzl. MwSt. | zzgl. Versandkosten
<hr class="">
</div>
</section>
<script>
$(document).ready(function() {
var swiper = new Swiper(".mySwiper", {
slidesPerView: 1,
spaceBetween: 10,
pagination: {
el: ".swiper-pagination",
clickable: true,
},
navigation: {
nextEl: ".swiper-button-next",
prevEl: ".swiper-button-prev",
},
breakpoints: {
576: {
slidesPerView: 1,
spaceBetween: 10,
},
768: {
slidesPerView: 2,
spaceBetween: 20,
},
992: {
slidesPerView: 3,
spaceBetween: 20,
},
1200: {
slidesPerView: 3,
spaceBetween: 20,
},
},
});
});
</script>
</section>

82
resources/views/web/promotion/_shop_products_inner.blade.php Normal file
View file

@ -0,0 +1,82 @@
<div class="swiper mySwiper">
<div class="swiper-wrapper">
@foreach ($shop_products as $product)
@php($cartItem = Yard::instance('shopping')->getCartItemByProduct($product->id, false, false))
@php($qty = isset($cartItem->qty) ? "x".$cartItem->qty : 0)
@php($rowId = isset($cartItem->rowId) ? $cartItem->rowId : '')
<div class="swiper-slide">
<div class="text-center">
@if ($product->images)
@if ($image = $product->images->first())
<img src="{{ route('product_image', [$image->slug]) }}" class="mb-2 img-fluid" alt="">
@endif
@endif
<h4 class="product-title px-4">
{{ $product->name }}
</h4>
<div class="mb-2 product-description px-2">
{{ $product->getShortCopy(true, 110) }}
</div>
<div class="more_details">
<a href="" class="" data-modal="modal-lg" data-toggle="modal"
data-target="#modals-load-content" data-id="{{ $product->id }}"
data-route="{{ route('web_promotion_modal_load') }}"
data-action="web-show-product" data-view="with-price">
<i class="fa fa-search"></i> Mehr Details</a>
</div>
<div class="product-item-price mt-2 mt-2">
{{ $product->getFormattedPrice() }} &euro;*
<br><span class="small text-muted">{{ $product->getBasePriceFormattedFull() }} &euro;</span>
</div>
<div class="mt-2 pb-3">
<button type="button" class="btn btn-primary btn-add-product-shop" data-product_id="{{ $product->id }}" data-row-id="{{ $cartItem->rowId }}">
In den Warenkorb &nbsp; <i class="ion ion-md-basket navbar-icon align-middle"></i>
<span class="badge badge-cart indicator" id="badge_cart_indicator_{{ $product->id }}">{{ $qty }}</span>
</button>
<div class="p-2"></div>
</div>
</div>
</div>
@endforeach
</div>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
<div class="swiper-pagination"></div>
</div>
<script>
$(document).ready(function() {
var swiper = new Swiper(".mySwiper", {
slidesPerView: 1,
spaceBetween: 10,
pagination: {
el: ".swiper-pagination",
clickable: true,
},
navigation: {
nextEl: ".swiper-button-next",
prevEl: ".swiper-button-prev",
},
breakpoints: {
576: {
slidesPerView: 1,
spaceBetween: 10,
},
768: {
slidesPerView: 2,
spaceBetween: 20,
},
992: {
slidesPerView: 3,
spaceBetween: 20,
},
1200: {
slidesPerView: 3,
spaceBetween: 20,
},
},
});
});
</script>

58
resources/views/web/promotion/show_product.blade.php
View file

@ -1,14 +1,11 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
Produktdetails
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="modal-body p-2 p-md-4">
<div class="card mb-3">
<div class="media flex-wrap flex-md-nowrap">
<div class="d-block col-12 col-md-4 col-lg-4 text-center p-0 m-0">
@ -17,37 +14,36 @@
@endif
</div>
<div class="media-body p-4 p-md-5 ">
<h4 class="mb-2">
<a href="#" class="text-body">{{ $product->name }}</a>
</h4>
<div class="media-body py-4 px-3 px-md-4">
<h3 class="mb-2">
{{ $product->name }}
</h3>
{!! $product->copy !!}
<table class="table my-4">
<table class="table table-bordered table-stripe my-4">
<tbody>
<tr>
<td class="border-0 text-muted align-middle" style="width: 120px">Inhalt:</td>
<td class="border-0">{{ $product->contents }}</td>
<td class="align-middle" style="width: 120px">Inhalt:</td>
<td class="font-weight-bold">{{ $product->contents }}</td>
</tr>
<tr>
<td class="border-0 text-muted align-middle">Gewicht:</td>
<td class="border-0">{{ $product->weight }} g</td>
<td class="align-middle">Gewicht:</td>
<td class="font-weight-bold">{{ $product->weight }} g</td>
</tr>
<tr>
<td class="border-0 text-muted align-middle">Art.-Nr.:</td>
<td class="border-0">{{ $product->number }}</td>
<td class="align-middle">Art.-Nr.:</td>
<td class="font-weight-bold">{{ $product->number }}</td>
</tr>
@if(isset($data['view']) && $data['view'] === 'with-price')
<tr>
<td class="border-0 text-muted align-middle">Preis:</td>
<td class="border-0">{{ $product->getFormattedPrice() }} &euro;*</td>
<td class="align-middle">Preis:</td>
<td class="font-weight-bold">{{ $product->getFormattedPrice() }} &euro;*</td>
</tr>
<tr>
<td class="border-0 text-muted align-middle">Grundpreis:</td>
<td class="border-0">{{ $product->getBasePriceFormattedFull() }} &euro;</td>
<td class="align-middle">Grundpreis:</td>
<td class="font-weight-bold">{{ $product->getBasePriceFormattedFull() }} &euro;</td>
</tr>
<tr>
<td colspan="2" class="border-0 text-muted">* inkl. gesetzl. MwSt. | zzgl. Versandkosten</td>
<td colspan="2" class="">* inkl. gesetzl. MwSt. | zzgl. Versandkosten</td>
</tr>
@endif
@ -58,22 +54,21 @@
<div class="">
<ul class="nav nav-tabs tabs-alt justify-content-center border-0 px-4 px-lg-5">
<ul class="nav nav-tabs tabs-alt justify-content-center border-0 px-4 px-lg-5 mb-2">
<li class="nav-item">
<a class="nav-link small font-weight-normal text-expanded py-4 active" data-toggle="tab" href="#shop-product-description">Bechreibung</a>
<a class="nav-link small font-weight-normal text-expanded py-2 active" data-toggle="tab" href="#shop-product-description">Bechreibung</a>
</li>
<li class="nav-item">
<a class="nav-link small font-weight-normal text-expanded py-4" data-toggle="tab" href="#shop-product-usage">Anwendung</a>
<a class="nav-link small font-weight-normal text-expanded py-2" data-toggle="tab" href="#shop-product-usage">Anwendung</a>
</li>
<li class="nav-item">
<a class="nav-link small font-weight-normal text-expanded py-4" data-toggle="tab" href="#shop-product-full-ingredients">Inhaltsstoffe</a>
<a class="nav-link small font-weight-normal text-expanded py-2" data-toggle="tab" href="#shop-product-full-ingredients">Inhaltsstoffe</a>
</li>
<li class="nav-item">
<a class="nav-link small font-weight-normal text-expanded py-4" data-toggle="tab" href="#shop-product-ingredients">Hinweise</a>
<a class="nav-link small font-weight-normal text-expanded py-2" data-toggle="tab" href="#shop-product-ingredients">Hinweise</a>
</li>
</ul>
<hr class="m-0">
<div class="tab-content">
<div class="tab-pane fade show active" id="shop-product-description">
<div class="card borderless">
@ -92,8 +87,9 @@
</div>
<div class="tab-pane fade" id="shop-product-full-ingredients">
<div class="card borderless">
<div class="card-body">
<div class="card borderless no-border ">
<div class="card-body p-0">
<div class="table-responsive">
<table class="datatables-style table table-striped table-bordered">
<thead>
<tr>
@ -112,11 +108,11 @@
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="tab-pane fade" id="shop-product-ingredients">
<div class="card borderless">
<div class="card-body">
@ -128,7 +124,7 @@
</div>
</div>
</div>
<div class="modal-footer">
<div class="modal-footer p-2 p-md-4">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
</div>
</div>

6
resources/views/web/promotion/thanksreminder.blade.php
View file

@ -24,11 +24,13 @@
<div class="container flex-grow-1 container-p-y pb-0">
<div class="media align-items-center pt-3 mb-3">
{{-- <img src="assets/img/avatars/5-small.png" alt="" class="d-block ui-w-100 rounded-circle"> --}}
@if($promotion_user->user->hasProfileImage())
<img src="{{ route('response_file', ['user', $promotion_user->user->getProfileImage()]) }}" alt="" class="d-block ui-w-100 rounded-circle mt-3">
@endif
<div class="media-body ml-4">
<h1 class="text-center">Super, geschafft!</h1>
<p class="text-center">
Wir werden dich infomieren ....
Ich danke Dir, dass Du unseren Service nutzt, wir werden Dich infomieren wenn die Promotion wieder zur Verfügung steht.
</p>
<p class="text-center">Liebe Grüße,<br>{{ $promotion_user->user->getFullName() }}<br>Vertriebspartner:in der GRÜNEN SEELE Naturkosmetik</p>
</div>