diff options
Diffstat (limited to 'StoneIsland/platforms/ios/www/js/lib')
3 files changed, 10 insertions, 3 deletions
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js index 64a65b09..06e051cb 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js @@ -4,15 +4,17 @@ var BlogView = View.extend({ loaded: false, initialize: function(){ this.loader = new Loader () - this.fetch() }, - fetch: function(){ + fetch: function(fn){ $.ajax({ method: "GET", // url: sdk.env == 'test' ? '/db.json' : "http://stone.sup.land/db.json", url: "http://stone.sup.land/db.json", - success: this.success.bind(this), + success: function(data){ + this.success(data) + fn && fn() + }.bind(this), cache: true, }) }, diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartConfirm.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartConfirm.js index e1bfb114..a82509af 100755 --- a/StoneIsland/platforms/ios/www/js/lib/cart/CartConfirm.js +++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartConfirm.js @@ -128,9 +128,12 @@ var CartConfirm = FormView.extend({ }, save: function(){ + app.curtain.show("loading") promise(sdk.cart.finalize, {}).then(function(){ + app.curtain.hide("loading") app.router.go('cart/thanks') }.bind(this)).error(function(data){ + app.curtain.hide("loading") // {"Header":{"StatusCode":403,"Description":"403 Forbidden"},"Error":{"Description":"GenericApiError:CartAlreadyClosed"}} // {"Header":{"StatusCode":409,"Description":"304 NotModified"},"Error":{"Description":"FinalizationError:\\"Item has been removed from cart because it is no longer available.\\"\\n235"}}' // {"Header":{"StatusCode":409,"Description":"304 NotModified"},"Error":{"Description":"FinalizationError:\"The cart cannot be empty.\"\n233"}} diff --git a/StoneIsland/platforms/ios/www/js/lib/cart/CartThanks.js b/StoneIsland/platforms/ios/www/js/lib/cart/CartThanks.js index 798fbbb3..03a45d4d 100755 --- a/StoneIsland/platforms/ios/www/js/lib/cart/CartThanks.js +++ b/StoneIsland/platforms/ios/www/js/lib/cart/CartThanks.js @@ -17,6 +17,8 @@ var CartThanks = View.extend({ app.footer.hide() app.orders.loaded = false + + sdk.auth.clear_cart() }, ok: function(){ |