load department id from querystring

11 files changed, 18 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 57a0c3a3..4627e998 100755
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ app.min.js
 
 server/
 
+StoneIsland/www/db.json
diff --git a/StoneIsland/angle-down.svg b/StoneIsland/angle-down.svg
deleted file mode 100644
index e7f3161b..00000000
--- a/StoneIsland/angle-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="2048" height="2048" viewBox="0 0 2048 2048" xmlns="http://www.w3.org/2000/svg"><path fill="#dddddd" d="M1523 864q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z"/></svg>
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml
index b19749a0..5260c0a2 100755
--- a/StoneIsland/config.xml
+++ b/StoneIsland/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="0.8.6" android-versionCode="6000" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="0.8.7" android-versionCode="6087" 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/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index e591d9f5..0297ea66 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/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
index 9df040b0..6182f0a3 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>0.8.5</string>
+    <string>0.8.6</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>0.8.5</string>
+    <string>0.8.6</string>
     <key>GCM_SENDER_ID</key>
     <string>XXXXXXX</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 95e7c2ef..eadd656d 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="6000" id="us.okfoc.stoneisland" version="0.8.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="6000" id="us.okfoc.stoneisland" version="0.8.6" 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/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
index a757f681..4ae77c1f 100755
--- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js
@@ -118,7 +118,9 @@ var ProductView = ScrollableView.extend({
     var title = name_partz.join(' ')
     var type = title_case( data['MicroCategory'] )
     var price = "$" + data['DiscountedPrice'] + ".00"
-    var body = descriptions['Details'] + " " + descriptions['EditorialDescription']
+    var details = descriptions['Details'] || ""
+    var editorial = descriptions['EditorialDescription'] || ""
+    var body = details + " " + editorial
     // body = body.replace(/<br>/g, "<br><br>").replace(/(<br>)+$/, "")
 
     var default_color_id = this.populate_selectors(data, details)
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 06bfaaac..e583a2cd 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -4,7 +4,7 @@ var app = (function(){
   app.init = function(){
     console.log("init")
 
-    sdk.init({ env: "production" })
+    sdk.init({ env: "test" })
 
     app.bind()
     app.build()
diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 1bd56908..fe36e025 100755
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
@@ -9,8 +9,8 @@ var BlogView = View.extend({
   fetch: function(fn){
     $.ajax({
       method: "GET",
-//       url: sdk.env == 'test' ? '/db.json' : "https://stone.sup.land/db.json",
-      url: "https://stone.sup.land/db.json",
+      url: sdk.env === 'test' ? '/db.json' : "https://stone.sup.land/db.json",
+      // url: "https://stone.sup.land/db.json",
       success: function(data){
         this.success(data)
         fn && fn()
@@ -42,7 +42,7 @@ var BlogView = View.extend({
         break
     }
     
-    if (app.closed.storeIsClosed) {
+    if (app.closed.storeIsClosed && sdk.env !== 'test') {
       app.closed.populate(data.store[0].ClosedStoreImages)
     }
     else {
@@ -52,6 +52,10 @@ var BlogView = View.extend({
       app.collection.setCollectionName( data.store[0].Departments[0].text )
       //// demo department for shoes with weird SizeTypeId
       // app.department_id = "NKDrtSC"
+      if (sdk.env === 'test') {
+        app.department_id = window.location.search.substr(1) || app.department_id
+        console.log('using test department id', app.department_id)
+      }
       app.collection.loaded = false
       app.collection.fetch()
     }
diff --git a/StoneIsland/www/js/lib/etc/push.js b/StoneIsland/www/js/lib/etc/push.js
index da63fdd1..043a4d75 100755
--- a/StoneIsland/www/js/lib/etc/push.js
+++ b/StoneIsland/www/js/lib/etc/push.js
@@ -2,7 +2,7 @@ var push = (function(){
   var push = { settings: {}, disabled: false }
   var pushPlugin
   push.init = function(){
-    if (device.platform !== "ios") {
+    if (! ('device' in window) || device.platform !== "ios") {
       push.disabled = true
       return
     }
diff --git a/StoneIsland/www/js/lib/products/CollectionView.js b/StoneIsland/www/js/lib/products/CollectionView.js
index 3bc2623c..67a3a456 100755
--- a/StoneIsland/www/js/lib/products/CollectionView.js
+++ b/StoneIsland/www/js/lib/products/CollectionView.js
@@ -98,6 +98,7 @@ var CollectionView = ScrollableView.extend({
       if (is_single_product) {
         console.log("IS SINGLE PRODUCT")
         var item = data.SearchResponseFull.Results.Items[0]
+        console.log(item)
         var url = sdk.image(item['DefaultCode10'], '13_f')
         console.log(url)
         var img = new Image ()