[cart] add to cart, update cart
diff --git a/website/templates/css/product_page.css b/website/templates/css/product_page.css
index e2f4293..566b6b5 100644
--- a/website/templates/css/product_page.css
+++ b/website/templates/css/product_page.css
@@ -7,7 +7,4 @@
font-size: 18px;
line-height: 200%;
}
- .item-price-info {
- margin-top: 20px;
- }
</style>
\ No newline at end of file
diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html
index ac1af5a..837b105 100644
--- a/website/templates/html/product_page.html
+++ b/website/templates/html/product_page.html
@@ -35,11 +35,20 @@
{{ web_long_description or web_short_description or
"[No description given]" }}
</div>
- <div class="item-price-info" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
- <div class="item-price hide" itemprop="price"></div>
- <div class="item-stock" itemprop="availablity"></div>
- <button class="btn btn-primary item-add-to-cart hide">Add to Cart</button>
- <button class="btn btn-default item-remove-from-cart hide">Remove from Cart</button>
+ <div style="min-height: 100px; margin: 10px 0;">
+ <div class="item-price-info" style="display: none;">
+ <h4 class="item-price" itemprop="price"></h4>
+ <div class="item-stock" itemprop="availablity"></div>
+ <div id="item-add-to-cart">
+ <button class="btn btn-primary">Add to Cart</button>
+ </div>
+ <div id="item-update-cart" class="input-group col-lg-6" style="display: none;">
+ <input type="text">
+ <div class="input-group-btn">
+ <button class="btn btn-primary">Update</button>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/website/templates/js/cart.js b/website/templates/js/cart.js
index eaa1fab..121ca6a 100644
--- a/website/templates/js/cart.js
+++ b/website/templates/js/cart.js
@@ -18,15 +18,45 @@
$(document).ready(function() {
// make list of items in the cart
- wn.cart.render();
- wn.cart.bind_events();
+ // wn.cart.render();
+ // wn.cart.bind_events();
+ wn.call({
+ method: "website.helpers.cart.get_cart_quotation",
+ args: {
+ _type: "POST"
+ },
+ callback: function(r) {
+ console.log(r);
+ $("#cart-container").removeClass("hide");
+ $(".progress").remove();
+ if(r.exc) {
+ if(r.exc.indexOf("WebsitePriceListMissingError")!==-1) {
+ wn.cart.show_error("Oops!", "Price List not configured.");
+ } else {
+ wn.cart.show_error("Oops!", "Something went wrong.");
+ }
+ } else {
+ if(r.message[0].__islocal) {
+ wn.cart.show_error("Empty :-(", "Go ahead and add something to your cart.");
+ } else {
+ wn.cart.render(r.message);
+ }
+ }
+
+ }
+ });
});
// shopping cart
if(!wn.cart) wn.cart = {};
$.extend(wn.cart, {
- render: function() {
- var $cart_wrapper = $("#cart-added-items").empty();
+ show_error: function(title, text) {
+ $("#cart-container").html('<div class="well"><h4>' + title + '</h4> ' + text + '</div>');
+ },
+
+ render: function(doclist) {
+ return;
+ var $cart_wrapper = $("#cart-items").empty();
if(Object.keys(wn.cart.get_cart()).length) {
$('<div class="row">\
<div class="col col-lg-9 col-sm-9">\
diff --git a/website/templates/js/product_page.js b/website/templates/js/product_page.js
index e3e4c61..adfeb5e 100644
--- a/website/templates/js/product_page.js
+++ b/website/templates/js/product_page.js
@@ -15,55 +15,77 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
$(document).ready(function() {
- $.ajax({
- method: "GET",
- url:"server.py",
- dataType: "json",
- data: {
- cmd: "website.helpers.product.get_product_info",
+ var item_code = $('[itemscope] [itemprop="name"]').text().trim();
+ var qty = 0;
+
+ wn.call({
+ type: "POST",
+ method: "website.helpers.product.get_product_info",
+ args: {
item_code: "{{ name }}"
},
- success: function(data) {
- if(data.message) {
- if(data.message.price) {
- $("<h4>")
- .html(data.message.price.formatted_price + " per " + data.message.uom)
- .appendTo(".item-price");
- $(".item-price").removeClass("hide");
- }
- if(data.message.stock==0) {
+ callback: function(r) {
+ if(r.message && r.message.price) {
+ $(".item-price")
+ .html(r.message.price.formatted_price + " per " + r.message.uom);
+
+ if(r.message.stock==0) {
$(".item-stock").html("<div class='help'>Not in stock</div>");
}
- else if(data.message.stock==1) {
+ else if(r.message.stock==1) {
$(".item-stock").html("<div style='color: green'>\
<i class='icon-check'></i> Available (in stock)</div>");
}
+
+ $(".item-price-info").toggle(true);
+
+ if(r.message.qty) {
+ qty = r.message.qty;
+ toggle_update_cart(qty);
+ $("#item-update-cart input").val(qty);
+ }
}
}
- });
+ })
- if(wn.cart.get_cart()[$('[itemscope] [itemprop="name"]').text().trim()]) {
- $(".item-remove-from-cart").removeClass("hide");
- } else {
- $(".item-add-to-cart").removeClass("hide");
- }
-
- $("button.item-add-to-cart").on("click", function() {
- wn.cart.add_to_cart({
- url: window.location.href,
- image: $('[itemscope] [itemprop="image"]').attr("src"),
- item_code: $('[itemscope] [itemprop="name"]').text().trim(),
- item_name: $('[itemscope] [itemprop="productID"]').text().trim(),
- description: $('[itemscope] [itemprop="description"]').html().trim(),
- price: $('[itemscope] [itemprop="price"]').text().trim()
+ $("#item-add-to-cart button").on("click", function() {
+ wn.cart.update_cart({
+ item_code: item_code,
+ qty: 1,
+ callback: function(r) {
+ if(!r.exc) {
+ toggle_update_cart(1);
+ qty = 1;
+ }
+ },
+ btn: this,
});
- $(".item-add-to-cart").addClass("hide");
- $(".item-remove-from-cart").removeClass("hide");
});
- $("button.item-remove-from-cart").on("click", function() {
- wn.cart.remove_from_cart($('[itemscope] [itemprop="name"]').text().trim());
- $(".item-add-to-cart").removeClass("hide");
- $(".item-remove-from-cart").addClass("hide");
+ $("#item-update-cart button").on("click", function() {
+ wn.cart.update_cart({
+ item_code: item_code,
+ qty: $("#item-update-cart input").val(),
+ btn: this,
+ callback: function(r) {
+ if(r.exc) {
+ $("#item-update-cart input").val(qty);
+ } else {
+ qty = $("#item-update-cart input").val();
+ }
+ },
+ });
});
-})
\ No newline at end of file
+
+ if(localStorage && localStorage.getItem("pending_add_to_cart") && full_name) {
+ localStorage.removeItem("pending_add_to_cart");
+ $("#item-add-to-cart button").trigger("click");
+ }
+});
+
+var toggle_update_cart = function(qty) {
+ $("#item-add-to-cart").toggle(qty ? false : true);
+ $("#item-update-cart")
+ .toggle(qty ? true : false)
+ .find("input").val(qty);
+}
\ No newline at end of file
diff --git a/website/templates/pages/cart.html b/website/templates/pages/cart.html
index 31d5084..ada1577 100644
--- a/website/templates/pages/cart.html
+++ b/website/templates/pages/cart.html
@@ -9,9 +9,21 @@
{% block content %}
<div class="col col-lg-12">
<h2>Shopping Cart</h2>
- <hr>
- <div id="cart-added-items">
- <!-- list of items in the cart will be generated using javascript -->
+ <div class="progress progress-striped active">
+ <div class="progress-bar progress-bar-info" style="width: 100%;"></div>
+ </div>
+ <div id="cart-container" class="hide">
+ <button class="btn btn-success pull-right" type="button">Place Order</button>
+ <div class="clearfix"></div>
+ <hr>
+ <div id="cart-items">
+ </div>
+ <hr>
+ <div id="cart-taxes">
+ </div>
+ <div id="cart-addresses">
+ </div>
+ <button class="btn btn-success pull-right" type="button">Place Order</button>
</div>
</div>
{% endblock %}
\ No newline at end of file