From c8a3164db258636dd2ce1a0d3d8eb407e3e3a91b Mon Sep 17 00:00:00 2001 From: nazaninreihani Date: Tue, 2 Apr 2019 17:26:17 -0400 Subject: [PATCH 01/15] self exclusion message for uk clients --- www/i18n/en.json | 5 ++++- .../self-exclusion.controller.js | 7 +++++-- .../self-exclusion.template.html | 20 +++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/www/i18n/en.json b/www/i18n/en.json index 5dfbe8809d..db9dd8dbe3 100644 --- a/www/i18n/en.json +++ b/www/i18n/en.json @@ -384,7 +384,10 @@ "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.", + "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" }, "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..70161021cd 100644 --- a/www/js/pages/self-exclusion/self-exclusion.controller.js +++ b/www/js/pages/self-exclusion/self-exclusion.controller.js @@ -9,9 +9,10 @@ (function() { angular.module("binary.pages.self-exclusion.controllers").controller("SelfExclusionController", SelfExclusion); - SelfExclusion.$inject = ["$scope", "$translate", "alertService", "websocketService", "validationService"]; + SelfExclusion.$inject = ["$scope", "$translate", "alertService", "websocketService", + "accountService", "validationService"]; - function SelfExclusion($scope, $translate, alertService, websocketService, + function SelfExclusion($scope, $translate, alertService, websocketService, accountService, validationService) { const vm = this; vm.hasError = false; @@ -26,6 +27,8 @@ vm.isDataLoaded = false; vm.disableForZeroValues = 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']; diff --git a/www/js/pages/self-exclusion/self-exclusion.template.html b/www/js/pages/self-exclusion/self-exclusion.template.html index b114b1b38a..d06d09a3de 100644 --- a/www/js/pages/self-exclusion/self-exclusion.template.html +++ b/www/js/pages/self-exclusion/self-exclusion.template.html @@ -13,6 +13,26 @@

