Update Framework, Invoices
This commit is contained in:
Kevin Adametz
parent
cc5c147c27
commit
9b0b5feb7e
174 changed files with 28356 additions and 8093 deletions
|
|
@ -3,13 +3,13 @@
|
|||
<!-- Status -->
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-md-6 mb-1">
|
||||
<div class="col-md-3 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-3 mb-1">
|
||||
<strong class="mr-2">Versand:</strong>
|
||||
|
||||
@if($isAdmin)
|
||||
|
|
@ -26,6 +26,54 @@
|
|||
</span>
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-3 mb-1">
|
||||
<strong class="mr-2">Rechnung:</strong>
|
||||
@if($isAdmin)
|
||||
@if($shopping_order->isInvoice())
|
||||
<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(Auth::user()->isSySAdmin())
|
||||
<button type="button" class="btn btn-sm btn-info" 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="fa fa-file"></span>
|
||||
</button>
|
||||
@endif
|
||||
@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="fa fa-file"></span> <strong>Rechnung erstellen</strong>
|
||||
</button>
|
||||
--}}
|
||||
@endif
|
||||
@else
|
||||
@if($shopping_order->isInvoice())
|
||||
<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
|
||||
@if($shopping_order->txaction === 'extern' && $shopping_order->wp_invoice_path)
|
||||
<a href="{{$shopping_order->wp_invoice_path}}" class="btn btn-secondary btn-sm"><i class="fa fa-external-link-alt"></i> <i class="fa fa-download"></i></a>
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-3 mb-1">
|
||||
|
||||
@if($isAdmin)
|
||||
<strong class="mr-2">Lieferschein:</strong>
|
||||
@if($shopping_order->isInvoice())
|
||||
<a href="{{ route('storage_file', [$shopping_order->id, 'delivery', 'download']) }}" class="btn btn-primary btn-sm"><i class="fa fa-download"></i></a>
|
||||
<a href="{{ route('storage_file', [$shopping_order->id, 'delivery', 'stream']) }}" target="_blank" class="btn btn-warning btn-sm"><i class="fa fa-eye"></i></a>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -368,15 +416,14 @@
|
|||
{{__('email.checkout_mail_shipping')}}
|
||||
</td>
|
||||
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
|
||||
@if($shopping_order->shopping_user->is_from === 'user_order')
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@if($shopping_order->tax > 0)
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
@else
|
||||
{{ $shopping_order->getFormattedShipping() }} €
|
||||
{{ $shopping_order->getFormattedShippingNet() }} €
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
<td colspan="3">
|
||||
{{__('email.checkout_mail_subtotal_ws')}}
|
||||
</td>
|
||||
|
|
@ -512,7 +559,7 @@
|
|||
@if($shopping_order->wp_invoice_path)
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<a href="{{$shopping_order->wp_invoice_path}}" target="_blank" class="btn btn-secondary btn-sm">Link zur Rechnung</a>
|
||||
<a href="{{$shopping_order->wp_invoice_path}}" target="_blank" class="btn btn-secondary btn-sm"><i class="fa fa-external-link-alt"></i> Link zur Rechnung</a>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -623,7 +670,6 @@
|
|||
</div>
|
||||
|
||||
@if($isAdmin)
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modals-shipped">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
|
||||
|
|
@ -651,8 +697,46 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="modals-invoice">
|
||||
<div class="modal-dialog">
|
||||
<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">
|
||||
<input type="hidden" name="back" value="{{url()->current()}}">
|
||||
<input type="hidden" name="view" value="{{$isView}}">
|
||||
<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', '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">
|
||||
<label class="custom-control custom-checkbox">
|
||||
{!! Form::checkbox('invoice_send_mail', 1, false, ['class'=>'custom-control-input']) !!}
|
||||
<span class="custom-control-label">Rechnung <strong>nicht</strong> senden an: {{ $shopping_order->shopping_user->billing_email }}</span>
|
||||
</label>
|
||||
</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 button-prevent-multiple-submits"><i class="spinner fa fa-spinner fa-spin"></i> {{__('save')}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modals-txaction">
|
||||
<div class="modal-dialog">
|
||||
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
|
||||
|
|
@ -661,7 +745,6 @@
|
|||
<input type="hidden" name="payment_id">
|
||||
<input type="hidden" name="action" value="store_txaction">
|
||||
<input type="hidden" name="back" value="{{url()->current()}}">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">{{__('Bestellung')}} {{__('Rechnung')}} </h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue