diff --git a/scss/shared/_general.scss b/scss/shared/_general.scss
index a862dbf691..10298607a7 100644
--- a/scss/shared/_general.scss
+++ b/scss/shared/_general.scss
@@ -228,10 +228,10 @@ input {
top: 2px;
position: relative;
}
- &[type="date"] {
+ &[type="date"], &[type="datetime-local"] {
min-height: 30px!important;
}
- &[type="date"]::-webkit-calendar-picker-indicator {
+ &[type="date"]::-webkit-calendar-picker-indicator, &[type="datetime-local"]::-webkit-calendar-picker-indicator {
color: $secondaryContentColor;
}
}
diff --git a/www/i18n/en.json b/www/i18n/en.json
index 5dfbe8809d..b5a95a6f2b 100644
--- a/www/i18n/en.json
+++ b/www/i18n/en.json
@@ -384,7 +384,15 @@
"success": "Success",
"warning": "Warning",
"not_zero": "Value can not be 0",
- "error": "Sorry, an error occurred while processing your request."
+ "error": "Sorry, an error occurred while processing your request.",
+ "customer_support": "customer support",
+ "info": "Online trading can become addictive. Fill in the form below to limit your participation on the website or send a signed letter or fax to our customer support team. Once set, you can only tighten your limits. Limits will only be removed or loosened after 7 days with the exception of the self-exclusion date, which cannot be removed or altered once you have confirmed it. To remove or increase your limits, please contact",
+ "ukgc_info_1": "If you are considering self-exclusion, you may wish to register with GAMSTOP.",
+ "ukgc_info_2": "GAMSTOP is a free service that enables you to self-exclude from all online gambling companies licensed in Great Britain.",
+ "ukgc_info_3": "To find out more and to sign up with GAMSTOP, please visit",
+ "info_bottom_1": "Self-exclusion on this website only applies to your Binary.com account and does not include other companies or websites.",
+ "info_bottom_2": "Since you feel the need to self-exclude, we strongly encourage you to exclude yourself from similar services that you may have signed up for.",
+ "info_bottom_3": "To self-exclude from all online gambling companies licensed in Great Britain, you may go to "
},
"profile": {
"personal_details": "Personal Details",
diff --git a/www/js/pages/self-exclusion/self-exclusion.controller.js b/www/js/pages/self-exclusion/self-exclusion.controller.js
index 59359553e7..2895863280 100644
--- a/www/js/pages/self-exclusion/self-exclusion.controller.js
+++ b/www/js/pages/self-exclusion/self-exclusion.controller.js
@@ -9,10 +9,27 @@
(function() {
angular.module("binary.pages.self-exclusion.controllers").controller("SelfExclusionController", SelfExclusion);
- SelfExclusion.$inject = ["$scope", "$translate", "alertService", "websocketService", "validationService"];
-
- function SelfExclusion($scope, $translate, alertService, websocketService,
- validationService) {
+ SelfExclusion.$inject = [
+ "$scope",
+ "$state",
+ "$translate",
+ "$ionicScrollDelegate",
+ "alertService",
+ "websocketService",
+ "accountService",
+ "validationService"
+ ];
+
+ function SelfExclusion(
+ $scope,
+ $state,
+ $translate,
+ $ionicScrollDelegate,
+ alertService,
+ websocketService,
+ accountService,
+ validationService
+ ) {
const vm = this;
vm.hasError = false;
vm.validation = validationService;
@@ -25,7 +42,10 @@
vm.disableUpdateButton = true;
vm.isDataLoaded = false;
vm.disableForZeroValues = false;
+ let isUpdated = false;
vm.data = {};
+ const account = accountService.getDefault();
+ vm.country = account.country;
const noZeroValues = ['max_balance', 'max_turnover', 'max_losses', 'max_7day_turnover', 'max_7day_losses',
'max_30day_turnover', 'max_30day_losses', 'max_open_bets'];
@@ -55,6 +75,12 @@
});
vm.limits = _.clone(vm.data);
vm.disableUpdateButton = false;
+ if (isUpdated) {
+ isUpdated = false;
+ if (vm.country === 'gb') {
+ $ionicScrollDelegate.scrollBottom();
+ }
+ }
});
$scope.$on("set-self-exclusion:error", (e, error) => {
@@ -97,6 +123,7 @@
let stringify = JSON.stringify(data);
stringify = stringify.replace(/:(\d+)([,}])/g, ':"$1"$2');
websocketService.sendRequestFor.setSelfExclusion(JSON.parse(stringify));
+ isUpdated = true;
}
$scope.$on('get_limits', (e, limits) => {
@@ -109,6 +136,10 @@
vm.hasError = true;
});
+ vm.goToContact = () => {
+ $state.go('contact');
+ };
+
const init = () => getLimits();
init();
diff --git a/www/js/pages/self-exclusion/self-exclusion.template.html b/www/js/pages/self-exclusion/self-exclusion.template.html
index b114b1b38a..04a53d55be 100644
--- a/www/js/pages/self-exclusion/self-exclusion.template.html
+++ b/www/js/pages/self-exclusion/self-exclusion.template.html
@@ -13,6 +13,38 @@