Travel-Spends/tstat_be
Travel-Spends/tstat_be
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

report column seperation

Browse Source
This commit is contained in:
venba-Inspriron-3558 2025-07-09 16:28:16 +05:30
parent 08fac98b56
commit dbd11a688d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/PlanController.php
View File

@ -1395,9 +1395,9 @@ class PlanController extends ResourceController
$result = [ $result = [
"flightService" => $flightResult , "flight" => $flightResult ,
"acomodationService" => $accomodationResult , "acomodation" => $accomodationResult ,
"forexService" => $forexResult "forex" => $forexResult
]; ];
@ -1416,7 +1416,7 @@ class PlanController extends ResourceController
"flight" => $flightResult , "flight" => $flightResult ,
"acomodation" => $accomodationResult , "acomodation" => $accomodationResult ,
"forex" => $forexResult "forex" => $forexResult
]; ];

16
app/Models/ReportsModel.php
View File

@ -26,8 +26,9 @@ class ReportsModel extends Model
ELSE 'unknown' ELSE 'unknown'
END AS plan_trip_type, END AS plan_trip_type,
al.Service, al.Service,
m_plan.created_on, DATE_FORMAT(m_plan.created_on, '%d-%m-%Y') AS created_on,
al.FirstTravelDt, DATE_FORMAT(m_plan.created_on, '%H:%i:%s') AS created_time,
DATE_FORMAT(al.FirstTravelDt, '%d-%m-%Y') AS FirstTravelDt,
DATEDIFF(al.FirstTravelDt, m_plan.created_on) AS AdvPurch DATEDIFF(al.FirstTravelDt, m_plan.created_on) AS AdvPurch
FROM FROM
@ -177,8 +178,7 @@ class ReportsModel extends Model
CONCAT(acsf.Code, ' - ', acst.Code) CONCAT(acsf.Code, ' - ', acst.Code)
) AS sector, ) AS sector,
m_dropdown.dropdown_value as flight_class, m_dropdown.dropdown_value as flight_class,
cc_flight_trips.date AS flight_travel_date DATE_FORMAT(cc_flight_trips.date, '%d-%m-%Y') AS flight_travel_date
FROM FROM
m_plan m_plan
JOIN m_users ON m_plan.user_id = m_users.user_id JOIN m_users ON m_plan.user_id = m_users.user_id
@ -228,8 +228,8 @@ class ReportsModel extends Model
ELSE 'unknown' ELSE 'unknown'
END AS plan_trip_type, END AS plan_trip_type,
c_accomodation.hotel_name AS hotel_name, c_accomodation.hotel_name AS hotel_name,
c_accomodation.checkin_date AS check_in_date, DATE_FORMAT(c_accomodation.checkin_date, '%d-%m-%Y') check_in_date,
c_accomodation.checkout_date AS check_out_date, DATE_FORMAT(c_accomodation.checkout_date, '%d-%m-%Y') check_out_date,
c_accomodation.destination_city AS hotel_city c_accomodation.destination_city AS hotel_city
@ -273,8 +273,8 @@ class ReportsModel extends Model
m_plan.so_number, m_plan.so_number,
m_cost_center.name AS cost_center, m_cost_center.name AS cost_center,
m_country.country_name As visiting_country, m_country.country_name As visiting_country,
c_forex.start_date As forex_from_date, DATE_FORMAT(c_forex.start_date, '%d-%m-%Y') As forex_from_date,
c_forex.end_date As forex_to_date, DATE_FORMAT(c_forex.end_date, '%d-%m-%Y') As forex_to_date,
( (
c_forex.perdiem_amount + c_forex.perdiem_amount +
c_forex.transport + c_forex.transport +