Commit 366a8eb0 by Nilu

fix minor issues

parent 9cd6806c
...@@ -24,6 +24,7 @@ import performa.intercom.resources.Company; ...@@ -24,6 +24,7 @@ import performa.intercom.resources.Company;
import performa.intercom.resources.CustomAttribute; import performa.intercom.resources.CustomAttribute;
import performa.intercom.resources.Intercom; import performa.intercom.resources.Intercom;
import performa.intercom.resources.InvalidException; import performa.intercom.resources.InvalidException;
import performa.intercom.resources.NotFoundException;
import performa.intercom.resources.RateLimitException; import performa.intercom.resources.RateLimitException;
import performa.intercom.resources.ServerException; import performa.intercom.resources.ServerException;
import performa.intercom.resources.User; import performa.intercom.resources.User;
...@@ -85,7 +86,7 @@ public class IntercomUtils ...@@ -85,7 +86,7 @@ public class IntercomUtils
return User.find(map); 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"); LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, e, "Error while fetching a user by id from intercom");
...@@ -202,7 +203,7 @@ public class IntercomUtils ...@@ -202,7 +203,7 @@ public class IntercomUtils
return Company.find(map); 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"); LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, e, "Error while fetching a company by id from intercom");
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
}); });
</script> </script>
...@@ -78,5 +78,27 @@ ...@@ -78,5 +78,27 @@
</div> </div>
</div> </div>
</oneit:form> </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> </oneit:dynIncluded>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment