diff options
18 files changed, 63 insertions, 46 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..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 28ca34f1..0d4abc01 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>2017-11-05T23:58:16Z</date> + <date>2017-11-06T00:12:45Z</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 bcd26138..c5dd229c 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 4ca18da1..bdf3c1d9 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 64b46b31..68197b64 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 e90fd9f6..eb264e22 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 e1debb5a..9f55d2cf 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 62a7ebb4..9d725dad 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> - 3QLY7IFl2jsHfRekuAPi44tSS/8= + iDTtbfbFqax4n+II4SPZi6t2ocs= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - KEGDsPP2jNdTq5vcYG+7IZG+4JE= + cjhLx1lLVZaWC3dmzZDFDUEXhmI= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -106,7 +106,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - BHzRnooh9kd2lNO477SrLLFAWDs= + CXnUxM+P13q3aYXtFroFsJcZRp0= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -118,7 +118,7 @@ </data> <key>MainViewController.nib</key> <data> - W2bJSgBpMIVZRzu6EW1Y7NH5HY4= + K9LFYuifrU35JVY7i37lK8lxS6I= </data> <key>PkgInfo</key> <data> @@ -462,11 +462,11 @@ </data> <key>www/js/lib/etc/sim.js</key> <data> - p9UkFNaLWA+ZqQmAXQuwr+NI+sI= + L6kNX9syzHF+dAmyaFb/VegGPyE= </data> <key>www/js/lib/nav/AddressView.js</key> <data> - 7LJJ0CnyURtInuVhaKbkBjLj9Wo= + /ASdyn0hUfLgrTbSOkgJzofUF3g= </data> <key>www/js/lib/nav/CreditCardView.js</key> <data> @@ -502,7 +502,7 @@ </data> <key>www/js/lib/products/CollectionView.js</key> <data> - g7ama0ca186rxP6eho2Lcqqlaxo= + dZYIlXKeCgVJVU3GHPND6CLid+w= </data> <key>www/js/lib/products/GalleryView.js</key> <data> @@ -510,7 +510,7 @@ </data> <key>www/js/lib/products/ProductView.js</key> <data> - sM/LY1QKtDfnmCngnmUVft/y9Ao= + 6GSJ7S/a8ZK24iOOKJxm3fKtaaA= </data> <key>www/js/lib/products/Selector.js</key> <data> @@ -937,22 +937,22 @@ <dict> <key>hash</key> <data> - 3QLY7IFl2jsHfRekuAPi44tSS/8= + iDTtbfbFqax4n+II4SPZi6t2ocs= </data> <key>hash2</key> <data> - Xy2IuTIScWkLccyPQ9TOC9MqtJ93UMMMuTFRGcrHIe4= + vfBROztCO7fMLW3FdPnU2i/eSMYzp+sknjcvVMM3baU= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - KEGDsPP2jNdTq5vcYG+7IZG+4JE= + cjhLx1lLVZaWC3dmzZDFDUEXhmI= </data> <key>hash2</key> <data> - 7Hv0dktmPjL++3r0YPRuYXE15u9ZVTkD4qhFAWXrBE0= + hsTEu4ZattGa/49zdwHvcKwjT9TR86DT/SShXHK+L7U= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -970,11 +970,11 @@ <dict> <key>hash</key> <data> - BHzRnooh9kd2lNO477SrLLFAWDs= + CXnUxM+P13q3aYXtFroFsJcZRp0= </data> <key>hash2</key> <data> - ED1LfLiyA1rH2h/L6i17KuGAEBTv8HFLudoIw7+kQo4= + nYXBlcnB/stfRcqPQqVCv4Hdy4j6Ni9t6j/YSwktbrg= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -992,11 +992,11 @@ <dict> <key>hash</key> <data> - W2bJSgBpMIVZRzu6EW1Y7NH5HY4= + K9LFYuifrU35JVY7i37lK8lxS6I= </data> <key>hash2</key> <data> - 2951Uljbg6F4uky32pHeUSvBsAHKIhoyqxIqIRPNTbs= + m3JXvkgOy9hLaYir6AQHU/3YPB+GVMRzLtx6yVTx/iA= </data> </dict> <key>archived-expanded-entitlements.xcent</key> @@ -1927,22 +1927,22 @@ <dict> <key>hash</key> <data> - p9UkFNaLWA+ZqQmAXQuwr+NI+sI= + L6kNX9syzHF+dAmyaFb/VegGPyE= </data> <key>hash2</key> <data> - 4jKacgqpnhY8T/RJRcLWn+k553URMgfgJ++rXQryUPM= + v4e3+smzRWO0SQU7LUOqxpFJCYuShVsMe5UcblwS948= </data> </dict> <key>www/js/lib/nav/AddressView.js</key> <dict> <key>hash</key> <data> - 7LJJ0CnyURtInuVhaKbkBjLj9Wo= + /ASdyn0hUfLgrTbSOkgJzofUF3g= </data> <key>hash2</key> <data> - FYp6WSmd8vwxOcqmofcQHUkt5xBNR9vETVy/v/hI2bQ= + +QD7HO4LypwHg5MQxGlScAjQealYgBoztTdz7x/lmnA= </data> </dict> <key>www/js/lib/nav/CreditCardView.js</key> @@ -2037,11 +2037,11 @@ <dict> <key>hash</key> <data> - g7ama0ca186rxP6eho2Lcqqlaxo= + dZYIlXKeCgVJVU3GHPND6CLid+w= </data> <key>hash2</key> <data> - NcitCXjEiXmYPy2MrX5QRfk41qI0GFkD0kZTTx7uFr8= + F3m7DIDNcROqnCiN7Ebm2xWV6CT1KmGrxZ5Pi7nclsY= </data> </dict> <key>www/js/lib/products/GalleryView.js</key> @@ -2059,11 +2059,11 @@ <dict> <key>hash</key> <data> - sM/LY1QKtDfnmCngnmUVft/y9Ao= + 6GSJ7S/a8ZK24iOOKJxm3fKtaaA= </data> <key>hash2</key> <data> - b3E1CxezHAYUIR7majwpb5IMSFnLz2yij1tWkC8cakM= + Wz37/FgslyUj3wZ1yHnLqnHFPmUTy4nHDlT7d3F2fgc= </data> </dict> <key>www/js/lib/products/Selector.js</key> diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/sim.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/sim.js index 9f5d7f4f..65be02b0 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/sim.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/sim.js @@ -10,6 +10,7 @@ var sim = (function(){ } sim.fetch = function(cb){ + console.log('fetching sim data') sim.afterFetch = cb window.plugins.sim.getSimInfo(sim.success, sim.error) } @@ -26,7 +27,6 @@ var sim = (function(){ sim.data.countryCode = 'us' } } - sim.data.countryCode = 'ca' sim.loaded = true sim.afterFetch() } @@ -38,6 +38,10 @@ var sim = (function(){ jsonp: "callback", dataType: "jsonp", success: sim.success, + error: function(){ + sim.loaded = true + sim.afterFetch() + } }) } diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/AddressView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/AddressView.js index fd7df218..64ea265f 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/AddressView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/nav/AddressView.js @@ -22,7 +22,7 @@ var AddressView = SerializableView.extend({ populate: function(data){ this.$("[name=Province]").empty() this.$("[name=Province]").append(this.us_states) - if (! app.store.notAvailableInCanada) { + if (! app.store.NotAvailableInCanada) { this.$("[name=Province]").append(this.ca_states) } this.data = data diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/CollectionView.js index 7c73d66f..4674fc18 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/CollectionView.js @@ -121,10 +121,16 @@ var CollectionView = ScrollableView.extend({ if (is_single_product) { console.log("IS SINGLE PRODUCT") var item = data.SearchResponseFull.Results.Items[0] - var url = sdk.image(item['DefaultCode10'], '13_f') - console.log(url) - var img = new Image () - img.src = url + // console.log(data.SearchResponseFull.Results) + if (item) { + var url = sdk.image(item['DefaultCode10'], '13_f') + console.log(url) + var img = new Image () + img.src = url + } + else { + console.log("no products at all!") + } } // if (data.SearchResponseFull.Results.Items.length == 1) { diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js index 7434888c..218c151d 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js @@ -130,7 +130,7 @@ var ProductView = ScrollableView.extend({ var default_color_id = this.populate_selectors(data, details) - var notAvailableInCanada = !! app.store.notAvailableInCanada + var notAvailableInCanada = !! app.store.NotAvailableInCanada app.product.$notAvailableInCanada.toggle( notAvailableInCanada ) if (notAvailableInCanada && sim.data.countryCode === 'ca') { this.isNotAvailable = true 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/www/js/lib/etc/sim.js b/StoneIsland/platforms/ios/www/js/lib/etc/sim.js index 9f5d7f4f..65be02b0 100644 --- a/StoneIsland/platforms/ios/www/js/lib/etc/sim.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/sim.js @@ -10,6 +10,7 @@ var sim = (function(){ } sim.fetch = function(cb){ + console.log('fetching sim data') sim.afterFetch = cb window.plugins.sim.getSimInfo(sim.success, sim.error) } @@ -26,7 +27,6 @@ var sim = (function(){ sim.data.countryCode = 'us' } } - sim.data.countryCode = 'ca' sim.loaded = true sim.afterFetch() } @@ -38,6 +38,10 @@ var sim = (function(){ jsonp: "callback", dataType: "jsonp", success: sim.success, + error: function(){ + sim.loaded = true + sim.afterFetch() + } }) } diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js b/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js index fd7df218..64ea265f 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js @@ -22,7 +22,7 @@ var AddressView = SerializableView.extend({ populate: function(data){ this.$("[name=Province]").empty() this.$("[name=Province]").append(this.us_states) - if (! app.store.notAvailableInCanada) { + if (! app.store.NotAvailableInCanada) { this.$("[name=Province]").append(this.ca_states) } this.data = data diff --git a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js index 7c73d66f..4674fc18 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/CollectionView.js @@ -121,10 +121,16 @@ var CollectionView = ScrollableView.extend({ if (is_single_product) { console.log("IS SINGLE PRODUCT") var item = data.SearchResponseFull.Results.Items[0] - var url = sdk.image(item['DefaultCode10'], '13_f') - console.log(url) - var img = new Image () - img.src = url + // console.log(data.SearchResponseFull.Results) + if (item) { + var url = sdk.image(item['DefaultCode10'], '13_f') + console.log(url) + var img = new Image () + img.src = url + } + else { + console.log("no products at all!") + } } // if (data.SearchResponseFull.Results.Items.length == 1) { diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index 7434888c..218c151d 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -130,7 +130,7 @@ var ProductView = ScrollableView.extend({ var default_color_id = this.populate_selectors(data, details) - var notAvailableInCanada = !! app.store.notAvailableInCanada + var notAvailableInCanada = !! app.store.NotAvailableInCanada app.product.$notAvailableInCanada.toggle( notAvailableInCanada ) if (notAvailableInCanada && sim.data.countryCode === 'ca') { this.isNotAvailable = true diff --git a/StoneIsland/www/js/lib/products/ProductView.js b/StoneIsland/www/js/lib/products/ProductView.js index 218c151d..f9de3ab3 100755 --- a/StoneIsland/www/js/lib/products/ProductView.js +++ b/StoneIsland/www/js/lib/products/ProductView.js @@ -132,16 +132,13 @@ var ProductView = ScrollableView.extend({ var notAvailableInCanada = !! app.store.NotAvailableInCanada app.product.$notAvailableInCanada.toggle( notAvailableInCanada ) - if (notAvailableInCanada && sim.data.countryCode === 'ca') { + + if (! ('Price' in details['Item'])) { this.isNotAvailable = true } else { this.isNotAvailable = false } - - if (! ('Price' in details['Item'])) { - this.isNotAvailable = true - } if (this.sold_out || this.isNotAvailable) { this.$style.css("opacity", 0) |