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

Work to invoice

Browse source
This commit is contained in:
Kevin Adametz 2021-02-10 10:42:24 +01:00
parent 224bf9e951
commit 02e78e7255
101 changed files with 23483 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

201
resources/lang/de.json
View file

File diff suppressed because one or more lines are too long

7
resources/lang/de/navigation.php
View file

@ -11,8 +11,8 @@ return [
'my_clients' => 'Meine Kunden',
'my_orders' => 'Meine Bestellungen',
'my_homeparty' => 'Meine Homeparty',
'member_register' => 'Berater registrieren',
'member'=>'Berater',
'member_register' => 'Vertriebspartner registrieren',
'member'=>'Vertriebspartner',
'membership' => 'Mitgliedschaft',
'my_membership' => 'Meine Mitgliedschaft',
'orders'=>'Bestellungen',
@ -38,5 +38,6 @@ return [
'user_level' => 'Rollen',
'countries'=>'Länder',
'logout'=>'Logout',
'system_settings' => 'Systemeinstellungen'
'system_settings' => 'Systemeinstellungen',
'new_register' => 'neu registrieren'
];

4
resources/lang/de/validation.php
View file

@ -210,6 +210,8 @@ return [
'has_customer_buyed' => 'Die Angabe',
'billing_country_code' => 'Land Code',
'sales_partnership' => 'Vertriebspartnerschaft',
'sales_partnership_message' => 'Vertriebspartnerschaft Hinweis'
'sales_partnership_message' => 'Vertriebspartnerschaft Hinweis',
'tax_number' => 'Steuernummer',
'tax_identification_number' => 'USt-ID Nummer'
],
];

2
resources/views/admin/lead/index.blade.php
View file

