This commit is contained in:
Kevin Adametz 2020-05-06 15:52:59 +02:00
parent 68b9d1ff88
commit b9c26d06d0
75 changed files with 2143 additions and 818 deletions

View file

@ -65,6 +65,7 @@
<th>BuchungsID</th>
<th>{{__('Status')}}</th>
<th>{{__('MyJack Nr.')}}</th>
<th>{{__('Organisation')}}</th>
<th>{{__('Reisepreis')}}</th>
<th>{{__('Erlös')}}</th>
<th>{{__('Kunde')}}</th>
@ -79,6 +80,7 @@
<tr>
<td colspan="3">Total</td>
<td id="price_total_sum">0</td>
<td id="price_total_total_sum">0</td>
<td id="proceed_total_sum">0</td>
<td colspan="5"></td>
</tr>
@ -111,6 +113,7 @@
{ data: 'lead.status_id', name: 'lead.status_id', orderable: false, searchable: false },
{ 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: 'start_date', name: 'start_date' },
@ -127,6 +130,7 @@
},
drawCallback: function (settings) {
$('#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);
}
});

View file

@ -61,6 +61,7 @@
<th>BuchungsID</th>
<th>{{__('Reiseveranstalter')}}</th>
<th>{{__('MyJack Nr.')}}</th>
<th>{{__('Organisation')}}</th>
<th>{{__('Reisepreis')}}</th>
<th>{{__('Erlös')}}</th>
<th>{{__('Kunde')}}</th>
@ -74,6 +75,7 @@
<tr>
<td colspan="4">Total</td>
<td id="price_total_sum">0</td>
<td id="price_total_total_sum">0</td>
<td id="proceed_total_sum">0</td>
<td colspan="3"></td>
</tr>
@ -109,6 +111,7 @@
{ data: 'service_provider.name', name: 'service_provider.name' },
{ 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.customer.fullName', name: 'booking.customer.fullName' },
{ data: 'booking.start_date', name: 'booking.start_date' },
@ -124,6 +127,7 @@
},
drawCallback: function (settings) {
$('#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);
}
});