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
fb1d4bfd
Commit
fb1d4bfd
authored
5 years ago
by
Jansa Jose
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'dev_production'
add locality in organizer city list See merge request
!266
parents
9d995e04
b0f01f22
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
0 deletions
+10
-0
Organizer_model.php
application/models/Organizer_model.php
+10
-0
No files found.
application/models/Organizer_model.php
View file @
fb1d4bfd
...
...
@@ -1273,6 +1273,16 @@ class Organizer_model extends CI_Model {
foreach
(
$regionData
AS
$key
=>
$region
)
{
$regData
=
langTranslator
(
$region
[
'id'
],
'REG'
,
'EN'
);
$regionData
[
$key
]
=
array_merge
(
$regionData
[
$key
],
$regData
);
$this
->
db
->
select
(
'id,status'
);
$loc
=
$this
->
db
->
get_where
(
'locality'
,
array
(
'region_id'
=>
$region
[
'id'
]));
$regionData
[
$key
][
'locality'
]
=
[];
if
(
isset
(
$loc
)
&&
!
empty
(
$locData
=
$loc
->
result_array
())){
foreach
(
$locData
AS
$key_loc
=>
$locality
)
{
$reglocData
=
langTranslator
(
$locality
[
'id'
],
'LOC'
,
'EN'
);
$locData
[
$key_loc
]
=
array_merge
(
$locData
[
$key_loc
],
$reglocData
);
}
$regionData
[
$key
][
'locality'
]
=
$locData
;
}
}
$resp
=
array
(
'data'
=>
$regionData
,
'meta'
=>
$meta
);
$res
=
array
(
'status'
=>
1
,
'message'
=>
'Successfully'
,
'data'
=>
$resp
);
...
...
This diff is collapsed.
Click to expand it.
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