Просмотр исходного кода

renamed change currency function and sorted out recommended currency

Henry Oswald 12 лет назад
Родитель
Сommit
2bbdea3433

+ 3 - 4
services/web/app/views/subscriptions/dashboard.jade

@@ -1,8 +1,7 @@
 extends ../layout
 extends ../layout
 block scripts
 block scripts
 	script(type='text/javascript').
 	script(type='text/javascript').
-		window.recurlyPublicToken = '#{settings.apis.recurly.publicKey}'
-
+		window.recomendedCurrency = '#{recomendedCurrency}'
 
 
 mixin printPlan(plan)
 mixin printPlan(plan)
 	-if (!plan.hideFromUsers)
 	-if (!plan.hideFromUsers)
@@ -13,7 +12,7 @@ mixin printPlan(plan)
 				-if (plan.annual)
 				-if (plan.annual)
 					| {{plans[currencyCode][plan.planCode.replace("-annual","")]['annual']}} / #{translate("year")}
 					| {{plans[currencyCode][plan.planCode.replace("-annual","")]['annual']}} / #{translate("year")}
 				-else
 				-else
-					| {{plans[currencyCode][plan.planCode]['monthly']}} / #{translate("month")}	
+					| {{plans[currencyCode][plan.planCode]['monthly']}} / #{translate("month")}
 			td
 			td
 				-if (subscription.state == "free-trial")
 				-if (subscription.state == "free-trial")
 					a(href="/user/subscription/new?planCode=#{plan.planCode}").btn.btn-success #{translate("subscribe_to_this_plan")}
 					a(href="/user/subscription/new?planCode=#{plan.planCode}").btn.btn-success #{translate("subscribe_to_this_plan")}
@@ -83,7 +82,7 @@ block content
 										li(ng-repeat="(currency, value) in plans", dropdown-toggle)
 										li(ng-repeat="(currency, value) in plans", dropdown-toggle)
 											a(
 											a(
 												href,
 												href,
-												ng-click="changeCurreny(currency)"
+												ng-click="changeCurrency(currency)"
 											) {{currency}} ({{value['symbol']}})
 											) {{currency}} ({{value['symbol']}})
 								p: table.table
 								p: table.table
 									tr
 									tr

+ 1 - 1
services/web/public/coffee/main/subscription-dashboard.coffee

@@ -9,7 +9,7 @@ define [
 		$scope.plans = MultiCurrencyPricing.plans
 		$scope.plans = MultiCurrencyPricing.plans
 		$scope.currencyCode = MultiCurrencyPricing.currencyCode
 		$scope.currencyCode = MultiCurrencyPricing.currencyCode
 
 
-		$scope.changeCurreny = (newCurrency)->
+		$scope.changeCurrency = (newCurrency)->
 			MultiCurrencyPricing.currencyCode = newCurrency
 			MultiCurrencyPricing.currencyCode = newCurrency