community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #901 from Kamidu/master

Browse Source 
enabling billing status cache invalidation
This commit is contained in:
Madawa Soysa 2017-10-23 14:48:46 +05:30 committed by GitHub
commit 08b1bf7e5b
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag
View File

@ -33,8 +33,13 @@ var util = require("/app/modules/oauth/token-handler-utils.js")["utils"];
var responseProcessor = require("utils").response; var responseProcessor = require("utils").response;
var result; var result;
if (uriMatcher.match("/{context}/api/user/clearBilling")) {
if (uriMatcher.match("/{context}/api/user/authenticate")) { carbonUser = session.get(constants.USER_SESSION_KEY);
session.put('BILLING_INFO_' + carbonUser.domain, null);
log.info("billing info cleared for " + carbonUser.domain);
} else if (uriMatcher.match("/{context}/api/user/authenticate")) {
var username = request.getParameter("username"); var username = request.getParameter("username");
var password = request.getParameter("password"); var password = request.getParameter("password");
//Check if a username and password is provided //Check if a username and password is provided

27
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/public/js/user-menu.js
View File

@ -16,6 +16,33 @@
* under the License. * under the License.
*/ */
$(document).ready(function () { $(document).ready(function () {
$("#expire-upgrade-now-link").click(function() {
$.get("api/user/clearBilling", function(data, status){
});
window.location.href = $("#expire-upgrade-now-link").data("url");
});
$("#expire-req-ext-link").click(function() {
$.get("api/user/clearBilling", function(data, status){
});
window.location.href = $("#expire-req-ext-link").data("url");
});
$(".expire-upgrade-now-link").parent().click(function(e) {
e.preventDefault();
$.get("api/user/clearBilling", function(data, status){
});
window.location.href = $(this).attr("href");
});
$(".expire-req-ext-link").parent().click(function(e) {
e.preventDefault();
$.get("api/user/clearBilling", function(data, status){
});
window.location.href = $(this).attr("href");
});
$('#cloud-menu-popover i.fw-tiles').popover({ $('#cloud-menu-popover i.fw-tiles').popover({
html: true, html: true,
trigger: 'click', trigger: 'click',

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
View File

@ -171,10 +171,10 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="{{Main.Account.dropDown.[Upgrade Now].url}}" id="expire-upgrade-now-link" class="btn-operations"> <a data-url="{{Main.Account.dropDown.[Upgrade Now].url}}" id="expire-upgrade-now-link" class="btn-operations">
Upgrade Now Upgrade Now
</a> </a>
<a href="{{Main.Account.dropDown.[Request Extension].url}}" id="expire-req-ext-link" class="btn-operations"> <a data-url="{{Main.Account.dropDown.[Request Extension].url}}" id="expire-req-ext-link" class="btn-operations">
Request Extension Request Extension
</a> </a>
</div> </div>