[fix] view shopping cart dropdown (#6928)
This commit is contained in:
parent
6261745366
commit
440650d4a2
@ -181,7 +181,6 @@
|
||||
}
|
||||
.cart-dropdown-container .cart-items-dropdown {
|
||||
max-height: 350px;
|
||||
overflow: auto;
|
||||
}
|
||||
.cart-dropdown-container .cart-items-dropdown .cart-dropdown {
|
||||
display: block;
|
||||
|
@ -65,7 +65,7 @@ $.extend(shopping_cart, {
|
||||
var cart_count = getCookie("cart_count");
|
||||
|
||||
if(cart_count) {
|
||||
$(".shopping-cart").toggleClass('hidden', true);
|
||||
$(".shopping-cart").toggleClass('hidden', false);
|
||||
}
|
||||
|
||||
var $cart = $('.cart-icon');
|
||||
|
@ -233,7 +233,6 @@
|
||||
|
||||
.cart-items-dropdown {
|
||||
max-height: 350px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.cart-items-dropdown .cart-dropdown {
|
||||
|
@ -3,7 +3,7 @@
|
||||
{% block title %} {{ title }} {% endblock %}
|
||||
|
||||
{% block breadcrumbs %}
|
||||
{% include "templates/includes/breadcrumbs.html" %}
|
||||
{% include "templates/includes/breadcrumbs.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block page_content %}
|
||||
@ -25,17 +25,17 @@
|
||||
{{ _("Item Code") }}: <span itemprop="productID">{{ variant and variant.name or name }}</span></p>
|
||||
<br>
|
||||
<div class="item-attribute-selectors">
|
||||
{% if has_variants %}
|
||||
{% for d in attributes %}
|
||||
{% if has_variants %}
|
||||
{% for d in attributes %}
|
||||
{% if attribute_values[d.attribute] -%}
|
||||
<div class="item-view-attribute {% if (attribute_values[d.attribute] | len)==1 -%} hidden {%- endif %}"
|
||||
style="margin-bottom: 10px;">
|
||||
<h6 class="text-muted">{{ _(d.attribute) }}</h6>
|
||||
<select class="form-control"
|
||||
style="max-width: 140px"
|
||||
data-attribute="{{ d.attribute }}">
|
||||
<div class="item-view-attribute {% if (attribute_values[d.attribute] | len)==1 -%} hidden {%- endif %}"
|
||||
style="margin-bottom: 10px;">
|
||||
<h6 class="text-muted">{{ _(d.attribute) }}</h6>
|
||||
<select class="form-control"
|
||||
style="max-width: 140px"
|
||||
data-attribute="{{ d.attribute }}">
|
||||
{% for value in attribute_values[d.attribute] %}
|
||||
<option value="{{ value }}"
|
||||
<option value="{{ value }}"
|
||||
{% if selected_attributes and selected_attributes[d.attribute]==value -%}
|
||||
selected
|
||||
{%- elif disabled_attributes and value in disabled_attributes.get(d.attribute, []) -%}
|
||||
@ -43,12 +43,12 @@
|
||||
{%- endif %}>
|
||||
{{ _(value) }}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
{%- endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</div>
|
||||
<br>
|
||||
<div style="min-height: 100px; margin: 10px 0;">
|
||||
@ -56,18 +56,17 @@
|
||||
<h4 class="item-price" itemprop="price"></h4>
|
||||
<div class="item-stock" itemprop="availability"></div>
|
||||
</div>
|
||||
<div class="item-cart hide">
|
||||
<div id="item-add-to-cart">
|
||||
<button class="btn btn-primary btn-sm">
|
||||
{{ _("Add to Cart") }}</button>
|
||||
</div>
|
||||
<div id="item-update-cart"
|
||||
style="display: none;
|
||||
padding-left: 0px; padding-right: 0px;
|
||||
padding-top: 10px;">
|
||||
<a href="/cart">{{ _("Goto Cart") }}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item-cart hide">
|
||||
<div id="item-add-to-cart">
|
||||
<button class="btn btn-primary btn-sm">
|
||||
{{ _("Add to Cart") }}</button>
|
||||
</div>
|
||||
<div id="item-update-cart" style="display: none;">
|
||||
<a href="/cart" class='btn btn-sm btn-default'>
|
||||
<i class='octicon octicon-check'></i>
|
||||
{{ _("View in Cart") }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -101,10 +100,10 @@
|
||||
<script>
|
||||
{% include "templates/includes/product_page.js" %}
|
||||
|
||||
{% if variant_info %}
|
||||
window.variant_info = {{ variant_info }};
|
||||
{% else %}
|
||||
window.variant_info = null;
|
||||
{% endif %}
|
||||
{% if variant_info %}
|
||||
window.variant_info = {{ variant_info }};
|
||||
{% else %}
|
||||
window.variant_info = null;
|
||||
{% endif %}
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
@ -1,6 +1,6 @@
|
||||
<div class="cart-dropdown-container">
|
||||
<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="col-sm-6 col-xs-6 h6 text-uppercase">
|
||||
{{ _("Item") }}
|
||||
@ -15,7 +15,7 @@
|
||||
{% include "templates/includes/cart/cart_items_dropdown.html" %}
|
||||
</div>
|
||||
<div class="checkout-btn">
|
||||
<a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
|
||||
<a href="/cart" class="btn btn-block btn-primary">{{ _("Checkout") }}</a>
|
||||
</div>
|
||||
{% else %}
|
||||
<p>{{ _("Cart is Empty") }}</p>
|
||||
|
@ -7,7 +7,6 @@
|
||||
</div>
|
||||
<div class="col-sm-4 col-xs-4 text-right col-amount">
|
||||
{{ d.get_formatted("amount") }}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
@ -1,7 +1,12 @@
|
||||
{% macro product_image_square(website_image, css_class="") %}
|
||||
{% if website_image -%} <meta itemprop="image" content="{{ frappe.utils.quoted(website_image) | abs_url }}"></meta>{%- 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 %}>
|
||||
{% if website_image -%}
|
||||
<meta itemprop="image" content="{{ frappe.utils.quoted(website_image) | abs_url }}"></meta>
|
||||
{%- 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>
|
||||
{% endmacro %}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
{% block navbar_right_extension %}
|
||||
<li class="shopping-cart hidden">
|
||||
<div class="cart-icon small">
|
||||
<div class="cart-icon">
|
||||
<a class="dropdown-toggle" href="#" data-toggle="dropdown" id="navLogin">
|
||||
Cart <span class="badge-wrapper" id="cart-count"></span>
|
||||
</a>
|
||||
|
@ -13,6 +13,7 @@
|
||||
</div>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{% macro item_name_and_description_cart(d) %}
|
||||
<div class="row item_name_dropdown">
|
||||
<div class="col-xs-4 col-sm-4 order-image-col">
|
||||
@ -27,9 +28,9 @@
|
||||
<button class="btn btn-default cart-btn" data-dir="dwn">
|
||||
–</button>
|
||||
</span>
|
||||
<input class="form-control text-right cart-qty"
|
||||
value = "{{ d.get_formatted('qty') }}"
|
||||
data-item-code="{{ d.item_code }}">
|
||||
<input class="form-control text-right cart-qty"
|
||||
value = "{{ d.get_formatted('qty') }}"
|
||||
data-item-code="{{ d.item_code }}">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-default cart-btn" data-dir="up">
|
||||
+</button>
|
||||
|
Loading…
x
Reference in New Issue
Block a user