Merge pull request #87 from rberlind/master

modified customer-orders.html to support full URLs and modified basket.html

Author: nustiueudinastea

public/basket.html

@@ -119,8 +119,8 @@ <h1>Shopping cart</h1>
                         <div class="box">
                             <div class="box-header">
                                 <h4 style="display: inline;">Shipping Address</h4>
-                                <p style="display: inline; float: right;">
-                                    <a data-toggle="modal" data-target="#address-modal" href="#change">Change</a>
+                                <p id="add_shipping" style="display: inline; float: right;">
+                                    <a data-toggle="modal" data-target="#address-modal" href="#add">Add</a>
                                 </p>
                             </div>
                             <p id="address"></p>
@@ -170,8 +170,8 @@ <h4 class="modal-title" id="Login">Address</h4>
                         <div class="box">
                             <div class="box-header">
                                 <h4 style="display: inline;">Payment</h4>
-                                <p style="display: inline; float: right;">
-                                    <a data-toggle="modal" data-target="#card-modal" href="#change">Change</a>
+                                <p id="add_payment" style="display: inline; float: right;">
+                                    <a data-toggle="modal" data-target="#card-modal" href="#add">Add</a>
                                 </p>
                             </div>
                             <p id="number"></p>
@@ -366,6 +366,7 @@ <h4>Coupon code</h4>
                 var cartTotal = 0;
                 var numItemsInCart = 0;
                 var shipping = 4.99;
+                var orderPlaced = false;
                 $.each(data, function (index, element) {
                     if (element != null && element.itemId != null && element.itemId != "null") {
                         $.getJSON('/catalogue/' + element.itemId, function (data) {
@@ -405,6 +406,8 @@ <h4>Coupon code</h4>
                                 });
                             } else {
                                 $('#orderButton').click(function(event) {
+                                    if (orderPlaced == false) {
+                                      orderPlaced = true;
                                     return order();
                                 });
                             }
@@ -423,8 +426,10 @@ <h4>Coupon code</h4>
         $.getJSON('/card', function(data) {
             if (data.status_code !== 500) {
                 $("p#number").text("Card ending in " + data.number).css("color", "black");
+                $("#add_payment").hide();
             } else {
                 $("p#number").text("No credit card saved for user.").css("color", "red");
+                $("#add_payment").show();
             }
         });
 
@@ -439,8 +444,10 @@ <h4>Coupon code</h4>
                 text += "</br>";
                 text += data.country;
                 $("p#address").html(text).css("color", "black");
+                $("#add_shipping").hide();
             } else {
                 $("p#address").text("No address saved for user.").css("color", "red");
+                $("#add_shipping").show();
             }
         });
 

public/customer-orders.html

@@ -177,7 +177,7 @@ <h1>My orders</h1>
                             <span class="label label-success">Shipped</span>\
                         </td>\
                         <td>\
-                            <a href="customer-order.html?order=' + selfRef.replace("http://orders", "") + '" class="btn btn-primary btn-sm">View</a>\
+                            <a href="customer-order.html?order=' + selfRef.replace(/http:\/\/(.*)\/orders/, "/orders") + '" class="btn btn-primary btn-sm">View</a>\
                         </td>\
                     </tr>');
                     });