added new currencies removed ab test as well

services/web/app/coffee/infrastructure/GeoIpLookup.coffee

@@ -6,13 +6,20 @@ logger = require("logger-sharelatex")
 currencyMappings = {
 	"GB":"GBP"
 	"US":"USD"
+	"CH":"CHF"
+	"NZ":"NZD"
+	"AU":"AUD"
+	"DK":"DKK"
+	"NO":"NOK"
+	"CA":"CAD"
+	"SE":"SEK"
 }
 
 # Countries which would likely prefer Euro's
-EuroCountries = ["AT", "BE", "BG", "HR", "CY", "CZ", 
-"DK", "EE", "FI", "FR", "DE", "EL", "HU", "IE", 
+EuroCountries = ["AT", "BE", "BG", "HR", "CY", "CZ",  
+"EE", "FI", "FR", "DE", "EL", "HU", "IE", 
 "IT", "LV", "LT", "LU", "MT", "NL", "PL", "PT",
-"RO", "SK", "SI", "ES", "SE"]
+"RO", "SK", "SI", "ES"]
 
 _.each EuroCountries, (country)-> currencyMappings[country] = "EUR"
 

services/web/config/settings.defaults.coffee

@@ -99,7 +99,7 @@ module.exports =
 			apiKey: ""
 			subdomain: ""
 		geoIpLookup:
-			url: "https://freegeoip.net/json/"
+			url: "http://localhost:8080/json"
 			
 	templates:
 		user_id: process.env.TEMPLATES_USER_ID or "5395eb7aad1f29a88756c7f2"

services/web/public/coffee/main/new-subscription.coffee

@@ -7,16 +7,5 @@ define [
 		$scope.currencyCode = MultiCurrencyPricing.currencyCode
 		$scope.plans = MultiCurrencyPricing.plans
 
-
-		if MultiCurrencyPricing.currencyCode != "USD"
-			currencyBuckets = [
-				{ bucketName:"eu-eu", currency:MultiCurrencyPricing.currencyCode}
-				{ bucketName:"eu-usd", currency:"USD"}
-			]
-			multiCurrencyBucket = abTestManager.getABTestBucket "multi_currency", currencyBuckets
-			$scope.currencyCode = multiCurrencyBucket.currency
-			abTestManager.processTestWithStep("multi_currency_editor", multiCurrencyBucket.bucketName, 0)
-
-
 		$scope.changeCurrency = (newCurrency)->
 			window.location = "/user/subscription/new?planCode=#{window.plan_code}&currency=#{newCurrency}"

services/web/public/coffee/main/plans.coffee

@@ -147,23 +147,10 @@ define [
 
 
 	App.controller "PlansController", ($scope, $modal, event_tracking, abTestManager, MultiCurrencyPricing, $http) ->
-		
 
 		$scope.plans = MultiCurrencyPricing.plans
 		$scope.currencyCode = MultiCurrencyPricing.currencyCode
 
-
-
-		if MultiCurrencyPricing.currencyCode != "USD"
-			currencyBuckets = [
-				{ bucketName:"eu-eu", currency:MultiCurrencyPricing.currencyCode}
-				{ bucketName:"eu-usd", currency:"USD"}
-			]
-			multiCurrencyBucket = abTestManager.getABTestBucket "multi_currency", currencyBuckets
-			$scope.currencyCode = multiCurrencyBucket.currency
-
-
-
 		$scope.trial_len = 7
 		$scope.planQueryString = '_free_trial_7_days'
 
@@ -171,14 +158,10 @@ define [
 			view: "monthly"
 
 
-
 		$scope.changeCurreny = (newCurrency)->
 			$scope.currencyCode = newCurrency
 
 		$scope.signUpNowClicked = (plan, annual)->
-			if multiCurrencyBucket?
-				abTestManager.processTestWithStep("multi_currency", multiCurrencyBucket.bucketName, 0)
-
 			if $scope.ui.view == "annual"
 				plan = "#{plan}_annual"