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

2
resources/views/admin/modal/add_credit.blade.php
View file

@ -33,7 +33,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary button-prevent-multiple-submits">{{__('Gutschrift hinzufügen')}}</button>
<button type="submit" class="btn btn-primary button-prevent-multiple-submits"><i class="spinner fa fa-spinner fa-spin"></i> {{__('Gutschrift hinzufügen')}}</button>
</div>
{!! Form::close() !!}

2
resources/views/admin/modal/add_pay_credit.blade.php
View file

@ -33,7 +33,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary button-prevent-multiple-submits">{{__('Einkaufsguthaben aufladen')}}</button>
<button type="submit" class="btn btn-primary button-prevent-multiple-submits"><i class="spinner fa fa-spinner fa-spin"></i> {{__('Einkaufsguthaben aufladen')}}</button>
</div>
{!! Form::close() !!}

2
resources/views/admin/payment/credit/index.blade.php
View file

@ -237,7 +237,7 @@
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="credit_number">{{ __('Gutschriftsnummer') }}</label>
{!! Form::text('credit_number', App\Services\Credit::getCreditNumber(), ['class'=>'form-control']) !!}
{!! Form::text('credit_number', App\Services\Credit::getCreditNumber(), ['class'=>'form-control', 'disabled']) !!}
<em> nächste Gutschriftsnummer <a href="{{ route('admin_settings') }}"><i class="fa fa-edit"></i></a></em>
</div>
<div class="form-group col-sm-12">

2
resources/views/admin/payment/invoice/index.blade.php
View file

@ -30,6 +30,7 @@
<th>{{__('Betrag') }}</th>
<th>{{__('Datum') }}</th>
<th>{{__('Status')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('Order')}}</th>
</tr>
</thead>
@ -63,6 +64,7 @@
{ data: 'total_shipping', name: 'total_shipping' },
{ data: 'created_at', name: 'shopping_orders.created_at' },
{ data: 'txaction', name: 'txaction', searchable: false },
{ data: 'payment_for', name: 'payment_for' },
{ data: 'shipping_order', name: 'shipping_order', orderable: false },
],
"bLengthChange": false,

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

@ -339,7 +339,6 @@
</div>
</div>
</div>
@if(Auth::user()->isSySAdmin())
<div class="card mb-2">
<h5 class="card-header">

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

