diff options
12 files changed, 23 insertions, 29 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index d76524d7..46df452f 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6093" id="us.okfoc.stoneisland" version="0.9.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-versionCode="6094" id="us.okfoc.stoneisland" version="0.9.4" 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/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist b/StoneIsland/platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/xcschememanagement.plist index 54b0db05..daa4d171 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>3</integer> + <integer>2</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 0d4abc01..bf2b4797 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-06T00:12:45Z</date> + <date>2017-11-06T01:12:34Z</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 c5dd229c..5371688d 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 bdf3c1d9..21c6c5b7 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 68197b64..06d89c25 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 eb264e22..e4e07bee 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 9f55d2cf..388e8a56 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 9d725dad..6a53cbbb 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> - iDTtbfbFqax4n+II4SPZi6t2ocs= + ZxneQByk7eU6OsqM/Hd7cynlzEw= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - cjhLx1lLVZaWC3dmzZDFDUEXhmI= + K6G4ubGAH/b4e7d99iTPzYdcgHk= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -106,7 +106,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - CXnUxM+P13q3aYXtFroFsJcZRp0= + IFOMmirH54VKouWHIk3r354JEbE= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -118,7 +118,7 @@ </data> <key>MainViewController.nib</key> <data> - K9LFYuifrU35JVY7i37lK8lxS6I= + 9KTh6O2nod4nQQiwyBHr+i3Qb+A= </data> <key>PkgInfo</key> <data> @@ -510,7 +510,7 @@ </data> <key>www/js/lib/products/ProductView.js</key> <data> - 6GSJ7S/a8ZK24iOOKJxm3fKtaaA= + Jrn+jawSHSGwRE48JbVKcUsvwhU= </data> <key>www/js/lib/products/Selector.js</key> <data> @@ -937,22 +937,22 @@ <dict> <key>hash</key> <data> - iDTtbfbFqax4n+II4SPZi6t2ocs= + ZxneQByk7eU6OsqM/Hd7cynlzEw= </data> <key>hash2</key> <data> - vfBROztCO7fMLW3FdPnU2i/eSMYzp+sknjcvVMM3baU= + SMVXXtVgZBjmvuBAS4JrYVSGL4eUnRNtScLd6lcFuog= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - cjhLx1lLVZaWC3dmzZDFDUEXhmI= + K6G4ubGAH/b4e7d99iTPzYdcgHk= </data> <key>hash2</key> <data> - hsTEu4ZattGa/49zdwHvcKwjT9TR86DT/SShXHK+L7U= + J+XM/1tkARewcNev981LakgjdI7KGn7xqI3g+uX1HKg= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -970,11 +970,11 @@ <dict> <key>hash</key> <data> - CXnUxM+P13q3aYXtFroFsJcZRp0= + IFOMmirH54VKouWHIk3r354JEbE= </data> <key>hash2</key> <data> - nYXBlcnB/stfRcqPQqVCv4Hdy4j6Ni9t6j/YSwktbrg= + NpjH/uvuNHv6/di1iG4/xO0rOAevJX9pJ8iaHSrSNd4= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -992,11 +992,11 @@ <dict> <key>hash</key> <data> - K9LFYuifrU35JVY7i37lK8lxS6I= + 9KTh6O2nod4nQQiwyBHr+i3Qb+A= </data> <key>hash2</key> <data> - m3JXvkgOy9hLaYir6AQHU/3YPB+GVMRzLtx6yVTx/iA= + U6SjPhPMB70sqWoz6fjHmAgQWGCovM4TeS1frWGdorE= </data> </dict> <key>archived-expanded-entitlements.xcent</key> @@ -2059,11 +2059,11 @@ <dict> <key>hash</key> <data> - 6GSJ7S/a8ZK24iOOKJxm3fKtaaA= + Jrn+jawSHSGwRE48JbVKcUsvwhU= </data> <key>hash2</key> <data> - Wz37/FgslyUj3wZ1yHnLqnHFPmUTy4nHDlT7d3F2fgc= + RxDuamxdpjueDtKYoo4eZp+7vHeDszLkMzFF3/Famtg= </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/products/ProductView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/products/ProductView.js index 218c151d..f9de3ab3 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 @@ -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) 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 371cb20d..d744b66e 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>2</integer> + <integer>3</integer> </dict> </dict> </dict> diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index 218c151d..f9de3ab3 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/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) |