diff options
41 files changed, 565 insertions, 333 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 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 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 @@ <key>CFBundleIdentifier</key> <string>us.okfoc.stoneisland</string> <key>CFBundleShortVersionString</key> - <string>0.9.2</string> + <string>0.9.3</string> <key>CFBundleVersion</key> - <string>0.9.2</string> + <string>0.9.3</string> <key>SigningIdentity</key> <string>iPhone Developer: Francesca Agusani (3ECUPBTQ5W)</string> </dict> <key>ArchiveVersion</key> <integer>2</integer> <key>CreationDate</key> - <date>2017-10-26T01:03:35Z</date> + <date>2017-11-05T23:34:28Z</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/AppIcon29x29@3x.png b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon29x29@3x.png Binary files differindex 79ed5ae9..cd9d0c5b 100644 --- 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 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 Binary files differdeleted file mode 100644 index d7f0b418..00000000 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/AppIcon40x40@2x.png +++ /dev/null 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 f93ac283..b0f77256 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 f403edb4..db03e6cc 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 07161619..7faed620 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/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Info.plist Binary files differindex 422c1138..d05a4f16 100644 --- 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 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 fc7a4240..0361cda3 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 7420a984..d3a2bbaa 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 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 @@ </data> <key>AppIcon29x29@3x.png</key> <data> - oFXDhglhwveDc/NdX1KUiwK9pc8= + 34x3jkHPlzEFjwiLm8KS7t+JvIY= </data> <key>AppIcon29x29~ipad.png</key> <data> Is6VLMY4XWleZkWcLbcHYvQLtEk= </data> - <key>AppIcon40x40@2x.png</key> - <data> - PtOZln81Z9Z9mhyjrpU9sD3/Bsg= - </data> <key>AppIcon40x40@2x~ipad.png</key> <data> PtOZln81Z9Z9mhyjrpU9sD3/Bsg= @@ -98,11 +94,11 @@ </data> <key>Assets.car</key> <data> - M/PS+vILUt+ZdoqpyDBl5RGSL18= + CpxH2Q4gG83s0S1Kchn/Ctvbo64= </data> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <data> - txRRdx7r8oM2u4ou2knn4+RkScg= + ij4eTPRdAsOcPWZEHpxmOPpJuJo= </data> <key>CDVLaunchScreen.storyboardc/Info.plist</key> <data> @@ -110,7 +106,7 @@ </data> <key>CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib</key> <data> - lrsFIaZz7Iz7ZNZ+48eRxZqjygo= + 5cK1zMJPrMdw43g+XVm7rjaRKJw= </data> <key>CDVNotification.bundle/beep.wav</key> <data> @@ -118,11 +114,11 @@ </data> <key>Info.plist</key> <data> - q2ZHOk06KXQywkMV36ajnHxs0j0= + G5ncUmlLiHwYJ4JNgFnJ9U5cp2g= </data> <key>MainViewController.nib</key> <data> - EY05QVjVbNDD+0+HVs2xUFPuAVE= + YXr/2svEkt7uE61Z6FFZrH+X3+Q= </data> <key>PkgInfo</key> <data> @@ -134,7 +130,7 @@ </data> <key>config.xml</key> <data> - fhpq5N5Bnj7ApZZGNrBM7i5Hz/8= + F5YU8YW/BDhsDOizSe9Lz/PiQkE= </data> <key>embedded.mobileprovision</key> <data> @@ -162,7 +158,7 @@ </data> <key>www/cordova_plugins.js</key> <data> - iOxxb9wdyzUPrj90+W57Vj4et4E= + i6S3cNxlLtQi5ayc0zd4qrDT96c= </data> <key>www/css/account.css</key> <data> @@ -238,7 +234,7 @@ </data> <key>www/css/products.css</key> <data> - bY2IfaCUQ+Rz5riamQVF0rOVe6A= + +fUNkWTJRbnCPObOIppxTXdSwz0= </data> <key>www/css/vendor/flickity.css</key> <data> @@ -354,11 +350,11 @@ </data> <key>www/index.html</key> <data> - 1CV2rewRIfTTLMhrx86Hte/FRrI= + CACJE32yVdNdEm05YFQ3xB0v7+w= </data> <key>www/js/index.js</key> <data> - Plb7S5c6Fc0HZbQjIH7VudaPPFU= + wOXzRHktU04rH4QKjeb0Xz8WDHY= </data> <key>www/js/lib/_router.js</key> <data> @@ -464,9 +460,13 @@ <data> +3CWZcxp1Ao9A/4KiM4nA82Hia8= </data> + <key>www/js/lib/etc/sim.js</key> + <data> + aQPvISjrCZABE0Y+DdUHUUlKTZE= + </data> <key>www/js/lib/nav/AddressView.js</key> <data> - JFoETIdARQvI5GU6tc1YJhhttEc= + 7LJJ0CnyURtInuVhaKbkBjLj9Wo= </data> <key>www/js/lib/nav/CreditCardView.js</key> <data> @@ -510,7 +510,7 @@ </data> <key>www/js/lib/products/ProductView.js</key> <data> - lID8uwdlyxHLJU8s69LDl1vb9wo= + sM/LY1QKtDfnmCngnmUVft/y9Ao= </data> <key>www/js/lib/products/Selector.js</key> <data> @@ -546,7 +546,7 @@ </data> <key>www/js/sdk/_sdk.js</key> <data> - +RIDPxfqUZwaTbuh+hEYSte1cv0= + p+aPqpbTEwmY/5eb/F9NF58t0W8= </data> <key>www/js/sdk/account.js</key> <data> @@ -664,6 +664,10 @@ <data> jxeuXL/JPk6C5eQC7iVThLg7NPc= </data> + <key>www/plugins/cordova-plugin-sim/www/sim.js</key> + <data> + ClFcxSc++1+co21X98ODwFS+dYA= + </data> <key>www/plugins/cordova-plugin-splashscreen/www/splashscreen.js</key> <data> n2E0W8B/grOxM2ORx/haAYOWIcA= @@ -757,11 +761,11 @@ <dict> <key>hash</key> <data> - oFXDhglhwveDc/NdX1KUiwK9pc8= + 34x3jkHPlzEFjwiLm8KS7t+JvIY= </data> <key>hash2</key> <data> - rIYBFPd8U6tNy/Ogw3nYTzb2F47VzeN9TWA13ZYaNWg= + ILfuARqTyA3SWNRU8D8qGDMwoS7kIxYKiVX9XpFnlbg= </data> </dict> <key>AppIcon29x29~ipad.png</key> @@ -775,17 +779,6 @@ B335YAj6s7XMv/1E833Dg8f6gsJ1KuRtXQmsfHRxAvI= </data> </dict> - <key>AppIcon40x40@2x.png</key> - <dict> - <key>hash</key> - <data> - PtOZln81Z9Z9mhyjrpU9sD3/Bsg= - </data> - <key>hash2</key> - <data> - wSGjpTyfXyE/VY7XduvSkCSzZZASCOyn8yF8WE7L7Uk= - </data> - </dict> <key>AppIcon40x40@2x~ipad.png</key> <dict> <key>hash</key> @@ -944,22 +937,22 @@ <dict> <key>hash</key> <data> - M/PS+vILUt+ZdoqpyDBl5RGSL18= + CpxH2Q4gG83s0S1Kchn/Ctvbo64= </data> <key>hash2</key> <data> - RJQmWIQMob9a6gP0OjH/4ALiP+kjsPE0Uxuj0RBxn4o= + gaycW4hHsfbVswV6Gq89ZD9hxtpVMFMow7ANyVfnGhI= </data> </dict> <key>CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib</key> <dict> <key>hash</key> <data> - txRRdx7r8oM2u4ou2knn4+RkScg= + ij4eTPRdAsOcPWZEHpxmOPpJuJo= </data> <key>hash2</key> <data> - Yn4zoGTd4bJGoj2M0i0E75RhMlqGO9xnEpvWQzGNk90= + kGrFfODnQnb+c9Ojuy8BvxPick16b7RbnGe+Di0Cz1s= </data> </dict> <key>CDVLaunchScreen.storyboardc/Info.plist</key> @@ -977,11 +970,11 @@ <dict> <key>hash</key> <data> - lrsFIaZz7Iz7ZNZ+48eRxZqjygo= + 5cK1zMJPrMdw43g+XVm7rjaRKJw= </data> <key>hash2</key> <data> - Kg3ncoLHsG3Urwjd/X2bjQQj6fdwFlzBSg8bqtvscP4= + vwli50HKwIEDNhSAIfs5N3U80+sM0zbN43DGO92VQ5k= </data> </dict> <key>CDVNotification.bundle/beep.wav</key> @@ -999,11 +992,11 @@ <dict> <key>hash</key> <data> - EY05QVjVbNDD+0+HVs2xUFPuAVE= + YXr/2svEkt7uE61Z6FFZrH+X3+Q= </data> <key>hash2</key> <data> - 5W+z1OG8hkoyk7Pk0DBsiYG0IBy3gNVm+Ib1M2KYooo= + k/kNo4NIBjFqVCY581QgL8UllhRH3GcrBch3cgAtXbo= </data> </dict> <key>archived-expanded-entitlements.xcent</key> @@ -1021,11 +1014,11 @@ <dict> <key>hash</key> <data> - fhpq5N5Bnj7ApZZGNrBM7i5Hz/8= + F5YU8YW/BDhsDOizSe9Lz/PiQkE= </data> <key>hash2</key> <data> - fksgJ/hSiEBUc5wFHerPKX6TRhXX+y4p8UmwZDAFY9w= + Sn3JrSovoEaZgG/md9h/DjPgH98Dv7m1hFfRNL54vJA= </data> </dict> <key>embedded.mobileprovision</key> @@ -1098,11 +1091,11 @@ <dict> <key>hash</key> <data> - iOxxb9wdyzUPrj90+W57Vj4et4E= + i6S3cNxlLtQi5ayc0zd4qrDT96c= </data> <key>hash2</key> <data> - MLg/5ZAFiqY7FC859kWt994HUKF8lZ3lJ6HDnYqKCNU= + u03mWJJkPkP7r5gqnGz/5bBrYTuOXZhfCcAOc6IxOco= </data> </dict> <key>www/css/account.css</key> @@ -1307,11 +1300,11 @@ <dict> <key>hash</key> <data> - bY2IfaCUQ+Rz5riamQVF0rOVe6A= + +fUNkWTJRbnCPObOIppxTXdSwz0= </data> <key>hash2</key> <data> - hPZUQWrlZ/hGqd0scKaIjhli7AmNraugdxjdk5UoORg= + 4YeXdsIzAETntWgyK3wdkERMCmdwsxiCWwq8yJ0bm3Q= </data> </dict> <key>www/css/vendor/flickity.css</key> @@ -1626,22 +1619,22 @@ <dict> <key>hash</key> <data> - 1CV2rewRIfTTLMhrx86Hte/FRrI= + CACJE32yVdNdEm05YFQ3xB0v7+w= </data> <key>hash2</key> <data> - 7qx1UoxYjCWYy0eAjKq13o60Wpl7y/BhzcDzQ/rFBXM= + BzwyBUkvTtQBC/mrDy2fuwtUdaW4SkhpuTzkGJJu1nI= </data> </dict> <key>www/js/index.js</key> <dict> <key>hash</key> <data> - Plb7S5c6Fc0HZbQjIH7VudaPPFU= + wOXzRHktU04rH4QKjeb0Xz8WDHY= </data> <key>hash2</key> <data> - o0gXIFJpWseSG7bZIURj2/N1Ho0VZVa6l5nbTpUXaM8= + kmyYZ5GdiBKABgetHNxZUE09E9OtKoslDFP4bUYMdfQ= </data> </dict> <key>www/js/lib/_router.js</key> @@ -1930,15 +1923,26 @@ 1kY0DEwWFQO8RFoncYf/51g2MWyKHwesCyP/Nt7xDXk= </data> </dict> + <key>www/js/lib/etc/sim.js</key> + <dict> + <key>hash</key> + <data> + aQPvISjrCZABE0Y+DdUHUUlKTZE= + </data> + <key>hash2</key> + <data> + WSn8re6AUQ0xV7PhArqIugKaGLA5S3ymHauimcs8dHE= + </data> + </dict> <key>www/js/lib/nav/AddressView.js</key> <dict> <key>hash</key> <data> - JFoETIdARQvI5GU6tc1YJhhttEc= + 7LJJ0CnyURtInuVhaKbkBjLj9Wo= </data> <key>hash2</key> <data> - tlqapPZSqJXPu1tVTEPiqafuJYdHnff/lCfnLeAzXrs= + FYp6WSmd8vwxOcqmofcQHUkt5xBNR9vETVy/v/hI2bQ= </data> </dict> <key>www/js/lib/nav/CreditCardView.js</key> @@ -2055,11 +2059,11 @@ <dict> <key>hash</key> <data> - lID8uwdlyxHLJU8s69LDl1vb9wo= + sM/LY1QKtDfnmCngnmUVft/y9Ao= </data> <key>hash2</key> <data> - 1fJlacmFl3czqEHHeyoexuADgQTK5vTwLOhj+LZanLE= + b3E1CxezHAYUIR7majwpb5IMSFnLz2yij1tWkC8cakM= </data> </dict> <key>www/js/lib/products/Selector.js</key> @@ -2154,11 +2158,11 @@ <dict> <key>hash</key> <data> - +RIDPxfqUZwaTbuh+hEYSte1cv0= + p+aPqpbTEwmY/5eb/F9NF58t0W8= </data> <key>hash2</key> <data> - PjbBMjYeor9n8QefRZ4/bthUR0xgliIr5i1w89Wp7Ws= + 6LahOUZ7IdibY4LB9/x3om63z+ItHu6FvkvgNFQ4k0s= </data> </dict> <key>www/js/sdk/account.js</key> @@ -2480,6 +2484,17 @@ 6BrhkQ/LskQvmM1rbhciH8KThNK7PeYwvje9PZsZIro= </data> </dict> + <key>www/plugins/cordova-plugin-sim/www/sim.js</key> + <dict> + <key>hash</key> + <data> + ClFcxSc++1+co21X98ODwFS+dYA= + </data> + <key>hash2</key> + <data> + bxLaY2hOh13X+tMPiaLF4+Nj/dZcWSzVsaDz6Bj7CAc= + </data> + </dict> <key>www/plugins/cordova-plugin-splashscreen/www/splashscreen.js</key> <dict> <key>hash</key> 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 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6092" id="us.okfoc.stoneisland" version="0.9.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<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"> <feature name="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> @@ -52,6 +52,9 @@ <feature name="PushNotification"> <param name="ios-package" value="PushPlugin" /> </feature> + <feature name="Sim"> + <param name="ios-package" value="Sim" /> + </feature> <name>Stone Island</name> <description> 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 @@ <span class="share">SHARE +</span> </div> <div class="fit">Fits Large</div> + <div class="notAvailableInCanada">Not Available In Canada</div> <div class="body"> </div> <div class="sizing"> @@ -974,72 +975,6 @@ <div class="select-wrapper"> <span>STATE</span> <select name="Province"> - <option value="NONE" selected>State</option> - <option value="AL">Alabama</option> - <option value="AK">Alaska</option> - <option value="AZ">Arizona</option> - <option value="AR">Arkansas</option> - <option value="CA">California</option> - <option value="CO">Colorado</option> - <option value="CT">Connecticut</option> - <option value="DE">Delaware</option> - <option value="DC">District Of Columbia</option> - <option value="FL">Florida</option> - <option value="GA">Georgia</option> - <option value="HI">Hawaii</option> - <option value="ID">Idaho</option> - <option value="IL">Illinois</option> - <option value="IN">Indiana</option> - <option value="IA">Iowa</option> - <option value="KS">Kansas</option> - <option value="KY">Kentucky</option> - <option value="LA">Louisiana</option> - <option value="ME">Maine</option> - <option value="MD">Maryland</option> - <option value="MA">Massachusetts</option> - <option value="MI">Michigan</option> - <option value="MN">Minnesota</option> - <option value="MS">Mississippi</option> - <option value="MO">Missouri</option> - <option value="MT">Montana</option> - <option value="NE">Nebraska</option> - <option value="NV">Nevada</option> - <option value="NH">New Hampshire</option> - <option value="NJ">New Jersey</option> - <option value="NM">New Mexico</option> - <option value="NY">New York</option> - <option value="NC">North Carolina</option> - <option value="ND">North Dakota</option> - <option value="OH">Ohio</option> - <option value="OK">Oklahoma</option> - <option value="OR">Oregon</option> - <option value="PA">Pennsylvania</option> - <option value="RI">Rhode Island</option> - <option value="SC">South Carolina</option> - <option value="SD">South Dakota</option> - <option value="TN">Tennessee</option> - <option value="TX">Texas</option> - <option value="UT">Utah</option> - <option value="VT">Vermont</option> - <option value="VA">Virginia</option> - <option value="WA">Washington</option> - <option value="WV">West Virginia</option> - <option value="WI">Wisconsin</option> - <option value="WY">Wyoming</option> - <option disabled>_________________</option> - <option value="AB">Alberta</option> - <option value="BC">British Columbia</option> - <option value="MB">Manitoba</option> - <option value="NB">New Brunswick</option> - <option value="NL">Newfoundland and Labrador</option> - <option value="NS">Nova Scotia</option> - <option value="NT">Northwest Territories</option> - <option value="NU">Nunavut</option> - <option value="ON">Ontario</option> - <option value="PE">Prince Edward Island</option> - <option value="SK">Saskatchewan</option> - <option value="QC">Quebec</option> - <option value="YT">Yukon</option> </select> </div> </div> @@ -1068,7 +1003,78 @@ </div> </div> --> +</script> + +<script type="text/html" id="us_states"> + <option value="NONE" selected>State</option> + <option value="AL">Alabama</option> + <option value="AK">Alaska</option> + <option value="AZ">Arizona</option> + <option value="AR">Arkansas</option> + <option value="CA">California</option> + <option value="CO">Colorado</option> + <option value="CT">Connecticut</option> + <option value="DE">Delaware</option> + <option value="DC">District Of Columbia</option> + <option value="FL">Florida</option> + <option value="GA">Georgia</option> + <option value="HI">Hawaii</option> + <option value="ID">Idaho</option> + <option value="IL">Illinois</option> + <option value="IN">Indiana</option> + <option value="IA">Iowa</option> + <option value="KS">Kansas</option> + <option value="KY">Kentucky</option> + <option value="LA">Louisiana</option> + <option value="ME">Maine</option> + <option value="MD">Maryland</option> + <option value="MA">Massachusetts</option> + <option value="MI">Michigan</option> + <option value="MN">Minnesota</option> + <option value="MS">Mississippi</option> + <option value="MO">Missouri</option> + <option value="MT">Montana</option> + <option value="NE">Nebraska</option> + <option value="NV">Nevada</option> + <option value="NH">New Hampshire</option> + <option value="NJ">New Jersey</option> + <option value="NM">New Mexico</option> + <option value="NY">New York</option> + <option value="NC">North Carolina</option> + <option value="ND">North Dakota</option> + <option value="OH">Ohio</option> + <option value="OK">Oklahoma</option> + <option value="OR">Oregon</option> + <option value="PA">Pennsylvania</option> + <option value="RI">Rhode Island</option> + <option value="SC">South Carolina</option> + <option value="SD">South Dakota</option> + <option value="TN">Tennessee</option> + <option value="TX">Texas</option> + <option value="UT">Utah</option> + <option value="VT">Vermont</option> + <option value="VA">Virginia</option> + <option value="WA">Washington</option> + <option value="WV">West Virginia</option> + <option value="WI">Wisconsin</option> + <option value="WY">Wyoming</option> +</script> +<script type="text/html" id="ca_states"> + <option disabled>_________________</option> + <option value="AB">Alberta</option> + <option value="BC">British Columbia</option> + <option value="MB">Manitoba</option> + <option value="NB">New Brunswick</option> + <option value="NL">Newfoundland and Labrador</option> + <option value="NS">Nova Scotia</option> + <option value="NT">Northwest Territories</option> + <option value="NU">Nunavut</option> + <option value="ON">Ontario</option> + <option value="PE">Prince Edward Island</option> + <option value="SK">Saskatchewan</option> + <option value="QC">Quebec</option> + <option value="YT">Yukon</option> </script> </body> @@ -1098,6 +1104,7 @@ <script src="js/lib/etc/push.js"></script> <script src="js/lib/etc/deeplink.js"></script> <script src="js/lib/etc/geo.js"></script> +<script src="js/lib/etc/sim.js"></script> <script src="js/lib/etc/backup_db.js"></script> <script src="js/lib/view/View.js"></script> 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 @@ <key>Stone Island.xcscheme</key> <dict> <key>orderHint</key> - <integer>2</integer> + <integer>3</integer> </dict> </dict> </dict> 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 Binary files differindex f43c8bf2..58942dfd 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/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 Binary files differnew file mode 100644 index 00000000..d33fd5aa --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-1025.png 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 Binary files differnew file mode 100644 index 00000000..8e3a96d6 --- /dev/null +++ b/StoneIsland/platforms/ios/Stone Island/Images.xcassets/AppIcon.appiconset/icon-small@2x-1.png 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 Binary files differindex 5c37dfc2..a40b6358 100644 --- 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 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 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.9.2</string> + <string>0.9.3</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>0.9.2</string> + <string>0.9.3</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSMainNibFile</key> 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 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-versionCode="6092" id="us.okfoc.stoneisland" version="0.9.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<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"> <feature name="LocalStorage"> <param name="ios-package" value="CDVLocalStorage" /> </feature> @@ -52,6 +52,9 @@ <feature name="PushNotification"> <param name="ios-package" value="PushPlugin" /> </feature> + <feature name="Sim"> + <param name="ios-package" value="Sim" /> + </feature> <name>Stone Island</name> <description> Stone Island @@ -109,7 +112,4 @@ <preference name="SplashMaintainAspectRatio" value="true" /> <preference name="ShowSplashScreenSpinner" value="false" /> <preference name="AutoHideSplashScreen" value="true" /> - <feature name="Sim"> - <param name="ios-package" value="Sim" /> - </feature> </widget> 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 @@ <span class="share">SHARE +</span> </div> <div class="fit">Fits Large</div> + <div class="notAvailableInCanada">Not Available In Canada</div> <div class="body"> </div> <div class="sizing"> @@ -974,72 +975,6 @@ <div class="select-wrapper"> <span>STATE</span> <select name="Province"> - <option value="NONE" selected>State</option> - <option value="AL">Alabama</option> - <option value="AK">Alaska</option> - <option value="AZ">Arizona</option> - <option value="AR">Arkansas</option> - <option value="CA">California</option> - <option value="CO">Colorado</option> - <option value="CT">Connecticut</option> - <option value="DE">Delaware</option> - <option value="DC">District Of Columbia</option> - <option value="FL">Florida</option> - <option value="GA">Georgia</option> - <option value="HI">Hawaii</option> - <option value="ID">Idaho</option> - <option value="IL">Illinois</option> - <option value="IN">Indiana</option> - <option value="IA">Iowa</option> - <option value="KS">Kansas</option> - <option value="KY">Kentucky</option> - <option value="LA">Louisiana</option> - <option value="ME">Maine</option> - <option value="MD">Maryland</option> - <option value="MA">Massachusetts</option> - <option value="MI">Michigan</option> - <option value="MN">Minnesota</option> - <option value="MS">Mississippi</option> - <option value="MO">Missouri</option> - <option value="MT">Montana</option> - <option value="NE">Nebraska</option> - <option value="NV">Nevada</option> - <option value="NH">New Hampshire</option> - <option value="NJ">New Jersey</option> - <option value="NM">New Mexico</option> - <option value="NY">New York</option> - <option value="NC">North Carolina</option> - <option value="ND">North Dakota</option> - <option value="OH">Ohio</option> - <option value="OK">Oklahoma</option> - <option value="OR">Oregon</option> - <option value="PA">Pennsylvania</option> - <option value="RI">Rhode Island</option> - <option value="SC">South Carolina</option> - <option value="SD">South Dakota</option> - <option value="TN">Tennessee</option> - <option value="TX">Texas</option> - <option value="UT">Utah</option> - <option value="VT">Vermont</option> - <option value="VA">Virginia</option> - <option value="WA">Washington</option> - <option value="WV">West Virginia</option> - <option value="WI">Wisconsin</option> - <option value="WY">Wyoming</option> - <option disabled>_________________</option> - <option value="AB">Alberta</option> - <option value="BC">British Columbia</option> - <option value="MB">Manitoba</option> - <option value="NB">New Brunswick</option> - <option value="NL">Newfoundland and Labrador</option> - <option value="NS">Nova Scotia</option> - <option value="NT">Northwest Territories</option> - <option value="NU">Nunavut</option> - <option value="ON">Ontario</option> - <option value="PE">Prince Edward Island</option> - <option value="SK">Saskatchewan</option> - <option value="QC">Quebec</option> - <option value="YT">Yukon</option> </select> </div> </div> @@ -1068,7 +1003,78 @@ </div> </div> --> +</script> + +<script type="text/html" id="us_states"> + <option value="NONE" selected>State</option> + <option value="AL">Alabama</option> + <option value="AK">Alaska</option> + <option value="AZ">Arizona</option> + <option value="AR">Arkansas</option> + <option value="CA">California</option> + <option value="CO">Colorado</option> + <option value="CT">Connecticut</option> + <option value="DE">Delaware</option> + <option value="DC">District Of Columbia</option> + <option value="FL">Florida</option> + <option value="GA">Georgia</option> + <option value="HI">Hawaii</option> + <option value="ID">Idaho</option> + <option value="IL">Illinois</option> + <option value="IN">Indiana</option> + <option value="IA">Iowa</option> + <option value="KS">Kansas</option> + <option value="KY">Kentucky</option> + <option value="LA">Louisiana</option> + <option value="ME">Maine</option> + <option value="MD">Maryland</option> + <option value="MA">Massachusetts</option> + <option value="MI">Michigan</option> + <option value="MN">Minnesota</option> + <option value="MS">Mississippi</option> + <option value="MO">Missouri</option> + <option value="MT">Montana</option> + <option value="NE">Nebraska</option> + <option value="NV">Nevada</option> + <option value="NH">New Hampshire</option> + <option value="NJ">New Jersey</option> + <option value="NM">New Mexico</option> + <option value="NY">New York</option> + <option value="NC">North Carolina</option> + <option value="ND">North Dakota</option> + <option value="OH">Ohio</option> + <option value="OK">Oklahoma</option> + <option value="OR">Oregon</option> + <option value="PA">Pennsylvania</option> + <option value="RI">Rhode Island</option> + <option value="SC">South Carolina</option> + <option value="SD">South Dakota</option> + <option value="TN">Tennessee</option> + <option value="TX">Texas</option> + <option value="UT">Utah</option> + <option value="VT">Vermont</option> + <option value="VA">Virginia</option> + <option value="WA">Washington</option> + <option value="WV">West Virginia</option> + <option value="WI">Wisconsin</option> + <option value="WY">Wyoming</option> +</script> +<script type="text/html" id="ca_states"> + <option disabled>_________________</option> + <option value="AB">Alberta</option> + <option value="BC">British Columbia</option> + <option value="MB">Manitoba</option> + <option value="NB">New Brunswick</option> + <option value="NL">Newfoundland and Labrador</option> + <option value="NS">Nova Scotia</option> + <option value="NT">Northwest Territories</option> + <option value="NU">Nunavut</option> + <option value="ON">Ontario</option> + <option value="PE">Prince Edward Island</option> + <option value="SK">Saskatchewan</option> + <option value="QC">Quebec</option> + <option value="YT">Yukon</option> </script> </body> @@ -1098,6 +1104,7 @@ <script src="js/lib/etc/push.js"></script> <script src="js/lib/etc/deeplink.js"></script> <script src="js/lib/etc/geo.js"></script> +<script src="js/lib/etc/sim.js"></script> <script src="js/lib/etc/backup_db.js"></script> <script src="js/lib/view/View.js"></script> 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 Binary files differnew file mode 100644 index 00000000..d33fd5aa --- /dev/null +++ b/StoneIsland/res/icon/ios/icon-1024.png 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 @@ <div class="select-wrapper"> <span>STATE</span> <select name="Province"> - <option value="NONE" selected>State</option> - <option value="AL">Alabama</option> - <option value="AK">Alaska</option> - <option value="AZ">Arizona</option> - <option value="AR">Arkansas</option> - <option value="CA">California</option> - <option value="CO">Colorado</option> - <option value="CT">Connecticut</option> - <option value="DE">Delaware</option> - <option value="DC">District Of Columbia</option> - <option value="FL">Florida</option> - <option value="GA">Georgia</option> - <option value="HI">Hawaii</option> - <option value="ID">Idaho</option> - <option value="IL">Illinois</option> - <option value="IN">Indiana</option> - <option value="IA">Iowa</option> - <option value="KS">Kansas</option> - <option value="KY">Kentucky</option> - <option value="LA">Louisiana</option> - <option value="ME">Maine</option> - <option value="MD">Maryland</option> - <option value="MA">Massachusetts</option> - <option value="MI">Michigan</option> - <option value="MN">Minnesota</option> - <option value="MS">Mississippi</option> - <option value="MO">Missouri</option> - <option value="MT">Montana</option> - <option value="NE">Nebraska</option> - <option value="NV">Nevada</option> - <option value="NH">New Hampshire</option> - <option value="NJ">New Jersey</option> - <option value="NM">New Mexico</option> - <option value="NY">New York</option> - <option value="NC">North Carolina</option> - <option value="ND">North Dakota</option> - <option value="OH">Ohio</option> - <option value="OK">Oklahoma</option> - <option value="OR">Oregon</option> - <option value="PA">Pennsylvania</option> - <option value="RI">Rhode Island</option> - <option value="SC">South Carolina</option> - <option value="SD">South Dakota</option> - <option value="TN">Tennessee</option> - <option value="TX">Texas</option> - <option value="UT">Utah</option> - <option value="VT">Vermont</option> - <option value="VA">Virginia</option> - <option value="WA">Washington</option> - <option value="WV">West Virginia</option> - <option value="WI">Wisconsin</option> - <option value="WY">Wyoming</option> - <option disabled>_________________</option> - <option value="AB">Alberta</option> - <option value="BC">British Columbia</option> - <option value="MB">Manitoba</option> - <option value="NB">New Brunswick</option> - <option value="NL">Newfoundland and Labrador</option> - <option value="NS">Nova Scotia</option> - <option value="NT">Northwest Territories</option> - <option value="NU">Nunavut</option> - <option value="ON">Ontario</option> - <option value="PE">Prince Edward Island</option> - <option value="SK">Saskatchewan</option> - <option value="QC">Quebec</option> - <option value="YT">Yukon</option> </select> </div> </div> @@ -1069,7 +1003,78 @@ </div> </div> --> +</script> + +<script type="text/html" id="us_states"> + <option value="NONE" selected>State</option> + <option value="AL">Alabama</option> + <option value="AK">Alaska</option> + <option value="AZ">Arizona</option> + <option value="AR">Arkansas</option> + <option value="CA">California</option> + <option value="CO">Colorado</option> + <option value="CT">Connecticut</option> + <option value="DE">Delaware</option> + <option value="DC">District Of Columbia</option> + <option value="FL">Florida</option> + <option value="GA">Georgia</option> + <option value="HI">Hawaii</option> + <option value="ID">Idaho</option> + <option value="IL">Illinois</option> + <option value="IN">Indiana</option> + <option value="IA">Iowa</option> + <option value="KS">Kansas</option> + <option value="KY">Kentucky</option> + <option value="LA">Louisiana</option> + <option value="ME">Maine</option> + <option value="MD">Maryland</option> + <option value="MA">Massachusetts</option> + <option value="MI">Michigan</option> + <option value="MN">Minnesota</option> + <option value="MS">Mississippi</option> + <option value="MO">Missouri</option> + <option value="MT">Montana</option> + <option value="NE">Nebraska</option> + <option value="NV">Nevada</option> + <option value="NH">New Hampshire</option> + <option value="NJ">New Jersey</option> + <option value="NM">New Mexico</option> + <option value="NY">New York</option> + <option value="NC">North Carolina</option> + <option value="ND">North Dakota</option> + <option value="OH">Ohio</option> + <option value="OK">Oklahoma</option> + <option value="OR">Oregon</option> + <option value="PA">Pennsylvania</option> + <option value="RI">Rhode Island</option> + <option value="SC">South Carolina</option> + <option value="SD">South Dakota</option> + <option value="TN">Tennessee</option> + <option value="TX">Texas</option> + <option value="UT">Utah</option> + <option value="VT">Vermont</option> + <option value="VA">Virginia</option> + <option value="WA">Washington</option> + <option value="WV">West Virginia</option> + <option value="WI">Wisconsin</option> + <option value="WY">Wyoming</option> +</script> +<script type="text/html" id="ca_states"> + <option disabled>_________________</option> + <option value="AB">Alberta</option> + <option value="BC">British Columbia</option> + <option value="MB">Manitoba</option> + <option value="NB">New Brunswick</option> + <option value="NL">Newfoundland and Labrador</option> + <option value="NS">Nova Scotia</option> + <option value="NT">Northwest Territories</option> + <option value="NU">Nunavut</option> + <option value="ON">Ontario</option> + <option value="PE">Prince Edward Island</option> + <option value="SK">Saskatchewan</option> + <option value="QC">Quebec</option> + <option value="YT">Yukon</option> </script> </body> 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] |
