From 874448ba5fa8ff0796e9934c44eb8ba695c80257 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 6 Nov 2017 00:54:06 +0100 Subject: check if hub needed.. --- .../xcschemes/xcschememanagement.plist | 2 +- .../ios/Stone Island.xcarchive/Info.plist | 6 +- .../Stone Island.app/AppIcon29x29@3x.png | Bin 9082 -> 9773 bytes .../Stone Island.app/AppIcon40x40@2x.png | Bin 8883 -> 0 bytes .../Applications/Stone Island.app/Assets.car | Bin 587848 -> 844136 bytes .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2283 -> 2284 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Applications/Stone Island.app/Info.plist | Bin 1698 -> 1698 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2224128 -> 2224144 bytes .../Stone Island.app/_CodeSignature/CodeResources | 125 ++++++++++-------- .../Applications/Stone Island.app/config.xml | 5 +- .../Stone Island.app/www/cordova_plugins.js | 11 +- .../Stone Island.app/www/css/products.css | 8 +- .../Applications/Stone Island.app/www/index.html | 139 +++++++++++---------- .../Applications/Stone Island.app/www/js/index.js | 8 +- .../Stone Island.app/www/js/lib/etc/sim.js | 44 +++++++ .../Stone Island.app/www/js/lib/nav/AddressView.js | 7 ++ .../www/js/lib/products/ProductView.js | 38 ++++-- .../Stone Island.app/www/js/sdk/_sdk.js | 6 +- .../www/plugins/cordova-plugin-sim/www/sim.js | 8 ++ .../xcschemes/xcschememanagement.plist | 2 +- .../UserInterfaceState.xcuserstate | Bin 40452 -> 41601 bytes .../AppIcon.appiconset/Contents.json | 54 ++++---- .../AppIcon.appiconset/icon-1025.png | Bin 0 -> 325663 bytes .../AppIcon.appiconset/icon-small@2x-1.png | Bin 0 -> 6014 bytes .../AppIcon.appiconset/icon-small@3x.png | Bin 7040 -> 10331 bytes .../ios/Stone Island/Stone Island-Info.plist | 4 +- StoneIsland/platforms/ios/Stone Island/config.xml | 8 +- StoneIsland/platforms/ios/www/css/products.css | 8 +- StoneIsland/platforms/ios/www/index.html | 139 +++++++++++---------- StoneIsland/platforms/ios/www/js/index.js | 8 +- StoneIsland/platforms/ios/www/js/lib/etc/sim.js | 44 +++++++ .../platforms/ios/www/js/lib/nav/AddressView.js | 7 ++ .../ios/www/js/lib/products/ProductView.js | 38 ++++-- StoneIsland/platforms/ios/www/js/sdk/_sdk.js | 6 +- StoneIsland/res/icon/ios/icon-1024.png | Bin 0 -> 325663 bytes StoneIsland/www/index.html | 137 ++++++++++---------- StoneIsland/www/js/lib/blogs/HubView.js | 10 +- StoneIsland/www/js/lib/etc/sim.js | 19 ++- StoneIsland/www/js/lib/nav/AddressView.js | 7 ++ 41 files changed, 565 insertions(+), 333 deletions(-) delete mode 100644 StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon40x40@2x.png create mode 100644 StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/sim.js create mode 100644 StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/plugins/cordova-plugin-sim/www/sim.js create mode 100644 StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-1025.png create mode 100644 StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-small@2x-1.png create mode 100644 StoneIsland/platforms/ios/www/js/lib/etc/sim.js create mode 100644 StoneIsland/res/icon/ios/icon-1024.png (limited to 'StoneIsland') 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 @@ CordovaLib.xcscheme orderHint - 3 + 2 diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 34d78992..73f0a58b 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -9,16 +9,16 @@ CFBundleIdentifier us.okfoc.stoneisland CFBundleShortVersionString - 0.9.2 + 0.9.3 CFBundleVersion - 0.9.2 + 0.9.3 SigningIdentity iPhone Developer: Francesca Agusani (3ECUPBTQ5W) ArchiveVersion 2 CreationDate - 2017-10-26T01:03:35Z + 2017-11-05T23:34:28Z Name Stone Island SchemeName diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon29x29@3x.png b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon29x29@3x.png index 79ed5ae9..cd9d0c5b 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon29x29@3x.png and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon29x29@3x.png differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon40x40@2x.png b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon40x40@2x.png deleted file mode 100644 index d7f0b418..00000000 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon40x40@2x.png and /dev/null differ 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 index f93ac283..b0f77256 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car differ 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 index f403edb4..db03e6cc 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ 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 index 07161619..7faed620 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist index 422c1138..d05a4f16 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist differ 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 index fc7a4240..0361cda3 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib differ 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 index 7420a984..d3a2bbaa 100755 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island differ 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 4ebd411b..cf77397c 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 @@ -30,16 +30,12 @@ AppIcon29x29@3x.png - oFXDhglhwveDc/NdX1KUiwK9pc8= + 34x3jkHPlzEFjwiLm8KS7t+JvIY= AppIcon29x29~ipad.png Is6VLMY4XWleZkWcLbcHYvQLtEk= - AppIcon40x40@2x.png - - PtOZln81Z9Z9mhyjrpU9sD3/Bsg= - AppIcon40x40@2x~ipad.png PtOZln81Z9Z9mhyjrpU9sD3/Bsg= @@ -98,11 +94,11 @@ Assets.car - M/PS+vILUt+ZdoqpyDBl5RGSL18= + CpxH2Q4gG83s0S1Kchn/Ctvbo64= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - txRRdx7r8oM2u4ou2knn4+RkScg= + ij4eTPRdAsOcPWZEHpxmOPpJuJo= CDVLaunchScreen.storyboardc/Info.plist @@ -110,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - lrsFIaZz7Iz7ZNZ+48eRxZqjygo= + 5cK1zMJPrMdw43g+XVm7rjaRKJw= CDVNotification.bundle/beep.wav @@ -118,11 +114,11 @@ Info.plist - q2ZHOk06KXQywkMV36ajnHxs0j0= + G5ncUmlLiHwYJ4JNgFnJ9U5cp2g= MainViewController.nib - EY05QVjVbNDD+0+HVs2xUFPuAVE= + YXr/2svEkt7uE61Z6FFZrH+X3+Q= PkgInfo @@ -134,7 +130,7 @@ config.xml - fhpq5N5Bnj7ApZZGNrBM7i5Hz/8= + F5YU8YW/BDhsDOizSe9Lz/PiQkE= embedded.mobileprovision @@ -162,7 +158,7 @@ www/cordova_plugins.js - iOxxb9wdyzUPrj90+W57Vj4et4E= + i6S3cNxlLtQi5ayc0zd4qrDT96c= www/css/account.css @@ -238,7 +234,7 @@ www/css/products.css - bY2IfaCUQ+Rz5riamQVF0rOVe6A= + +fUNkWTJRbnCPObOIppxTXdSwz0= www/css/vendor/flickity.css @@ -354,11 +350,11 @@ www/index.html - 1CV2rewRIfTTLMhrx86Hte/FRrI= + CACJE32yVdNdEm05YFQ3xB0v7+w= www/js/index.js - Plb7S5c6Fc0HZbQjIH7VudaPPFU= + wOXzRHktU04rH4QKjeb0Xz8WDHY= www/js/lib/_router.js @@ -464,9 +460,13 @@ +3CWZcxp1Ao9A/4KiM4nA82Hia8= + www/js/lib/etc/sim.js + + aQPvISjrCZABE0Y+DdUHUUlKTZE= + www/js/lib/nav/AddressView.js - JFoETIdARQvI5GU6tc1YJhhttEc= + 7LJJ0CnyURtInuVhaKbkBjLj9Wo= www/js/lib/nav/CreditCardView.js @@ -510,7 +510,7 @@ www/js/lib/products/ProductView.js - lID8uwdlyxHLJU8s69LDl1vb9wo= + sM/LY1QKtDfnmCngnmUVft/y9Ao= www/js/lib/products/Selector.js @@ -546,7 +546,7 @@ www/js/sdk/_sdk.js - +RIDPxfqUZwaTbuh+hEYSte1cv0= + p+aPqpbTEwmY/5eb/F9NF58t0W8= www/js/sdk/account.js @@ -664,6 +664,10 @@ jxeuXL/JPk6C5eQC7iVThLg7NPc= + www/plugins/cordova-plugin-sim/www/sim.js + + ClFcxSc++1+co21X98ODwFS+dYA= + www/plugins/cordova-plugin-splashscreen/www/splashscreen.js n2E0W8B/grOxM2ORx/haAYOWIcA= @@ -757,11 +761,11 @@ hash - oFXDhglhwveDc/NdX1KUiwK9pc8= + 34x3jkHPlzEFjwiLm8KS7t+JvIY= hash2 - rIYBFPd8U6tNy/Ogw3nYTzb2F47VzeN9TWA13ZYaNWg= + ILfuARqTyA3SWNRU8D8qGDMwoS7kIxYKiVX9XpFnlbg= AppIcon29x29~ipad.png @@ -775,17 +779,6 @@ B335YAj6s7XMv/1E833Dg8f6gsJ1KuRtXQmsfHRxAvI= - AppIcon40x40@2x.png - - hash - - PtOZln81Z9Z9mhyjrpU9sD3/Bsg= - - hash2 - - wSGjpTyfXyE/VY7XduvSkCSzZZASCOyn8yF8WE7L7Uk= - - AppIcon40x40@2x~ipad.png hash @@ -944,22 +937,22 @@ hash - M/PS+vILUt+ZdoqpyDBl5RGSL18= + CpxH2Q4gG83s0S1Kchn/Ctvbo64= hash2 - RJQmWIQMob9a6gP0OjH/4ALiP+kjsPE0Uxuj0RBxn4o= + gaycW4hHsfbVswV6Gq89ZD9hxtpVMFMow7ANyVfnGhI= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - txRRdx7r8oM2u4ou2knn4+RkScg= + ij4eTPRdAsOcPWZEHpxmOPpJuJo= hash2 - Yn4zoGTd4bJGoj2M0i0E75RhMlqGO9xnEpvWQzGNk90= + kGrFfODnQnb+c9Ojuy8BvxPick16b7RbnGe+Di0Cz1s= CDVLaunchScreen.storyboardc/Info.plist @@ -977,11 +970,11 @@ hash - lrsFIaZz7Iz7ZNZ+48eRxZqjygo= + 5cK1zMJPrMdw43g+XVm7rjaRKJw= hash2 - Kg3ncoLHsG3Urwjd/X2bjQQj6fdwFlzBSg8bqtvscP4= + vwli50HKwIEDNhSAIfs5N3U80+sM0zbN43DGO92VQ5k= CDVNotification.bundle/beep.wav @@ -999,11 +992,11 @@ hash - EY05QVjVbNDD+0+HVs2xUFPuAVE= + YXr/2svEkt7uE61Z6FFZrH+X3+Q= hash2 - 5W+z1OG8hkoyk7Pk0DBsiYG0IBy3gNVm+Ib1M2KYooo= + k/kNo4NIBjFqVCY581QgL8UllhRH3GcrBch3cgAtXbo= archived-expanded-entitlements.xcent @@ -1021,11 +1014,11 @@ hash - fhpq5N5Bnj7ApZZGNrBM7i5Hz/8= + F5YU8YW/BDhsDOizSe9Lz/PiQkE= hash2 - fksgJ/hSiEBUc5wFHerPKX6TRhXX+y4p8UmwZDAFY9w= + Sn3JrSovoEaZgG/md9h/DjPgH98Dv7m1hFfRNL54vJA= embedded.mobileprovision @@ -1098,11 +1091,11 @@ hash - iOxxb9wdyzUPrj90+W57Vj4et4E= + i6S3cNxlLtQi5ayc0zd4qrDT96c= hash2 - MLg/5ZAFiqY7FC859kWt994HUKF8lZ3lJ6HDnYqKCNU= + u03mWJJkPkP7r5gqnGz/5bBrYTuOXZhfCcAOc6IxOco= www/css/account.css @@ -1307,11 +1300,11 @@ hash - bY2IfaCUQ+Rz5riamQVF0rOVe6A= + +fUNkWTJRbnCPObOIppxTXdSwz0= hash2 - hPZUQWrlZ/hGqd0scKaIjhli7AmNraugdxjdk5UoORg= + 4YeXdsIzAETntWgyK3wdkERMCmdwsxiCWwq8yJ0bm3Q= www/css/vendor/flickity.css @@ -1626,22 +1619,22 @@ hash - 1CV2rewRIfTTLMhrx86Hte/FRrI= + CACJE32yVdNdEm05YFQ3xB0v7+w= hash2 - 7qx1UoxYjCWYy0eAjKq13o60Wpl7y/BhzcDzQ/rFBXM= + BzwyBUkvTtQBC/mrDy2fuwtUdaW4SkhpuTzkGJJu1nI= www/js/index.js hash - Plb7S5c6Fc0HZbQjIH7VudaPPFU= + wOXzRHktU04rH4QKjeb0Xz8WDHY= hash2 - o0gXIFJpWseSG7bZIURj2/N1Ho0VZVa6l5nbTpUXaM8= + kmyYZ5GdiBKABgetHNxZUE09E9OtKoslDFP4bUYMdfQ= www/js/lib/_router.js @@ -1930,15 +1923,26 @@ 1kY0DEwWFQO8RFoncYf/51g2MWyKHwesCyP/Nt7xDXk= + www/js/lib/etc/sim.js + + hash + + aQPvISjrCZABE0Y+DdUHUUlKTZE= + + hash2 + + WSn8re6AUQ0xV7PhArqIugKaGLA5S3ymHauimcs8dHE= + + www/js/lib/nav/AddressView.js hash - JFoETIdARQvI5GU6tc1YJhhttEc= + 7LJJ0CnyURtInuVhaKbkBjLj9Wo= hash2 - tlqapPZSqJXPu1tVTEPiqafuJYdHnff/lCfnLeAzXrs= + FYp6WSmd8vwxOcqmofcQHUkt5xBNR9vETVy/v/hI2bQ= www/js/lib/nav/CreditCardView.js @@ -2055,11 +2059,11 @@ hash - lID8uwdlyxHLJU8s69LDl1vb9wo= + sM/LY1QKtDfnmCngnmUVft/y9Ao= hash2 - 1fJlacmFl3czqEHHeyoexuADgQTK5vTwLOhj+LZanLE= + b3E1CxezHAYUIR7majwpb5IMSFnLz2yij1tWkC8cakM= www/js/lib/products/Selector.js @@ -2154,11 +2158,11 @@ hash - +RIDPxfqUZwaTbuh+hEYSte1cv0= + p+aPqpbTEwmY/5eb/F9NF58t0W8= hash2 - PjbBMjYeor9n8QefRZ4/bthUR0xgliIr5i1w89Wp7Ws= + 6LahOUZ7IdibY4LB9/x3om63z+ItHu6FvkvgNFQ4k0s= www/js/sdk/account.js @@ -2480,6 +2484,17 @@ 6BrhkQ/LskQvmM1rbhciH8KThNK7PeYwvje9PZsZIro= + www/plugins/cordova-plugin-sim/www/sim.js + + hash + + ClFcxSc++1+co21X98ODwFS+dYA= + + hash2 + + bxLaY2hOh13X+tMPiaLF4+Nj/dZcWSzVsaDz6Bj7CAc= + + www/plugins/cordova-plugin-splashscreen/www/splashscreen.js hash diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml index 81ddacaf..007d089d 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/config.xml @@ -1,5 +1,5 @@ - + @@ -52,6 +52,9 @@ + + + Stone Island Stone Island diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/cordova_plugins.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/cordova_plugins.js index e6ad8b23..32af05ac 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/cordova_plugins.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/cordova_plugins.js @@ -122,6 +122,14 @@ module.exports = [ "clobbers": [ "PushNotification" ] + }, + { + "id": "cordova-plugin-sim.Sim", + "file": "plugins/cordova-plugin-sim/www/sim.js", + "pluginId": "cordova-plugin-sim", + "merges": [ + "window.plugins.sim" + ] } ]; module.exports.metadata = @@ -140,7 +148,8 @@ module.exports.metadata = "cordova-plugin-whitelist": "1.3.0", "cordova-plugin-x-socialsharing": "5.1.3", "ionic-plugin-keyboard": "2.2.1", - "phonegap-plugin-push": "1.9.2" + "phonegap-plugin-push": "1.9.2", + "cordova-plugin-sim": "1.3.3" }; // BOTTOM OF METADATA }); \ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css index c4599866..1f858898 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/css/products.css @@ -207,18 +207,14 @@ } -.product .fit { +.product .fit, +.product .notAvailableInCanada { clear:both; font-size:9px; letter-spacing:0.5px; text-decoration:underline; text-transform:uppercase; padding:12px 0 0; - -} - -.product .content .fit { - } #product .gallery-prev, 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 6d52433c..1d929f26 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 @@ -278,6 +278,7 @@
Fits Large
+
Not Available In Canada
@@ -974,72 +975,6 @@
STATE
@@ -1068,7 +1003,78 @@ --> + + + + @@ -1098,6 +1104,7 @@ + diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js index eb3b32b9..511849ad 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js @@ -79,10 +79,16 @@ var app = (function(){ cordova.plugins.Keyboard.disableScroll(true) cordova.plugins.Keyboard.hideKeyboardAccessoryBar(false) geo.fetch() + sim.fetch(app.api_ready) var image = new Image image.src = "./img/compass-logo.png" } - + else { + app.api_ready() + } + } + + app.api_ready = function(){ if (is_iphone_x) { StatusBar.hide() } 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 new file mode 100644 index 00000000..ca01ddc7 --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/sim.js @@ -0,0 +1,44 @@ +var sim = (function(){ + var sim = {} + + sim.loaded = false + sim.data = { + carrierName: 'unknown', + countryCode: 'us', + mcc: '0', + mnc: '0', + } + + sim.fetch = function(cb){ + sim.afterFetch = cb + window.plugins.sim.getSimInfo(sim.success, sim.error) + } + + sim.afterFetch = function(){} + + sim.success = function(data){ + console.log(data) + if (sim.data.countryCode) { + sim.data = data + sim.data.countryCode = sim.data.countryCode.toLowerCase() + // app is only available in US or Canada, so call the US API regardless + if (sim.data.countryCode !== 'ca') { + sim.data.countryCode = 'us' + } + } + sim.loaded = true + sim.afterFetch() + } + + sim.error = function(){ + console.log("no SIM card detected") + $.ajax({ + url: "http://ip-api.com/json/", + jsonp: "callback", + dataType: "jsonp", + success: sim.success, + }) + } + + return sim +})() \ No newline at end of file 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 4a05c4b6..fd7df218 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 @@ -2,6 +2,8 @@ var AddressView = SerializableView.extend({ template: $("#address_template").html(), + us_states: $("#us_states").html(), + ca_states: $("#ca_states").html(), disabled: false, @@ -18,6 +20,11 @@ var AddressView = SerializableView.extend({ }, populate: function(data){ + this.$("[name=Province]").empty() + this.$("[name=Province]").append(this.us_states) + if (! app.store.notAvailableInCanada) { + this.$("[name=Province]").append(this.ca_states) + } this.data = data var address = data.Address.split("\n") data.Address1 = address[0] 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 c1847496..7434888c 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 @@ -5,6 +5,7 @@ var ProductView = ScrollableView.extend({ events: { "click .fit": "scroll_to_bottom", + "click .notAvailableInCanada": "scroll_to_bottom", "click .size": "select_size", "click .color": "select_color", "click .share": "share", @@ -25,6 +26,7 @@ var ProductView = ScrollableView.extend({ this.$color = this.$(".color") this.$body = this.$(".body") this.$fit = this.$(".fit") + this.$notAvailableInCanada = this.$(".notAvailableInCanada") this.$sizing = this.$(".sizing") this.$style = this.$(".style") }, @@ -39,9 +41,12 @@ var ProductView = ScrollableView.extend({ }, showFooter: function(){ - if (this.not_available) { + if (this.sold_out) { app.footer.show("SOLD OUT") } + else if (this.isNotAvailable) { + app.footer.show("NOT AVAILABLE") + } else { app.footer.show("ADD TO CART", "BUY NOW") } @@ -125,7 +130,20 @@ var ProductView = ScrollableView.extend({ var default_color_id = this.populate_selectors(data, details) - if (this.not_available) { + var notAvailableInCanada = !! app.store.notAvailableInCanada + app.product.$notAvailableInCanada.toggle( notAvailableInCanada ) + if (notAvailableInCanada && sim.data.countryCode === 'ca') { + 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) this.$color.html("NOT AVAILABLE") this.$size.hide() @@ -206,11 +224,11 @@ var ProductView = ScrollableView.extend({ console.log('colors:', modelColors.length || "none") if (! modelColors.length) { - this.not_available = true + this.sold_out = true return } else { - this.not_available = false + this.sold_out = false } modelColors.forEach(function(color, index){ @@ -261,7 +279,8 @@ var ProductView = ScrollableView.extend({ }, select_size: function(){ - if (this.not_available) { return } + if (this.sold_out) { return } + if (this.notAvailable) { return } if (this.is_onesize) { return this.select_color() } if (this.item['Sizes'].length == 0) { return } var sizes = Object.keys(this.sizes).map(function(key){ @@ -276,7 +295,8 @@ var ProductView = ScrollableView.extend({ }, select_color: function(){ - if (this.not_available) { return } + if (this.sold_out) { return } + if (this.notAvailable) { return } if (this.item['Colors'].length == 0) { return } var colors = Object.keys(this.colors).map(function(key){ return this.colors[key] @@ -291,12 +311,14 @@ var ProductView = ScrollableView.extend({ // ADD TO CART save: function(){ - if (this.not_available) { return } + if (this.sold_out) { return } + if (this.notAvailable) { return } this.add_to_cart({ route: false }) }, // BUY NOW cancel: function(){ - if (this.not_available) { return } + if (this.sold_out) { return } + if (this.notAvailable) { return } this.add_to_cart({ route: true }) }, diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js index 7b4966a5..fc871727 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/sdk/_sdk.js @@ -22,13 +22,17 @@ var sdk = (function(){ } sdk.path = function(api, path){ - return endpoint + api + "/STONEISLAND_US/" + path + return endpoint + api + "/STONEISLAND_" + sdk.cc() + "/" + path } sdk.image = function(code, size){ return "https://cdn.yoox.biz/" + code.substr(0,2) + "/" + code + "_" + size + ".jpg" } + sdk.cc = function(){ + return sim.data.countryCode.toUpperCase() + } + sdk.cms = function(){ return "https://stone.giraffe.life" // return "https://staging.stone.giraffe.life" diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/plugins/cordova-plugin-sim/www/sim.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/plugins/cordova-plugin-sim/www/sim.js new file mode 100644 index 00000000..ccc52e54 --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/plugins/cordova-plugin-sim/www/sim.js @@ -0,0 +1,8 @@ +cordova.define("cordova-plugin-sim.Sim", function(require, exports, module) { +module.exports = { + getSimInfo: function(successCallback, errorCallback) { + cordova.exec(successCallback, errorCallback, 'Sim', 'getSimInfo', []); + } +}; + +}); 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 @@ Stone Island.xcscheme orderHint - 2 + 3 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 f43c8bf2..58942dfd 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/Contents.json b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/Contents.json index 4c005a7e..9fa61bb8 100644 --- a/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,153 +1,153 @@ { "images" : [ { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", "filename" : "icon-20@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", "filename" : "icon-20@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", "filename" : "icon-small.png", "scale" : "1x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", "filename" : "icon-small@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", "filename" : "icon-small@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "40x40", - "filename" : "icon-40@2x.png", + "idiom" : "iphone", + "filename" : "icon-small@2x-1.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", "filename" : "icon-60@2x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "57x57", + "idiom" : "iphone", "filename" : "icon.png", "scale" : "1x" }, { - "idiom" : "iphone", "size" : "57x57", + "idiom" : "iphone", "filename" : "icon@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", "filename" : "icon-60@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", "filename" : "icon-60@3x.png", "scale" : "3x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", "filename" : "icon-20.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", "filename" : "icon-20@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "29x29", + "idiom" : "ipad", "filename" : "icon-small.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "29x29", + "idiom" : "ipad", "filename" : "icon-small@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "40x40", + "idiom" : "ipad", "filename" : "icon-40.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "40x40", + "idiom" : "ipad", "filename" : "icon-40@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "50x50", + "idiom" : "ipad", "filename" : "icon-50.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "50x50", + "idiom" : "ipad", "filename" : "icon-50@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "72x72", + "idiom" : "ipad", "filename" : "icon-72.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "72x72", + "idiom" : "ipad", "filename" : "icon-72@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", "filename" : "icon-76.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", "filename" : "icon-76@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "83.5x83.5", + "idiom" : "ipad", "filename" : "icon-83.5@2x.png", "scale" : "2x" }, { "size" : "1024x1024", "idiom" : "ios-marketing", - "filename" : "icon-1024.png", + "filename" : "icon-1025.png", "scale" : "1x" }, { @@ -223,4 +223,4 @@ "version" : 1, "author" : "xcode" } -} +} \ No newline at end of file diff --git a/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-1025.png b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-1025.png new file mode 100644 index 00000000..d33fd5aa Binary files /dev/null and b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-1025.png differ diff --git a/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-small@2x-1.png b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-small@2x-1.png new file mode 100644 index 00000000..8e3a96d6 Binary files /dev/null and b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-small@2x-1.png differ diff --git a/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-small@3x.png b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-small@3x.png index 5c37dfc2..a40b6358 100644 Binary files a/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-small@3x.png and b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-small@3x.png differ diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index bc255035..5f213178 100644 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -21,11 +21,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.2 + 0.9.3 CFBundleSignature ???? CFBundleVersion - 0.9.2 + 0.9.3 LSRequiresIPhoneOS NSMainNibFile diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index c7a3a817..007d089d 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ - + @@ -52,6 +52,9 @@ + + + Stone Island Stone Island @@ -109,7 +112,4 @@ - - - diff --git a/StoneIsland/platforms/ios/www/css/products.css b/StoneIsland/platforms/ios/www/css/products.css index c4599866..1f858898 100755 --- a/StoneIsland/platforms/ios/www/css/products.css +++ b/StoneIsland/platforms/ios/www/css/products.css @@ -207,18 +207,14 @@ } -.product .fit { +.product .fit, +.product .notAvailableInCanada { clear:both; font-size:9px; letter-spacing:0.5px; text-decoration:underline; text-transform:uppercase; padding:12px 0 0; - -} - -.product .content .fit { - } #product .gallery-prev, diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 6d52433c..1d929f26 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -278,6 +278,7 @@
Fits Large
+
Not Available In Canada
@@ -974,72 +975,6 @@
STATE
@@ -1068,7 +1003,78 @@ --> + + + + @@ -1098,6 +1104,7 @@ + diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js index eb3b32b9..511849ad 100755 --- a/StoneIsland/platforms/ios/www/js/index.js +++ b/StoneIsland/platforms/ios/www/js/index.js @@ -79,10 +79,16 @@ var app = (function(){ cordova.plugins.Keyboard.disableScroll(true) cordova.plugins.Keyboard.hideKeyboardAccessoryBar(false) geo.fetch() + sim.fetch(app.api_ready) var image = new Image image.src = "./img/compass-logo.png" } - + else { + app.api_ready() + } + } + + app.api_ready = function(){ if (is_iphone_x) { StatusBar.hide() } diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/sim.js b/StoneIsland/platforms/ios/www/js/lib/etc/sim.js new file mode 100644 index 00000000..ca01ddc7 --- /dev/null +++ b/StoneIsland/platforms/ios/www/js/lib/etc/sim.js @@ -0,0 +1,44 @@ +var sim = (function(){ + var sim = {} + + sim.loaded = false + sim.data = { + carrierName: 'unknown', + countryCode: 'us', + mcc: '0', + mnc: '0', + } + + sim.fetch = function(cb){ + sim.afterFetch = cb + window.plugins.sim.getSimInfo(sim.success, sim.error) + } + + sim.afterFetch = function(){} + + sim.success = function(data){ + console.log(data) + if (sim.data.countryCode) { + sim.data = data + sim.data.countryCode = sim.data.countryCode.toLowerCase() + // app is only available in US or Canada, so call the US API regardless + if (sim.data.countryCode !== 'ca') { + sim.data.countryCode = 'us' + } + } + sim.loaded = true + sim.afterFetch() + } + + sim.error = function(){ + console.log("no SIM card detected") + $.ajax({ + url: "http://ip-api.com/json/", + jsonp: "callback", + dataType: "jsonp", + success: sim.success, + }) + } + + return sim +})() \ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js b/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js index 4a05c4b6..fd7df218 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/AddressView.js @@ -2,6 +2,8 @@ var AddressView = SerializableView.extend({ template: $("#address_template").html(), + us_states: $("#us_states").html(), + ca_states: $("#ca_states").html(), disabled: false, @@ -18,6 +20,11 @@ var AddressView = SerializableView.extend({ }, populate: function(data){ + this.$("[name=Province]").empty() + this.$("[name=Province]").append(this.us_states) + if (! app.store.notAvailableInCanada) { + this.$("[name=Province]").append(this.ca_states) + } this.data = data var address = data.Address.split("\n") data.Address1 = address[0] diff --git a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js index c1847496..7434888c 100755 --- a/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js +++ b/StoneIsland/platforms/ios/www/js/lib/products/ProductView.js @@ -5,6 +5,7 @@ var ProductView = ScrollableView.extend({ events: { "click .fit": "scroll_to_bottom", + "click .notAvailableInCanada": "scroll_to_bottom", "click .size": "select_size", "click .color": "select_color", "click .share": "share", @@ -25,6 +26,7 @@ var ProductView = ScrollableView.extend({ this.$color = this.$(".color") this.$body = this.$(".body") this.$fit = this.$(".fit") + this.$notAvailableInCanada = this.$(".notAvailableInCanada") this.$sizing = this.$(".sizing") this.$style = this.$(".style") }, @@ -39,9 +41,12 @@ var ProductView = ScrollableView.extend({ }, showFooter: function(){ - if (this.not_available) { + if (this.sold_out) { app.footer.show("SOLD OUT") } + else if (this.isNotAvailable) { + app.footer.show("NOT AVAILABLE") + } else { app.footer.show("ADD TO CART", "BUY NOW") } @@ -125,7 +130,20 @@ var ProductView = ScrollableView.extend({ var default_color_id = this.populate_selectors(data, details) - if (this.not_available) { + var notAvailableInCanada = !! app.store.notAvailableInCanada + app.product.$notAvailableInCanada.toggle( notAvailableInCanada ) + if (notAvailableInCanada && sim.data.countryCode === 'ca') { + 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) this.$color.html("NOT AVAILABLE") this.$size.hide() @@ -206,11 +224,11 @@ var ProductView = ScrollableView.extend({ console.log('colors:', modelColors.length || "none") if (! modelColors.length) { - this.not_available = true + this.sold_out = true return } else { - this.not_available = false + this.sold_out = false } modelColors.forEach(function(color, index){ @@ -261,7 +279,8 @@ var ProductView = ScrollableView.extend({ }, select_size: function(){ - if (this.not_available) { return } + if (this.sold_out) { return } + if (this.notAvailable) { return } if (this.is_onesize) { return this.select_color() } if (this.item['Sizes'].length == 0) { return } var sizes = Object.keys(this.sizes).map(function(key){ @@ -276,7 +295,8 @@ var ProductView = ScrollableView.extend({ }, select_color: function(){ - if (this.not_available) { return } + if (this.sold_out) { return } + if (this.notAvailable) { return } if (this.item['Colors'].length == 0) { return } var colors = Object.keys(this.colors).map(function(key){ return this.colors[key] @@ -291,12 +311,14 @@ var ProductView = ScrollableView.extend({ // ADD TO CART save: function(){ - if (this.not_available) { return } + if (this.sold_out) { return } + if (this.notAvailable) { return } this.add_to_cart({ route: false }) }, // BUY NOW cancel: function(){ - if (this.not_available) { return } + if (this.sold_out) { return } + if (this.notAvailable) { return } this.add_to_cart({ route: true }) }, diff --git a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js index 7b4966a5..fc871727 100755 --- a/StoneIsland/platforms/ios/www/js/sdk/_sdk.js +++ b/StoneIsland/platforms/ios/www/js/sdk/_sdk.js @@ -22,13 +22,17 @@ var sdk = (function(){ } sdk.path = function(api, path){ - return endpoint + api + "/STONEISLAND_US/" + path + return endpoint + api + "/STONEISLAND_" + sdk.cc() + "/" + path } sdk.image = function(code, size){ return "https://cdn.yoox.biz/" + code.substr(0,2) + "/" + code + "_" + size + ".jpg" } + sdk.cc = function(){ + return sim.data.countryCode.toUpperCase() + } + sdk.cms = function(){ return "https://stone.giraffe.life" // return "https://staging.stone.giraffe.life" diff --git a/StoneIsland/res/icon/ios/icon-1024.png b/StoneIsland/res/icon/ios/icon-1024.png new file mode 100644 index 00000000..d33fd5aa Binary files /dev/null and b/StoneIsland/res/icon/ios/icon-1024.png differ diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 7e660fe7..1d929f26 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -975,72 +975,6 @@
STATE
@@ -1069,7 +1003,78 @@ --> + + + + diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js index 38a7eecf..d2d26787 100755 --- a/StoneIsland/www/js/lib/blogs/HubView.js +++ b/StoneIsland/www/js/lib/blogs/HubView.js @@ -22,6 +22,7 @@ var HubView = ScrollableView.extend({ this.deferScrollToTop() app.footer.hide() document.body.className = "hub" + HubLoader.isNeeded() if (! this.populated) { this.populate( BACKUP_DB.hub ) } @@ -143,12 +144,13 @@ var HubLoader = (function(){ var count = 0 var HubLoader = {} var loader + var needed = false HubLoader.init = function(v){ view = v } HubLoader.add = function(items){ queue = items - this.load() + HubLoader.load() } HubLoader.load = function(){ item = queue.shift() @@ -167,10 +169,14 @@ var HubLoader = (function(){ HubLoader.build() } } + HubLoader.isNeeded = function(){ + needed = true + } HubLoader.build = function(){ view.append(item) view.scroller.refresh() - setTimeout(HubLoader.load, count < 4 ? 50 : 5000) + if (count === 3 && ! needed) return + setTimeout(HubLoader.load, count < 3 ? 1000 : 30000) } return HubLoader })() diff --git a/StoneIsland/www/js/lib/etc/sim.js b/StoneIsland/www/js/lib/etc/sim.js index c9cb77fe..ca01ddc7 100644 --- a/StoneIsland/www/js/lib/etc/sim.js +++ b/StoneIsland/www/js/lib/etc/sim.js @@ -18,11 +18,13 @@ var sim = (function(){ sim.success = function(data){ console.log(data) - sim.data = data - sim.data.countryCode = sim.data.countryCode.toLowerCase() - // app is only available in US or Canada, so call the US API regardless - if (sim.data.countryCode !== 'ca') { - sim.data.countryCode = 'us' + if (sim.data.countryCode) { + sim.data = data + sim.data.countryCode = sim.data.countryCode.toLowerCase() + // app is only available in US or Canada, so call the US API regardless + if (sim.data.countryCode !== 'ca') { + sim.data.countryCode = 'us' + } } sim.loaded = true sim.afterFetch() @@ -30,7 +32,12 @@ var sim = (function(){ sim.error = function(){ console.log("no SIM card detected") - sim.afterFetch() + $.ajax({ + url: "http://ip-api.com/json/", + jsonp: "callback", + dataType: "jsonp", + success: sim.success, + }) } return sim diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js index 4a05c4b6..fd7df218 100755 --- a/StoneIsland/www/js/lib/nav/AddressView.js +++ b/StoneIsland/www/js/lib/nav/AddressView.js @@ -2,6 +2,8 @@ var AddressView = SerializableView.extend({ template: $("#address_template").html(), + us_states: $("#us_states").html(), + ca_states: $("#ca_states").html(), disabled: false, @@ -18,6 +20,11 @@ var AddressView = SerializableView.extend({ }, populate: function(data){ + this.$("[name=Province]").empty() + this.$("[name=Province]").append(this.us_states) + if (! app.store.notAvailableInCanada) { + this.$("[name=Province]").append(this.ca_states) + } this.data = data var address = data.Address.split("\n") data.Address1 = address[0] -- cgit v1.2.3-70-g09d2