Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5323 from KanchanChauhan/shoppingcart-changes

Browse Source 
Shopping cart dropdown changes
This commit is contained in:
Anand Doshi 2016-05-09 16:57:08 +05:30
commit 969863541d
9 changed files with 29 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/public/css/website.css
View File

@ -70,7 +70,6 @@
border-top: 1px solid #EBEFF2; border-top: 1px solid #EBEFF2;
} }
.transaction-list-item { .transaction-list-item {
border-bottom: none;
padding: 30px; padding: 30px;
margin: 0px -30px; margin: 0px -30px;
} }
@ -166,7 +165,7 @@
display: none; display: none;
} }
.cart-dropdown-container { .cart-dropdown-container {
width: 350px; width: 320px;
padding: 15px; padding: 15px;
} }
.cart-dropdown-container .item-price { .cart-dropdown-container .item-price {
@ -189,7 +188,7 @@
display: none; display: none;
} }
.cart-dropdown-container .checkout-btn { .cart-dropdown-container .checkout-btn {
margin: 15px; padding-top: 25px;
} }
.cart-dropdown-container .col-name-description { .cart-dropdown-container .col-name-description {
margin-bottom: 8px; margin-bottom: 8px;

3
erpnext/public/js/shopping_cart.js
View File

@ -48,8 +48,7 @@ $.extend(shopping_cart, {
shopping_cart.set_cart_count(); shopping_cart.set_cart_count();
if (r.message.shopping_cart_menu) { if (r.message.shopping_cart_menu) {
$('.shopping-cart-menu').html(r.message.shopping_cart_menu); $('.shopping-cart-menu').html(r.message.shopping_cart_menu);
} }
if(opts.callback) if(opts.callback)
opts.callback(r); opts.callback(r);
} }

8
erpnext/public/less/website.less
View File

@ -83,7 +83,6 @@
} }
.transaction-list-item { .transaction-list-item {
border-bottom: none;
padding: 30px; padding: 30px;
margin: 0px -30px; margin: 0px -30px;
@ -213,7 +212,7 @@
} }
.cart-dropdown-container { .cart-dropdown-container {
width: 350px; width: 320px;
padding: 15px; padding: 15px;
.item-price { .item-price {
@ -241,7 +240,7 @@
} }
.checkout-btn { .checkout-btn {
margin:15px; padding-top:25px;
} }
.col-name-description { .col-name-description {
margin-bottom:8px; margin-bottom:8px;
@ -316,4 +315,5 @@
.homepage-tagline { .homepage-tagline {
font-size:40px !important; font-size:40px !important;
} }

19
erpnext/templates/includes/cart.js
View File

@ -63,23 +63,6 @@ $.extend(shopping_cart, {
btn: this, btn: this,
callback: function(r) { callback: function(r) {
frappe.unfreeze(); frappe.unfreeze();
if(!r.exc) {
$(".cart-items").html(r.message.items);
$(".cart-tax-items").html(r.message.taxes);
$(".cart-icon").hide();
}
},
});
});
},
bind_remove_item: function() {
$(".cart-items").on("click", ".remove-item", function() {
var item_code = $(this).attr("data-item-code");
shopping_cart.update_cart({
item_code: item_code,
qty: "0",
callback: function(r) {
location.reload(); location.reload();
if(!r.exc) { if(!r.exc) {
$(".cart-items").html(r.message.items); $(".cart-items").html(r.message.items);
@ -90,7 +73,7 @@ $.extend(shopping_cart, {
}); });
}); });
}, },
render_tax_row: function($cart_taxes, doc, shipping_rules) { render_tax_row: function($cart_taxes, doc, shipping_rules) {
var shipping_selector; var shipping_selector;
if(shipping_rules) { if(shipping_rules) {

11
erpnext/templates/includes/cart/cart_dropdown.html
View File

@ -2,13 +2,10 @@
<div id="cart-error" class="alert alert-danger" <div id="cart-error" class="alert alert-danger"
style="display: none;"></div> style="display: none;"></div>
<div class="row cart-items-dropdown cart-item-header text-muted"> <div class="row cart-items-dropdown cart-item-header text-muted">
<div class="col-sm-7 col-xs-6 h6 text-uppercase"> <div class="col-sm-6 col-xs-6 h6 text-uppercase">
{{ _("Item") }} {{ _("Item") }}
</div> </div>
<div class="col-sm-2 col-xs-2 text-right h6 text-uppercase"> <div class="col-sm-6 col-xs-6 text-right h6 text-uppercase">
{{ _("Qty") }}
</div>
<div class="col-sm-3 col-xs-2 text-right h6 text-uppercase">
{{ _("Price") }} {{ _("Price") }}
</div> </div>
</div> </div>
@ -17,8 +14,8 @@
<div class="cart-items"> <div class="cart-items">
{% include "templates/includes/cart/cart_items.html" %} {% include "templates/includes/cart/cart_items.html" %}
</div> </div>
<div class="text-center checkout-btn"> <div class="checkout-btn">
<p class="text-center"><a href="/cart" class="btn btn-primary">{{ _("Checkout") }}</a></p> <a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
</div> </div>
{% else %} {% else %}
<p>{{ _("Cart is Empty") }}</p> <p>{{ _("Cart is Empty") }}</p>

8
erpnext/templates/includes/cart/cart_items.html
View File

@ -10,7 +10,6 @@
<input class="form-control text-right cart-qty" <input class="form-control text-right cart-qty"
value = "{{ d.get_formatted('qty') }}" value = "{{ d.get_formatted('qty') }}"
data-item-code="{{ d.item_code }}"></span> data-item-code="{{ d.item_code }}"></span>
<span class="text-muted small remove-item" data-item-code="{{ d.item_code }}">{{_("Remove")}}</span>
</div> </div>
<div class="col-sm-2 col-xs-3 text-right col-amount"> <div class="col-sm-2 col-xs-3 text-right col-amount">
{{ d.get_formatted("amount") }} {{ d.get_formatted("amount") }}
@ -20,13 +19,10 @@
</div> </div>
<div class="row cart-items cart-dropdown"> <div class="row cart-items cart-dropdown">
<div class="col-sm-7 col-xs-6 col-name-description"> <div class="col-sm-8 col-xs-8 col-name-description">
{{ item_name_and_description(d) }} {{ item_name_and_description(d) }}
</div> </div>
<div class="col-sm-2 col-xs-2 text-right col-qty"> <div class="col-sm-4 col-xs-4 text-right col-amount">
{{ d.get_formatted('qty') }}
</div>
<div class="col-sm-3 col-xs-2 text-right col-amount">
{{ d.get_formatted("amount") }} {{ d.get_formatted("amount") }}
</div> </div>

9
erpnext/templates/includes/issue_row.html
View File

@ -1,13 +1,14 @@
<div class="web-list-item transaction-list-item"> <div class="web-list-item transaction-list-item">
<a href="/issues?name={{ doc.name }}"> <a href="/issues?name={{ doc.name }}">
<div class="row"> <div class="row">
<div class="col-xs-8"> <div class="col-xs-3">
<span class="indicator {{ "red" if doc.status=="Open" else "darkgrey" }}"> <span class="indicator {{ "red" if doc.status=="Open" else "darkgrey" }}">
{{ doc.name }}</span> {{ doc.name }}</span>
<div class="items-preview text-ellipsis"> </div>
<div class="col-xs-6 items-preview text-ellipsis">
{{ doc.subject }}</div> {{ doc.subject }}</div>
</div>
<div class="col-xs-4 text-right small text-muted"> <div class="col-xs-3 text-right small text-muted">
{{ frappe.format_date(doc.modified) }} {{ frappe.format_date(doc.modified) }}
</div> </div>
</div> </div>

4
erpnext/templates/includes/order/order_macros.html
View File

@ -16,8 +16,8 @@
<div class="row item_name_dropdown"> <div class="row item_name_dropdown">
<div class="col-xs-4 col-sm-4 order-image-col"> <div class="col-xs-4 col-sm-4 order-image-col">
<div class="order-image"> <div class="order-image">
{{ product_image_square(d.image) }} <span class="cart-count-badge pull-right small"> {{ d.get_formatted('qty') }} </span>{{ product_image_square(d.image) }}
</div> </div>
</div> </div>
<div class="col-xs-8 col-sm-8"> <div class="col-xs-8 col-sm-8">
{{ d.item_code }} {{ d.item_code }}

16
erpnext/templates/includes/transaction_row.html
View File

@ -1,18 +1,18 @@
<div class="web-list-item transaction-list-item"> <div class="web-list-item transaction-list-item">
<a href="/{{ pathname }}/{{ doc.name }}"> <a href="/{{ pathname }}/{{ doc.name }}">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-5">
<span class="indicator small {{ doc.indicator_color or "darkgrey" }}"> <span class="indicator small {{ doc.indicator_color or "darkgrey" }}">
{{ doc.name }}</span> {{ doc.name }}</span>
<div class="items-preview text-ellipsis">
{{ doc.items_preview }}
</div>
</div>
<div class="col-sm-6 text-right">
<div class="small text-muted transaction-time" <div class="small text-muted transaction-time"
title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}"> title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">
{{ frappe.utils.format_datetime(doc.modified, "medium") }} {{ frappe.utils.format_datetime(doc.modified, "medium") }}
</div> </div>
</div>
<div class="col-sm-4 items-preview text-ellipsis">
{{ doc.items_preview }}
</div>
<div class="col-sm-3 text-right">
{{ doc.get_formatted("grand_total") }} {{ doc.get_formatted("grand_total") }}
</div> </div>
<!-- <div class="col-sm-3 text-right"> <!-- <div class="col-sm-3 text-right">