summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xStoneIsland/www/css/account.css14
-rwxr-xr-xStoneIsland/www/index.html11
-rwxr-xr-xStoneIsland/www/js/index.js4
-rwxr-xr-xStoneIsland/www/js/lib/account/PaymentView.js3
-rwxr-xr-xStoneIsland/www/js/lib/account/ShippingView.js3
-rwxr-xr-xStoneIsland/www/js/lib/cart/CartConfirm.js46
-rwxr-xr-xStoneIsland/www/js/lib/cart/CartPayment.js2
7 files changed, 52 insertions, 31 deletions
diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css
index da710fd7..29759906 100755
--- a/StoneIsland/www/css/account.css
+++ b/StoneIsland/www/css/account.css
@@ -365,11 +365,11 @@ input.switch:checked + label:after {
}
.checkbox-toggle input {
- width: 45px;
- height: 35px;
- opacity: 0;
- z-index: 99999;
- position: relative;
+ width: 45px;
+ height: 35px;
+ opacity: 0;
+ z-index: 99999;
+ position: relative;
}
.checkbox-caption {
@@ -378,6 +378,10 @@ input.switch:checked + label:after {
box-sizing:border-box;
}
+.billing-container .checkbox-caption {
+ text-transform: uppercase;
+}
+
.checkbox-row {
margin:6px 0 0;
box-sizing:border-box;
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 3e48c515..18becf7f 100755
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -765,7 +765,7 @@
<div class="billing_address_rapper">
<div class="address_dropdown dropdown-wrapper">
- <div class="dropdown-title add_edit">add / edit</div>
+ <div class="dropdown-title add_edit"> </div>
<div class="dropdown select_address">
BILLING ADDRESS
</div>
@@ -790,7 +790,7 @@
</div>
<div class="cc_dropdown dropdown-wrapper">
- <div class="dropdown-title add_edit">add / edit</div>
+ <div class="dropdown-title add_edit"></div>
<div class="dropdown select_address">
PAYMENT METHOD
</div>
@@ -957,8 +957,6 @@
<span>EXPIRATION YEAR</span>
<select name="ExpirationYear">
<option value="NONE">EXPIRATION YEAR</option>
- <option value="2016">2016</option>
- <option value="2017">2017</option>
<option value="2018">2018</option>
<option value="2019">2019</option>
<option value="2020">2020</option>
@@ -967,6 +965,11 @@
<option value="2023">2023</option>
<option value="2024">2024</option>
<option value="2025">2025</option>
+ <option value="2026">2026</option>
+ <option value="2027">2027</option>
+ <option value="2028">2028</option>
+ <option value="2029">2029</option>
+ <option value="2030">2030</option>
</select>
</div>
</div>
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index a5a2cdfa..ea992fc7 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -99,8 +99,8 @@ var app = (function(){
// if (sdk.env == "test") {
// app.router.launch()
// }
-// else {
-// }
+ // else {
+ // }
if (navigator.onLine) {
app.account.connect(window.deepLinkRoute || '/intro')
diff --git a/StoneIsland/www/js/lib/account/PaymentView.js b/StoneIsland/www/js/lib/account/PaymentView.js
index 796ea188..69d4f943 100755
--- a/StoneIsland/www/js/lib/account/PaymentView.js
+++ b/StoneIsland/www/js/lib/account/PaymentView.js
@@ -74,8 +74,9 @@ var PaymentView = FormView.extend({
app.curtain.show("loading")
app.account.listAddresses({
success: function(){
+ this.$msg.html('Your payment information has been saved.')
app.curtain.hide("loading")
- },
+ }.bind(this),
error: function(){
app.curtain.hide("loading")
},
diff --git a/StoneIsland/www/js/lib/account/ShippingView.js b/StoneIsland/www/js/lib/account/ShippingView.js
index 67a1cfec..abc12818 100755
--- a/StoneIsland/www/js/lib/account/ShippingView.js
+++ b/StoneIsland/www/js/lib/account/ShippingView.js
@@ -68,8 +68,9 @@ var ShippingView = FormView.extend({
app.curtain.show("loading")
app.account.listAddresses({
success: function(){
+ this.$msg.html('Your address has been saved.')
app.curtain.hide("loading")
- },
+ }.bind(this),
error: function(){
app.curtain.hide("loading")
},
diff --git a/StoneIsland/www/js/lib/cart/CartConfirm.js b/StoneIsland/www/js/lib/cart/CartConfirm.js
index 7f7d49b2..031e3359 100755
--- a/StoneIsland/www/js/lib/cart/CartConfirm.js
+++ b/StoneIsland/www/js/lib/cart/CartConfirm.js
@@ -110,28 +110,37 @@ var CartConfirm = FormView.extend({
this.$tax.html( as_cash(tax) )
this.$total.html( as_cash(total) )
- var street = data.Receiver.StreetWithNumber.replace(/\n$/,"").replace("\n", ", ")
- var address = data.Receiver.Name.toUpperCase() + " " + data.Receiver.Surname.toUpperCase() + "<br>" + street + ", "
- address += data.Receiver.City + ", " + data.Receiver.Region + " " + data.Receiver.PostalCode
+ if (data.Receiver) {
+ var street = data.Receiver.StreetWithNumber.replace(/\n$/,"").replace("\n", ", ")
+ var address = data.Receiver.Name.toUpperCase() + " " + data.Receiver.Surname.toUpperCase() + "<br>" + street + ", "
+ address += data.Receiver.City + ", " + data.Receiver.Region + " " + data.Receiver.PostalCode
- this.$shipping_address.html(address)
- this.$shipping_method.html(data.DeliveryMethod.Selected.Type == 1 ? "* STANDARD SHIPPING" : "* EXPRESS SHIPPING")
+ this.$shipping_address.html(address)
+ this.$shipping_method.html(data.DeliveryMethod.Selected.Type == 1 ? "* STANDARD SHIPPING" : "* EXPRESS SHIPPING")
+ } else {
+ this.$shipping_address.html( "Please enter your shipping information." )
+ this.$shipping_method.html( "" )
+ }
var cc = data.Payment.CreditCard
- var cc_street = cc ? cc.HolderAddress.replace(/\n$/,"").replace("\n", ", ") : ""
- var cc_type = cc ? cc.Type == "AmericanExpress" ? "American Express" : cc.Type : ""
- var cc_name = cc ? cc.HolderName.toUpperCase() + " " + cc.HolderSurname.toUpperCase() : ""
- var cc_eNcrYpTed = cc ? cc_type.toUpperCase() + " XXXX-XXXX-XXXX-" + cc.Last4 : ""
+ if (cc) {
+ var cc_street = cc.HolderAddress.replace(/\n$/,"").replace("\n", ", ")
+ var cc_type = cc.Type == "AmericanExpress" ? "American Express" : cc.Type
+ var cc_name = cc.HolderName.toUpperCase() + " " + cc.HolderSurname.toUpperCase()
+ var cc_eNcrYpTed = cc_type.toUpperCase() + " XXXX-XXXX-XXXX-" + cc.Last4
+ this.$payment_name.html( cc_name )
+ this.$payment_method.html( cc_eNcrYpTed )
+ } else {
+ this.$payment_name.html( "Please enter your credit card information." )
+ this.$payment_method.html( "" )
+ }
- this.$payment_name.html( cc_name )
- this.$payment_method.html( cc_eNcrYpTed )
-
app.curtain.hide("loading")
},
save: function(){
app.curtain.show("loading")
- promise(sdk.cart.secure_finalize, {}).then(function(){
+ promise(sdk.cart.finalize, {}).then(function(){
app.curtain.hide("loading")
app.router.go('cart/thanks')
}.bind(this)).error(function(res){
@@ -162,14 +171,17 @@ var CartConfirm = FormView.extend({
},
finalization_error: function(data){
- if (data['Error']['Description'].match(/receiver validation fails/)) {
- app.router.go('cart/shipping')
+ if (data['Error']['Description'].match(/receiver validation fails/i)) {
+ console.log('cc error')
+ app.router.go('cart/billing')
app.cart.payment.show_errors([["Number","There was a problem with your credit card."]])
}
- else if (data['Error']['Description'].match(/cart cannot be empty/)) {
+ else if (data['Error']['Description'].match(/cart cannot be empty/i)) {
+ console.log('cart empty')
app.router.go('cart/summary')
}
- else if (data['Error']['Description'].match(/Item has been removed/)) {
+ else if (data['Error']['Description'].match(/Item has been removed/i)) {
+ console.log('item does not exist')
app.router.go('cart/error')
app.cart.error.show_error("We're sorry, but one or more items was out of stock. Please check your cart and try again.")
}
diff --git a/StoneIsland/www/js/lib/cart/CartPayment.js b/StoneIsland/www/js/lib/cart/CartPayment.js
index 31c371a5..6e071399 100755
--- a/StoneIsland/www/js/lib/cart/CartPayment.js
+++ b/StoneIsland/www/js/lib/cart/CartPayment.js
@@ -63,7 +63,7 @@ var CartPayment = FormView.extend({
}
// this.$address_dropdown.toggle( !! app.account.ccs.length )
- this.address_list_mode = typeof state == "boolean" ? state : ! this.list_mode
+ this.address_list_mode = typeof state == "boolean" ? state : ! this.address_list_mode
this.address.disabled = this.address_list_mode
this.$address_form.toggle(! this.address_list_mode)
this.$address_list.toggle(this.address_list_mode)
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-15 16:09:03 +0000