@ -31,6 +31,14 @@
@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>
@if(false && Auth::user()->isSySAdmin())
<button type="button" class="btn btn-sm btn-danger" data-toggle="modal" data-target="#modals-invoice"
data-id="{{ $shopping_order->id }}"
data-back="{{url()->current()}}"
data-action="create_invoice">
<span class="far fa-file-invoice"></span> <strong>Rechnung überschreiben</strong>
</button>
@endif
@else
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-invoice"
data-id="{{ $shopping_order->id }}"
@ -41,6 +49,7 @@
<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>
@ -207,10 +216,10 @@
<div class="card-body">
<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 Vertriebspartner
@else
@if($shopping_order->shopping_user->is_for === 'ot')
Lieferadresse des Kunden
@else
Lieferadresse des Vertriebspartner
@endif
@endif
@if($shopping_order->shopping_user->is_from === 'wizard')
@ -220,63 +229,75 @@
Lieferadresse des Vertriebspartner
@endif
@if($shopping_order->shopping_user->is_from === 'shopping')
Lieferadresse des Kunden
@if($shopping_order->isPickUp())
Kunde holt die Ware persönlich ab
@else
Lieferadresse des Kunden
@endif
@endif
</h6>
@if($shopping_order->shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
<div class="row">
@if($shopping_order->shopping_user->shipping_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
{{ $shopping_order->shopping_user->shipping_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->shopping_user->shipping_salutation) }}
@if($shopping_order->isPickUp())
@if($shopping_order->promotion_user)
{!! nl2br($shopping_order->promotion_user->user_address) !!}
@endif
@else
@if($shopping_order->shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
<div class="row">
@if($shopping_order->shopping_user->shipping_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
{{ $shopping_order->shopping_user->shipping_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->shopping_user->shipping_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
{{ $shopping_order->shopping_user->shipping_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
{{ $shopping_order->shopping_user->shipping_lastname }}
</div>
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
{{ $shopping_order->shopping_user->shipping_firstname }}
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
{{ $shopping_order->shopping_user->shipping_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
{{ $shopping_order->shopping_user->shipping_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
{{ $shopping_order->shopping_user->shipping_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
{{ $shopping_order->shopping_user->shipping_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">E-Mail</div>
{{ $shopping_order->shopping_user->shipping_email }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
{{ $shopping_order->shopping_user->shipping_phone }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
{{ $shopping_order->shopping_user->shipping_country->getLocated() }}
</div>
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
{{ $shopping_order->shopping_user->shipping_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
{{ $shopping_order->shopping_user->shipping_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
{{ $shopping_order->shopping_user->shipping_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
{{ $shopping_order->shopping_user->shipping_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
{{ $shopping_order->shopping_user->shipping_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">E-Mail</div>
{{ $shopping_order->shopping_user->shipping_email }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
{{ $shopping_order->shopping_user->shipping_phone }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
{{ $shopping_order->shopping_user->shipping_country->getLocated() }}
</div>
</div>
@endif
@endif
</div>
@endif
@ -287,10 +308,10 @@
<div class="card-body">
<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 Vertriebspartner</strong>
@else
@if($shopping_order->shopping_user->is_for === 'ot')
<strong>Bestellung für Kunde</strong>
@else
<strong>Bestellung für Vertriebspartner</strong>
@endif
@endif
@if($shopping_order->shopping_user->is_from === 'wizard')
@ -300,7 +321,7 @@
<strong>Vertriebspartnerbestellung für Mitgliedschaft</strong>
@endif
@if($shopping_order->shopping_user->is_from === 'shopping')
@if($shopping_order->payment_for === 4)
@if($shopping_order->payment_for === 7)
<strong>Kundenbestellung über Promotion</strong>
@if($shopping_order->promotion_user)
<br>{{ $shopping_order->promotion_user->name }} || {{ $shopping_order->promotion_user->user->getFullName() }}
@ -624,7 +645,7 @@
</div>
<div class="modal fade" id="modals-invoice">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_sales_invoice') }}" method="post">
<form class="modal-content form-prevent-multiple-submits" 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">
@ -643,7 +664,7 @@
</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']) !!}
{!! Form::text('invoice_number', App\Services\Invoice::getInvoiceNumber(), ['class'=>'form-control', 'disabled']) !!}
<em> nächste Rechnungsnummer <a href="{{ route('admin_settings') }}"><i class="fa fa-edit"></i></a></em>
</div>
<div class="form-group col-sm-12">
@ -655,7 +676,7 @@
</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>
<button type="submit" class="btn btn-primary button-prevent-multiple-submits"><i class="spinner fa fa-spinner fa-spin"></i> {{__('save')}}</button>
</div>
</form>
</div>
@ -681,7 +702,7 @@
</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>
<button type="submit" class="btn btn-primary button-prevent-multiple-submits"><i class="spinner fa fa-spinner fa-spin"></i> {{__('save')}}</button>
</div>
</form>
</div>

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

@ -80,7 +80,7 @@
{ data: 'payment', name: 'payment', orderable: false },
{ data: 'txaction', name: 'txaction' },
{ data: 'shipped', name: 'shipped' },
{ data: 'is_for', name: 'is_for' },
{ data: 'payment_for', name: 'payment_for' },
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },

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

@ -27,7 +27,6 @@
<th>B.{{__('First name')}}</th>
<th>B.{{__('Last name')}}</th>
<th>B.{{__('E-Mail')}}</th>
<th>{{__('Rf-Nr.')}}</th>
<th>{{__('Käufe')}}</th>
</tr>
@ -49,7 +48,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 },

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

@ -100,6 +100,21 @@
</div>
</div>
<div class="card mb-2">
<div class="card-body">
<h4>Promotion</h4>
<div class="form-row">
<div class="form-group col-sm-12">
<div class="form-group col-sm-12">
<label class="form-label">{{ __('Gespeerte Namen für die URLs, mit Komma trennen.') }}</label>
{!! Form::textarea('settings[promotion_user_url_profanity][val]', \App\Models\Setting::getContentBySlug('promotion_user_url_profanity'), array('class'=>'form-control', 'rows'=>3)) !!}
{{ Form::hidden('settings[promotion_user_url_profanity][type]', 'full_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>
{!! Form::close() !!}
@endsection