+
+
+
+
+ {{ 'self-exclusion.ukgc_info_1' | translate }} +
+
+
+
+ {{ 'self-exclusion.ukgc_info_2' | translate }} +
+
+
+
+ {{ 'self-exclusion.ukgc_info_3' | translate }} + www.gamstop.co.uk. +
+
+
+
From 99014d9e77ddd727e28798f4b51881a5fe0031df Mon Sep 17 00:00:00 2001 From: nazaninreihani Date: Mon, 22 Apr 2019 09:31:25 -0400 Subject: [PATCH 02/15] self exclusion notes --- .idea/codeStyles/Project.xml | 10 ++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 +++++ .idea/inspectionProfiles/Project_Default.xml | 8 ++++++++ .idea/jsLinters/jshint.xml | 16 ++++++++++++++++ .idea/misc.xml | 6 ++++++ .idea/mobile.iml | 13 +++++++++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 7 +++++++ .../self-exclusion.controller.js | 8 ++++++-- .../self-exclusion.template.html | 18 +++++++++++++++--- 10 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/jsLinters/jshint.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/mobile.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000000..ad7bfc73ea --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000..79ee123c2b --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000000..001f05ccca --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/jsLinters/jshint.xml b/.idea/jsLinters/jshint.xml new file mode 100644 index 0000000000..3d8b3cbfcf --- /dev/null +++ b/.idea/jsLinters/jshint.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..28a804d893 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/mobile.iml b/.idea/mobile.iml new file mode 100644 index 0000000000..5da5fb5a42 --- /dev/null +++ b/.idea/mobile.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000..348e586c61 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..8e3404f991 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/www/js/pages/self-exclusion/self-exclusion.controller.js b/www/js/pages/self-exclusion/self-exclusion.controller.js index 70161021cd..d4c2526596 100644 --- a/www/js/pages/self-exclusion/self-exclusion.controller.js +++ b/www/js/pages/self-exclusion/self-exclusion.controller.js @@ -9,10 +9,10 @@ (function() { angular.module("binary.pages.self-exclusion.controllers").controller("SelfExclusionController", SelfExclusion); - SelfExclusion.$inject = ["$scope", "$translate", "alertService", "websocketService", + SelfExclusion.$inject = ["$scope", "$state", "$translate", "alertService", "websocketService", "accountService", "validationService"]; - function SelfExclusion($scope, $translate, alertService, websocketService, accountService, + function SelfExclusion($scope, $state, $translate, alertService, websocketService, accountService, validationService) { const vm = this; vm.hasError = false; @@ -112,6 +112,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 d06d09a3de..6352206912 100644 --- a/www/js/pages/self-exclusion/self-exclusion.template.html +++ b/www/js/pages/self-exclusion/self-exclusion.template.html @@ -13,19 +13,31 @@

+
+
+
+
+ {{ 'self-exclusion.info' | translate }} + + {{ 'profile.customer_support' | translate }}. + +
+
+
+
-
+
{{ 'self-exclusion.ukgc_info_1' | translate }}
-
+
{{ 'self-exclusion.ukgc_info_2' | translate }}
-
+
{{ 'self-exclusion.ukgc_info_3' | translate }} www.gamstop.co.uk. From ccdf33b488a926594287485bcaf44367945948f9 Mon Sep 17 00:00:00 2001 From: nazaninreihani Date: Mon, 22 Apr 2019 09:33:26 -0400 Subject: [PATCH 03/15] self exclusion notes --- www/i18n/en.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www/i18n/en.json b/www/i18n/en.json index db9dd8dbe3..622bfa7ada 100644 --- a/www/i18n/en.json +++ b/www/i18n/en.json @@ -385,6 +385,8 @@ "warning": "Warning", "not_zero": "Value can not be 0", "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" From dc4a1e57a6eba584cfc2efa725726218a4626a5c Mon Sep 17 00:00:00 2001 From: nazaninreihani Date: Mon, 22 Apr 2019 10:47:37 -0400 Subject: [PATCH 04/15] show bottom note in self exclusion --- www/i18n/en.json | 5 ++++- .../self-exclusion.controller.js | 12 +++++++++-- .../self-exclusion.template.html | 20 +++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/www/i18n/en.json b/www/i18n/en.json index 622bfa7ada..b5a95a6f2b 100644 --- a/www/i18n/en.json +++ b/www/i18n/en.json @@ -389,7 +389,10 @@ "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" + "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 d4c2526596..6839305095 100644 --- a/www/js/pages/self-exclusion/self-exclusion.controller.js +++ b/www/js/pages/self-exclusion/self-exclusion.controller.js @@ -9,10 +9,10 @@ (function() { angular.module("binary.pages.self-exclusion.controllers").controller("SelfExclusionController", SelfExclusion); - SelfExclusion.$inject = ["$scope", "$state", "$translate", "alertService", "websocketService", + SelfExclusion.$inject = ["$scope", "$state", "$translate", "$ionicScrollDelegate", "alertService", "websocketService", "accountService", "validationService"]; - function SelfExclusion($scope, $state, $translate, alertService, websocketService, accountService, + function SelfExclusion($scope, $state, $translate, $ionicScrollDelegate, alertService, websocketService, accountService, validationService) { const vm = this; vm.hasError = false; @@ -26,6 +26,7 @@ vm.disableUpdateButton = true; vm.isDataLoaded = false; vm.disableForZeroValues = false; + let isUpdated = false; vm.data = {}; const account = accountService.getDefault(); vm.country = account.country; @@ -58,6 +59,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) => { @@ -100,6 +107,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) => { diff --git a/www/js/pages/self-exclusion/self-exclusion.template.html b/www/js/pages/self-exclusion/self-exclusion.template.html index 6352206912..738b0f4285 100644 --- a/www/js/pages/self-exclusion/self-exclusion.template.html +++ b/www/js/pages/self-exclusion/self-exclusion.template.html @@ -469,6 +469,26 @@

+
+
+
+
+ {{ 'self-exclusion.info_bottom_1' | translate }} +
+
+
+
+ {{ 'self-exclusion.info_bottom_2' | translate }} +
+
+
+
+ {{ 'self-exclusion.info_bottom_3' | translate }} + www.gamstop.co.uk. +
+
+
+
From 94530713bd857641b8d4531516a564698981afac Mon Sep 17 00:00:00 2001 From: nazaninreihani Date: Mon, 22 Apr 2019 10:53:57 -0400 Subject: [PATCH 05/15] fix eslint error --- .../self-exclusion.controller.js | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/www/js/pages/self-exclusion/self-exclusion.controller.js b/www/js/pages/self-exclusion/self-exclusion.controller.js index 6839305095..2895863280 100644 --- a/www/js/pages/self-exclusion/self-exclusion.controller.js +++ b/www/js/pages/self-exclusion/self-exclusion.controller.js @@ -9,11 +9,27 @@ (function() { angular.module("binary.pages.self-exclusion.controllers").controller("SelfExclusionController", SelfExclusion); - SelfExclusion.$inject = ["$scope", "$state", "$translate", "$ionicScrollDelegate", "alertService", "websocketService", - "accountService", "validationService"]; - - function SelfExclusion($scope, $state, $translate, $ionicScrollDelegate, alertService, websocketService, accountService, - 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; From 4ecb10a1a55c783812262a5826ddedb07b38939c Mon Sep 17 00:00:00 2001 From: Nazanin Reihani Date: Wed, 24 Apr 2019 08:50:19 -0400 Subject: [PATCH 06/15] remove commited files by mistake --- .idea/codeStyles/Project.xml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index ad7bfc73ea..0000000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file From a50ce5592147bdfbcd095c7ff833c07d3b7d9b3d Mon Sep 17 00:00:00 2001 From: Nazanin Reihani Date: Wed, 24 Apr 2019 08:50:31 -0400 Subject: [PATCH 07/15] remove commited files by mistake --- .idea/codeStyles/codeStyleConfig.xml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123c2b..0000000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file From 2dff53d49aa6778425fbf8fa2197bff40367b801 Mon Sep 17 00:00:00 2001 From: Nazanin Reihani Date: Wed, 24 Apr 2019 08:50:40 -0400 Subject: [PATCH 08/15] remove commited files by mistake --- .idea/inspectionProfiles/Project_Default.xml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .idea/inspectionProfiles/Project_Default.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 001f05ccca..0000000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file From 050b7765a97231f33e8168d7f9a4cc6f589f4de1 Mon Sep 17 00:00:00 2001 From: Nazanin Reihani Date: Wed, 24 Apr 2019 08:50:51 -0400 Subject: [PATCH 09/15] remove commited files by mistake --- .idea/jsLinters/jshint.xml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .idea/jsLinters/jshint.xml diff --git a/.idea/jsLinters/jshint.xml b/.idea/jsLinters/jshint.xml deleted file mode 100644 index 3d8b3cbfcf..0000000000 --- a/.idea/jsLinters/jshint.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file From 49e0af5667b9b5ba0e7c182866e6529d3bd34b59 Mon Sep 17 00:00:00 2001 From: Nazanin Reihani Date: Wed, 24 Apr 2019 08:51:00 -0400 Subject: [PATCH 10/15] remove commited files by mistake --- .idea/misc.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/misc.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 28a804d893..0000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file From f0b3480d2156d0562a9edd98f68c8c854e297ba2 Mon Sep 17 00:00:00 2001 From: Nazanin Reihani Date: Wed, 24 Apr 2019 08:51:10 -0400 Subject: [PATCH 11/15] remove commited files by mistake --- .idea/mobile.iml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .idea/mobile.iml diff --git a/.idea/mobile.iml b/.idea/mobile.iml deleted file mode 100644 index 5da5fb5a42..0000000000 --- a/.idea/mobile.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file From 491c68445c79fdbdb0f6cd8bdea799bc0d1d3968 Mon Sep 17 00:00:00 2001 From: Nazanin Reihani Date: Wed, 24 Apr 2019 08:51:21 -0400 Subject: [PATCH 12/15] remove commited files by mistake --- .idea/modules.xml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .idea/modules.xml diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 348e586c61..0000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From e748e2cc7bd5e1a97e8411b8ba8972af5830731b Mon Sep 17 00:00:00 2001 From: Nazanin Reihani Date: Wed, 24 Apr 2019 08:51:33 -0400 Subject: [PATCH 13/15] remove commited files by mistake --- .idea/vcs.xml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 8e3404f991..0000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From ca9467dc5f2ef66005c49240af4fc9b98171bb54 Mon Sep 17 00:00:00 2001 From: nazaninreihani Date: Wed, 24 Apr 2019 08:57:29 -0400 Subject: [PATCH 14/15] fix exclude until datepicker --- .../self-exclusion/self-exclusion.template.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/www/js/pages/self-exclusion/self-exclusion.template.html b/www/js/pages/self-exclusion/self-exclusion.template.html index 738b0f4285..04a53d55be 100644 --- a/www/js/pages/self-exclusion/self-exclusion.template.html +++ b/www/js/pages/self-exclusion/self-exclusion.template.html @@ -439,11 +439,13 @@

- +
{{ 'self-exclusion.exclude_me_hint' | translate }}
From 3f7a131edf247a212ef67054c15869e517b6f29b Mon Sep 17 00:00:00 2001 From: nazaninreihani Date: Wed, 24 Apr 2019 09:50:34 -0400 Subject: [PATCH 15/15] fix style of datetime-local input indicator --- scss/shared/_general.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } }