Skip to content

Resolved issues/prim-56,57,58 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
muzamilse wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Resolved issues/prim-56,57,58 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00c3edf
Resolved issues/prim-56,57,58
Aug 28, 2024
974a3e8
Merge branch 'master' into issues/prim-56,57,58
qasimgulzar Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions templates/eggs/templates/oscar/catalogue/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
{% load i18n %}
{% load purchase_info_tags %}
{% load image_tags %}
{% load primzel_tags %}


{% block content_wrapper %}

Expand Down Expand Up @@ -75,11 +77,14 @@ <h1 class="h3 text-light mb-0">{{ product.get_title }}</h1>
{% iffeature "reviews" %}
{% include "oscar/catalogue/reviews/partials/review_stars.html" with yellow_stars=True total_reviews=product.reviews.count %}
{% endiffeature %}
<div class="mb-3"><span class="h3 font-weight-normal text-accent mr-1">
<div class="mb-3">
<span class="h3 font-weight-normal text-accent mr-1">
{% include "oscar/catalogue/partials/stock_record.html" %}
</span>
<!-- <del class="text-muted font-size-lg mr-3">$25.<small>00</small></del>-->
<!-- <span class="badge badge-danger badge-shadow align-middle mt-n2">Sale</span>-->
</span>
{% get_discounted_price product as info %}
{% if info.discounted_price %}
<span class="badge badge-danger badge-shadow align-middle mt-n2">Sale</span>
{% endif %}
</div>

{% include "oscar/catalogue/partials/options/option_control.html" %}
Expand Down
6 changes: 6 additions & 0 deletions templates/eggs/templates/oscar/catalogue/partials/product.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@

{% block product %}
<div class="card product-card">

{% get_discounted_price product as info %}
{% if info.discounted_price %}
<span class="badge badge-danger badge-shadow">Sale</span>
{% endif %}

{% include 'oscar/catalogue/partials/wishlist-button.html' %}
{% with image=product.primary_image %}
{% oscar_thumbnail image.original "296x276" upscale=False as thumb %}
Expand Down
11 changes: 7 additions & 4 deletions templates/eggs/templates/oscar/catalogue/partials/product_quick_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ <h4 class="modal-title product-title"><a href="shop-single-v1.html" data-toggle=
<div class="cz-product-gallery">
<div class="cz-preview order-sm-2">


{% with all_images=product.get_all_images %}
{% if all_images|length > 0 %}
{% for image in all_images %}
Expand Down Expand Up @@ -54,10 +53,14 @@ <h4 class="modal-title product-title"><a href="shop-single-v1.html" data-toggle=
{% iffeature "reviews" %}
{% include "oscar/catalogue/reviews/partials/review_stars.html" with yellow_stars=True total_reviews=product.reviews.count %}
{% endiffeature %}
<div class="mb-3"><span class="h3 font-weight-normal text-accent mr-1">
<div class="mb-3">
<span class="h3 font-weight-normal text-accent mr-1">
{% include "oscar/catalogue/partials/stock_record.html" %}
</span>
<!-- <del class="text-muted font-size-lg mr-3">$25.<small>00</small></del><span class="badge badge-danger badge-shadow align-middle mt-n2">Sale</span>-->
</span>
{% get_discounted_price product as info %}
{% if info.discounted_price %}
<span class="badge badge-danger badge-shadow align-middle mt-n2">Sale</span>
{% endif %}
</div>

{% include "oscar/catalogue/partials/options/option_control.html" %}
Expand Down