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
649a8b8a
Commit
649a8b8a
authored
May 17, 2019
by
Tobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dc
parent
c0367894
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
Api.php
application/controllers/Api.php
+4
-4
Event.php
application/controllers/Event.php
+1
-1
Api_model.php
application/models/Api_model.php
+4
-4
Webservice_model.php
application/models/Webservice_model.php
+2
-2
No files found.
application/controllers/Api.php
View file @
649a8b8a
...
...
@@ -322,7 +322,7 @@ class Api extends CI_Controller {
public
function
payNow
(
$auth_token
=
''
,
$amount
=
0
,
$booking_id
=
''
,
$event_id
=
''
){
if
(
empty
(
$auth_token
)
||
empty
(
$amount
)
||
empty
(
$booking_id
)){
redirect
(
'https://
projects.nuvento.com
/failure'
);
redirect
(
'https://
timeout.sa/staging
/failure'
);
}
$payData
=
array
(
'auth_token'
=>
$auth_token
,
'amount'
=>
$amount
,
'booking_id'
=>
$booking_id
);
$res
=
$this
->
Api_model
->
payNow
(
$payData
);
...
...
@@ -331,7 +331,7 @@ class Api extends CI_Controller {
$this
->
paymentGateway
(
$amount
,
$res
[
'transaction_id'
],
$event_id
,
$booking_id
,
$res
[
'custData'
]);
}
else
{
redirect
(
'https://
projects.nuvento.com
/failure?event_id='
.
$eventid
);
redirect
(
'https://
timeout.sa/staging
/failure?event_id='
.
$eventid
);
}
}
...
...
@@ -353,7 +353,7 @@ class Api extends CI_Controller {
$booking_id
=
$last_id
[
3
];
$this
->
Api_model
->
update_payment
(
$response
,
$transaction_id
,
$lastid
,
'1'
)
;
redirect
(
'https://
projects.nuvento.com
/bookingdetails?booking_id='
.
$booking_id
);
redirect
(
'https://
timeout.sa/staging
/bookingdetails?booking_id='
.
$booking_id
);
}
}
...
...
@@ -376,7 +376,7 @@ class Api extends CI_Controller {
$booking_id
=
$last_id
[
3
];
$this
->
Api_model
->
update_payment
(
$response
,
$transaction_id
,
$lastid
,
'0'
);
redirect
(
'https://
projects.nuvento.com
/failure?event_id='
.
$eventid
);
redirect
(
'https://
timeout.sa/staging
/failure?event_id='
.
$eventid
);
}
}
...
...
application/controllers/Event.php
View file @
649a8b8a
...
...
@@ -187,7 +187,7 @@ class Event extends CI_Controller {
$subject
=
"TimeOut, New Event Created"
;
$emailId
=
$settings
[
'admin_mail_id'
];
$message
=
"<html><body>
New Event Created, event name: <strong>"
.
$_POST
[
'event_name'
]
.
"</strong>. Event URL :
https://projects.nuvento.com/
eventdetail?event_id=
$event_id
New Event Created, event name: <strong>"
.
$_POST
[
'event_name'
]
.
"</strong>. Event URL :
"
.
base_url
()
.
"
eventdetail?event_id=
$event_id
</body></html>"
;
$this
->
Api_model
->
send_mail
(
$subject
,
$emailId
,
$message
);
// END - NEW EVENT NOTIFICATION MAIL \\
...
...
application/models/Api_model.php
View file @
649a8b8a
...
...
@@ -82,7 +82,7 @@ class Api_model extends CI_Model {
$subject
=
"TimeOut, Verify your account"
;
$email_id
=
$data
[
'email_id'
];
$reset_link
=
'https://projects.nuvento.com/admin/
Api/verifyMail/'
.
$unique_id
;
$reset_link
=
base_url
()
.
'
Api/verifyMail/'
.
$unique_id
;
$message
=
"<html>
<body>
Hi,
\n\r
Welcome to TimeOut.
\r\n
Please Verify your E-mail for the username: "
.
$email_id
.
". User the following link verify your account "
.
$reset_link
.
".
...
...
@@ -154,7 +154,7 @@ class Api_model extends CI_Model {
$this
->
db
->
where
(
'email'
,
$data
[
'email_id'
])
->
update
(
'customer'
,
array
(
'reset_key'
=>
$unique_id
));
$subject
=
"TimeOut: Forgot Password"
;
$url
=
'https://
projects.nuvento.com
/forgot/?reset_key='
.
$unique_id
;
$url
=
'https://
timeout.sa/staging
/forgot/?reset_key='
.
$unique_id
;
$message
=
"<html>
<body>
...
...
@@ -1195,11 +1195,11 @@ class Api_model extends CI_Model {
$cust
=
$cust
->
row_array
();
if
(
$this
->
db
->
update
(
'customer'
,
array
(
'confirm_link'
=>
''
,
'email_verified'
=>
'1'
),
array
(
'customer_id'
=>
$cust
[
'customer_id'
]))){
header
(
'Location:https://
projects.nuvento.com
/location?login=1'
);
header
(
'Location:https://
timeout.sa/staging
/location?login=1'
);
}
}
}
catch
(
Exception
$e
){}
header
(
'Location:https://
projects.nuvento.com
/location'
);
header
(
'Location:https://
timeout.sa/staging
/location'
);
}
}
?>
application/models/Webservice_model.php
View file @
649a8b8a
...
...
@@ -1336,12 +1336,12 @@ class Webservice_model extends CI_Model {
if
(
!
EMPTY
(
$locality
))
{
$locality
=
$locality
;
}
else
{
$locality
=
'null'
;
$locality
=
array
()
;
}
if
(
!
EMPTY
(
$category
))
{
$category
=
$category
;
}
else
{
$category
=
'null'
;
$category
=
array
()
;
}
if
(
isset
(
$dateArray
)){
$resultData
=
array
();
...
...
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