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
01c05c2e
Commit
01c05c2e
authored
6 years ago
by
Tobin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'dev_production'
url update See merge request
!9
parents
3874e3dd
f89f9144
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
Api.php
application/controllers/Api.php
+4
-4
No files found.
application/controllers/Api.php
View file @
01c05c2e
...
...
@@ -300,7 +300,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
(
'http
://localhost:4200
/failure'
);
redirect
(
'http
s://projects.nuvento.com
/failure'
);
}
$payData
=
array
(
'auth_token'
=>
$auth_token
,
'amount'
=>
$amount
,
'booking_id'
=>
$booking_id
);
$res
=
$this
->
Api_model
->
payNow
(
$payData
);
...
...
@@ -309,7 +309,7 @@ class Api extends CI_Controller {
$this
->
paymentGateway
(
$amount
,
$res
[
'transaction_id'
],
$event_id
,
$booking_id
);
}
else
{
redirect
(
'http
://localhost:4200
/failure?event_id='
.
$eventid
);
redirect
(
'http
s://projects.nuvento.com
/failure?event_id='
.
$eventid
);
}
}
...
...
@@ -331,7 +331,7 @@ class Api extends CI_Controller {
$booking_id
=
$last_id
[
3
];
$this
->
Api_model
->
update_payment
(
$response
,
$transaction_id
,
$lastid
,
'1'
)
;
redirect
(
'http
://localhost:4200
/bookingdetails?booking_id='
.
$booking_id
);
redirect
(
'http
s://projects.nuvento.com
/bookingdetails?booking_id='
.
$booking_id
);
}
}
...
...
@@ -354,7 +354,7 @@ class Api extends CI_Controller {
$booking_id
=
$last_id
[
3
];
$this
->
Api_model
->
update_payment
(
$response
,
$transaction_id
,
$lastid
,
'0'
);
redirect
(
'http
://localhost:4200
/failure?event_id='
.
$eventid
);
redirect
(
'http
s://projects.nuvento.com
/failure?event_id='
.
$eventid
);
}
}
...
...
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