deplay phase 1
This commit is contained in:
parent
e3dc1afd8e
commit
5a7478907e
68 changed files with 2831 additions and 818 deletions
|
|
@ -89,7 +89,7 @@ class RequestController extends Controller
|
|||
wirte old where has state to new has travel_documents
|
||||
$bs = Booking::whereHas('arrangements', function($q){
|
||||
$q->where('state', '!=', NULL);
|
||||
})->where('inquiry_id', '!=', NULL)->where('new_drafts', 0)->get();
|
||||
})->where('lead_id', '!=', NULL)->where('new_drafts', 0)->get();
|
||||
|
||||
foreach ($bs as $b){
|
||||
$b->travel_documents = true;
|
||||
|
|
@ -101,7 +101,7 @@ class RequestController extends Controller
|
|||
private function getSearchRequests()
|
||||
{
|
||||
|
||||
$query = Booking::with('lead')->with('customer')->with('customer_mails')->with('customer_mails')->select('booking.*')->where('inquiry_id', '!=', NULL);
|
||||
$query = Booking::with('lead')->with('customer')->with('customer_mails')->with('customer_mails')->select('booking.*')->where('lead_id', '!=', NULL);
|
||||
|
||||
if (Request::get('full_firstname_search') != "") {
|
||||
$query->whereHas('customer', function ($q) {
|
||||
|
|
@ -241,7 +241,7 @@ class RequestController extends Controller
|
|||
}
|
||||
|
||||
if (Request::get('full_lead_id_search') != "") {
|
||||
$query->where('inquiry_id', 'LIKE', '%' . Request::get('full_lead_id_search') . '%');
|
||||
$query->where('lead_id', 'LIKE', '%' . Request::get('full_lead_id_search') . '%');
|
||||
}
|
||||
if (Request::get('full_booking_id_search') != "") {
|
||||
$query->where('id', 'LIKE', '%' . Request::get('full_booking_id_search') . '%');
|
||||
|
|
@ -398,10 +398,10 @@ class RequestController extends Controller
|
|||
return '<a data-order="' . $booking->id . '" href="' . make_old_url('booking/' . $booking->id . '/edit') . '" data-id="' . $booking->id . '">' . $booking->id . '</a>';
|
||||
})
|
||||
->addColumn('action_lead_edit', function (Booking $booking) {
|
||||
return '<a href="' . route('lead_detail', [$booking->inquiry_id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
|
||||
return '<a href="' . route('lead_detail', [$booking->lead_id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
|
||||
})
|
||||
->addColumn('lead_id', function (Booking $booking) {
|
||||
return '<a data-order="' . $booking->inquiry_id . '" href="' . make_old_url('leads/' . $booking->inquiry_id . '/edit') . '" data-id="' . $booking->inquiry_id . '">' . $booking->inquiry_id . '</a>';
|
||||
return '<a data-order="' . $booking->lead_id . '" href="' . make_old_url('leads/' . $booking->lead_id . '/edit') . '" data-id="' . $booking->lead_id . '">' . $booking->lead_id . '</a>';
|
||||
})
|
||||
->addColumn('travel_country_id', function (Booking $booking) {
|
||||
return '<span data-order="' . ($booking->travel_country_id ? $booking->travel_country_id : 0) . '">' . ($booking->travel_country_id ? $booking->travel_country->name : "-") . '</span>';
|
||||
|
|
@ -523,7 +523,7 @@ class RequestController extends Controller
|
|||
}
|
||||
})
|
||||
*/
|
||||
->orderColumn('lead_id', 'inquiry_id $1')
|
||||
->orderColumn('lead_id', 'lead_id $1')
|
||||
->orderColumn('id', 'id $1')
|
||||
->orderColumn('travel_country_id', 'travel_country_id $1')
|
||||
->orderColumn('travelagenda_id', 'travelagenda_id $1')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue