diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 24a84b2..7b0fa8d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,29 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -48,103 +25,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - @@ -192,37 +90,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - @@ -464,6 +330,13 @@ + + + + + + + @@ -926,9 +811,10 @@ - + + @@ -936,12 +822,12 @@ - + - + diff --git a/app/Http/Controllers/Admin/ReportController.php b/app/Http/Controllers/Admin/ReportController.php index b7e702c..7c8366b 100755 --- a/app/Http/Controllers/Admin/ReportController.php +++ b/app/Http/Controllers/Admin/ReportController.php @@ -143,7 +143,8 @@ class ReportController extends Controller }) ->orderColumn('id', 'id $1') ->orderColumn('start_date', 'start_date $1') - ->orderColumn('start_date', 'start_date $1') + ->orderColumn('end_date', 'end_date $1') + ->orderColumn('booking_date', 'booking_date $1') ->orderColumn('customer.fullName', 'customer.firstname $1') //->orderColumn('lead.status_id', 'lead.status_id $1') //->orderColumn('is_cleared', 'is_cleared $1') @@ -153,9 +154,24 @@ class ReportController extends Controller public function bookingsExport(){ - $query = $this->prozessBookingSearch(); - $query->orderBy("id", 'ASC'); + $query = $this->prozessBookingSearch(); + + $order = explode(",", Request::get('order')); + $orderByNum = [ + 0 => "id", + 2 => "merlin_order_number", + 3 => "price", + 4 => "price_total", + 7 => "start_date", + 8 => "end_date", + 9 => "booking_date", + ]; + if(isset($order[0])) { + $column = isset($orderByNum[$order[0]]) ? $orderByNum[$order[0]] : "start_date"; + $direction = isset($order[1]) ? strtoupper($order[1]) : "ASC"; + $query->orderBy($column, $direction); + } $filename = "file-".date('Y-m-d-H-i-s'); $exports = $query->get(); @@ -273,7 +289,9 @@ class ReportController extends Controller private function prozessProvidersSearch(){ - $query = ServiceProviderEntry::with('booking', 'service_provider', 'booking.customer')->select('service_provider_entry.*'); + $query = ServiceProviderEntry::with('booking', 'service_provider', 'booking.customer')->select('service_provider_entry.*') + ->join('booking', 'service_provider_entry.booking_id', '=', 'booking.id' ); + if(Request::get('filter_is_cleared') != ""){ $query->where('is_cleared', '=', Request::get('filter_is_cleared')); } @@ -292,6 +310,7 @@ class ReportController extends Controller $q->where("start_date", '<=', $travel_date_to); }); } + return $query; } @@ -385,9 +404,23 @@ class ReportController extends Controller { $query = $this->prozessProvidersSearch(); - $query->whereHas('booking', function ($q) { - $q->orderBy("lead_id", 'ASC'); - }); + $order = explode(",", Request::get('order')); + $orderByNum = [ + 0 => "id", + 1 => "booking.id", //booking + 3 => "booking.merlin_order_number",//booking + 4 => "booking.price",//booking + 5 => "booking.price_total",//booking + 8 => "booking.start_date",//booking + 9 => "booking.end_date",//booking + 10 => "is_cleared", + ]; + + if(isset($order[0])){ + $column = isset($orderByNum[$order[0]]) ? $orderByNum[$order[0]] : "start_date"; + $direction = isset($order[1]) ? strtoupper($order[1]) : "ASC"; + $query->orderBy($column, $direction);; + } $filename = "file-".date('Y-m-d-H-i-s'); $exports = $query->get(); diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php index 359d8ee..2df1468 100644 --- a/app/Http/Controllers/ModalController.php +++ b/app/Http/Controllers/ModalController.php @@ -30,7 +30,6 @@ class ModalController extends Controller $generalFileRepo->_set('dir', '/'.date('Y/m').'/'); $generalFileRepo->_set('identifier', 'travel_country'); $generalFileRepo->_set('redirect', $data['back']); - return $generalFileRepo->uploadFile(Request::all()); } } diff --git a/app/Models/Booking.php b/app/Models/Booking.php index 5fbc667..5c9da88 100644 --- a/app/Models/Booking.php +++ b/app/Models/Booking.php @@ -638,7 +638,7 @@ class Booking extends Model } public function isCanceled(){ - return ($this->attributes['canceled'] > 0); + return ($this->attributes['canceled'] !== null); } //erlös #getRevenueFactor diff --git a/app/Repositories/CustomerFewoMailRepository.php b/app/Repositories/CustomerFewoMailRepository.php index 890aa01..f71a62e 100644 --- a/app/Repositories/CustomerFewoMailRepository.php +++ b/app/Repositories/CustomerFewoMailRepository.php @@ -234,7 +234,6 @@ class CustomerFewoMailRepository extends BaseRepository { $value->show = 'single'; $value->lead_title_id = " - (".$value->booking->invoice_number.")"; - $tmp = []; $tmp['email'] = $booking->travel_user ? $booking->travel_user->email : ""; $tmp['name'] = $booking->travel_user ? $booking->travel_user->first_name . " " . $booking->travel_user->last_name . " | " : "- | "; @@ -252,7 +251,7 @@ class CustomerFewoMailRepository extends BaseRepository { if($customer_mail->reply_id){ $value->title = "E-Mail Antwort an Kunden senden"; $value->subtitle = "Dem Kunden wird eine E-Mail zugesendet, die im System als Antwort gespeichert wird."; - $value->customer_mail = $customer_mail; + $value->customer_mail = $customer_mail->customer_mail; } $value->s_placeholder = "Betreff der E-Mail"; $value->m_placeholder = "Nachricht der E-Mail"; @@ -261,7 +260,6 @@ class CustomerFewoMailRepository extends BaseRepository { $value->customer_mail_subdir = $customer_mail->subdir ? $customer_mail->subdir : 0; return view("travel.user.booking.mail.modal-new-mail", compact('data', 'value'))->render(); - } /* neue Mail */ if ($data['action'] === "new-customer-mail") { diff --git a/app/Repositories/CustomerMailRepository.php b/app/Repositories/CustomerMailRepository.php index 32507ea..ba81cc6 100644 --- a/app/Repositories/CustomerMailRepository.php +++ b/app/Repositories/CustomerMailRepository.php @@ -257,7 +257,7 @@ class CustomerMailRepository extends BaseRepository { if($customer_mail->reply_id){ $value->title = "E-Mail Antwort an Kunden senden"; $value->subtitle = "Dem Kunden wird eine E-Mail zugesendet, die im System als Antwort gespeichert wird."; - $value->customer_mail = $customer_mail; + $value->customer_mail = $customer_mail->customer_mail; } $value->s_placeholder = "Betreff der E-Mail"; @@ -265,9 +265,7 @@ class CustomerMailRepository extends BaseRepository { $value->url = $data['url']; $value->customer_mail_dir = $customer_mail->dir ? $customer_mail->dir : 0; $value->customer_mail_subdir = $customer_mail->subdir ? $customer_mail->subdir : 0; - return view("customer.mail.modal-new-mail", compact('data', 'value'))->render(); - } /* neue Mail */ if ($data['action'] === "new-customer-mail") { diff --git a/resources/views/admin/modal/upload.blade.php b/resources/views/admin/modal/upload.blade.php index 2d81b6f..6875e9a 100755 --- a/resources/views/admin/modal/upload.blade.php +++ b/resources/views/admin/modal/upload.blade.php @@ -35,6 +35,14 @@ diff --git a/resources/views/admin/report/service_providers.blade.php b/resources/views/admin/report/service_providers.blade.php index dc1271c..3b74a6f 100755 --- a/resources/views/admin/report/service_providers.blade.php +++ b/resources/views/admin/report/service_providers.blade.php @@ -7,7 +7,7 @@
{!! Form::open(['url' => route('admin_report_export_providers'), 'class' => '']) !!} - + {!! Form::hidden('order', '[[8, "asc"]]', ['id'=>'order_table']) !!}
@@ -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(); }); }); diff --git a/resources/views/booking/_detail_price.blade.php b/resources/views/booking/_detail_price.blade.php index b2649e6..8d8d0e3 100755 --- a/resources/views/booking/_detail_price.blade.php +++ b/resources/views/booking/_detail_price.blade.php @@ -25,7 +25,7 @@ {{ Form::text('service_total', $booking->getServiceTotal(), array('placeholder'=>__('Gesamtpreis Vermittlung'), 'class'=>'form-control', 'id'=>'service_total', 'readonly')) }}
- @if($booking->isCanceled() > 0) + @if($booking->isCanceled())
@@ -78,7 +78,7 @@
- @if($booking->isCanceled() > 0) + @if($booking->isCanceled())
diff --git a/resources/views/booking/upload_modal.blade.php b/resources/views/booking/upload_modal.blade.php index 75d0db4..c8c2ff3 100755 --- a/resources/views/booking/upload_modal.blade.php +++ b/resources/views/booking/upload_modal.blade.php @@ -34,6 +34,15 @@