richie 3.1.3.dev28__tar.gz → 3.1.3.dev31__tar.gz

{richie-3.1.3.dev28 → richie-3.1.3.dev31}/CHANGELOG.md

@@ -13,6 +13,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 - Add `discounted_price`, `discount`, `certificate_discounted_price` and
   `certificate_discount` fields to `CourseRun` model
 - Add search indexation for new `CourseRun` model fields
+- Add `discounted_price` to the course glimpse template
 
 ### Changed
 

{richie-3.1.3.dev28 → richie-3.1.3.dev31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richie
-Version: 3.1.3.dev28
+Version: 3.1.3.dev31
 Summary: A CMS to build learning portals for open education
 Author-email: "Open FUN (France Université Numérique)" <fun.dev@fun-mooc.fr>
 License: MIT License

{richie-3.1.3.dev28 → richie-3.1.3.dev31}/src/frontend/js/widgets/SyllabusCourseRunsList/components/CourseProductItem/_styles.scss

@@ -70,6 +70,7 @@
     & .product-widget__header-main {
       display: flex;
       justify-content: center;
+      text-align: center;
     }
 
     & .product-widget__title {

{richie-3.1.3.dev28 → richie-3.1.3.dev31}/src/frontend/scss/objects/_course_glimpses.scss

@@ -399,6 +399,7 @@ $course-glimpse-content-padding-sides: 0.7rem !default;
     .offer_prices {
       display: flex;
       flex-direction: column;
+      align-items: flex-end;
     }
 
     .offer__price {

{richie-3.1.3.dev28 → richie-3.1.3.dev31}/src/richie/apps/courses/models/course.py

@@ -683,6 +683,15 @@ class Course(EsIdMixin, BasePageExtension):
             return self.best_course_run.price
         return None
 
+    @property
+    def discounted_price(self):
+        """
+        Returns the discounted price of the course run with the best state.
+        """
+        if self.best_course_run:
+            return self.best_course_run.discounted_price
+        return None
+
     @property
     def certificate_offer(self):
         """
@@ -701,6 +710,15 @@ class Course(EsIdMixin, BasePageExtension):
             return self.best_course_run.certificate_price
         return None
 
+    @property
+    def discounted_certificate_price(self):
+        """
+        Returns the discounted certificate price of the course run with the best state.
+        """
+        if self.best_course_run:
+            return self.best_course_run.discounted_certificate_price
+        return None
+
     def copy_relations(self, oldinstance, language=None):
         """
         This method is called for 2 types of copying:

{richie-3.1.3.dev28 → richie-3.1.3.dev31}/src/richie/apps/courses/templates/courses/cms/fragment_course_glimpse.html

@@ -117,7 +117,14 @@
                         <use href="#icon-offer-{{course.offer|default:'free'}}" />
                 </svg>
                 {% if course.offer != 'free' and course.price %}
-                    <span class="offer__price">{{ course.price|currency:course.price_currency }}</span>
+                    {% if course.discounted_price %}
+                        <div class="offer_prices">
+                            <span class="offer__price offer__price--striked">{{ course.price|currency:course.price_currency }}</span>
+                            <span class="offer__price offer__price--discounted">{{ course.discounted_price|currency:course.price_currency }}</span>
+                        </div>
+                    {% else %}
+                        <span class="offer__price">{{ course.price|currency:course.price_currency }}</span>
+                    {% endif %}
                 {% endif %}
             </div>
         </div>