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

47
app/Http/Controllers/Admin/ReportController.php
View file

@ -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();

1
app/Http/Controllers/ModalController.php
View file

@ -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());
}
}

2
app/Models/Booking.php
View file

@ -638,7 +638,7 @@ class Booking extends Model
}
public function isCanceled(){
return ($this->attributes['canceled'] > 0);
return ($this->attributes['canceled'] !== null);
}
//erlös #getRevenueFactor

4
app/Repositories/CustomerFewoMailRepository.php
View file

@ -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") {

4
app/Repositories/CustomerMailRepository.php
View file

@ -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") {