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

[fix] view shopping cart dropdown (#6928)

Browse Source
This commit is contained in:
Rushabh Mehta 2016-11-14 13:13:53 +05:30 committed by GitHub
parent 6261745366
commit 440650d4a2
9 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,6 @@
} }
.cart-dropdown-container .cart-items-dropdown { .cart-dropdown-container .cart-items-dropdown {
max-height: 350px; max-height: 350px;
overflow: auto;
} }
.cart-dropdown-container .cart-items-dropdown .cart-dropdown { .cart-dropdown-container .cart-items-dropdown .cart-dropdown {
display: block; display: block;

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

@ -65,7 +65,7 @@ $.extend(shopping_cart, {
var cart_count = getCookie("cart_count"); var cart_count = getCookie("cart_count");
if(cart_count) { if(cart_count) {
$(".shopping-cart").toggleClass('hidden', true); $(".shopping-cart").toggleClass('hidden', false);
} }
var $cart = $('.cart-icon'); var $cart = $('.cart-icon');

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

@ -233,7 +233,6 @@
.cart-items-dropdown { .cart-items-dropdown {
max-height: 350px; max-height: 350px;
overflow: auto;
} }
.cart-items-dropdown .cart-dropdown { .cart-items-dropdown .cart-dropdown {

9
erpnext/templates/generators/item.html
View File

@ -61,11 +61,10 @@
<button class="btn btn-primary btn-sm"> <button class="btn btn-primary btn-sm">
{{ _("Add to Cart") }}</button> {{ _("Add to Cart") }}</button>
</div> </div>
<div id="item-update-cart" <div id="item-update-cart" style="display: none;">
style="display: none; <a href="/cart" class='btn btn-sm btn-default'>
padding-left: 0px; padding-right: 0px; <i class='octicon octicon-check'></i>
padding-top: 10px;"> {{ _("View in Cart") }}</a>
<a href="/cart">{{ _("Goto Cart") }}</a>
</div> </div>
</div> </div>
</div> </div>

1
erpnext/templates/includes/cart/cart_items_dropdown.html
View File

@ -7,7 +7,6 @@
</div> </div>
<div class="col-sm-4 col-xs-4 text-right col-amount"> <div class="col-sm-4 col-xs-4 text-right col-amount">
{{ d.get_formatted("amount") }} {{ d.get_formatted("amount") }}
</div> </div>
</div> </div>
{% endfor %} {% endfor %}

11
erpnext/templates/includes/macros.html
View File

@ -1,7 +1,12 @@
{% macro product_image_square(website_image, css_class="") %} {% macro product_image_square(website_image, css_class="") %}
{% if website_image -%} <meta itemprop="image" content="{{ frappe.utils.quoted(website_image) | abs_url }}"></meta>{%- endif %} {% if website_image -%}
<div class="product-image product-image-square {% if not website_image -%} missing-image {%- endif %} {{ css_class }}" <meta itemprop="image" content="{{ frappe.utils.quoted(website_image) | abs_url }}"></meta>
{% if website_image -%} style="background-image: url('{{ frappe.utils.quoted(website_image) | abs_url }}');" {%- endif %}> {%- endif %}
<div class="product-image product-image-square
{% if not website_image -%} missing-image {%- endif %} {{ css_class }}"
{% if website_image -%}
style="background-image: url('{{ frappe.utils.quoted(website_image) | abs_url }}');"
{%- endif %}>
</div> </div>
{% endmacro %} {% endmacro %}

2
erpnext/templates/includes/navbar/navbar_items.html
View File

@ -2,7 +2,7 @@
{% block navbar_right_extension %} {% block navbar_right_extension %}
<li class="shopping-cart hidden"> <li class="shopping-cart hidden">
<div class="cart-icon small"> <div class="cart-icon">
<a class="dropdown-toggle" href="#" data-toggle="dropdown" id="navLogin"> <a class="dropdown-toggle" href="#" data-toggle="dropdown" id="navLogin">
Cart <span class="badge-wrapper" id="cart-count"></span> Cart <span class="badge-wrapper" id="cart-count"></span>
</a> </a>

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

@ -13,6 +13,7 @@
</div> </div>
</div> </div>
{% endmacro %} {% endmacro %}
{% macro item_name_and_description_cart(d) %} {% macro item_name_and_description_cart(d) %}
<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">