gitmedia/mein-sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mails + Upload

Browse source
This commit is contained in:
Kevin Adametz 2020-06-14 13:49:11 +02:00
parent 767e84e640
commit a3bef8d1aa
19 changed files with 151 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

21
resources/views/admin/modal/upload.blade.php
View file

@ -35,6 +35,14 @@
<script type="text/javascript">
var responseRedirect = undefined;
$('#modals-load-content').on('hide.bs.modal', function (event) {
$(this).off('hide.bs.modal');
if(responseRedirect){
window.location.href = responseRedirect;
}
});
$( document ).ready(function() {
Dropzone.autoDiscover = false;
$("#uploadModalFile").dropzone({
@ -76,18 +84,21 @@
message = response.message;
var _ele = $('.alert-danger');
_ele.fadeIn();
console.log(message);
$(file.previewElement).find('.dz-error-message').text(message);
$(file.previewElement).addClass('dz-error');
_ele.text(message);
},
success: function(file, response) {
console.log(file);
console.log(response);
//console.log(file);
//console.log(response);
$(file.previewElement).addClass('dz-success');
if(response.error === false){
if(response.redirect){
window.location.href = response.redirect
responseRedirect = response.redirect;
// window.location.href = response.redirect
}else{
//window.location.href = window.location.href; //This is a possibility
window.location.reload(); //Another possiblity
// window.location.reload(); //Another possiblity
}
}
}

15
resources/views/admin/report/bookings.blade.php
View file

@ -7,7 +7,7 @@
</h4>
<div class="card">
{!! Form::open(['url' => route('admin_report_export_bookings'), 'class' => '']) !!}
{!! Form::hidden('order', '[[7, "asc"]]', ['id'=>'order_table']) !!}
<div class="ui-bordered px-4 pt-3 mb-0">
<div class="form-row align-items-center">
@ -114,14 +114,14 @@
{ data: 'merlin_order_number', name: 'merlin_order_number' },
{ data: 'price', name: 'price' },
{ data: 'price_total', name: 'price_total' },
{ data: 'proceeds', name: 'proceeds' },
{ data: 'customer.fullName', name: 'customer.fullName' },
{ data: 'proceeds', name: 'proceeds', orderable: false },
{ data: 'customer.fullName', name: 'customer.fullName', orderable: false },
{ data: 'start_date', name: 'start_date' },
{ data: 'end_date', name: 'end_date' },
{ data: 'booking_date', name: 'booking_date' },
{ data: 'service_provider.names', name: 'service_provider.names' },
{ data: 'service_provider.names', name: 'service_provider.names', orderable: false },
],
"order": [[ 0, "desc" ]],
"order": [[ 7, "asc" ]],
"orderSequence": ["desc", "asc"],
"bLengthChange": false,
"iDisplayLength": 100,
@ -129,16 +129,17 @@
"url": "/js/German.json"
},
drawCallback: function (settings) {
$('#order_table').val(table.order());
$('#price_total_sum').html(settings.json.price_total_sum);
$('#price_total_total_sum').html(settings.json.price_total_total_sum);
$('#proceed_total_sum').html(settings.json.proceed_total_sum);
}
});
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by').on('change', function(){
table.order( [ 0, 'desc' ] ).draw();
table.order( [ 7, 'asc' ] ).draw();
});
$('.datepicker-base').on('change', function(){
table.order( [ 0, 'desc' ] ).draw();
table.order( [ 7, 'asc' ] ).draw();
});
});
</script>

13
resources/views/admin/report/service_providers.blade.php
View file

@ -7,7 +7,7 @@
</h4>
<div class="card">
{!! Form::open(['url' => route('admin_report_export_providers'), 'class' => '']) !!}
{!! Form::hidden('order', '[[8, "asc"]]', ['id'=>'order_table']) !!}
<div class="ui-bordered px-4 pt-3 mb-0">
<div class="form-row align-items-center">
<div class="col-12 col-md-4 mb-4">
@ -108,17 +108,17 @@
"columns": [
{ data: 'id', name: 'id' },
{ data: 'booking.id', name: 'booking.id' },
{ data: 'service_provider.name', name: 'service_provider.name' },
{ data: 'service_provider.name', name: 'service_provider.name', orderable: false },
{ data: 'booking.merlin_order_number', name: 'booking.merlin_order_number' },
{ data: 'booking.price', name: 'booking.price' },
{ data: 'booking.price_total', name: 'booking.price_total' },
{ data: 'booking.proceeds', name: 'booking.proceeds' },
{ data: 'booking.proceeds', name: 'booking.proceeds', orderable: false },
{ data: 'booking.customer.fullName', name: 'booking.customer.fullName' },
{ data: 'booking.start_date', name: 'booking.start_date' },
{ data: 'booking.end_date', name: 'booking.end_date' },
{ data: 'is_cleared', name: 'is_cleared' },
],
"order": [[ 0, "desc" ]],
"order": [[ 8, "asc" ]],
"orderSequence": ["desc", "asc"],
"bLengthChange": false,
"iDisplayLength": 100,
@ -126,6 +126,7 @@
"url": "/js/German.json"
},
drawCallback: function (settings) {
$('#order_table').val(table.order());
$('#price_total_sum').html(settings.json.price_total_sum);
$('#price_total_total_sum').html(settings.json.price_total_total_sum);
$('#proceed_total_sum').html(settings.json.proceed_total_sum);
@ -133,11 +134,11 @@
});
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by').on('change', function(){
table.order( [ 0, 'desc' ] ).draw();
table.order( [ 8, 'asc' ] ).draw();
});
$('.datepicker-base').on('change', function(){
table.order( [ 0, 'desc' ] ).draw();
table.order( [ 8, 'asc' ] ).draw();
});
});
</script>