change coupon route in angular router to promo

This commit is contained in:
Blade Barringer
2015-05-08 21:24:57 -05:00
parent 1bfc82c636
commit 71c65c7a73
5 changed files with 12 additions and 11 deletions

View File

@@ -116,5 +116,6 @@
"apply": "Apply",
"resubscribe": "Resubscribe",
"promoCode": "Promo Code",
"promoCodeApplied": "Promo Code Applied! Check your inventory",
"promoPlaceholder": "Enter Promotion Code"
}

View File

@@ -216,9 +216,9 @@ window.habitrpg = angular.module('habitrpg',
url: "/export",
templateUrl: "partials/options.settings.export.html"
})
.state('options.settings.coupon', {
url: "/coupon",
templateUrl: "partials/options.settings.coupon.html"
.state('options.settings.promo', {
url: "/promo",
templateUrl: "partials/options.settings.promo.html"
})
.state('options.settings.subscription', {
url: "/subscription",

View File

@@ -20,7 +20,7 @@ habitrpg.controller('SettingsCtrl',
var mapPrefToEmailString = {
'importantAnnouncements': 'inactivityEmails'
};
// If ?unsubFrom param is passed with valid email type,
// automatically unsubscribe users from that email and
// show an alert
@@ -42,7 +42,7 @@ habitrpg.controller('SettingsCtrl',
User.set({"preferences.stickyHeader":false});
$rootScope.$on('userSynced', function(){
window.location.reload();
});
});
}
}
@@ -144,7 +144,7 @@ habitrpg.controller('SettingsCtrl',
$http.post(ApiUrl.get() + '/api/v2/user/coupon/' + code).success(function(res,code){
if (code!==200) return;
User.sync();
Notification.text('Coupon applied! Check your inventory');
Notification.text(env.t('promoCodeApplied'));
});
}
$scope.generateCodes = function(codes){

View File

@@ -9,8 +9,8 @@ script(id='partials/options.settings.html', type="text/ng-template")
li(ng-class="{ active: $state.includes('options.settings.export') }")
a(ui-sref='options.settings.export')
=env.t('dataExport')
li(ng-class="{ active: $state.includes('options.settings.coupon') }")
a(ui-sref='options.settings.coupon')
li(ng-class="{ active: $state.includes('options.settings.promo') }")
a(ui-sref='options.settings.promo')
=env.t('promoCode')
li(ng-class="{ active: $state.includes('options.settings.subscription') }")
a(ui-sref='options.settings.subscription')=env.t('subscription')
@@ -154,11 +154,11 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
a.btn.btn-danger(ng-click='openModal("reset", {controller:"SettingsCtrl"})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('resetAccPop'))= env.t('resetAccount')
a.btn.btn-danger(ng-click='openModal("delete", {controller:"SettingsCtrl"})', popover-trigger='mouseenter', popover=env.t('deleteAccPop'))= env.t('deleteAccount')
script(type='text/ng-template', id='partials/options.settings.coupon.html')
script(type='text/ng-template', id='partials/options.settings.promo.html')
.container-fluid
.row
.col-md-6
h2= env.t('promoCode')
h2=env.t('promoCode')
form.form-inline(role='form',ng-submit='enterCoupon(_couponCode)')
input.form-control(type='text', ng-model='_couponCode', placeholder=env.t('promoPlaceholder'))
button.btn.btn-primary(type='submit')= env.t('submit')

View File

@@ -243,7 +243,7 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
li
a(ui-sref='options.settings.export')=env.t('export')
li
a(ui-sref='options.settings.coupon')=env.t('promoCode')
a(ui-sref='options.settings.promo')=env.t('promoCode')
li
a(ui-sref='options.settings.subscription')=env.t('subscription')
li