@ -18,6 +18,7 @@
<tr>
<th>#</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Firma')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname')}}</th>
<th>{{__('Level')}}</th>
@ -52,6 +53,7 @@ $( document ).ready(function() {
"columns": [
{data: 'id', searchable: false},
{ data: 'email', name: 'email' },
{ data: 'company', name: 'account.company' },
{ data: 'first_name', name: 'account.first_name' },
{ data: 'last_name', name: 'account.last_name' },
{ data: 'user_level', name: 'user_level' },

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

@ -25,10 +25,6 @@
<table class="table my-4">
<tbody>
<tr>
<td class="border-0 text-muted align-middle" style="width: 110px">Points:</td>
<td class="border-0">{{ $product->points }}</td>
</tr>
<tr>
<td class="border-0 text-muted align-middle" style="width: 110px">Inhalt:</td>
<td class="border-0">{{ $product->contents }}</td>
@ -79,7 +75,10 @@
<a class="nav-link small font-weight-normal text-expanded py-4" 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-ingredients">Inhaltsstoffe</a>
<a class="nav-link small font-weight-normal text-expanded py-4" 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>
</li>
</ul>
<hr class="m-0">
@ -100,6 +99,33 @@
</div>
</div>
</div>
<div class="tab-pane fade" id="shop-product-full-ingredients">
<div class="card borderless">
<div class="card-body">
<table class="datatables-style table table-striped table-bordered">
<thead>
<tr>
<th>{{__('Name')}}</th>
<th>{{__('INCI')}}</th>
<th>{{__('Wirkung') }}</th>
</tr>
</thead>
<tbody>
@foreach($product->p_ingredients as $ingredient)
<tr>
<td>{{ $ingredient->name }}</td>
<td>{{ $ingredient->inci }}</td>
<td>{{ $ingredient->effect }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
<div class="tab-pane fade" id="shop-product-ingredients">
<div class="card borderless">
<div class="card-body">

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

@ -3,15 +3,14 @@
<!-- Status -->
<div class="card-body">
<div class="row">
<div class="col-md-6 mb-1">
<div class="col-md-4 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">
<div class="col-md-4 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 }}"
@ -26,6 +25,29 @@
</span>
@endif
</div>
<div class="col-md-4 mb-1">
<strong class="mr-2">Rechnung:</strong>
@if($isAdmin)
@if(App\Services\Invoice::isInvoice($shopping_order))
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice', 'download']) }}" class="btn btn-primary btn-sm"><i class="fa fa-download"></i></a>
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice', 'stream']) }}" target="_blank" class="btn btn-warning btn-sm"><i class="fa fa-eye"></i></a>
@else
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-invoice"
data-id="{{ $shopping_order->id }}"
//TODO
// data-invoice="{{ $shopping_order->invoice_status }}"
data-back="{{url()->current()}}"
data-action="create_invoice">
<span class="far fa-file-invoice"></span> <strong>Rechnung erstellen</strong>
</button>
@endif
@else
@if(App\Services\Invoice::isInvoice($shopping_order))
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice', 'download']) }}" class="btn btn-primary btn-sm"><i class="fa fa-download"></i></a>
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice', 'stream']) }}" target="_blank" class="btn btn-warning btn-sm"><i class="fa fa-eye"></i></a>
@endif
@endif
</div>
</div>
</div>
@ -587,7 +609,6 @@
<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>
@ -596,7 +617,38 @@
</form>
</div>
</div>
<div class="modal fade" id="modals-invoice">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_sales_invoice') }}" method="post">
@csrf
<input type="hidden" name="id" value="{{$shopping_order->id}}">
<input type="hidden" name="action" value="create_invoice">
<input type="hidden" name="back" value="{{url()->current()}}">
<div class="modal-header">
<h5 class="modal-title">{{__('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">
{{ Form::select('invoice_option', ['create'=>'Rechnung erstellen'], false, array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="invoice_date">{{ __('Rechnungsdatum') }}</label>
{!! Form::text('invoice_date', $shopping_order->created_at->format("d.m.Y"), ['class'=>'form-control datepicker-base']) !!}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="invoice_number">{{ __('Rechnungsnummer') }}</label>
{!! Form::text('invoice_number', App\Services\Invoice::getInvoiceNumber(), ['class'=>'form-control']) !!}
<em> nächste Rechnungsnummer <a href="{{ route('admin_settings') }}"><i class="fa fa-edit"></i></a></em>
</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>
<div class="modal fade" id="modals-txaction">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
@ -615,7 +667,6 @@
<label class="form-label" for="txaction">{{ __('Zahlung') }}</label>
{{ Form::select('txaction', \App\Services\Payment::$txaction_invoice, 'open', 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>

25
resources/views/admin/settings/index.blade.php
View file

@ -10,36 +10,41 @@
<div class="card-body">
<h4>Vorkasse Infos</h4>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('Kontoinhaber') }}*</label>
<label class="form-label">{{ __('Kontoinhaber') }}*</label>
{{ Form::text('settings[prepayment-account-owner][val]', \App\Models\Setting::getContentBySlug('prepayment-account-owner'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-account-owner][type]', 'text') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('IBAN') }}*</label>
<label class="form-label">{{ __('IBAN') }}*</label>
{{ Form::text('settings[prepayment-iban][val]', \App\Models\Setting::getContentBySlug('prepayment-iban'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-iban][type]', 'text') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('BIC') }}*</label>
<label class="form-label">{{ __('BIC') }}*</label>
{{ Form::text('settings[prepayment-bic][val]', \App\Models\Setting::getContentBySlug('prepayment-bic'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-bic][type]', 'text') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('Bank') }}*</label>
<label class="form-label">{{ __('Bank') }}*</label>
{{ Form::text('settings[prepayment-bank][val]', \App\Models\Setting::getContentBySlug('prepayment-bank'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-bank][type]', 'text') }}
</div>
</div>
<button type="submit" name="action" value="save_prepayment" class="btn btn-primary btn-sm mb-2"><i class="ion ion-ios-save"></i> speichern</button>
</div>
</div>
{{--
<div class="card mb-2">
<div class="card-body">
<h4>Rechnungen Einstellungen</h4>
<div class="form-row">
<div class="form-group col-sm-12">
{{ Form::textarea('settings[prepayment-info][val]', \App\Models\Setting::getContentBySlug('prepayment-info'), array('placeholder'=>__('Inhalt zur Vorkasse'), 'class'=>'form-control summernote-small', 'rows'=>10)) }}
{{ Form::hidden('settings[prepayment-info][type]', 'full_text') }}
<label class="form-label">{{ __('nächste Rechnungsnummer') }}*</label>
{{ Form::text('settings[invoice-number][val]', \App\Models\Setting::getContentBySlug('invoice-number'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[invoice-number][type]', 'int') }}
</div>
--}}
</div>
<button type="submit" name="action" value="save_prepayment" class="btn btn-primary btn-sm mb-2"><i class="ion ion-ios-save"></i> speichern</button>
</div>

1
resources/views/dashboard.blade.php
View file

@ -79,7 +79,6 @@
<hr>
@endif
<p>{{__('membership.home_copy_last_31', ['days'=>$user->daysActiveAccount()])}}</p>
@endif
</div>
<div class="card-footer py-3">

7
resources/views/layouts/includes/layout-navbar.blade.php
View file

@ -1,6 +1,4 @@
<nav class="layout-navbar navbar navbar-expand-lg align-items-lg-center bg-navbar-theme container-p-x" id="layout-navbar">
@empty($hide_layout_sidenav_toggle)
<!-- Sidenav toggle -->
<div class="layout-sidenav-toggle navbar-nav align-items-lg-center mr-auto mr-lg-4">
@ -14,16 +12,17 @@
<a href="/"><img src="{{ asset('/images/gruene-seele-logo.jpg') }}" alt="gruene-seele-logo" class="" style="width: 100px;"></a>
<!-- Navbar toggle -->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#layout-navbar-collapse">
{{-- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#layout-navbar-collapse">
<span class="navbar-toggler-icon"></span>
</button>
--}}
<div class="navbar-nav align-items-lg-center ml-auto">
<div class="demo-navbar-messages nav-item dropdown mr-lg-3">
<div class="demo-navbar-user nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">
<span class="d-inline-flex flex-lg-row-reverse align-items-center align-middle">
<span class="px-1 ml-2 ml-lg-0">{{ Auth::user()->email }}</span>
<span class="px-1 ml-2 ml-lg-0"> Guthaben <strong>{{ Auth::user()->getFormattedPaymentCredit() }} &euro;</strong> |<br class="d-sm-none"> {{ Auth::user()->email }}</span>
</span>
</a>
<div class="dropdown-menu dropdown-menu-right">

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

@ -28,31 +28,15 @@
</li>
</ul>
</li>
{{-- <li class="sidenav-item @if(Request::is('user/shop', 'user/shop/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-basket"></i>
<div>{{ __('navigation.my_shop') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('user/shop') ? ' active' : '' }}">
<a href="{{ route('user_shop') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cog"></i><div>{{ __('navigation.settings') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('user/shop/orders', 'user/shop/order/*') ? ' active' : '' }}">
<a href="{{ route('user_shop_orders') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cart"></i><div>{{ __('navigation.orders') }}</div></a>
</li>
</ul>
</li>
--}}
@if(Auth::user()->isActiveAccount())
<li class="sidenav-item @if(Request::is('user/team/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-people"></i>
<div>{{ __('navigation.my_team') }}</div>
<div>{{ __('navigation.member') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('user/team/members') ? ' active' : '' }}">
<a href="{{ route('user_team_members') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-person-add"></i><div>{{ __('navigation.member') }}</div></a>
<a href="{{ route('user_team_members') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-person-add"></i><div>{{ __('navigation.new_register') }}</div></a>
</li>
</ul>
</li>

463
resources/views/pdf/invoice.blade.php Normal file
View file

@ -0,0 +1,463 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>partner.gruene-seele.bio</title>
<style>
/* roboto-300 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url('fonts/roboto-v20-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
}
/* roboto-regular - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('fonts/roboto-v20-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
}
/* roboto-500 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src: url('fonts/roboto-v20-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
}
/* roboto-700 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: url('fonts/roboto-v20-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
}
html {
width: 100%;
height: 100%;
}
body {
position: relative;
width: 100%;
height: 100%;
margin: 0 auto;
padding: 0;
color: #000;
background: #fff;
font-family: 'Roboto', sans-serif;
font-size: 8pt;
font-weight: 400 ;
}
table {
border: none;
}
strong {
font-weight: bold !important;
}
@page {
margin: 0px;
}
@page {
margin-top: 0px;
}
@page {
margin: 75mm 0 40mm 0;
}
.font-weight-bold {
font-weight: bold !important;
}
#address_box {
position: absolute;
top:-30mm;
left: 15mm;
width: 100mm;
height: 45mm;
z-index: 1;
font-size: 8pt;
line-height: 9pt;
letter-spacing: 0.05em;
}
#address_box_top {
font-size: 7pt;
color:#858585;
}
#title_box {
position: absolute;
top:0mm;
left: 15mm;
width: 180mm;
height: 10mm;
z-index: 2;
text-align: center;
}
#title_box .title {
font-size: 15pt;
line-height: 12pt;
}
#title_box .subtitle {
font-size: 9pt;
line-height: 9pt;
}
#detail_box_left {
position: absolute;
top:8mm;
left: 15mm;
width: 90mm;
height: 15mm;
z-index: 3;
font-size: 8pt;
}
#detail_box_right {
position: absolute;
top:8mm;
left: 105mm;
width: 90mm;
height: 15mm;
z-index: 4;
font-size: 8pt;
}
#detail_box_left table, #detail_box_right table {
width: 100%;
line-height: 9pt;
}
#detail_box_left table td {
text-align: left;
}
#detail_box_right table td {
text-align: right;
}
#invoice_box {
position: relative;
padding-top: 20mm;
margin-left: 15mm;
width: 180mm;
font-size: 8pt;
line-height: 8pt;
}
#invoice_box table {
width: 100%;
border-collapse: collapse;
}
#invoice_box table tr {
page-break-after: avoid;
}
#invoice_box table tr td {
vertical-align: top;
padding-top: 2mm;
padding-bottom: 2mm;
padding-left: 1.5mm;
padding-right: 1.5mm;
border-top: 0.5pt dotted #1a1a18;
}
#invoice_box table tfoot tr td {
border-top: none;
}
#invoice_box table tfoot tr.fullline td {
border-top: 0.3pt solid #575755;
}
#invoice_box table tfoot tr.fullline td.no-border {
border-top: none;
}
#invoice_box table tfoot tr td {
padding-top: 1.2mm;
padding-bottom: 1.2mm;
}
#invoice_box table td.small {
width: 1%;
white-space: nowrap;
}
#invoice_box table tr th {
line-height: 12pt;
padding-bottom: 1mm;
padding-left: 1mm;
padding-right: 1mm;
background-color: rgb(212, 212, 212);
}
#invoice_box table td .title {
font-size: 10pt;
}
#invoice_box table td .description {
padding-top: 1mm;
font-size: 9pt;
}
#invoice_box table td .price_net {
padding-top: 1mm;
font-size: 10pt;
padding-bottom: 1mm;
}
#invoice_box table td .price_tax {
padding-top: 0.7mm;
padding-bottom: 0.7mm;
}
#invoice_box table td .price_total {
padding-top: 2mm;
font-size: 11pt;
}
.singel-line-top {
border-top: 1pt solid #1a1a18;
}
.double-line {
border-bottom: 2.5pt double #1a1a18;
}
.dotted-line {
border-bottom: 0.8pt dotted #1a1a18;
}
#footer_box {
position: relative;
top:0mm;
left: 15mm;
width: 180mm;
height: 20mm;
z-index: 6;
font-size: 8pt;
line-height: 8pt;
}
.text-right {
text-align: right;
}
.text-left {
text-align: left;
}
.text-center {
text-align: center;
}
</style>
</head>
<body>
<div id="address_box">
<div id="address_box_top">GÜNE SEELE • Hauptstr. 174 • 51143 Köln</div>
@if($shopping_order->shopping_user->billing_company)
{{ $shopping_order->shopping_user->billing_company }}<br>
@endif
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->shopping_user->billing_salutation) }}
{{ $shopping_order->shopping_user->billing_firstname }} {{ $shopping_order->shopping_user->billing_lastname }}<br>
{{ $shopping_order->shopping_user->billing_address }}<br>
@if($shopping_order->shopping_user->billing_address_2)
{{ $shopping_order->shopping_user->billing_address_2 }}<br>
@endif
{{ $shopping_order->shopping_user->billing_zipcode }} {{ $shopping_order->shopping_user->billing_city }}<br>
{{ $shopping_order->shopping_user->billing_country->getLocated() }}
</div>
<div id="title_box">
<div class="title">RECHNUNG</div>
{{-- @if($cancellation)
<div class="subtitle">{{ $invoice->invoice_name }}</div>
@endif--}}
</div>
<div id="detail_box_left">
<table>
<tr>
<td>
{{ __('Rechnungsnummer') }}: {{ $invoice_number }}
</td>
</tr>
<tr>
<td>
{{ __('Bestellnummer') }}: {{ $shopping_order->getLastShoppingPayment('reference') }}
</td>
</tr>
</table>
</div>
<div id="detail_box_right">
<table>
<tr>
<td>
{{ __('Datum') }}: {{ $invoice_date }}
</td>
</tr>
</table>
</div>
<div id="invoice_box">
<table>
<thead>
<tr>
<th class="text-left" style="width: 50%">Bezeichnung</th>
<th class="text-center" style="width: 15%">Anzahl</th>
<th class="text-center" style="width: 20%">
@if($shopping_order->shopping_user->is_from === 'user_order')
Netto-Preis
@else
Preis
@endif
</th>
<th class="text-right" style="width: 15%">Summe</th>
</tr>
</thead>
<tbody>
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
<tr class="item">
<td class="small text-left">
{{ $shopping_order_item->product->name }}
</td>
<td class="text-center small">
{{ $shopping_order_item->qty }}
</td>
<td class="small text-center">
@if($shopping_order->shopping_user->is_from === 'user_order')
{{ $shopping_order_item->getFormattedPriceNet() }} &euro;
@else
{{ $shopping_order_item->getFormattedPrice() }} &euro;
@endif
</td>
<td class="text-right small">
@if($shopping_order->shopping_user->is_from === 'user_order')
{{ $shopping_order_item->getFormattedTotalPriceNet() }} &euro;
@else
{{ $shopping_order_item->getFormattedTotalPrice() }} &euro;
@endif
</td>
</tr>
@endforeach
</tbody>
<tfoot>
@if($shopping_order->shopping_user->is_from === 'user_order')
<tr class="fullline">
<td class="text-right" colspan="3">
Zwischensumme
</td>
<td class="text-right">
{{ $shopping_order->getFormattedSubtotalFull() }} &euro;*
</td>
</tr>
<tr class="">
<td class="text-right no-border">&nbsp;</td>
<td class="text-right" colspan="2">
Handelspanne
</td>
<td class="text-right">
- {{ $shopping_order->getFormattedDiscount() }} &euro;*
</td>
</tr>
<tr class="">
<td class="text-right no-border">&nbsp;</td>
<td class="text-right" colspan="2">
<strong>Summe (Netto)</strong>
</td>
<td class="text-right">
<strong>{{ $shopping_order->getFormattedSubtotal() }} &euro;*</strong>
</td>
</tr>
@endif
<tr class="fullline">
<td class="text-right no-border">&nbsp;</td>
<td class="text-right" colspan="2">
{{__('email.checkout_mail_shipping')}}
</td>
<td class="text-right">
@if($shopping_order->shopping_user->is_from === 'user_order')
{{ $shopping_order->getFormattedShippingNet() }} &euro;*
@else
{{ $shopping_order->getFormattedShipping() }} &euro;
@endif
</td>
</tr>
<tr class="fullline">
<td class="text-right no-border">&nbsp;</td>
<td class="text-right" colspan="2">
{{__('email.checkout_mail_subtotal_ws')}}
</td>
<td class="text-right">
{{ $shopping_order->getFormattedSubtotalShipping() }} &euro;*
</td>
</tr>
<tr class="">
<td class="text-right no-border">&nbsp;</td>
<td class="text-right" colspan="2">
{{__('email.checkout_mail_tax')}}
</td>
<td class="text-right">
{{ $shopping_order->getFormattedTax() }} &euro;
</td>
</tr>
@if($shopping_order->shopping_user->is_from === 'user_order' && $shopping_order->payment_credit > 0)
<tr class="fullline">
<td class="text-right no-border">&nbsp;</td>
<td class="text-right" colspan="2">
<b> Summe (Brutto):</b>
</td>
<td class="text-right">
<b> {{ $shopping_order->getFormattedTotalWithoutCredit() }} &euro;</b>
</td>
</tr>
<tr class="border-bottom">
<td class="text-right no-border">&nbsp;</td>
<td class="text-right" colspan="2">
aus Guthaben (Brutto):
</td>
<td class="text-right">
{{ $shopping_order->getFormattedPaymentCredit() }} &euro;
</td>
</tr>
@endif
<tr class="fullline">
<td class="text-right no-border">&nbsp;</td>
<td class="text-right" colspan="2">
<b>Gesamtsumme (Brutto):</b>
</td>
<td class="text-right">
<b>{{ $shopping_order->getFormattedTotalShipping() }} &euro;</b>
<br>
<span style="font-size: 0.9em"><em>* Nettobeträge</em></span>
</td>
</tr>
</tfoot>
</table>
</div>
<div id="footer_box">
<div class="text">
<p>Status der Rechnung: {{ App\Services\Payment::getFormattedTxaction($shopping_order->txaction) }}<br>
Zahlungsart: {{ $shopping_order->getLastShoppingPayment('getPaymentType') }}</p>
<p>Bei Kauf auf Rechnung / Vorauskasse, bitte den Gesamtbetrag innerhalb von 5 Werktagen auf unten stehendes Konto überweisen. Verwendungszweck: {{ $shopping_order->getLastShoppingPayment('reference') }}</p>
</div>
</div>
</body>
</html>

4
resources/views/user/checkout/checkout.blade.php
View file

@ -842,16 +842,14 @@
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input {{ ($errors->has('accepted_data_checkbox') ? 'has-error' : '') }}" name="accepted_data_checkbox" id="accepted_data_checkbox" required>
<span class="custom-control-label small">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.*</span>
<span class="custom-control-label small">Mit Klick auf "Jetzt kaufen" akzeptiere ich die <a href="https://www.gruene-seele.bio/vp-agb/" target="_blank" class="text-secondary">Allgemeinen Geschäftsbedingungen</a> und die <a href="https://www.gruene-seele.bio/datenschutzerklaerung/" target="_bank" class="text-secondary">Datenschutzbelehrung</a>, damit für die Bestellung meine Daten verarbeitet werden können.*</span>
</label>
</div>
<button type="submit" class="btn btn-primary btn-lg btn-block size-18 btn-text-500 mt-4 faa-parent animated-hover"><i class="fa fa-mail-forward faa-horizontal"></i> Jetzt kaufen</button>
<hr>
<p class="text-center" style="line-height: 1.2em;"><em class="small text-center"> <i class="fa fa-lock"></i> Sind alle Deine Angaben vollsätndig ausgefüllt, klicke auf "Jetzt kaufen" und Du wist zu unserem Zahlungsanbieter weitergeleitet, die Verbindung wird ist SSL verschlüsselt.</em></p>
</div>
</div>
</div>
<!-- /COL -->

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

@ -77,13 +77,13 @@
<tr>
<th>{{__('Bild')}}</th>
<th>{{__('Produkt')}}</th>
<th>{{__('Kategorie')}}</th>
<th>{{__('Preis netto')}}</th>
<th>{{__('Preis brutto')}}</th>
<th>{{__('Provision')}}</th>
<th>{{__('Gewicht')}}</th>
<th><span class="no-line-break">{{__('Inhalt (ml)')}}</span></th>
<th>{{__('Artikelnummer')}}</th>
<th>#</th>
</tr>
</thead>
<tbody>
@ -150,13 +150,13 @@
"columns": [
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'product', name: 'product' },
{ data: 'category', name: 'category', orderable: true },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },
{ data: 'price_gross', name: 'price_gross', searchable: false, orderable: false },
{ data: 'single_commission', name: 'single_commission', searchable: false },
{ data: 'weight', name: 'weight', searchable: false },
{ data: 'contents_total', name: 'contents_total', searchable: false },
{ data: 'number', name: 'number' },
{ data: 'action', name: 'action', searchable: false, orderable: false },
],
"bLengthChange": false,
"iDisplayLength": 1000,

5
resources/views/user/team/members.blade.php
View file

@ -16,13 +16,12 @@
</div>
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.my_team') }}
{{ __('navigation.member') }} / {{ __('navigation.new_register') }}
</h4>
<div class="card">
<h5 class="card-header">Vertriebspartner registrieren</h5>
<div class="row no-gutters row-bordered">
<div class="col-md-12 p-4">
<h6 class="mb-4">Link für Vertriebspartnerregistrierung</h6>
<h6 class="mb-4">Link für Vertriebspartner-Registrierung</h6>
<div class="form-group">
<div class="input-group">
<span class="input-group-prepend">

47
resources/views/user/user_form.blade.php
View file

@ -17,8 +17,8 @@
<div class="col-12 col-lg-6">
<div class="form-row">
<div class="form-group col-md-12">
<label for="company" class="form-label">{{ __('Company name') }} (optional)</label>
{{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'tabindex' => 1)) }}
<label for="company" class="form-label">{{ __('Company name') }}*</label>
{{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'required'=>true, 'tabindex' => 1)) }}
</div>
</div>
<div class="form-row">
@ -94,7 +94,7 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<div class="form-group col-md-12 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Country') }}*</label>
<select class="selectpicker" name="country_id" id="country_id" data-style="btn-light" data-live-search="true" required tabindex="9">
{!! HTMLHelper::getContriesWithMore($user->account->country_id) !!}
@ -105,10 +105,6 @@
</span>
@endif
</div>
<div class="form-group col-md-6">
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}*</label>
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>true, 'class'=>'form-control datepicker-birthday')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
@ -140,7 +136,28 @@
<div class="badge badge-warning">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="birthday_day" class="form-label">{{ __('Geburtsdatum') }}*</label>
<select class="selectpicker" name="birthday_day" id="birthday_day" data-style="btn-light" data-live-search="false" required>
{!! HTMLHelper::getCustomListOf('day', $user->getBirthdayFormat('d')) !!}
</select>
</div>
<div class="form-group col-md-4">
<label for="birthday_month" class="form-label">&nbsp;</label>
<select class="selectpicker" name="birthday_month" id="birthday_month" data-style="btn-light" data-live-search="false" required>
{!! HTMLHelper::getCustomListOf('month', $user->getBirthdayFormat('m')) !!}
</select>
</div>
<div class="form-group col-md-4">
<label for="birthday_year" class="form-label">&nbsp;</label>
<select class="selectpicker" name="birthday_year" id="birthday_year" data-style="btn-light" data-live-search="false" required>
{!! HTMLHelper::getCustomListOf('year', $user->getBirthdayFormat('Y')) !!}
</select>
</div>
</div>
</div>
<div class="col-12 col-lg-6">
@ -321,9 +338,17 @@
</div>
<div class="form-group col-md-6">
<label class="form-label" for="tax_identification_number">{{ __('USt-ID Nummer') }} @if($user->account->getCountryAttrAs('tax_id_number'))* @endif</label>
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }}
{{ Form::text('tax_identification_number', $user->account->tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }}
</div>
</div>
<div class="row">
<div class="form-group col-md-12">
@if($errors->has('tax_number') || $errors->has('tax_identification_number'))
<div class="alert badge-danger block p-2">Bitte {{ __('Steuernummer') }} und/oder {{ __('USt-ID Nummer') }} angeben!*</div>
@else
<div class="badge badge-warning">Bitte {{ __('Steuernummer') }} und/oder {{ __('USt-ID Nummer') }} angeben!*</div>
@endif
</div>
</div>
</div>
@ -430,10 +455,6 @@
city : {
required: "{{__('This field is required.')}}",
},
birthday : {
required: "{{__('This field is required.')}}",
},
equalTo : "{{__('Please enter the same value again.')}}",
'email-confirm' : {
equalTo : "{{__('Please enter the same value again.')}}",

6
resources/views/user/user_new_form.blade.php
View file

@ -88,7 +88,7 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<div class="form-group col-md-12 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Country') }}*</label>
<select class="selectpicker" name="country_id" id="country_id" data-style="btn-light" data-live-search="true" required tabindex="9">
{!! HTMLHelper::getContriesWithMore($user->account->country_id) !!}
@ -99,10 +99,6 @@
</span>
@endif
</div>
<div class="form-group col-md-6">
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}</label>
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'class'=>'form-control datepicker-birthday')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">