diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-10-03 05:29:35 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-10-03 05:29:35 +0200 |
| commit | 21b41e6c7cbde9d60e8e99dfce8331c218068052 (patch) | |
| tree | 4cc513245f2e0b822c9083b2d2e30556894d3709 | |
| parent | 58eb0a78f6c0e717278a2ac2e00ef2afa2cbea2b (diff) | |
buildl
45 files changed, 235 insertions, 183 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index 313fb75d..ed00b248 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/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"> <name>Stone Island</name> <description> Stone Island 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> diff --git a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index daa4d171..54b0db05 100644 --- a/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,7 +12,7 @@ <key>CordovaLib.xcscheme</key> <dict> <key>orderHint</key> - <integer>2</integer> + <integer>3</integer> </dict> </dict> </dict> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 3e59c464..1887e791 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -9,16 +9,18 @@ <key>CFBundleIdentifier</key> <string>us.okfoc.stoneisland</string> <key>CFBundleShortVersionString</key> - <string>1.0.5</string> + <string>1.1.0</string> <key>CFBundleVersion</key> - <string>1.0.5</string> + <string>1.1.0</string> <key>SigningIdentity</key> <string>iPhone Developer: Francesca Agusani (3ECUPBTQ5W)</string> + <key>Team</key> + <string>C6JQTPGJ97</string> </dict> <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2018-07-24T16:49:46Z</date> + <date>2018-10-03T01:34:31Z</date> <key>Name</key> <string>Stone Island</string> <key>SchemeName</key> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car Binary files differindex 53bcd571..271f6e3d 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib Binary files differindex 5c45a642..e6db4716 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib Binary files differindex c30f4d2f..69123580 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist Binary files differindex 039459f8..be04aaa5 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib Binary files differindex aa2d93d3..d05862db 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island Binary files differindex 8580cfe7..e729e8f5 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources index 2de0e8d4..58cd9606 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources @@ -94,11 +94,11 @@ </data> <key>Assets.car</key> <data> - wI0hzD71qNa/p1g+4iJVL+CnDPA= + QBTHoRJ0x8xv/TSloxDRiFB1FMc= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - 1HShhs3o+yABq/lv8bjYO0qQUNQ= + gXqcDJNrIf7qR1DKI9ch+1V9PDU= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -106,7 +106,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - 2xAfbC/qzxc+dfdcVYAH9rmYMvU= + 1mmKAwCFy4227LZ0S7gS6/Du8O8= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -114,11 +114,11 @@ </data> <key>Info.plist</key> <data> - gmoS5k3M2WBtpHvHprKv2fCiWCQ= + JSI5Ec8Q4kW5bUuZV6ovXqPRDw0= </data> <key>MainViewController.nib</key> <data> - vt0gC+83+s5GbfVzkae+JzX2Zrs= + VnEob4dYi3BF3NfvgMSVbBvdp70= </data> <key>PkgInfo</key> <data> @@ -126,11 +126,11 @@ </data> <key>config.xml</key> <data> - khjJQJW0CCgPITYraYD8o6v9kAw= + bfkQF8MbJwqxyLtjkZ/gpbN5XUs= </data> <key>embedded.mobileprovision</key> <data> - 6a29fgIuenXjxvHTXPZvMubF7Mk= + WLS7bPgkyLNAOPSGAH/RMV9viq4= </data> <key>www/cordova-js-src/exec.js</key> <data> @@ -226,7 +226,7 @@ </data> <key>www/css/nav.css</key> <data> - VbNFWKLsl9NRgJraJXNDX3i5vIo= + m/IdwEAy3GdFXoqWuEdHjDT/Z1c= </data> <key>www/css/products.css</key> <data> @@ -350,7 +350,7 @@ </data> <key>www/index.html</key> <data> - TlBHJrobN7ufQtkOVpCa5+yCZQA= + WfmLMrq2VwoMbLb2pXyFB7HO8RA= </data> <key>www/js/index.js</key> <data> @@ -358,15 +358,15 @@ </data> <key>www/js/lib/_router.js</key> <data> - bVxlqQcjwXyMn5062b4TDC6Nmfg= + RCIZHAOoU6tTieJXNSBh65fbXc8= </data> <key>www/js/lib/account/AccountView.js</key> <data> - 55BziygniLnmW5LHvmQmd6UT5Fs= + aVpIFnEgArttSQ+Hhv6TuJfBU4A= </data> <key>www/js/lib/account/ConsentModal.js</key> <data> - nGC5YZf/p/OEidXhuLzmMi/mS1Q= + kfkJ6Hte1U4nETpXQ12bkkeBzAU= </data> <key>www/js/lib/account/OrdersView.js</key> <data> @@ -390,15 +390,15 @@ </data> <key>www/js/lib/auth/LoginView.js</key> <data> - 2nZGYC2LOCDPymoAm3yBxHwgYgY= + xy8zU0tBvK30DvJ3hmwSDnyBFgE= </data> <key>www/js/lib/auth/LogoutView.js</key> <data> - jhf/Pzr8A/yk68t3W15g32q4eQ4= + VKg1r6aC7u3NVzzZXFNC8UyKeb4= </data> <key>www/js/lib/auth/SignupView.js</key> <data> - hNiFSjOSrY4pnAU52GQC066912g= + XHqLwLQmMiFgm/FQMVUACWwaMhg= </data> <key>www/js/lib/blogs/ArchiveView.js</key> <data> @@ -945,22 +945,22 @@ <dict> <key>hash</key> <data> - wI0hzD71qNa/p1g+4iJVL+CnDPA= + QBTHoRJ0x8xv/TSloxDRiFB1FMc= </data> <key>hash2</key> <data> - YtRFCxwXv2V6EO416DNdGBudAEHYDJYf7czfaZmsbME= + TPY2WEVP1NprXT8QrFED0SnysoNbEX77Bo0ohK1Q1FM= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - 1HShhs3o+yABq/lv8bjYO0qQUNQ= + gXqcDJNrIf7qR1DKI9ch+1V9PDU= </data> <key>hash2</key> <data> - ACU5IgRYDubiy8shczjFlqoVM39k8S9rAVYVY5ySvmY= + 7B1IaTogj84Gr05DmyNhEgxjlAnFyDzSc9oB1y/0pms= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -978,11 +978,11 @@ <dict> <key>hash</key> <data> - 2xAfbC/qzxc+dfdcVYAH9rmYMvU= + 1mmKAwCFy4227LZ0S7gS6/Du8O8= </data> <key>hash2</key> <data> - f5dDxPfEMdqhkNN1Nisy/Jnp6HHBBHKfXCfGendFlyQ= + WKlHZ6y3qNoMdkAFGx778YJ+mhDt18wMn4RY+glb8k4= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -1000,33 +1000,33 @@ <dict> <key>hash</key> <data> - vt0gC+83+s5GbfVzkae+JzX2Zrs= + VnEob4dYi3BF3NfvgMSVbBvdp70= </data> <key>hash2</key> <data> - 61HZDI4+JByt7uf5gI+4JZO3bvzun8o/yrmvfY2Kf2g= + uluxF5ka8nGH0NgslihktESpYM3yuAveL0rutQZLjEo= </data> </dict> <key>config.xml</key> <dict> <key>hash</key> <data> - khjJQJW0CCgPITYraYD8o6v9kAw= + bfkQF8MbJwqxyLtjkZ/gpbN5XUs= </data> <key>hash2</key> <data> - ul+28ht3LCyIyh5QNlysO0g22h5Ue78r7fkxzaQKJSI= + 7WmvJuHvQdc7/6q41PdabIVMeOTfwLjGwHq8OchRmLw= </data> </dict> <key>embedded.mobileprovision</key> <dict> <key>hash</key> <data> - 6a29fgIuenXjxvHTXPZvMubF7Mk= + WLS7bPgkyLNAOPSGAH/RMV9viq4= </data> <key>hash2</key> <data> - bsbcK855Yy1AFdFbpZOEfNlwpqtrxpMeWJJkDULt+D8= + P4d1qHmYFGlLUCMl/C9wnQiYd1vWXFMxT4JmJRgUxSI= </data> </dict> <key>www/cordova-js-src/exec.js</key> @@ -1286,11 +1286,11 @@ <dict> <key>hash</key> <data> - VbNFWKLsl9NRgJraJXNDX3i5vIo= + m/IdwEAy3GdFXoqWuEdHjDT/Z1c= </data> <key>hash2</key> <data> - 2dM7U1iyZz9Ui5zlKwXvRUx2zZMCbtZ1NrZPxf4V1Mg= + MtRdAFiYLEZFwIaHll90exG5yyXlWPejuG2if/SYhVo= </data> </dict> <key>www/css/products.css</key> @@ -1627,11 +1627,11 @@ <dict> <key>hash</key> <data> - TlBHJrobN7ufQtkOVpCa5+yCZQA= + WfmLMrq2VwoMbLb2pXyFB7HO8RA= </data> <key>hash2</key> <data> - BfWtaGRuP0vLdEdbZZhMod9bljV9c1/MTzAZpkcaPvs= + Z5SztGcvL5GvvJA/izhKa2N937u6THJcoDuSKChyFNQ= </data> </dict> <key>www/js/index.js</key> @@ -1649,33 +1649,33 @@ <dict> <key>hash</key> <data> - bVxlqQcjwXyMn5062b4TDC6Nmfg= + RCIZHAOoU6tTieJXNSBh65fbXc8= </data> <key>hash2</key> <data> - KHJSHq91Hdnxnqs26L/4UCcUyBJVYKX9DXSthE5dPiE= + SvsOzghqUT7ELjA1rck23YHHx6n2WnKfjhLW8AZR0eI= </data> </dict> <key>www/js/lib/account/AccountView.js</key> <dict> <key>hash</key> <data> - 55BziygniLnmW5LHvmQmd6UT5Fs= + aVpIFnEgArttSQ+Hhv6TuJfBU4A= </data> <key>hash2</key> <data> - RWBgO9Mk/CBQiQtxubyjRhEIBTLxUiYqS+6tw860dfw= + iG1tranbNydzGN9uEJs6u4YvjBTjDUH6+Ey2GuOskx0= </data> </dict> <key>www/js/lib/account/ConsentModal.js</key> <dict> <key>hash</key> <data> - nGC5YZf/p/OEidXhuLzmMi/mS1Q= + kfkJ6Hte1U4nETpXQ12bkkeBzAU= </data> <key>hash2</key> <data> - haVQeTinFVuJ0RRLXTyLs6gfrx7obRffmX4o3OCKp4Y= + jzmqSpGq/qU8D2rzdxb1HEI4i919XmEYrQK4h4NBv+k= </data> </dict> <key>www/js/lib/account/OrdersView.js</key> @@ -1737,33 +1737,33 @@ <dict> <key>hash</key> <data> - 2nZGYC2LOCDPymoAm3yBxHwgYgY= + xy8zU0tBvK30DvJ3hmwSDnyBFgE= </data> <key>hash2</key> <data> - 3RDWoVVhjr+IH7U5MC5ADOe9jNo/zbo6u2kPV2PGtXo= + MSTazwuOvdGRfUt5PP1j9H691vga6cRWXDT7/jd2RzE= </data> </dict> <key>www/js/lib/auth/LogoutView.js</key> <dict> <key>hash</key> <data> - jhf/Pzr8A/yk68t3W15g32q4eQ4= + VKg1r6aC7u3NVzzZXFNC8UyKeb4= </data> <key>hash2</key> <data> - WUOCYL3XOiQkxLTopAv/dlhluzFRrJM4HRU9NlkUw4Q= + XjcosqUC3CQEcCvWuN4nsH3emBF9rMejpAFEiSGFo78= </data> </dict> <key>www/js/lib/auth/SignupView.js</key> <dict> <key>hash</key> <data> - hNiFSjOSrY4pnAU52GQC066912g= + XHqLwLQmMiFgm/FQMVUACWwaMhg= </data> <key>hash2</key> <data> - Wo4pNtVlXr3kSU4BCbRWL4c4i8J2yPxhL2mW0PJfWKY= + mJ5alsHK/9iF7Ue+3fD6jOqVKmAal3Ldd/KDSiKaIf0= </data> </dict> <key>www/js/lib/blogs/ArchiveView.js</key> @@ -2583,7 +2583,7 @@ </dict> <key>rules</key> <dict> - <key>^</key> + <key>^.*</key> <true/> <key>^.*\.lproj/</key> <dict> @@ -2614,11 +2614,6 @@ <key>weight</key> <real>11</real> </dict> - <key>^</key> - <dict> - <key>weight</key> - <real>20</real> - </dict> <key>^(.*/)?\.DS_Store$</key> <dict> <key>omit</key> @@ -2626,13 +2621,6 @@ <key>weight</key> <real>2000</real> </dict> - <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key> - <dict> - <key>nested</key> - <true/> - <key>weight</key> - <real>10</real> - </dict> <key>^.*</key> <true/> <key>^.*\.lproj/</key> @@ -2668,13 +2656,6 @@ <key>weight</key> <real>20</real> </dict> - <key>^[^/]+$</key> - <dict> - <key>nested</key> - <true/> - <key>weight</key> - <real>10</real> - </dict> <key>^embedded\.provisionprofile$</key> <dict> <key>weight</key> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml index 4d2f9418..d4267d95 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6105" id="us.okfoc.stoneisland" version="1.0.5" 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="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision Binary files differindex 7ef37a30..487c9919 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/embedded.mobileprovision diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css index 77bc5487..b7002f20 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/nav.css @@ -368,7 +368,14 @@ padding-bottom:0px; color: white; border-color: black; } - +#consent_error { + opacity: 0; + color: red; + transition: 0.3s all; +} +#consent_error.visible { + opacity: 1; +} /* SELECTOR */ #selector { diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html index ddd55c42..b6fc8317 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/index.html @@ -67,7 +67,7 @@ <!-- flex fill --> <span class="submenu"> <div class="main_menu"> - <span class="account">ACCOUNT</span> + <span class="account">MY ACCOUNT</span> <span class="login">LOGIN</span> <span class="faq">FAQ</span> </div> @@ -77,7 +77,7 @@ <span class="main">MAIN MENU</span> </div> <div class="faq_menu"> - <span class="account">ACCOUNT</span> + <span class="account">MY ACCOUNT</span> <span class="login">LOGIN</span> <span class="logout">LOGOUT</span> <span class="main">MAIN MENU</span> @@ -425,11 +425,11 @@ <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"> - I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions). + I AGREE TO STONE ISLAND - SPORTSWEAR COMPANY COLLECTING AND PROCESSING MY PERSONAL INFORMATION FOR MARKETING PURPOSES. </label> </div> <div class="checkbox-row"> @@ -438,22 +438,24 @@ <label for="checkbox-shopping-data-profiling"></label> </div> <label class="checkbox-caption" for="checkbox-shopping-data-profiling"> - I agree that YOOX NET-A-PORTER GROUP and SPORTSWEAR COMPANY may collect my personal information for creating a profile of my shopping habits. + I AGREE TO STONE ISLAND - SPORTSWEAR COMPANY COLLECTING AND PROCESSING MY PERSONAL INFORMATION TO CUSTOMIZE MY SHOPPING EXPERIENCE BASED ON MY INTERESTS AND HABITS. </label> </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-shopping-account-terms" name="AccountTerms" value="true" required tabindex="9"> + <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 account terms and conditions of use + I ACCEPT MY ACCOUNT TERMS AND CONDITIONS OF USE * </label> </div> <div class="container-message submessage"> <span class="msg"></span> </div> <div class="privacy-msg"> + Personal data will be electronically processed by SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP in order to complete your request. Please note that you are responsible for third party data that you disclose to SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP. + <br> Consult our <a href="#/page/privacy">PRIVACY POLICY</a> for further information. </div> </div> @@ -465,7 +467,7 @@ <div id="profile"> <div class="scroll"> - <h1>PROFILE</h1> + <h1>MY PROFILE</h1> <div class="form"> <div class="container"> <div class="container-row"> @@ -490,24 +492,25 @@ <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> + <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="receive-newsletter-profile"> - <b>Newsletter</b><br> - Receive Stone Island Newsletter + <label class="checkbox-caption" for="checkbox-data-profiling-profile"> + I AGREE TO STONE ISLAND - SPORTSWEAR COMPANY COLLECTING AND PROCESSING MY PERSONAL INFORMATION FOR MARKETING PURPOSES. </label> </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required tabindex="7"> + <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required tabindex="8"> <label for="checkbox-shopping-data-profiling-profile"></label> </div> <label class="checkbox-caption" for="checkbox-shopping-data-profiling-profile"> - I agree that YOOX NET-A-PORTER GROUP and SPORTSWEAR COMPANY may collect my personal information for creating a profile of my shopping habits. + I AGREE TO STONE ISLAND - SPORTSWEAR COMPANY COLLECTING AND PROCESSING MY PERSONAL INFORMATION TO CUSTOMIZE MY SHOPPING EXPERIENCE BASED ON MY INTERESTS AND HABITS. </label> </div> <div class="privacy-msg"> + Personal data will be electronically processed by SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP in order to complete your request. Please note that you are responsible for third party data that you disclose to SPORTSWEAR COMPANY and YOOX NET-A-PORTER GROUP. + <br> Consult our <a href="#/page/privacy">PRIVACY POLICY</a> for further information. </div> </div> @@ -521,7 +524,7 @@ <div id="shipping"> <div class="scroll"> - <h1>SHIPPING</h1> + <h1>ADDRESS BOOK</h1> <div class="form"> <div class="container"> <div class="container-row"> @@ -545,7 +548,7 @@ <div id="payment"> <div class="scroll"> - <h1>PAYMENT</h1> + <h1>MY CARD</h1> <div class="form"> <div class="container"> <div class="container-row"> @@ -600,7 +603,7 @@ <div id="orders"> <div class="scroll"> - <h1>ORDERS</h1> + <h1>MY ORDERS</h1> <div id="order_list"> <div class="list"></div> <div class="empty">You have no orders.</div> @@ -1014,14 +1017,14 @@ </label> </div> </div> - <div id="consent_error">Please note that if you do not consent to terms, you cannot use the app.</div> - <br><br> For more information, please consult our <a href="#/page/privacy">Privacy Policy</a> or visit <a href="#" id="care-link">Customer Care</a>. <br><br> To continue to My Account we invite you to click accept. Otherwise you can continue to navigate as an unregistered user. <br><br> + <div id="consent_error">Please note that if you do not consent to terms, you cannot use the app.</div> + <br><br> <button id="consent_proceed">PROCEED</button> <button id="consent_logout">LOG OUT</button> </div> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/_router.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/_router.js index 723bb944..75f598e9 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/_router.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/_router.js @@ -39,15 +39,24 @@ var SiteRouter = Router.extend({ '/cart/thanks': 'cart.thanks', '/cart/error': 'cart.error', }, - + + terms_routes: [ + 'terms', + 'account_terms', + 'privacy', + 'returns', + 'care', + 'logout', + ], + initialize: function(){ var fn - for (var route in this.routes) { - fn = this.routes[route] - if (! this[fn]) { - this[fn] = this.default_view(fn) - } - } + for (var route in this.routes) { + fn = this.routes[route] + if (! this[fn]) { + this[fn] = this.default_view(fn) + } + } }, initial_route: null, @@ -75,6 +84,7 @@ var SiteRouter = Router.extend({ default_view: function(name){ var fn = function(){ console.log(name) + var n = [name] if (app.view != app.login && app.view != app.signin) { app.last_view = app.view } @@ -82,7 +92,7 @@ var SiteRouter = Router.extend({ app.view.hide() } if (name.match(/\./)) { - var n = name.split(".") + n = name.split(".") console.log(name, n) app.view = app[n[0]][n[1]] } @@ -94,6 +104,22 @@ var SiteRouter = Router.extend({ console.log("view >>", app.view) app.header.set_back( !! app.view.back ) app.view.show() + + // var isTermsRoute = this.terms_routes.indexOf(name) !== -1 + // var isCartRoute = n[0] === 'cart' + // if ( (isCartRoute || app.demand_consent && !isTermsRoute) && app.account.consent.check()) { + // console.log('showed consent modal') + // return + // } + + 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 + } }.bind(this) return fn }, diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js index 4605416c..8ac7c193 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ConsentModal.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ConsentModal.js index c4fe0b53..c9235498 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ConsentModal.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/ConsentModal.js @@ -13,24 +13,35 @@ var ConsentModal = View.extend({ this.$form = this.$(".form") this.$msg = this.$(".msg") this.$checkbox = this.$("[name=AccountTermsConsent]") + this.$consentError = this.$("#consent_error") }, 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 } }, show: function(){ + app.demand_consent = true this.$el.show() setTimeout(function(){ this.$el.addClass('visible') }.bind(this), 20) - app.curtain.show() - app.curtain.classList.add('opaque') + app.curtain.show('opaque') + setTimeout(function(){ + app.curtain.show('opaque') + }, 300) }, hide: function(){ @@ -38,7 +49,7 @@ var ConsentModal = View.extend({ this.$el.removeClass('visible') setTimeout(function(){ this.$el.hide() - app.curtain.classList.remove('opaque') + app.curtain.$el.removeClass('opaque') }.bind(this), 300) }, @@ -51,23 +62,26 @@ var ConsentModal = View.extend({ changeConsent: function(){ var state = this.$checkbox.prop("checked") - // if (state) { - // this.$el.addClass('consent-yes').removeClass('consent-no') - // } else { - // this.$el.addClass('consent-no').removeClass('consent-yes') - // } + if (state) { + this.$consentError.removeClass('visible') + } else { + this.$consentError.addClass('visible') + } }, proceed: function(){ var state = this.$checkbox.prop("checked") if (!state) { + this.$consentError.addClass('visible') return } + app.demand_consent = false this.hide() localStorage.setItem('account_terms.consent', 'true') }, logout: function(){ + app.demand_consent = false this.hide() localStorage.setItem('account_terms.consent', 'false') app.router.go("account/logout") diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LoginView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LoginView.js index aeb15d1d..c3d839a5 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LoginView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LogoutView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LogoutView.js index 481dcb8d..d3f76428 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LogoutView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/LogoutView.js @@ -10,6 +10,9 @@ 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/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/SignupView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/SignupView.js index 078f7c07..ef7dd6aa 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/auth/SignupView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index d744b66e..371cb20d 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ <key>Stone Island.xcscheme</key> <dict> <key>orderHint</key> - <integer>3</integer> + <integer>2</integer> </dict> </dict> </dict> diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..949b6789 --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildSystemType</key> + <string>Original</string> +</dict> +</plist> diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate Binary files differindex 5655a8d7..7c07bcce 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate +++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/WorkspaceSettings.xcsettings b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..f25782dd --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildLocationStyle</key> + <string>UseAppPreferences</string> + <key>CustomBuildLocationType</key> + <string>RelativeToDerivedData</string> + <key>DerivedDataLocationStyle</key> + <string>Default</string> + <key>EnabledFullIndexStoreVisibility</key> + <false/> + <key>IssueFilterStyle</key> + <string>ShowActiveSchemeOnly</string> + <key>LiveSourceIssuesEnabled</key> + <true/> +</dict> +</plist> diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 0929c35f..1f9a3666 100644 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.0.8</string> + <string>1.1.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.0.8</string> + <string>1.1.0</string> <key>GCM_SENDER_ID</key> <string>85075801930</string> <key>IS_GCM_ENABLED</key> diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index 72311c70..d4267d95 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/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="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index bdad67c8..b6fc8317 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/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/ios/www/js/lib/auth/SignupView.js b/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js index 917644d2..ef7dd6aa 100755 --- a/StoneIsland/platforms/ios/www/js/lib/auth/SignupView.js +++ b/StoneIsland/platforms/ios/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,7 +64,7 @@ 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() diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index bdad67c8..b6fc8317 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/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/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js index 917644d2..ef7dd6aa 100755 --- a/StoneIsland/www/js/lib/auth/SignupView.js +++ b/StoneIsland/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,7 +64,7 @@ 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() |