').appendTo($(opts.btn).parent())
$(opts.btn).attr("disabled", "disabled");
}
@@ -23,6 +22,8 @@ wn.call = function(opts) {
$(opts.msg).toggle(false);
}
+ if(!opts.args) opts.args = {};
+
// get or post?
if(!opts.args._type) {
opts.args._type = opts.type || "GET";
@@ -48,10 +49,17 @@ wn.call = function(opts) {
success: function(data) {
if(opts.btn) {
$(opts.btn).attr("disabled", false);
- $spinner.remove();
}
if(data.exc) {
- console.log(data.exc);
+ if(opts.btn) {
+ $(opts.btn).addClass("btn-danger");
+ setTimeout(function() { $(opts.btn).removeClass("btn-danger"); }, 1000);
+ }
+ } else{
+ if(opts.btn) {
+ $(opts.btn).addClass("btn-success");
+ setTimeout(function() { $(opts.btn).removeClass("btn-success"); }, 1000);
+ }
}
if(opts.msg && data.message) {
$(opts.msg).html(data.message).toggle(true);
@@ -75,11 +83,8 @@ $(document).ready(function() {
$("#user-full-name").text(full_name);
}
- wn.cart.update_display();
$("#user-tools a").tooltip({"placement":"bottom"});
$("#user-tools-post-login a").tooltip({"placement":"bottom"});
-
- $(window).on("storage", function() { wn.cart.update_display(); });
});
// Utility functions
@@ -101,6 +106,12 @@ function get_url_arg(name) {
return decodeURIComponent(results[1]);
}
+function make_query_string(obj) {
+ var query_params = [];
+ $.each(obj, function(k, v) { query_params.push(encodeURIComponent(k) + "=" + encodeURIComponent(v)); });
+ return "?" + query_params.join("&");
+}
+
function repl(s, dict) {
if(s==null)return '';
for(key in dict) {
@@ -166,48 +177,30 @@ if (typeof Array.prototype.map !== "function") {
// shopping cart
if(!wn.cart) wn.cart = {};
+var full_name = getCookie("full_name");
+
$.extend(wn.cart, {
- get_count: function() {
- return Object.keys(this.get_cart()).length;
- },
-
- add_to_cart: function(itemprop) {
- var cart = this.get_cart();
- cart[itemprop.item_code] = $.extend(itemprop, {qty: 1});
- this.set_cart(cart);
- console.log(this.get_cart());
- },
-
- remove_from_cart: function(item_code) {
- var cart = this.get_cart();
- delete cart[item_code];
- this.set_cart(cart);
- console.log(this.get_cart());
- },
-
- get_cart: function() {
- if( !("localStorage" in window) ) {
- alert("Your browser seems to be ancient. Please use a modern browser.");
- throw "ancient browser error";
+ update_cart: function(opts) {
+ if(!full_name) {
+ if(localStorage) {
+ localStorage.setItem("last_visited", window.location.pathname.slice(1));
+ localStorage.setItem("pending_add_to_cart", opts.item_code);
+ }
+ window.location.href = "login";
+ } else {
+ wn.call({
+ type: "POST",
+ method: "website.helpers.cart.update_cart",
+ args: {
+ item_code: opts.item_code,
+ qty: opts.qty
+ },
+ btn: opts.btn,
+ callback: function(r) {
+ if(opts.callback)
+ opts.callback(r);
+ }
+ });
}
-
- return JSON.parse(localStorage.getItem("cart")) || {};
},
-
- set_cart: function(cart) {
- localStorage.setItem("cart", JSON.stringify(cart));
- wn.cart.update_display();
- },
-
- update_display: function() {
- $(".cart-count").text("( " + wn.cart.get_count() + " )");
- },
-
- set_value_in_cart: function(item_code, fieldname, value) {
- var cart = this.get_cart();
- if(cart[item_code]) {
- cart[item_code][fieldname] = value;
- this.set_cart(cart);
- }
- }
});
\ No newline at end of file
diff --git a/website/css/website.css b/website/css/website.css
index 4af35dcc728..7efceb2e63e 100644
--- a/website/css/website.css
+++ b/website/css/website.css
@@ -6,6 +6,10 @@ h1, h2, h3, h4, h5 {
font-weight: bold;
}
+a {
+ cursor: pointer;
+}
+
.content {
padding-bottom: 30px;
}
diff --git a/website/helpers/cart.py b/website/helpers/cart.py
index efeb9759a21..b62e0bb7cf8 100644
--- a/website/helpers/cart.py
+++ b/website/helpers/cart.py
@@ -7,20 +7,13 @@ from webnotes import _, msgprint
import webnotes.defaults
from webnotes.utils import today, get_fullname
-@webnotes.whitelist()
-def add_to_cart(item_code):
- update_qty(item_code, 1)
-
-@webnotes.whitelist()
-def remove_from_cart(item_code):
- update_qty(item_code, 0)
+class WebsitePriceListMissingError(webnotes.ValidationError): pass
@webnotes.whitelist()
-def update_qty(item_code, qty_to_set):
- party = get_lead_or_customer()
- quotation = get_shopping_cart_quotation(party)
+def update_cart(item_code, qty):
+ quotation = _get_cart_quotation()
- if qty_to_set == 0:
+ if qty == 0:
quotation.set_doclist(quotation.doclist.get({"item_code": ["!=", item_code]}))
else:
quotation_items = quotation.doclist.get({"item_code": item_code})
@@ -29,10 +22,10 @@ def update_qty(item_code, qty_to_set):
"doctype": "Quotation Item",
"parentfield": "quotation_details",
"item_code": item_code,
- "qty": qty_to_set
+ "qty": qty
})
else:
- quotation_items[0].qty = qty_to_set
+ quotation_items[0].qty = qty
quotation.ignore_permissions = True
quotation.save()
@@ -59,7 +52,16 @@ def get_lead_or_customer():
return lead_bean.doc
-def get_shopping_cart_quotation(party):
+
+@webnotes.whitelist()
+def get_cart_quotation():
+ return [d.fields for d in _get_cart_quotation(get_lead_or_customer()).doclist]
+
+
+def _get_cart_quotation(party=None):
+ if not party:
+ party = get_lead_or_customer()
+
quotation = webnotes.conn.get_value("Quotation",
{party.doctype.lower(): party.name, "order_type": "Shopping Cart", "docstatus": 0})
@@ -104,15 +106,14 @@ def get_price_list_using_geoip():
{"use_for_website": 1, "valid_for_all_countries": 1})
if not price_list_name:
- raise Exception, "No website Price List specified"
+ raise WebsitePriceListMissingError, "No website Price List specified"
return price_list_name
@webnotes.whitelist()
def checkout():
- party = get_lead_or_customer()
- quotation = get_shopping_cart_quotation(party)
+ quotation = _get_cart_quotation()
quotation.ignore_permissions = True
quotation.submit()
@@ -143,21 +144,21 @@ class TestCart(unittest.TestCase):
def test_add_to_cart(self):
webnotes.session.user = "test@example.com"
- add_to_cart("_Test Item")
+ update_cart("_Test Item", 1)
- quotation = get_shopping_cart_quotation(get_lead_or_customer())
+ quotation = _get_cart_quotation()
quotation_items = quotation.doclist.get({"parentfield": "quotation_details", "item_code": "_Test Item"})
self.assertTrue(quotation_items)
self.assertEquals(quotation_items[0].qty, 1)
return quotation
- def test_update_qty(self):
+ def test_update_cart(self):
self.test_add_to_cart()
- update_qty("_Test Item", 5)
+ update_cart("_Test Item", 5)
- quotation = get_shopping_cart_quotation(get_lead_or_customer())
+ quotation = _get_cart_quotation()
quotation_items = quotation.doclist.get({"parentfield": "quotation_details", "item_code": "_Test Item"})
self.assertTrue(quotation_items)
self.assertEquals(quotation_items[0].qty, 5)
@@ -167,16 +168,16 @@ class TestCart(unittest.TestCase):
def test_remove_from_cart(self):
quotation0 = self.test_add_to_cart()
- remove_from_cart("_Test Item")
+ update_cart("_Test Item", 0)
- quotation = get_shopping_cart_quotation(get_lead_or_customer())
+ quotation = _get_cart_quotation()
self.assertEquals(quotation0.doc.name, quotation.doc.name)
quotation_items = quotation.doclist.get({"parentfield": "quotation_details", "item_code": "_Test Item"})
self.assertEquals(quotation_items, [])
def test_checkout(self):
- quotation = self.test_update_qty()
+ quotation = self.test_update_cart()
sales_order = checkout()
self.assertEquals(sales_order.doclist.getone({"item_code": "_Test Item"}).prevdoc_docname, quotation.doc.name)
\ No newline at end of file
diff --git a/website/helpers/product.py b/website/helpers/product.py
index fb4d4e4aedc..e513c2d1d04 100644
--- a/website/helpers/product.py
+++ b/website/helpers/product.py
@@ -25,18 +25,26 @@ def get_product_info(item_code):
(item_code, price_list), as_dict=1) or []
price = price and price[0] or None
-
+ qty = 0
+
if price:
price["formatted_price"] = fmt_money(price["ref_rate"], currency=price["ref_currency"])
price["ref_currency"] = not cint(webnotes.conn.get_default("hide_currency_symbol")) \
and (webnotes.conn.get_value("Currency", price.ref_currency, "symbol") or price.ref_currency) \
or ""
+
+ if webnotes.session.user != "Guest":
+ from website.helpers.cart import _get_cart_quotation
+ item = _get_cart_quotation().doclist.get({"item_code": item_code})
+ if item:
+ qty = item[0].qty
return {
"price": price,
"stock": in_stock,
- "uom": webnotes.conn.get_value("Item", item_code, "stock_uom")
+ "uom": webnotes.conn.get_value("Item", item_code, "stock_uom"),
+ "qty": qty
}
@webnotes.whitelist(allow_guest=True)
diff --git a/website/templates/css/product_page.css b/website/templates/css/product_page.css
index e2f42937ec2..566b6b57aab 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;
- }
\ No newline at end of file
diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html
index ac1af5ab6b5..837b1057021 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]" }}
-