alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into sk-tpr

Browse Source
This commit is contained in:
Shane Kilkelly
2016-04-11 16:41:34 +01:00
parent a686d187ad 749d2aa013
commit 939d7cd042
12 changed files with 1191 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/coffee/Features/Referal/ReferalAllocator.coffee
+1 -1
View File
@@ -35,7 +35,7 @@ module.exports = ReferalAllocator =
query = _id: user_id
User.findOne query, (error, user) ->
return callback(error) if error
return callback(new Error("user not found")) if !user?
return callback(new Error("user not found #{user_id} for assignBonus")) if !user?
logger.log user_id: user_id, refered_user_count: user.refered_user_count, "assigning bonus"
if user.refered_user_count? and user.refered_user_count > 0
newFeatures = ReferalAllocator._calculateFeatures(user)
services/web/app/coffee/Features/Subscription/SubscriptionLocator.coffee
+1 -1
View File
@@ -25,4 +25,4 @@ module.exports =
Subscription.findOne {member_ids: user_id, _id:subscription_id}, {_id:1}, callback
getGroupSubscriptionMemberOf: (user_id, callback)->
Subscription.findOne {member_ids: user_id}, {_id:1}, callback
Subscription.findOne {member_ids: user_id}, {_id:1, planCode:1}, callback
services/web/app/coffee/Features/Subscription/SubscriptionUpdater.coffee
+8 -2
View File
@@ -71,7 +71,7 @@ module.exports = SubscriptionUpdater =
subscription.groupPlan = true
subscription.membersLimit = plan.membersLimit
subscription.save ->
allIds = _.union subscription.members_id, [subscription.admin_id]
allIds = _.union subscription.member_ids, [subscription.admin_id]
jobs = allIds.map (user_id)->
return (cb)->
SubscriptionUpdater._setUsersMinimumFeatures user_id, cb
@@ -84,12 +84,18 @@ module.exports = SubscriptionUpdater =
groupSubscription: (cb)->
SubscriptionLocator.getGroupSubscriptionMemberOf user_id, cb
async.series jobs, (err, results)->
if err?
logger.err err:err, user_id:user, "error getting subscription or group for _setUsersMinimumFeatures"
return callback(err)
{subscription, groupSubscription} = results
if subscription? and subscription.planCode?
if subscription? and subscription.planCode? and subscription.planCode != Settings.defaultPlanCode
logger.log user_id:user_id, "using users subscription plan code for features"
UserFeaturesUpdater.updateFeatures user_id, subscription.planCode, callback
else if groupSubscription? and groupSubscription.planCode?
logger.log user_id:user_id, "using group which user is memor of for features"
UserFeaturesUpdater.updateFeatures user_id, groupSubscription.planCode, callback
else
logger.log user_id:user_id, "using default features for user with no subscription or group"
UserFeaturesUpdater.updateFeatures user_id, Settings.defaultPlanCode, (err)->
if err?
logger.err err:err, user_id:user_id, "Error setting minimum user feature"
services/web/app/views/contact-us-modal.jade
+2 -2
View File
@@ -12,9 +12,9 @@ script(type='text/ng-template', id='supportModalTemplate')
| #{translate("subject")}
.form-group
input.field.text.medium.span8.form-control(ng-model="form.subject", maxlength='255', tabindex='1', onkeyup='')
label.desc
label.desc(ng-show="'#{getUserEmail()}'.length < 1")
| #{translate("email")}
.form-group
.form-group(ng-show="'#{getUserEmail()}'.length < 1")
input.field.text.medium.span8.form-control(ng-model="form.email", ng-init="form.email = '#{getUserEmail()}'", type='email', spellcheck='false', value='', maxlength='255', tabindex='2')
label#title12.desc
| #{translate("project_url")} (#{translate("optional")})