Merge branch 'android' of https://github.com/okfocus/stone-island into android

5 files changed, 7 insertions, 29 deletions

diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index df85b60f..92f36f53 100755
--- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 80b96929..d6581b76 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -383,16 +383,7 @@
             <div class="checkbox-container">
               <div class="checkbox-row">
                 <div class="checkbox-toggle">
-                   <input id="checkbox-data-profiling" type="checkbox" name="DataProfiling" value="true" required>
-                   <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).
-                </label>
-              </div>
-              <div class="checkbox-row">
-                <div class="checkbox-toggle">
-                   <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling2" value="true" required>
+                   <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required>
                    <label for="checkbox-shopping-data-profiling"></label>
                 </div>
                 <label class="checkbox-caption" for="checkbox-shopping-data-profiling">
@@ -440,16 +431,7 @@
               <div class="checkbox-container">
                 <div class="checkbox-row">
                   <div class="checkbox-toggle">
-                     <input id="checkbox-data-profiling-profile" type="checkbox" name="DataProfiling" value="true" required>
-                     <label for="checkbox-data-profiling-profile"></label>
-                  </div>
-                  <label class="checkbox-caption" for="checkbox-data-profiling-profile">
-                    I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions).
-                  </label>
-                </div>
-                <div class="checkbox-row">
-                  <div class="checkbox-toggle">
-                     <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling2" value="true" required>
+                     <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required>
                      <label for="checkbox-shopping-data-profiling-profile"></label>
                   </div>
                   <label class="checkbox-caption" for="checkbox-shopping-data-profiling-profile">
@@ -730,21 +712,21 @@
           <div class="checkbox-container">
             <div class="checkbox-row">
               <div class="checkbox-toggle">
-                 <input id="express-shipping" type="radio" name="ShippingType" value="Express" required>
+                 <input id="express-shipping" type="radio" name="ShippingType" value="Express" checked required>
                  <label for="express-shipping"></label>
               </div>
               <label class="checkbox-caption" for="express-shipping">
-                <b>COMPLIMENTARY EXPRESS $19.50</b><br>
+                <b>COMPLIMENTARY EXPRESS</b><br>
                 (DELIVERY IN 2-4 WORKING DAYS)
               </label>
             </div>
             <div class="checkbox-row">
               <div class="checkbox-toggle">
-                 <input id="standard-shipping" type="radio" name="ShippingType" value="Standard" checked required>
+                 <input id="standard-shipping" type="radio" name="ShippingType" value="Standard" required>
                  <label for="standard-shipping"></label>
               </div>
               <label class="checkbox-caption" for="standard-shipping">
-                <b>STANDARD SHIPPING $9.50</b><br>
+                <b>STANDARD SHIPPING</b><br>
                 (DELIVERY IN 5-8 WORKING DAYS)
               </label>
             </div>
diff --git a/StoneIsland/www/js/lib/account/ProfileView.js b/StoneIsland/www/js/lib/account/ProfileView.js
index 2b608cb4..d36f7f38 100755
--- a/StoneIsland/www/js/lib/account/ProfileView.js
+++ b/StoneIsland/www/js/lib/account/ProfileView.js
@@ -17,7 +17,6 @@ var ProfileView = FormView.extend({
     if (! auth.logged_in()) { return app.router.go("intro") }
     app.footer.show("SAVE")
     document.body.className = "profile"
-    auth.user.DataProfiling2 = auth.user.DataProfiling
     if (auth.user.BirthDay.match(/T/)) {
       auth.user.BirthDay = auth.user.BirthDay.split("T")[0]
     }
diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js
index 599f57c7..4645d4d9 100755
--- a/StoneIsland/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/www/js/lib/auth/SignupView.js
@@ -15,7 +15,6 @@ var SignupView = FormView.extend({
     "Surname": "TestSurname",
     "BirthDay": "1978-11-12",
     "DataProfiling": true,
-    "DataProfiling2": true,
   },
 */
 
@@ -63,12 +62,10 @@ 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 use this service." ]) }
-    if (data.DataProfiling2 !== "true") { errors.push([ "DataProfiling2", "You must consent to use this service." ]) }
     data.YooxLetter = this.$("[name=YooxLetter]").prop("checked")
   },
   
   finalize: function(data){
-    delete data.DataProfiling2
     delete data.ConfirmEmail
     
     data.Gender = "U"
diff --git a/StoneIsland/www/js/lib/blogs/StoryView.js b/StoneIsland/www/js/lib/blogs/StoryView.js
index c2a9f4b4..73b7b83b 100755
--- a/StoneIsland/www/js/lib/blogs/StoryView.js
+++ b/StoneIsland/www/js/lib/blogs/StoryView.js
@@ -26,7 +26,7 @@ var StoryView = ScrollableView.extend({
   },
   
   populate: function(data){
-    if (this.loaded) {}
+    if (this.loaded) { return }
     this.loaded = true
     this.data = data
     this.$loader.hide()