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

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>