last changes since 6-2023

This commit is contained in:
Kevin Adametz 2023-07-03 10:07:08 +02:00
parent 0341c9c189
commit 04d677d37a
142 changed files with 7895 additions and 2855 deletions

View file

@ -53,7 +53,7 @@
<td>{{ $user_credit_item['first_name'] }}</td>
<td>{{ $user_credit_item['last_name'] }}</td>
<td>{{ $user_credit_item['email'] }}</td>
<td>{!! formatNumber($user_credit_item['sum']) !!} &euro;</td>
<td><span class="no-line-break">{!! formatNumber($user_credit_item['sum']) !!} &euro;</span></td>
<td>
@foreach ($user_credit_item['entries'] as $key => $credit)
<div class="td-entry-table-margin">
@ -94,22 +94,22 @@
Gutschriften / Auszahlungen
</h5>
<div class="card-body p-0">
{!! Form::open(['url' => route('admin_payments_invoice'), 'class' => 'form-horizontal', 'id'=>'form_filter_payment_invoices']) !!}
{!! Form::open(['url' => route('admin_payments_credit'), 'class' => 'form-horizontal', 'id'=>'form_filter_payment_credits']) !!}
<div class="form-row align-items-center px-4 pb-2 pt-3">
<div class="col-12 col-sm-4 col-md-4 col-lg-4 mb-1">
<input class="form-control on_keyup_invoice" name="credit_filter_name" type="text" value="{{session('credit_filter_name')}}" placeholder="Name">
<input class="form-control on_keyup_credits" name="credit_filter_name" type="text" value="{{session('credit_filter_name')}}" placeholder="Name">
</div>
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
<select class="custom-select on_change_invoice" name="credit_filter_month">
<select class="custom-select on_change_credits" name="credit_filter_month">
@foreach($filter_months as $key=>$value)
<option value="{{$key}}" @if(session('credit_filter_month') == $key) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
<select class="custom-select on_change_invoice" name="credit_filter_year">
<select class="custom-select on_change_credits" name="credit_filter_year">
@foreach($filter_years as $key=>$value)
<option value="{{$value}}" @if(session('credit_filter_year') == $value) selected @endif>{{$value}}</option>
@endforeach
@ -154,7 +154,6 @@
</div>
<div class="modal-body">
<div class="form-group col-sm-12">
{{ Form::select('credit_option', ['create'=>'Gutschrift erstellen'], false, array('data-live-search'=>'false', 'class'=>'selectpicker')) }}
</div>
<div class="form-group col-sm-12">
@ -188,7 +187,9 @@
ajax: {
url: '{!! route( 'admin_payments_credit_datatable') !!}',
data: function(d) {
d.filter_sales_year = $('select[name=filter_sales_year]').val();
d.credit_filter_name = $('input[name=credit_filter_name]').val();
d.credit_filter_month = $('select[name=credit_filter_month]').val();
d.credit_filter_year = $('select[name=credit_filter_year]').val();
}
},
"order": [[0, "desc" ]],
@ -210,10 +211,13 @@
"url": "/js/German.json"
}
});
$('#filter_sales_year').on('change', function(){
oTable.draw();
});
$('select.on_change_credits').on('change', function(){
oTable.draw();
});
$('input.on_keyup_credits').on('keyup', function(){
oTable.draw();
});
$( document ).ready(function() {
$('#modals-credit').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget);

View file

@ -1,7 +1,4 @@
{!! Form::open(['url' => route('admin_payments_credit_create'), 'class' => 'modal-content', 'enctype' => 'multipart/form-data']) !!}
<style>
.unselectable {
-moz-user-select: none;