diff options
20 files changed, 134 insertions, 81 deletions
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..4bc8d36e 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 @@ -7,7 +7,7 @@ <key>Cordova.xcscheme</key> <dict> <key>orderHint</key> - <integer>4</integer> + <integer>3</integer> </dict> <key>CordovaLib.xcscheme</key> <dict> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 9e51e528..3e59c464 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -18,7 +18,7 @@ <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2018-07-24T16:40:13Z</date> + <date>2018-07-24T16:49:46Z</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 95b307cc..53bcd571 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 4274e954..5c45a642 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 16b9047c..c30f4d2f 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/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib Binary files differindex c68de5fc..aa2d93d3 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 056dc35a..8580cfe7 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 adc6b3f1..2de0e8d4 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> - xn+CeQP96vJdvmiF9htbfA0/VYg= + wI0hzD71qNa/p1g+4iJVL+CnDPA= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - mUi5boBhihhP3U1OmkkYC2nl7tY= + 1HShhs3o+yABq/lv8bjYO0qQUNQ= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -106,7 +106,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - IkjEhXcBeP+wuCA9zQmYBRTTMyk= + 2xAfbC/qzxc+dfdcVYAH9rmYMvU= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -118,7 +118,7 @@ </data> <key>MainViewController.nib</key> <data> - l+/U3zThNx6WTVr3Ud8r3BrrG30= + vt0gC+83+s5GbfVzkae+JzX2Zrs= </data> <key>PkgInfo</key> <data> @@ -158,7 +158,7 @@ </data> <key>www/css/account.css</key> <data> - JdTOqPyqqDcI711yc+o1kqMa/v8= + QleBinpy/MrHuJ0RNanvPLTucXY= </data> <key>www/css/blogs.css</key> <data> @@ -350,7 +350,7 @@ </data> <key>www/index.html</key> <data> - jZTkF4XZ3Jf1Qwos4pjH1lvh3o4= + TlBHJrobN7ufQtkOVpCa5+yCZQA= </data> <key>www/js/index.js</key> <data> @@ -945,22 +945,22 @@ <dict> <key>hash</key> <data> - xn+CeQP96vJdvmiF9htbfA0/VYg= + wI0hzD71qNa/p1g+4iJVL+CnDPA= </data> <key>hash2</key> <data> - 9C+3+Nqh5rDo83Kp6AS7mq+7WndxP1U47lGTaWt4G+k= + YtRFCxwXv2V6EO416DNdGBudAEHYDJYf7czfaZmsbME= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - mUi5boBhihhP3U1OmkkYC2nl7tY= + 1HShhs3o+yABq/lv8bjYO0qQUNQ= </data> <key>hash2</key> <data> - cX2Boy6yFNDt/59BhTdp8Wpo+bnNQiLXRmTSHSSaeWE= + ACU5IgRYDubiy8shczjFlqoVM39k8S9rAVYVY5ySvmY= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -978,11 +978,11 @@ <dict> <key>hash</key> <data> - IkjEhXcBeP+wuCA9zQmYBRTTMyk= + 2xAfbC/qzxc+dfdcVYAH9rmYMvU= </data> <key>hash2</key> <data> - v7izQzsH9IHek60k7Q3h8A8KY8+6H+jiucBUjg/ryL0= + f5dDxPfEMdqhkNN1Nisy/Jnp6HHBBHKfXCfGendFlyQ= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -1000,11 +1000,11 @@ <dict> <key>hash</key> <data> - l+/U3zThNx6WTVr3Ud8r3BrrG30= + vt0gC+83+s5GbfVzkae+JzX2Zrs= </data> <key>hash2</key> <data> - 6gpGqBusucx1+tgxoywzLqm+IRypgL+rBwbMxKynVoc= + 61HZDI4+JByt7uf5gI+4JZO3bvzun8o/yrmvfY2Kf2g= </data> </dict> <key>config.xml</key> @@ -1099,11 +1099,11 @@ <dict> <key>hash</key> <data> - JdTOqPyqqDcI711yc+o1kqMa/v8= + QleBinpy/MrHuJ0RNanvPLTucXY= </data> <key>hash2</key> <data> - EeSrSh/i7oUBg3Fef5XDVZ82LRd2OgUGGnUNLxp7GvA= + iG3ony/fJ708Vgul9dITTPufcs7dDxPfJxdQbTDV08w= </data> </dict> <key>www/css/blogs.css</key> @@ -1627,11 +1627,11 @@ <dict> <key>hash</key> <data> - jZTkF4XZ3Jf1Qwos4pjH1lvh3o4= + TlBHJrobN7ufQtkOVpCa5+yCZQA= </data> <key>hash2</key> <data> - rw2YtxP1uiuBWBREJ4G2UZ6mAJXAl+pHCmkBGyX6qTU= + BfWtaGRuP0vLdEdbZZhMod9bljV9c1/MTzAZpkcaPvs= </data> </dict> <key>www/js/index.js</key> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css index 973f3d2c..32c7df79 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/account.css @@ -442,12 +442,15 @@ input.switch:checked + label:after { } .privacy-msg { - left: 50%; - display: inline-block; - position: relative; - transform: translateX(-50%); - padding-top: 15px; - padding-bottom: 80px; + left: 50%; + display: inline-block; + position: relative; + transform: translateX(-50%); + padding-top: 15px; + padding-bottom: 80px; +} +.privacy-msg a { + color: black; } .select-wrapper { 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 8837b9a3..ddd55c42 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 @@ -454,7 +454,7 @@ <span class="msg"></span> </div> <div class="privacy-msg"> - Consult our <u>PRIVACY POLICY</u> for further information. + Consult our <a href="#/page/privacy">PRIVACY POLICY</a> for further information. </div> </div> </div> @@ -508,7 +508,7 @@ </label> </div> <div class="privacy-msg"> - Consult our <u>PRIVACY POLICY</u> for further information. + Consult our <a href="#/page/privacy">PRIVACY POLICY</a> for further information. </div> </div> </div> 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/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate Binary files differindex c47abc0b..863ea504 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/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index 973f3d2c..32c7df79 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -442,12 +442,15 @@ input.switch:checked + label:after { } .privacy-msg { - left: 50%; - display: inline-block; - position: relative; - transform: translateX(-50%); - padding-top: 15px; - padding-bottom: 80px; + left: 50%; + display: inline-block; + position: relative; + transform: translateX(-50%); + padding-top: 15px; + padding-bottom: 80px; +} +.privacy-msg a { + color: black; } .select-wrapper { diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 8837b9a3..e8816830 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/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> @@ -429,7 +429,7 @@ <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,23 +438,25 @@ <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="AccountTerms" 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 + ACCEPT MY ACCOUNT TERMS AND CONDITIONS OF USE * </label> </div> <div class="container-message submessage"> <span class="msg"></span> </div> <div class="privacy-msg"> - Consult our <u>PRIVACY POLICY</u> for further information. + 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> </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"> @@ -500,15 +502,26 @@ </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-data-profiling-profile" name="DataProfiling" value="true" required tabindex="7"> + <label for="checkbox-data-profiling-profile"></label> + </div> + <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="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"> - Consult our <u>PRIVACY POLICY</u> for further information. + 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> </div> @@ -521,7 +534,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 +558,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 +613,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> diff --git a/StoneIsland/platforms/ios/www/js/lib/_router.js b/StoneIsland/platforms/ios/www/js/lib/_router.js index 723bb944..bd13c126 100755 --- a/StoneIsland/platforms/ios/www/js/lib/_router.js +++ b/StoneIsland/platforms/ios/www/js/lib/_router.js @@ -42,12 +42,12 @@ var SiteRouter = Router.extend({ 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 +75,9 @@ var SiteRouter = Router.extend({ default_view: function(name){ var fn = function(){ console.log(name) + if (app.demand_consent && app.consent.check()) { + return + } if (app.view != app.login && app.view != app.signin) { app.last_view = app.view } diff --git a/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js b/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js index c4fe0b53..22f63c53 100644 --- a/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/ConsentModal.js @@ -19,12 +19,16 @@ var ConsentModal = View.extend({ var status = localStorage.getItem('account_terms.consent') if (status !== 'true') { this.show() + return true } else { this.hide() + app.demand_consent = false + return false } }, show: function(){ + app.demand_consent = true this.$el.show() setTimeout(function(){ this.$el.addClass('visible') @@ -63,11 +67,13 @@ var ConsentModal = View.extend({ if (!state) { 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/www/css/account.css b/StoneIsland/www/css/account.css index 973f3d2c..32c7df79 100755 --- a/StoneIsland/www/css/account.css +++ b/StoneIsland/www/css/account.css @@ -442,12 +442,15 @@ input.switch:checked + label:after { } .privacy-msg { - left: 50%; - display: inline-block; - position: relative; - transform: translateX(-50%); - padding-top: 15px; - padding-bottom: 80px; + left: 50%; + display: inline-block; + position: relative; + transform: translateX(-50%); + padding-top: 15px; + padding-bottom: 80px; +} +.privacy-msg a { + color: black; } .select-wrapper { diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 8837b9a3..e8816830 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/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> @@ -429,7 +429,7 @@ <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,23 +438,25 @@ <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="AccountTerms" 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 + ACCEPT MY ACCOUNT TERMS AND CONDITIONS OF USE * </label> </div> <div class="container-message submessage"> <span class="msg"></span> </div> <div class="privacy-msg"> - Consult our <u>PRIVACY POLICY</u> for further information. + 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> </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"> @@ -500,15 +502,26 @@ </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-data-profiling-profile" name="DataProfiling" value="true" required tabindex="7"> + <label for="checkbox-data-profiling-profile"></label> + </div> + <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="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"> - Consult our <u>PRIVACY POLICY</u> for further information. + 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> </div> @@ -521,7 +534,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 +558,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 +613,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> diff --git a/StoneIsland/www/js/lib/_router.js b/StoneIsland/www/js/lib/_router.js index 723bb944..1d9010ff 100755 --- a/StoneIsland/www/js/lib/_router.js +++ b/StoneIsland/www/js/lib/_router.js @@ -42,12 +42,12 @@ var SiteRouter = Router.extend({ 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 +75,9 @@ var SiteRouter = Router.extend({ default_view: function(name){ var fn = function(){ console.log(name) + if (app.demand_consent && app.account.consent.check()) { + return + } if (app.view != app.login && app.view != app.signin) { app.last_view = app.view } diff --git a/StoneIsland/www/js/lib/account/ConsentModal.js b/StoneIsland/www/js/lib/account/ConsentModal.js index c4fe0b53..22f63c53 100644 --- a/StoneIsland/www/js/lib/account/ConsentModal.js +++ b/StoneIsland/www/js/lib/account/ConsentModal.js @@ -19,12 +19,16 @@ var ConsentModal = View.extend({ var status = localStorage.getItem('account_terms.consent') if (status !== 'true') { this.show() + return true } else { this.hide() + app.demand_consent = false + return false } }, show: function(){ + app.demand_consent = true this.$el.show() setTimeout(function(){ this.$el.addClass('visible') @@ -63,11 +67,13 @@ var ConsentModal = View.extend({ if (!state) { 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") |