diff options
Diffstat (limited to 'StoneIsland/platforms/android')
15 files changed, 39 insertions, 31 deletions
diff --git a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileHashes.bin Binary files differindex 24748eea..68cf609b 100644 --- a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileHashes.bin +++ b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileHashes.bin diff --git a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin Binary files differindex ece3d7d3..cdae22a7 100644 --- a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin +++ b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin diff --git a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin Binary files differindex 514880d5..fcbedd1b 100644 --- a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin +++ b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin diff --git a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock Binary files differindex 4593c450..8107e00d 100644 --- a/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock +++ b/StoneIsland/platforms/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock diff --git a/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock Binary files differindex 7966c5fc..c25818cf 100644 --- a/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock +++ b/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock diff --git a/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock Binary files differindex 7aff4592..c0909e53 100644 --- a/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock +++ b/StoneIsland/platforms/android/.gradle/3.3/tasks/_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index d6229006..8ca9463a 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<manifest android:hardwareAccelerated="true" android:versionCode="6108" android:versionName="1.0.8" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android"> +<manifest android:hardwareAccelerated="true" android:versionCode="6110" android:versionName="1.1.0" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android"> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <application android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name" android:supportsRtl="true"> diff --git a/StoneIsland/platforms/android/assets/www/index.html b/StoneIsland/platforms/android/assets/www/index.html index bdad67c8..b6fc8317 100755 --- a/StoneIsland/platforms/android/assets/www/index.html +++ b/StoneIsland/platforms/android/assets/www/index.html @@ -425,7 +425,7 @@ <div class="checkbox-container "> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-data-profiling" name="DataProfiling" value="true" required tabindex="8"> + <input type="checkbox" id="checkbox-data-profiling" name="YooxLetter" value="true" required tabindex="8"> <label for="checkbox-data-profiling"></label> </div> <label class="checkbox-caption" for="checkbox-data-profiling"> @@ -443,11 +443,11 @@ </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-shopping-account-terms" name="AccountTerms" value="true" required tabindex="10"> + <input type="checkbox" id="checkbox-shopping-account-terms" name="GdprTerms" value="true" required tabindex="10"> <label for="checkbox-shopping-data-profiling"></label> </div> <label class="checkbox-caption" for="checkbox-shopping-account-terms"> - ACCEPT MY ACCOUNT TERMS AND CONDITIONS OF USE * + I ACCEPT MY ACCOUNT TERMS AND CONDITIONS OF USE * </label> </div> <div class="container-message submessage"> @@ -492,17 +492,7 @@ <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required tabindex="6"> - <label for="receive-newsletter-profile"></label> - </div> - <label class="checkbox-caption" for="receive-newsletter-profile"> - <b>Newsletter</b><br> - Receive Stone Island Newsletter - </label> - </div> - <div class="checkbox-row"> - <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-data-profiling-profile" name="DataProfiling" value="true" required tabindex="7"> + <input type="checkbox" id="checkbox-data-profiling-profile" name="YooxLetter" value="true" required tabindex="7"> <label for="checkbox-data-profiling-profile"></label> </div> <label class="checkbox-caption" for="checkbox-data-profiling-profile"> diff --git a/StoneIsland/platforms/android/assets/www/js/lib/_router.js b/StoneIsland/platforms/android/assets/www/js/lib/_router.js index 91f29b55..75f598e9 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/_router.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/_router.js @@ -40,7 +40,14 @@ var SiteRouter = Router.extend({ '/cart/error': 'cart.error', }, - terms_routes: ['terms','account_terms','privacy','returns','care','logout'], + terms_routes: [ + 'terms', + 'account_terms', + 'privacy', + 'returns', + 'care', + 'logout', + ], initialize: function(){ var fn @@ -105,8 +112,11 @@ var SiteRouter = Router.extend({ // return // } - var isTermsRoute = this.terms_routes.indexOf(name) !== -1 - if (app.demand_consent && !isTermsRoute && app.account.consent.check()) { + var isNotTermsRoute = this.terms_routes.indexOf(name) === -1 + var isCartRoute = n[0] === 'cart' + var userMightActuallyViewCart = isCartRoute && auth.logged_in() + var demandingConsent = app.demand_consent && isNotTermsRoute + if ((userMightActuallyViewCart || demandingConsent) && app.account.consent.check()) { console.log('showed consent modal') return } diff --git a/StoneIsland/platforms/android/assets/www/js/lib/account/AccountView.js b/StoneIsland/platforms/android/assets/www/js/lib/account/AccountView.js index 4605416c..8ac7c193 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/account/AccountView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/account/AccountView.js @@ -105,6 +105,7 @@ var AccountView = View.extend({ cb && cb() } console.log('logged in') + app.account.consent.check() if ( ! auth.has_cart() ) { console.log('no cart') app.curtain.show("loading") @@ -132,9 +133,10 @@ var AccountView = View.extend({ console.log("navigating to deep link route from logged_in") app.router.go(initialLoginPath) } - else { + else if (!app.last_view) { app.router.go("account/profile") } + app.account.consent.check() app.curtain.hide("loading") } }, diff --git a/StoneIsland/platforms/android/assets/www/js/lib/account/ConsentModal.js b/StoneIsland/platforms/android/assets/www/js/lib/account/ConsentModal.js index 9fc736dc..c9235498 100644 --- a/StoneIsland/platforms/android/assets/www/js/lib/account/ConsentModal.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/account/ConsentModal.js @@ -18,11 +18,14 @@ var ConsentModal = View.extend({ check: function(){ var status = localStorage.getItem('account_terms.consent') + console.log('account_terms.consent', status) if (status !== 'true') { + console.log('we demand consent!') app.demand_consent = true this.show() return true } else { + console.log('already received consent!') this.hide() app.demand_consent = false return false @@ -35,8 +38,10 @@ var ConsentModal = View.extend({ setTimeout(function(){ this.$el.addClass('visible') }.bind(this), 20) - app.curtain.show() - app.curtain.$el.addClass('opaque') + app.curtain.show('opaque') + setTimeout(function(){ + app.curtain.show('opaque') + }, 300) }, hide: function(){ diff --git a/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js b/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js index aeb15d1d..c3d839a5 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js @@ -43,9 +43,7 @@ var LoginView = FormView.extend({ success: function(data){ console.log(data) - app.account.logged_in(function(){ - app.router.go("store") - }) + app.account.logged_in(null, "store") }, error: function(data){ diff --git a/StoneIsland/platforms/android/assets/www/js/lib/auth/LogoutView.js b/StoneIsland/platforms/android/assets/www/js/lib/auth/LogoutView.js index 89091473..d3f76428 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/auth/LogoutView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/auth/LogoutView.js @@ -10,6 +10,7 @@ var LogoutView = View.extend({ app.header.set_cart_count(0) app.footer.hide() auth.log_out() + localStorage.setItem('account_terms.consent', 'false') app.demand_consent = false app.account.consent.hide() app.account.logged_out() diff --git a/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js b/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js index 078f7c07..ef7dd6aa 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js @@ -53,7 +53,7 @@ var SignupView = FormView.extend({ "Password": "Please enter your password.", "Password2": "Please enter your password again.", "DataProfiling": "You must consent to data profiling to use the Stone Island app.", - "AccountTerms": "You must agree to the Your My Account terms.", + "GdprTerms": "You must agree to the Your My Account terms.", }, validate_fields: function(data, errors){ @@ -64,14 +64,16 @@ var SignupView = FormView.extend({ if (data.Email.toLowerCase() !== data.ConfirmEmail.toLowerCase()) { errors.push([ "ConfirmEmail", "Email addresses don't match." ]) } // if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) } if (data.DataProfiling !== "true") { errors.push([ "DataProfiling", "You must consent to data profiling to use the Stone Island app." ]) } - if (data.AccountTerms !== "true") { errors.push([ "AccountTerms", "You must agree to the Your My Account terms to use the Stone Island app." ]) } + if (data.GdprTerms !== "true") { errors.push([ "GdprTerms", "You must agree to the Your My Account terms to use the Stone Island app." ]) } var now = new Date () var year = now.getFullYear() - if (! data.Birthday) data.BirthDay = year + '-01-01' - if (data.BirthDay.split('-')[0] || '2018') + if (! data.BirthDay) { + data.BirthDay = year + '-01-01' + } + // if (data.BirthDay.split('-')[0] || '2018') var birthday = new Date (data.BirthDay) - if (isNaN(birthday) || (now - birthday) / (365*24*60*60*1000) < 18) { + if (isNaN(birthday) || (new Date () - birthday) / (365*24*60*60*1000) < 18) { errors.push(['BirthDay', 'You must be 18 or older to use the Stone Island app.']) } @@ -108,7 +110,7 @@ var SignupView = FormView.extend({ auth.user.Email = this.last_data.Email auth.user.BirthDay = this.last_data.BirthDay localStorage.setItem('account_terms.consent', 'true') - app.account.logged_in(function(){ app.router.go("store") }) + app.account.logged_in(null, "store") }, error: function(data){ diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml index 16487014..dc38ba1b 100644 --- a/StoneIsland/platforms/android/res/xml/config.xml +++ b/StoneIsland/platforms/android/res/xml/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6108" id="us.okfoc.stoneisland" version="1.0.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6110" id="us.okfoc.stoneisland" version="1.1.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <feature name="InAppBrowser"> <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser" /> </feature> |