Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
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
Muhammad Usman
PERFORMA_REPLICA
Commits
366a8eb0
Commit
366a8eb0
authored
Apr 11, 2018
by
Nilu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix minor issues
parent
9cd6806c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
4 deletions
+28
-4
IntercomUtils.java
cmsWebApp/src/performa/intercom/utils/IntercomUtils.java
+3
-2
card_payment.jsp
cmsWebApp/webroot/extensions/adminportal/card_payment.jsp
+25
-2
No files found.
cmsWebApp/src/performa/intercom/utils/IntercomUtils.java
View file @
366a8eb0
...
...
@@ -24,6 +24,7 @@ import performa.intercom.resources.Company;
import
performa.intercom.resources.CustomAttribute
;
import
performa.intercom.resources.Intercom
;
import
performa.intercom.resources.InvalidException
;
import
performa.intercom.resources.NotFoundException
;
import
performa.intercom.resources.RateLimitException
;
import
performa.intercom.resources.ServerException
;
import
performa.intercom.resources.User
;
...
...
@@ -85,7 +86,7 @@ public class IntercomUtils
return
User
.
find
(
map
);
}
catch
(
AuthorizationException
|
ClientException
|
ServerException
|
InvalidException
|
RateLimitException
e
)
catch
(
AuthorizationException
|
ClientException
|
ServerException
|
InvalidException
|
RateLimitException
|
NotFoundException
e
)
{
LogMgr
.
log
(
LoggingArea
.
ALL
,
LogLevel
.
PROCESSING1
,
e
,
"Error while fetching a user by id from intercom"
);
...
...
@@ -202,7 +203,7 @@ public class IntercomUtils
return
Company
.
find
(
map
);
}
catch
(
InvalidException
|
AuthorizationException
e
)
catch
(
InvalidException
|
AuthorizationException
|
NotFoundException
e
)
{
LogMgr
.
log
(
LoggingArea
.
ALL
,
LogLevel
.
PROCESSING1
,
e
,
"Error while fetching a company by id from intercom"
);
...
...
cmsWebApp/webroot/extensions/adminportal/card_payment.jsp
View file @
366a8eb0
...
...
@@ -18,7 +18,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("
form
"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("
makePayment
"), {'recalcOnError':true});
});
</script>
...
...
@@ -78,5 +78,27 @@
</div>
</div>
</oneit:form>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
<div class="row">
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="form-group hide">
<input type="hidden" name="stripe-token-id" />
</div>
</div>
</div>
<oneit:button value="Pay" name="savePayment" cssClass="hide" id="payNow"
requestAttribs='<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("Company", company)
.mapEntry("ReplaceCard", Boolean.TRUE)
.mapEntry("PPJ", ppj)
.toMap() %>'/>
</oneit:form>
<script src="https://js.stripe.com/v3/"></script>
<script>
var stripePubKey = '<%= MakePaymentFP.STRIPE_PUB_KEY %>';
</script>
<oneit:script>
<!-- MUST be included after initializing stripePubKey -->
<oneit:script src="/scripts/performaStripe.js"/>
</oneit:script>
</oneit:dynIncluded>
\ No newline at end of file
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