summaryrefslogtreecommitdiff
path: root/StoneIsland
diff options
context:
space:
mode:
Diffstat (limited to 'StoneIsland')
-rw-r--r--StoneIsland/www/css/cart.css8
-rw-r--r--StoneIsland/www/js/lib/cart/CartConfirm.js5
-rw-r--r--StoneIsland/www/js/lib/cart/CartPayment.js1
-rw-r--r--StoneIsland/www/js/lib/cart/CartThanks.js3
-rw-r--r--StoneIsland/www/js/lib/view/Serializable.js1
5 files changed, 11 insertions, 7 deletions
diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css
index 204feeef..5b79f010 100644
--- a/StoneIsland/www/css/cart.css
+++ b/StoneIsland/www/css/cart.css
@@ -32,7 +32,8 @@
#cart_shipping,
#cart_payment,
#cart_confirm,
-#cart_thanks {
+#cart_thanks,
+#cart_error {
height: calc(100vh - 187px);
overflow: hidden;
position: relative;
@@ -76,6 +77,11 @@
display: none;
}
+#cart.error #cart_error { display: block }
+#cart_error {
+ display: none;
+}
+
.summary-container {
top:0px;
}
diff --git a/StoneIsland/www/js/lib/cart/CartConfirm.js b/StoneIsland/www/js/lib/cart/CartConfirm.js
index 8e841138..27e249cf 100644
--- a/StoneIsland/www/js/lib/cart/CartConfirm.js
+++ b/StoneIsland/www/js/lib/cart/CartConfirm.js
@@ -138,13 +138,14 @@ var CartConfirm = FormView.extend({
// {"Header":{"StatusCode":441,"Description":"304 NotModified"},"Error":{"Description":"GenericApiError:EmptyCreditCard"}}
switch (data.StatusCode) {
case 403: // cart already closed
- // reset cart
+ auth.clear_cart(auth.create_cart)
+ app.router.go('thanks')
break
case 409: // finalization error
this.finalization_error(data)
break
case 440: // genericapierror (credit card error!)
- case 441: // genericapierror (credit card cleared)
+ case 441: // genericapierror (credit card empty)
app.router.go('cart/payment')
app.cart.payment.show_errors(["Number","There was a problem with your credit card."])
break
diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js
index 8a597310..8a803de3 100644
--- a/StoneIsland/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/www/js/lib/cart/CartPayment.js
@@ -173,6 +173,7 @@ var CartPayment = FormView.extend({
error: function(data){
console.log(data)
+ app.cart.payment.show_errors(["Number","There was a problem with your credit card."])
},
cancel: function(){
diff --git a/StoneIsland/www/js/lib/cart/CartThanks.js b/StoneIsland/www/js/lib/cart/CartThanks.js
index 97b7155f..eb95197b 100644
--- a/StoneIsland/www/js/lib/cart/CartThanks.js
+++ b/StoneIsland/www/js/lib/cart/CartThanks.js
@@ -18,9 +18,6 @@ var CartThanks = View.extend({
app.orders.loaded = false
},
- show_error: function(){
- },
-
ok: function(){
app.router.go("store")
},
diff --git a/StoneIsland/www/js/lib/view/Serializable.js b/StoneIsland/www/js/lib/view/Serializable.js
index 3cb6e660..6ef8eda3 100644
--- a/StoneIsland/www/js/lib/view/Serializable.js
+++ b/StoneIsland/www/js/lib/view/Serializable.js
@@ -69,7 +69,6 @@ var SerializableView = View.extend({
var errors = errors || []
var presence_msgs = this.validate_presence || {}
if (! this.disabled) {
- console.log("not dislab.ed..")
Object.keys(presence_msgs).forEach(function(k){
if (! data[k]) errors.push( [ k, presence_msgs[k] ] )
})