Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
TimeOutAdmin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TimeOut
TimeOutAdmin
Commits
61d5dc8a
Commit
61d5dc8a
authored
Jan 27, 2020
by
Jansa Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes in booking apis in api model
parent
f635b733
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
Api_model.php
application/models/Api_model.php
+9
-6
No files found.
application/models/Api_model.php
View file @
61d5dc8a
...
@@ -381,12 +381,12 @@ class Api_model extends CI_Model {
...
@@ -381,12 +381,12 @@ class Api_model extends CI_Model {
$bookedData
=
$this
->
db
->
query
(
"
$bookedData
=
$this
->
db
->
query
(
"
SELECT ODR.order_id,ODR.order_type,ODR.booking_id FROM orders AS ODR
SELECT ODR.order_id,ODR.order_type,ODR.booking_id FROM orders AS ODR
LEFT JOIN booking AS BOK ON
LEFT JOIN booking AS BOK ON
(ODR.booking_id=BOK.bookId AND
(ODR.booking_id=BOK.bookId AND
BOK.status IN (0,1,2,3,5,6))
BOK.status IN (0,1,2,3,5,6))
LEFT JOIN flight_booking AS FBK ON
LEFT JOIN flight_booking AS FBK ON
(ODR.booking_id=FBK.flight_book_id AND
(ODR.booking_id=FBK.flight_book_id AND
FBK.status IN (0,1,2,3,5))
FBK.status IN (0,1,2,3,5))
LEFT JOIN hotel_booking AS HBK ON
LEFT JOIN hotel_booking AS HBK ON
(ODR.booking_id=HBK.hotel_book_id AND
(ODR.booking_id=HBK.hotel_book_id AND
HBK.status IN (0,1,2,3,5))
HBK.status IN (0,1,2,3,5))
WHERE ODR.customer_id='
$user_id
'
WHERE ODR.customer_id='
$user_id
'
GROUP BY ODR.order_id ORDER BY ODR.order_id DESC
$cond
"
);
GROUP BY ODR.order_id ORDER BY ODR.order_id DESC
$cond
"
);
if
(
$per_page
==
0
&&
$page
==
0
){
if
(
$per_page
==
0
&&
$page
==
0
){
...
@@ -445,6 +445,7 @@ class Api_model extends CI_Model {
...
@@ -445,6 +445,7 @@ class Api_model extends CI_Model {
WHERE booking.bookId='
$booking_id
'"
;
WHERE booking.bookId='
$booking_id
'"
;
$eventData
=
$this
->
db
->
query
(
$sql
)
->
row_array
();
$eventData
=
$this
->
db
->
query
(
$sql
)
->
row_array
();
$eventData
[
'order_type'
]
=
1
;
$evtLang
=
langTranslator
(
$eventData
[
'event_id'
],
'EVT'
);
$evtLang
=
langTranslator
(
$eventData
[
'event_id'
],
'EVT'
);
array_merge
(
$eventData
,
$evtLang
);
array_merge
(
$eventData
,
$evtLang
);
...
@@ -471,6 +472,7 @@ class Api_model extends CI_Model {
...
@@ -471,6 +472,7 @@ class Api_model extends CI_Model {
$hotelData
[
'event_time'
]
=
'11:00'
;
$hotelData
[
'event_time'
]
=
'11:00'
;
$hotelData
[
'book_id'
]
=
$hotelData
[
'event_id'
];
$hotelData
[
'book_id'
]
=
$hotelData
[
'event_id'
];
$hotelData
[
'venue_id'
]
=
$hotelData
[
'event_id'
];
$hotelData
[
'venue_id'
]
=
$hotelData
[
'event_id'
];
$hotelData
[
'order_type'
]
=
2
;
$hotelData
[
'has_payment'
]
=
1
;
$hotelData
[
'has_payment'
]
=
1
;
unset
(
$hotelData
[
'traveller_details'
]);
unset
(
$hotelData
[
'traveller_details'
]);
return
$hotelData
;
return
$hotelData
;
...
@@ -496,6 +498,7 @@ class Api_model extends CI_Model {
...
@@ -496,6 +498,7 @@ class Api_model extends CI_Model {
unset
(
$flightData
[
'traveller_details'
],
$flightData
[
'event_date'
]);
unset
(
$flightData
[
'traveller_details'
],
$flightData
[
'event_date'
]);
$flightData
[
'event_date'
]
=
(
isset
(
$fghtTme
[
0
])
&&
!
empty
(
$fghtTme
[
0
]))
?
$fghtTme
[
0
]
:
''
;
$flightData
[
'event_date'
]
=
(
isset
(
$fghtTme
[
0
])
&&
!
empty
(
$fghtTme
[
0
]))
?
$fghtTme
[
0
]
:
''
;
$flightData
[
'event_time'
]
=
(
isset
(
$fghtTme
[
1
])
&&
!
empty
(
$fghtTme
[
1
]))
?
$fghtTme
[
1
]
:
''
;
$flightData
[
'event_time'
]
=
(
isset
(
$fghtTme
[
1
])
&&
!
empty
(
$fghtTme
[
1
]))
?
$fghtTme
[
1
]
:
''
;
$flightData
[
'order_type'
]
=
3
;
$flightData
[
'has_payment'
]
=
1
;
$flightData
[
'has_payment'
]
=
1
;
$flightData
[
'book_id'
]
=
$flightData
[
'event_id'
];
$flightData
[
'book_id'
]
=
$flightData
[
'event_id'
];
$flightData
[
'venue_id'
]
=
$flightData
[
'event_id'
];
$flightData
[
'venue_id'
]
=
$flightData
[
'event_id'
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment