Merge branch 'master' of ssh://bitbucket.org/yackob03/quay
This commit is contained in:
commit
4059c6ccbb
1 changed files with 4 additions and 2 deletions
|
@ -1098,7 +1098,9 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
|
||||||
planDict[data.plans[i].stripeId] = data.plans[i];
|
planDict[data.plans[i].stripeId] = data.plans[i];
|
||||||
}
|
}
|
||||||
plans = data.plans;
|
plans = data.plans;
|
||||||
|
if (plans) {
|
||||||
callback(plans);
|
callback(plans);
|
||||||
|
}
|
||||||
}, function() { callback([]); });
|
}, function() { callback([]); });
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1194,7 +1196,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
|
||||||
|
|
||||||
planService.getCardInfo(orgname, function(cardInfo) {
|
planService.getCardInfo(orgname, function(cardInfo) {
|
||||||
if (plan.price > 0 && (previousSubscribeFailure || !cardInfo.last4)) {
|
if (plan.price > 0 && (previousSubscribeFailure || !cardInfo.last4)) {
|
||||||
var title = cardInfo.last4 ? 'Subscribe' : 'Start Free trial<span style="display:none">{{amount}}</span>';
|
var title = cardInfo.last4 ? 'Subscribe' : 'Start Trial ({{amount}} plan)';
|
||||||
planService.showSubscribeDialog($scope, orgname, planId, callbacks, title);
|
planService.showSubscribeDialog($scope, orgname, planId, callbacks, title);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue