richie 2.34.1.dev23__py2.py3-none-any.whl → 3.2.1__py2.py3-none-any.whl

richie/apps/core/context_processors.py

@@ -100,6 +100,10 @@ def site_metas(request: HttpRequest):
             settings.RICHIE_MINIMUM_COURSE_RUNS_ENROLLMENT_COUNT
         )
 
+    context["RICHIE_VIDEO_PLUGIN_LAZY_LOADING"] = getattr(
+        settings, "RICHIE_VIDEO_PLUGIN_LAZY_LOADING", False
+    )
+
     return context
 
 

richie/apps/core/defaults.py

@@ -51,7 +51,20 @@ for site_language in LANGUAGES_DICT:
 # regions.
 RFC_5646_LOCALES = lazy(
     lambda: getattr(
-        settings, "RFC_5646_LOCALES", ["en-US", "es-ES", "pt-PT", "fr-FR", "fr-CA"]
+        settings,
+        "RFC_5646_LOCALES",
+        [
+            "en-US",
+            "es-ES",
+            "pt-PT",
+            "pt-BR",
+            "fr-FR",
+            "fr-CA",
+            "ru-RU",
+            "vi-VN",
+            "ar-SA",
+            "ko-KR",
+        ],
     ),
     list,
 )()

richie/apps/core/templates/djangocms_video/default/video_player.html

@@ -1,18 +1,74 @@
-{% load i18n cms_tags %}
+{% load i18n cms_tags extra_tags thumbnail static %}
 {% comment %}
 This is a copy of original template from plugin just to clean <iframe> from
 obsolete attribute "frameborder" and invalid "allowfullscreen" attribute value.
+
+For performance reasons instead of loading the video iframe directly, 
+it changes the default template with an hidden iframe that is only visible
+when the user clicks on the image with a big play icon '▶', the image comes 
+from the video poster or the course cover.
+Only after the user clicks on the play icon '▶', the browser loads the external
+video player iframe.
+Additionaly, it tries to autoplay the external video player, this feature depends
+on the browser and external video platform implementations.
 {% endcomment %}
 
 {% if instance.embed_link %}
     {# show iframe if embed_link is provided #}
     <div class="aspect-ratio">
-        <iframe
-            title="{% if instance.label %}{{ instance.label }}{% else %}{% trans "Video" %}{% endif %}"
-            src="{{ instance.embed_link_with_parameters }}"
-            {{ instance.attributes_str }}
-            allowfullscreen
-        ></iframe>
+        {% if RICHIE_VIDEO_PLUGIN_LAZY_LOADING %}
+            <a class="video-player-image" onclick="this.style.display='none'; this.parentNode.getElementsByTagName('iframe')[0].style.display='block'; this.parentNode.getElementsByTagName('iframe')[0].src=this.parentNode.getElementsByTagName('iframe')[0].getAttribute('data-src');" href="javascript:void(0)">
+                {% if instance.poster %}
+                    <img
+                        src='{% thumbnail instance.poster.url 300x170 replace_alpha='#FFFFFF' crop upscale subject_location=instance.poster.subject_location %}'
+                        srcset='
+                        {% thumbnail instance.poster 300x170 replace_alpha='#FFFFFF' crop upscale subject_location=instance.poster.subject_location %} 300w
+                        {% if instance.poster.width >= 600 %},{% thumbnail instance.poster 600x340 replace_alpha='#FFFFFF' crop upscale subject_location=instance.poster.subject_location %} 600w{% endif %}
+                        {% if instance.poster.width >= 900 %},{% thumbnail instance.poster 900x510 replace_alpha='#FFFFFF' crop upscale subject_location=instance.poster.subject_location %} 900w{% endif %}
+                        '
+                        sizes='(max-width:62em) 100vw, 660px'
+                        alt='{% trans "Click to play the teaser for " %} {{ request.current_page.get_title }}'
+                    />
+                {% else %}
+                    {% placeholder_as_plugins "course_cover" as cover_plugins %}
+                    {% if cover_plugins|length == 0 %}
+                        {% placeholder_as_plugins "program_cover" as cover_plugins %}
+                    {% endif %}
+                    {% blockplugin cover_plugins.0 %}
+                        <img
+                            src='{% thumbnail instance.picture 300x170 replace_alpha='#FFFFFF' crop upscale subject_location=instance.picture.subject_location %}'
+                            srcset='
+                            {% thumbnail instance.picture 300x170 replace_alpha='#FFFFFF' crop upscale subject_location=instance.picture.subject_location %} 300w
+                            {% if instance.picture.width >= 600 %},{% thumbnail instance.picture 600x340 replace_alpha='#FFFFFF' crop upscale subject_location=instance.picture.subject_location %} 600w{% endif %}
+                            {% if instance.picture.width >= 900 %},{% thumbnail instance.picture 900x510 replace_alpha='#FFFFFF' crop upscale subject_location=instance.picture.subject_location %} 900w{% endif %}
+                            '
+                            sizes='(max-width:62em) 100vw, 660px'
+                            alt='{% if instance.picture.default_alt_text %}{{ instance.picture.default_alt_text }}{% else %}{% trans 'course cover image' %}{% endif %}'
+                        />
+                    {% endblockplugin %}
+                {% endif %}
+                <span>
+                    <svg aria-hidden="true">
+                        <use href="#icon-video-play" />
+                    </svg>
+                </span>
+            </a>
+            <iframe
+                title="{% if instance.label %}{{ instance.label }}{% else %}{% trans "Video" %}{% endif %}"
+                data-src="{{ instance.embed_link_with_parameters}}{% if '?' not in instance.embed_link_with_parameters %}?{% endif %}&autoplay=1"
+                {{ instance.attributes_str }}
+                allowfullscreen
+                allow="autoplay"
+                style="display: none;"
+            ></iframe>
+        {% else %}
+            <iframe
+                title="{% if instance.label %}{{ instance.label }}{% else %}{% trans "Video" %}{% endif %}"
+                src="{{ instance.embed_link_with_parameters }}"
+                {{ instance.attributes_str }}
+                allowfullscreen
+            ></iframe>
+        {% endif %}
     </div>
     {% with disabled=instance.embed_link %}
         {% for plugin in instance.child_plugin_instances %}
@@ -32,9 +88,9 @@ obsolete attribute "frameborder" and invalid "allowfullscreen" attribute value.
 
 {% comment %}
     # Available variables:
-    {{ instance.template }}
+    {{ instance.template }}
     {{ instance.label }}
     {{ instance.embed_link }}
     {{ instance.poster }}
-    {{ instance.attributes_str }}
+    {{ instance.attributes_str }}
 {% endcomment %}

richie/apps/core/templates/menu/header_menu.html

@@ -2,43 +2,47 @@
 
 {% for child in children %}
     {% with children_slug=child.get_menu_title|slugify menu_options=child.menu_extension %}
-        <li class="topbar__item
-            {% if menu_options.allow_submenu and child.children %}dropdown{% endif %}
-            {% if menu_options.allow_submenu and menu_options.menu_color %} topbar__item--{{ menu_options.menu_color }}{% endif %}
-            {% if child.selected or child.attr.redirect_url == current_page.get_absolute_url %} topbar__item--selected{% endif %}
-            {% if child.ancestor %} topbar__item--ancestor{% endif %}
-            {% if child.sibling %} topbar__item--sibling{% endif %}
-            {% if child.descendant %} topbar__item--descendant{% endif %}"
-        >
-            {% comment %}Dropdown menu for children are only for page with index page
-            extension with a specific option enabled{% endcomment %}
-            {% if menu_options.allow_submenu and child.children %}
-                    <button 
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      aria-controls="dropdown-{{ child.id }}"
-                      id="dropdown-button-{{ child.id }}"
-                    >
-                      {{ child.get_menu_title }}
-                      <svg class="icon" aria-hidden="true">
-                        <use xlink:href="#icon-chevron-down"></use>
-                      </svg>
-                    </button>
-                    <nav 
-                      class="topbar__sublist"
-                      id="dropdown-{{ child.id }}"
-                      aria-labelledby="dropdown-button-{{ child.id }}"
-                    >
-                      <ul role="menu">
-                        {% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
-                      </ul>
-                    </nav>
-            {% else %}
-                <a href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">
-                    {{ child.get_menu_title }}
-                </a>
-            {% endif %}
-        </li>
+        {% with page_url=current_page.get_absolute_url redirect_url=child.attr.redirect_url %}
+            <li class="topbar__item
+                {% if menu_options.allow_submenu and child.children %}dropdown{% endif %}
+                {% if menu_options.allow_submenu and menu_options.menu_color %} topbar__item--{{ menu_options.menu_color }}{% endif %}
+                {% if child.ancestor %} topbar__item--ancestor{% endif %}
+                {% if child.sibling %} topbar__item--sibling{% endif %}
+                {% if child.descendant %} topbar__item--descendant{% endif %}
+                {% if child.selected %} topbar__item--selected
+                {% elif redirect_url and page_url == redirect_url %} topbar__item--selected
+                {% endif %}"
+            >
+                {% comment %}Dropdown menu for children are only for page with index page
+                extension with a specific option enabled{% endcomment %}
+                {% if menu_options.allow_submenu and child.children %}
+                        <button
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            aria-controls="dropdown-{{ child.id }}"
+                            id="dropdown-button-{{ child.id }}"
+                        >
+                            {{ child.get_menu_title }}
+                            <svg class="icon" aria-hidden="true">
+                                <use xlink:href="#icon-chevron-down"></use>
+                            </svg>
+                        </button>
+                        <nav
+                            class="topbar__sublist"
+                            id="dropdown-{{ child.id }}"
+                            aria-labelledby="dropdown-button-{{ child.id }}"
+                        >
+                            <ul role="menu">
+                                {% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
+                            </ul>
+                        </nav>
+                {% else %}
+                    <a href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">
+                        {{ child.get_menu_title }}
+                    </a>
+                {% endif %}
+            </li>
+        {% endwith %}
     {% endwith %}
 {% endfor %}
 

richie/apps/core/templates/richie/base.html

@@ -88,6 +88,9 @@
         {# First link on a website should always be a skip to content #}
         {# Access key directive allows users to use keyboard shortcuts #}
         <a href="#site-content" class="offscreen-focusable skip-to-content" accesskey="c">{% trans "Skip to main content" %}</a>
+            
+            {# The above_header allows you to place content like notifications or navigation bars on the top of the page #}
+            {% block above_header %}{% endblock above_header %}
         
             {% block body_header %}
 
@@ -275,6 +278,7 @@
                     const $menuButton = $dropdown.previousElementSibling;
                     const topbarWidth = $topbar.getBoundingClientRect().width;
                     const topbarLeft = $topbar.getBoundingClientRect().left;
+                    const menuButtonWidth = $menuButton.getBoundingClientRect().width;
                     const menuButtonLeft = $menuButton.getBoundingClientRect().left;
                     $dropdown.style.display = 'block';
                     $menu.style.flexWrap = 'nowrap';
@@ -282,11 +286,21 @@
                     $dropdown.style = '';
                     $menu.style = '';
                     const menuRelativeOffsetX = menuButtonLeft - topbarLeft;
+                    const rightRemainingSpace = topbarWidth - menuRelativeOffsetX;
 
-                    
-                    if (menuWidth > (topbarWidth - menuRelativeOffsetX)) {
-                        $dropdown.classList.add('topbar__sublist--full-width');
-                    } else {
+                    if (menuWidth > rightRemainingSpace) {
+                        if (menuWidth < (menuRelativeOffsetX + menuButtonWidth)) {
+                            $dropdown.classList.add('topbar__sublist--position-right');
+                            $dropdown.style.setProperty('--button-width', `${menuButtonWidth}px`);
+                            $dropdown.classList.remove('topbar__sublist--full-width');
+                        }
+                        else {
+                            $dropdown.classList.add('topbar__sublist--full-width');
+                            $dropdown.classList.remove('topbar__sublist--position-right');
+                        }
+                    }
+                    else {
+                        $dropdown.classList.remove('topbar__sublist--position-right');
                         $dropdown.classList.remove('topbar__sublist--full-width');
                     }
                 }

richie/apps/core/templates/richie/icons.html

@@ -200,6 +200,25 @@
     <symbol id="icon-courses" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="none" stroke-width="1.5" stroke="currentColor">
       <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9Z" />
     </symbol>
-    
-  </defs>
+
+    <symbol id="icon-video-play" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+      <circle cx="12" cy="12" r="12" fill="#fff"/>
+      <path fill-rule="evenodd" clip-rule="evenodd" d="m9.417 17.781 7.43-4.26c1-.574 1-1.504 0-2.077l-7.43-4.26c-1-.574-1.81-.105-1.81 1.048v8.5c0 1.153.81 1.622 1.81 1.05Z" fill="currentColor"/>
+    </symbol>
+
+    <symbol id="icon-offer-paid" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+      <path fill="currentColor" fill-rule="evenodd" d="M12 22.5c5.799 0 10.5-4.701 10.5-10.5S17.799 1.5 12 1.5 1.5 6.201 1.5 12 6.201 22.5 12 22.5Zm-5.184-9.52c0 .2.137.343.35.343h.783c.432 2.335 2.121 3.694 4.47 3.694 1.73 0 3.268-.734 3.845-2.107.082-.193.117-.385.117-.563 0-.495-.358-.81-.927-.81-.42 0-.646.191-.893.617-.446.886-1.236 1.195-2.15 1.195-1.221 0-2.087-.748-2.41-2.026h3.152c.213 0 .35-.144.35-.343 0-.213-.137-.343-.35-.343H9.878c-.014-.179-.02-.371-.027-.57.006-.172.013-.344.027-.508h3.275c.213 0 .35-.144.35-.344 0-.213-.137-.343-.35-.343H9.988c.323-1.298 1.188-2.067 2.417-2.067.9 0 1.675.378 2.135 1.25.254.426.502.618.934.618.536 0 .886-.316.886-.797 0-.22-.062-.453-.192-.68-.653-1.31-1.991-2.066-3.804-2.066-2.294 0-3.997 1.387-4.422 3.742h-.776c-.213 0-.35.13-.35.343 0 .2.137.344.35.344h.693a7.576 7.576 0 0 0 0 1.078h-.693c-.213 0-.35.13-.35.343Z" clip-rule="evenodd"/>
+    </symbol>
+
+    <symbol id="icon-offer-free" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+      <path fill="currentColor" fill-rule="evenodd" d="M17.26 19.418A9.094 9.094 0 0 1 4.58 6.738l2.957 2.957c-.186.438-.324.92-.41 1.443h-.824c-.24 0-.377.128-.377.36 0 .217.136.353.377.353h.745c-.008.184-.016.368-.016.553 0 .224.008.44.024.649h-.753c-.24 0-.377.136-.377.36 0 .224.136.36.377.36h.84c.49 2.796 2.5 4.39 5.32 4.39 1.063 0 2.06-.239 2.866-.676l1.932 1.931ZM6.545 4.724a9.094 9.094 0 0 1 12.732 12.732l1.003 1.003A10.454 10.454 0 0 0 22.5 12c0-5.799-4.701-10.5-10.5-10.5-2.436 0-4.678.83-6.46 2.221l1.004 1.003Zm-2.569-.58L20.12 20.29a.703.703 0 0 1-1.011.977l-.843-.842A10.454 10.454 0 0 1 12 22.5C6.201 22.5 1.5 17.799 1.5 12c0-2.35.771-4.518 2.075-6.268l-.908-.908a.703.703 0 1 1 .994-.994l.314.314Zm13.154 11.165c.014-.087.02-.175.02-.262 0-.673-.504-1.113-1.313-1.113l-.081.001 1.374 1.374ZM9.325 7.506c.844-.559 1.88-.854 3.042-.854 2.099 0 3.645.793 4.462 2.235.184.304.272.617.272.921 0 .657-.48 1.074-1.233 1.074-.585 0-.898-.24-1.274-.785-.537-.858-1.29-1.17-2.147-1.17-.516 0-.962.128-1.332.368l-1.79-1.79Zm3.632 3.632.64.64c.08-.061.124-.158.124-.28 0-.232-.136-.36-.377-.36h-.387Zm-3.106 1.258c0-.127.004-.254.01-.378l1.034 1.034h-1.02a8.523 8.523 0 0 1-.024-.656Zm.145 1.377h1.62l1.924 1.924c-.333.136-.7.191-1.093.191-1.274 0-2.123-.769-2.451-2.114Z" clip-rule="evenodd"/>
+    </symbol>
+
+    <symbol id="icon-offer-partially_free" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+      <path fill="currentColor" fill-rule="evenodd" d="M1.5 12c0 5.8 4.701 10.5 10.5 10.5S22.5 17.8 22.5 12a10.462 10.462 0 0 0-3.41-7.746A10.46 10.46 0 0 0 12 1.5C6.201 1.5 1.5 6.201 1.5 12ZM12 18.703v2.39a9.094 9.094 0 1 1 0-18.187v2.39a6.703 6.703 0 0 0 0 13.407ZM6.816 12.98c0 .2.137.343.35.343h.783c.432 2.335 2.121 3.694 4.47 3.694 1.73 0 3.268-.734 3.845-2.107.082-.193.117-.385.117-.563 0-.495-.358-.81-.927-.81-.42 0-.646.191-.893.617-.446.886-1.236 1.195-2.15 1.195-1.221 0-2.087-.748-2.41-2.026h3.152c.213 0 .35-.144.35-.343 0-.213-.137-.343-.35-.343H9.878c-.014-.179-.02-.371-.027-.57.006-.172.013-.344.027-.508h3.275c.213 0 .35-.144.35-.344 0-.213-.137-.343-.35-.343H9.988c.323-1.298 1.188-2.067 2.417-2.067.9 0 1.675.378 2.135 1.25.254.426.502.618.934.618.536 0 .886-.316.886-.797 0-.22-.062-.453-.192-.68-.653-1.31-1.991-2.066-3.804-2.066-2.294 0-3.997 1.387-4.422 3.742h-.776c-.213 0-.35.13-.35.343 0 .2.137.344.35.344h.693a7.576 7.576 0 0 0 0 1.078h-.693c-.213 0-.35.13-.35.343Z" clip-rule="evenodd"/>
+    </symbol>
+
+    <symbol id="icon-offer-subscription" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+      <path fill="currentColor" fill-rule="evenodd" d="M15.932.66a.703.703 0 1 0-1.3.54l.299.717a10.5 10.5 0 0 0-9.834 17.995.703.703 0 1 0 .924-1.06 9.094 9.094 0 0 1 8.246-15.659l-.554.23a.703.703 0 1 0 .54 1.299l2.22-.922a.703.703 0 0 0 .38-.919l-.921-2.22Zm-3.275 3.881A7.487 7.487 0 0 0 8.96 18.844l.518-.215a1.406 1.406 0 0 1 1.865.83A7.487 7.487 0 0 0 15.04 5.156l-.518.215a1.406 1.406 0 0 1-1.865-.83ZM6.816 12.98c0 .2.137.343.35.343h.783c.432 2.335 2.121 3.694 4.47 3.694 1.73 0 3.268-.734 3.845-2.107.082-.193.117-.385.117-.563 0-.495-.358-.81-.927-.81-.42 0-.646.191-.893.617-.446.886-1.236 1.195-2.15 1.195-1.221 0-2.087-.748-2.41-2.026h3.152c.213 0 .35-.144.35-.343 0-.213-.137-.343-.35-.343H9.878c-.014-.179-.02-.371-.027-.57.006-.172.013-.344.027-.508h3.275c.213 0 .35-.144.35-.344 0-.213-.137-.343-.35-.343H9.988c.323-1.298 1.188-2.067 2.417-2.067.9 0 1.675.378 2.135 1.25.254.426.502.618.934.618.536 0 .886-.316.886-.797 0-.22-.062-.453-.192-.68-.653-1.31-1.991-2.066-3.804-2.066-2.294 0-3.997 1.387-4.422 3.742h-.776c-.213 0-.35.13-.35.343 0 .2.137.344.35.344h.693a7.576 7.576 0 0 0 0 1.078h-.693c-.213 0-.35.13-.35.343Zm2.171 10.74a.703.703 0 0 1-.919-.38l-.921-2.221a.703.703 0 0 1 .38-.92l2.22-.92a.703.703 0 0 1 .54 1.298l-.554.23A9.095 9.095 0 0 0 17.98 5.148a.703.703 0 1 1 .924-1.06A10.5 10.5 0 0 1 9.07 22.083l.298.718a.703.703 0 0 1-.38.919Z" clip-rule="evenodd"/>
+    </symbol>
 </svg>

richie/apps/core/templatetags/language_name.py

@@ -5,7 +5,7 @@ from django.conf import settings
 from django.utils import translation
 
 # do not use the lazy
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 register = template.Library()
 

richie/apps/courses/admin.py

@@ -60,8 +60,12 @@ class CourseRunAdminForm(TranslatableModelForm):
             "price_currency",
             "offer",
             "price",
+            "discounted_price",
+            "discount",
             "certificate_offer",
             "certificate_price",
+            "certificate_discounted_price",
+            "certificate_discount",
             "sync_mode",
             "display_mode",
         ]
@@ -158,8 +162,12 @@ class CourseRunAdmin(FrontendEditableAdminMixin, TranslatableAdmin):
         "price_currency",
         "offer",
         "price",
+        "discounted_price",
+        "discount",
         "certificate_offer",
         "certificate_price",
+        "certificate_discounted_price",
+        "certificate_discount",
         "sync_mode",
     )
     list_display = ["id"]

richie/apps/courses/api.py

@@ -3,6 +3,7 @@ API endpoints for the courses app.
 """
 
 from django.conf import settings
+from django.core.cache import caches
 from django.db.models import Q
 
 from cms import signals as cms_signals
@@ -147,6 +148,10 @@ def sync_course_run(data):
                         instance=course_run.direct_course.extended_object,
                         language=None,
                     )
+                    # We also need to clear the cache of the public course page
+                    # and the search index (catalog)
+                    course_run.direct_course.extended_object.clear_cache()
+                    caches["search"].clear()
             else:
                 course_run.refresh_from_db()
                 course_run.mark_course_dirty()
@@ -196,6 +201,10 @@ def sync_course_run(data):
             cms_signals.post_publish.send(
                 sender=Page, instance=course.extended_object, language=None
             )
+            # We also need to clear the cache of the public course page
+            # and the search index (catalog)
+            course.extended_object.clear_cache()
+            caches["search"].clear()
     else:
         # Save the draft course run marking the course page dirty
         draft_course_run.save()

richie/apps/courses/factories.py

@@ -446,10 +446,16 @@ class CourseRunFactory(factory.django.DjangoModelFactory):
     display_mode = models.CourseRunDisplayMode.DETAILED
     price_currency = "EUR"
     price = factory.Faker(
-        "pydecimal", min_value=1, max_value=100, left_digits=5, right_digits=2
+        "pydecimal", min_value=150, max_value=2000, left_digits=5, right_digits=2
     )
     certificate_price = factory.Faker(
-        "pydecimal", min_value=1, max_value=100, left_digits=5, right_digits=2
+        "pydecimal", min_value=50, max_value=200, left_digits=5, right_digits=2
+    )
+    discounted_price = factory.Faker(
+        "pydecimal", min_value=10, max_value=100, left_digits=5, right_digits=2
+    )
+    certificate_discounted_price = factory.Faker(
+        "pydecimal", min_value=10, max_value=40, left_digits=5, right_digits=2
     )
 
     # pylint: disable=no-self-use

richie/apps/courses/migrations/0040_courserun_certificate_discount_and_more.py

@@ -0,0 +1,68 @@
+# Generated by Django 4.2.23 on 2025-07-04 15:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("courses", "0039_program_duration_program_effort_program_price"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="courserun",
+            name="certificate_discount",
+            field=models.CharField(
+                blank=True,
+                help_text="The discount applied to the certificate",
+                max_length=20,
+                null=True,
+                verbose_name="certificate discount",
+            ),
+        ),
+        migrations.AddField(
+            model_name="courserun",
+            name="certificate_discounted_price",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                help_text="The discounted price of the certificate",
+                max_digits=9,
+                null=True,
+                verbose_name="certificate discounted price",
+            ),
+        ),
+        migrations.AddField(
+            model_name="courserun",
+            name="discount",
+            field=models.CharField(
+                blank=True,
+                help_text="The discount applied to the course run",
+                max_length=20,
+                null=True,
+                verbose_name="discount",
+            ),
+        ),
+        migrations.AddField(
+            model_name="courserun",
+            name="discounted_price",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                help_text="The discounted price of the course run",
+                max_digits=9,
+                null=True,
+                verbose_name="discounted price",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="course",
+            name="is_listed",
+            field=models.BooleanField(
+                default=True,
+                help_text="Tick if you want the course to be visible.",
+                verbose_name="is listed",
+            ),
+        ),
+    ]

richie/apps/courses/models/category.py

@@ -71,7 +71,10 @@ class Category(EsIdMixin, BasePageExtension):
         """
         return self.get_reverse_related_page_extensions(
             "course", language=language, include_descendants=include_descendants
-        ).filter(extended_object__node__parent__cms_pages__course__isnull=True)
+        ).filter(
+            extended_object__node__parent__cms_pages__course__isnull=True,
+            is_listed=True,
+        )
 
     def get_blogposts(self, language=None, include_descendants=True):
         """

richie/apps/courses/models/course.py

@@ -180,7 +180,7 @@ class Course(EsIdMixin, BasePageExtension):
     is_listed = models.BooleanField(
         default=True,
         verbose_name=_("is listed"),
-        help_text=_("Tick if you want the course to be visible on the search page."),
+        help_text=_("Tick if you want the course to be visible."),
     )
 
     is_self_paced = models.BooleanField(
@@ -621,6 +621,26 @@ class Course(EsIdMixin, BasePageExtension):
         """
         return self.get_reverse_related_page_extensions("program", language=language)
 
+    @property
+    def best_course_run(self):
+        """
+        Returns the course run with the best state.
+        """
+        best_run = None
+        course_runs = self.course_runs.only(
+            "start", "end", "enrollment_start", "enrollment_end"
+        ).exclude(catalog_visibility=CourseRunCatalogVisibility.HIDDEN)
+
+        for course_run in course_runs:
+            state = course_run.state
+            if best_run is None or best_run.state["priority"] > state["priority"]:
+                best_run = course_run
+            if state["priority"] == CourseState.ONGOING_OPEN:
+                # We found the best state, don't waste more time
+                break
+
+        return best_run
+
     @property
     def state(self):
         """
@@ -631,16 +651,74 @@ class Course(EsIdMixin, BasePageExtension):
         # The default state is for a course that has no course runs
         best_state = CourseState(CourseState.TO_BE_SCHEDULED)
 
-        for course_run in self.course_runs.only(
-            "start", "end", "enrollment_start", "enrollment_end"
-        ).exclude(catalog_visibility=CourseRunCatalogVisibility.HIDDEN):
-            state = course_run.state
-            best_state = min(state, best_state)
-            if state["priority"] == CourseState.ONGOING_OPEN:
-                # We found the best state, don't waste more time
-                break
+        if self.best_course_run:
+            best_state = self.best_course_run.state
+
         return best_state
 
+    @property
+    def price_currency(self):
+        """
+        Returns the price currency of the course run with the best state.
+        """
+        if self.best_course_run:
+            return self.best_course_run.price_currency
+        return None
+
+    @property
+    def offer(self):
+        """
+        Returns the offer of the course run with the best state.
+        """
+        if self.best_course_run:
+            return self.best_course_run.offer
+        return None
+
+    @property
+    def price(self):
+        """
+        Returns the price of the course run with the best state.
+        """
+        if self.best_course_run:
+            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):
+        """
+        Returns the certificate offer of the course run with the best state.
+        """
+        if self.best_course_run:
+            return self.best_course_run.certificate_offer
+        return None
+
+    @property
+    def certificate_price(self):
+        """
+        Returns the certificate price of the course run with the best state.
+        """
+        if self.best_course_run:
+            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:
@@ -809,6 +887,21 @@ class CourseRun(TranslatableModel):
         max_length=7,
         default=getattr(settings, "RICHIE_DEFAULT_COURSE_RUN_PRICE_CURRENCY", "EUR"),
     )
+    discounted_price = models.DecimalField(
+        _("discounted price"),
+        max_digits=9,
+        decimal_places=2,
+        null=True,
+        blank=True,
+        help_text=_("The discounted price of the course run"),
+    )
+    discount = models.CharField(
+        _("discount"),
+        max_length=20,
+        null=True,
+        blank=True,
+        help_text=_("The discount applied to the course run"),
+    )
     offer = models.CharField(
         _("offer"),
         choices=lazy(lambda: CourseRunOffer.choices, tuple)(),
@@ -824,6 +917,21 @@ class CourseRun(TranslatableModel):
         blank=True,
         help_text=_("The price of the certificate"),
     )
+    certificate_discounted_price = models.DecimalField(
+        _("certificate discounted price"),
+        max_digits=9,
+        decimal_places=2,
+        null=True,
+        blank=True,
+        help_text=_("The discounted price of the certificate"),
+    )
+    certificate_discount = models.CharField(
+        _("certificate discount"),
+        max_length=20,
+        null=True,
+        blank=True,
+        help_text=_("The discount applied to the certificate"),
+    )
     certificate_offer = models.CharField(
         _("certificate offer"),
         choices=lazy(lambda: CertificateOffer.choices, tuple)(),

richie/apps/courses/models/organization.py

@@ -147,7 +147,10 @@ class Organization(EsIdMixin, BasePageExtension):
         """
         return self.get_reverse_related_page_extensions(
             "course", language=language
-        ).filter(extended_object__node__parent__cms_pages__course__isnull=True)
+        ).filter(
+            extended_object__node__parent__cms_pages__course__isnull=True,
+            is_listed=True,
+        )
 
     def get_persons(self, language=None):
         """

richie/apps/courses/models/person.py

@@ -50,7 +50,10 @@ class Person(EsIdMixin, BasePageExtension):
         """
         return self.get_reverse_related_page_extensions(
             "course", language=language
-        ).filter(extended_object__node__parent__cms_pages__course__isnull=True)
+        ).filter(
+            extended_object__node__parent__cms_pages__course__isnull=True,
+            is_listed=True,
+        )
 
     def get_blogposts(self, language=None):
         """