main system
This commit is contained in:
parent
0baac018a2
commit
a96d7d5c77
115 changed files with 4589 additions and 557 deletions
|
|
@ -48,8 +48,9 @@
|
|||
{{$shopping_order->getFormattedTotalShipping()}} €
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Points gesamt</div>
|
||||
{{-- <div class="text-muted small">Points gesamt</div>
|
||||
{{ $shopping_order->points }}
|
||||
--}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -296,7 +297,6 @@
|
|||
}
|
||||
|
||||
</style>
|
||||
@if($shopping_order->shopping_user->is_from !== 'homeparty')
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-product m-0" style="">
|
||||
|
|
@ -330,7 +330,7 @@
|
|||
<small>
|
||||
<span class="text-muted">Inhalt: </span> {{ $shopping_order_item->product->contents }}<br>
|
||||
<span class="text-muted">Gewicht: </span> {{ $shopping_order_item->product->weight }} g<br>
|
||||
<span class="text-muted">Points: </span> {{ $shopping_order_item->product->points }}
|
||||
{{-- <span class="text-muted">Points: </span> {{ $shopping_order_item->product->points }} --}}
|
||||
</small>
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -402,105 +402,6 @@
|
|||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
@else
|
||||
@if($shopping_order->homeparty)
|
||||
<style>
|
||||
.table-small {
|
||||
font-size: 0.9em;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.table-small td {
|
||||
padding: 0.225rem 1rem 0.225rem 0;
|
||||
}
|
||||
|
||||
.btn-md-extra {
|
||||
padding: 0.3rem 0.6rem;
|
||||
font-size: 0.8rem;
|
||||
line-height: 1.5;
|
||||
border-radius: 0.25rem;
|
||||
}
|
||||
.md-btn-extra {
|
||||
width: calc(1.7rem + 2px) !important;
|
||||
line-height: 1.5rem;
|
||||
}
|
||||
.form-control.input-extra {
|
||||
padding: 0.28rem 0.6rem;
|
||||
font-size: 0.8rem;
|
||||
font-weight: 500;
|
||||
min-height: calc(1.8rem + 2px);
|
||||
height: calc(1.8rem + 2px);
|
||||
width: 44px;
|
||||
}
|
||||
.input-group-min-w {
|
||||
min-width: 102px;
|
||||
}
|
||||
.img-extra {
|
||||
min-width:55px;
|
||||
max-height: 120px;
|
||||
}
|
||||
|
||||
.table td.border-top {
|
||||
border: none;
|
||||
border-top: 1px solid #ccccdb;
|
||||
}
|
||||
|
||||
.table td {
|
||||
border: none;
|
||||
}
|
||||
|
||||
.table th {
|
||||
border: none;
|
||||
border-bottom: 1px solid #c3c3d2;
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
.default-style:not([dir=rtl]) div.card-datatable table.dataTable thead th:first-child,
|
||||
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tbody td:first-child,
|
||||
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tfoot th:first-child {
|
||||
padding-left: 0.6rem !important;
|
||||
|
||||
}
|
||||
.img-extra {
|
||||
min-width:35px;
|
||||
max-height: 160px;
|
||||
}
|
||||
}
|
||||
.table .foot-small td {
|
||||
padding: 0.225rem 0.625rem;
|
||||
}
|
||||
.table .text-body {
|
||||
font-size: 0.9em;
|
||||
}
|
||||
.table .options a.auto-delete-product {
|
||||
font-size: 0.7em;
|
||||
font-weight: bold;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.table .min-width-80 {
|
||||
min-width: 160px;
|
||||
}
|
||||
</style>
|
||||
@php($homeparty = $shopping_order->homeparty)
|
||||
@if($homeparty->homeparty_host)
|
||||
<p><strong>Bestellung Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong></p>
|
||||
@include('admin.sales._detail_homparty', ['homeparty'=>$shopping_order->homeparty, 'homeparty_guest' => $homeparty->homeparty_host])
|
||||
@endif
|
||||
|
||||
@if($homeparty->homeparty_guests)
|
||||
@php($g_count = 1)
|
||||
@foreach($homeparty->homeparty_guests as $homeparty_guest)
|
||||
<hr>
|
||||
<p><strong>Bestellung {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong></p>
|
||||
@include('admin.sales._detail_homparty', ['homeparty'=>$shopping_order->homeparty, 'homeparty_guest' => $homeparty_guest])
|
||||
@endforeach
|
||||
@endif
|
||||
<hr>
|
||||
|
||||
@include('admin.sales._detail_homparty_total', ['homeparty' => $homeparty])
|
||||
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
|
||||
|
|
@ -531,7 +432,7 @@
|
|||
<hr class="m-0">
|
||||
@endif
|
||||
|
||||
<!-- / Payment -->
|
||||
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Zahlung
|
||||
|
|
@ -557,7 +458,7 @@
|
|||
<td>{{$shopping_payment->getPaymentType()}}</td>
|
||||
<td>{{$shopping_payment->getPaymentAmount()}}</td>
|
||||
<td>
|
||||
@if($isAdmin && $shopping_payment->clearingtype === 'fnc' && $shopping_payment->onlinebanktransfertype === 'MIV')
|
||||
@if($isAdmin && ($shopping_payment->clearingtype === 'fnc' || $shopping_payment->clearingtype === 'vor'))
|
||||
<button type="button" class="btn btn-sm btn-{{ \App\Services\Payment::getFormattedTxactionColor($shopping_payment->txaction)}}" data-toggle="modal" data-target="#modals-txaction"
|
||||
data-id="{{ $shopping_order->id }}"
|
||||
data-payment_id="{{ $shopping_payment->id }}"
|
||||
|
|
@ -620,7 +521,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">
|
||||
|
|
@ -648,8 +548,6 @@
|
|||
</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">
|
||||
|
|
@ -660,13 +558,13 @@
|
|||
<input type="hidden" name="back" value="{{url()->current()}}">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">{{__('Bestellung')}} {{__('Rechnung')}} </h5>
|
||||
<h5 class="modal-title">{{__('Bestellung')}} {{__('Zahlung')}} </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">
|
||||
<label class="form-label" for="txaction">{{ __('Rechnung') }}</label>
|
||||
{{ Form::select('txaction', \App\Services\Payment::$txaction_invoice, 'invoice_paid', array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
|
||||
<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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue