richie 3.1.3.dev27__py2.py3-none-any.whl → 3.1.3.dev28__py2.py3-none-any.whl

richie/apps/courses/factories.py

@@ -451,6 +451,12 @@ class CourseRunFactory(factory.django.DjangoModelFactory):
     certificate_price = factory.Faker(
         "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
     @factory.lazy_attribute

richie/apps/search/indexers/courses.py

@@ -185,8 +185,12 @@ class CoursesIndexer:
                     "offer": {"type": "keyword"},
                     "price": {"type": "keyword"},
                     "price_currency": {"type": "keyword"},
+                    "discounted_price": {"type": "keyword"},
+                    "discount": {"type": "keyword"},
                     "certificate_price": {"type": "keyword"},
                     "certificate_offer": {"type": "keyword"},
+                    "certificate_discounted_price": {"type": "keyword"},
+                    "certificate_discount": {"type": "keyword"},
                 },
             },
             # Keywords
@@ -475,7 +479,14 @@ class CoursesIndexer:
                             params._source.course_runs[best_index]['certificate_price'],
                         'offer': params._source.course_runs[best_index]['offer'],
                         'price': params._source.course_runs[best_index]['price'],
-                        'price_currency': params._source.course_runs[best_index]['price_currency']
+                        'price_currency': params._source.course_runs[best_index]['price_currency'],
+                        'discounted_price':
+                            params._source.course_runs[best_index]['discounted_price'],
+                        'discount': params._source.course_runs[best_index]['discount'],
+                        'certificate_discounted_price':
+                            params._source.course_runs[best_index]['certificate_discounted_price'],
+                        'certificate_discount':
+                            params._source.course_runs[best_index]['certificate_discount']
                     ];
                 } else {
                     return [
@@ -483,7 +494,11 @@ class CoursesIndexer:
                         'certificate_price': null,
                         'offer': null,
                         'price': null,
-                        'price_currency': null
+                        'price_currency': null,
+                        'discounted_price': null,
+                        'discount': null,
+                        'certificate_discounted_price': null,
+                        'certificate_discount': null
                     ];
                 }
                 """,
@@ -639,8 +654,12 @@ class CoursesIndexer:
                 "price",
                 "price_currency",
                 "offer",
+                "discounted_price",
+                "discount",
                 "certificate_price",
                 "certificate_offer",
+                "certificate_discounted_price",
+                "certificate_discount",
             )
         )
 
@@ -654,8 +673,12 @@ class CoursesIndexer:
                 "price": cr["price"],
                 "price_currency": cr["price_currency"],
                 "offer": cr["offer"],
+                "discounted_price": cr["discounted_price"],
+                "discount": cr["discount"],
                 "certificate_price": cr["certificate_price"],
                 "certificate_offer": cr["certificate_offer"],
+                "certificate_discounted_price": cr["certificate_discounted_price"],
+                "certificate_discount": cr["certificate_discount"],
             }
             for cr in course_runs_queryset
         ]

{richie-3.1.3.dev27.dist-info → richie-3.1.3.dev28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richie
-Version: 3.1.3.dev27
+Version: 3.1.3.dev28
 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.dev27.dist-info → richie-3.1.3.dev28.dist-info}/RECORD

@@ -951,7 +951,7 @@ richie/apps/courses/cms_toolbars.py,sha256=x5V-BVboyD9AiDa32nHslrXtsQFNrNr3mb2t7
 richie/apps/courses/cms_wizards.py,sha256=PTkTFxkdvsIh2y1qhKNpW47-e0f0ulMbM5CWeujKQaM,18458
 richie/apps/courses/defaults.py,sha256=1bye7rSGSp89ZUTW6FHUT02GE_-i-lJXfXV6EbY3Oxo,13033
 richie/apps/courses/exceptions.py,sha256=XD2qNYjVYyeHRqYz5wNuDXKpCW6tHsQCsXRKL2b9ClY,192
-richie/apps/courses/factories.py,sha256=s3oNOdKSOwe-Y1QuyIJt2oDQTFhUox-6MOB41uDQUkE,36404
+richie/apps/courses/factories.py,sha256=aVp4UlqBsj1kMh0rlag0FDe2zMNNmL6_VnwLZDtK_Z4,36663
 richie/apps/courses/fields.py,sha256=km1AvdTC_nUTAJh6XdPtyvTeIozJ3R63Q8m0CSAezZI,1535
 richie/apps/courses/forms.py,sha256=77H5EsOldl2__aC8CMWc6Hp5ycSBDr84rbccerKKw1o,3458
 richie/apps/courses/helpers.py,sha256=DVUl9zD9EwEFaa-gfhjSEHWq6qy02DtSJI5jfBt3p_Q,3240
@@ -1138,7 +1138,7 @@ richie/apps/search/filter_definitions/helpers.py,sha256=Buyf0EJzYnlM3S8QrPWPhgRh
 richie/apps/search/filter_definitions/mixins.py,sha256=EEcYVu426reDfeCaeVzNEzj7z40KjPB_yz3FthAIN-c,5669
 richie/apps/search/indexers/__init__.py,sha256=RcrvJGdyUBxcuWY9OnZ2G-G0YEcDb55n3_otj2JqWWg,655
 richie/apps/search/indexers/categories.py,sha256=AqLVVgbiOagmS9DkWmxvbB-QtFzFrVv7b_r3mzOV7lo,7237
-richie/apps/search/indexers/courses.py,sha256=4exoJxm-bHBEUxZj9bXPyID_KcJjzY36ABDTp3hFWgA,34948
+richie/apps/search/indexers/courses.py,sha256=XMPm8pC6vd5vgADzdjPMSK7-6snF7i1sph0RznKWHec,36332
 richie/apps/search/indexers/licences.py,sha256=kZ0vT1jIOqCXSQUsQEKVmTiMIhCFpdiPQeDxAiMgInQ,3691
 richie/apps/search/indexers/organizations.py,sha256=uBTNBHiott4SMcxd4UdAliDdsUSDlWUK4gcoL-TJzCo,5774
 richie/apps/search/indexers/persons.py,sha256=xXAbPDGa_iXVXsK8vn11-KhaGJgRSIghMG29KuPXwas,5740
@@ -2486,9 +2486,9 @@ richie/static/richie/js/build/99870.34581ce2cb1783eaefab.index.js,sha256=3ZdjUuB
 richie/static/richie/js/build/99895.34581ce2cb1783eaefab.index.js,sha256=ST2kyTdc0fVK0IxNmItIgs6dnds7DVRwC7dzbHjG4CA,2570
 richie/static/richie/js/build/99953.34581ce2cb1783eaefab.index.js,sha256=OWoLPJnHrmvF3HBQPgXooAGo5E0yJpJ7QTFHFghJpI8,135
 richie/static/richie/js/build/index.js,sha256=_nRO5lntGWFWNEzWezxPzwzFeWW1VHCeOXPNe6sxu5w,1332732
-richie-3.1.3.dev27.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
-richie-3.1.3.dev27.dist-info/METADATA,sha256=IGEQWWb1jSsEG9dklsYxT0uvWD90-zCX_RupGNJ4oxE,7034
-richie-3.1.3.dev27.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-richie-3.1.3.dev27.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
-richie-3.1.3.dev27.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-richie-3.1.3.dev27.dist-info/RECORD,,
+richie-3.1.3.dev28.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
+richie-3.1.3.dev28.dist-info/METADATA,sha256=hc975kuf8WyM0WB1B3IFa2F5GZsTs8pOJ_NHqBDXX64,7034
+richie-3.1.3.dev28.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+richie-3.1.3.dev28.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
+richie-3.1.3.dev28.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+richie-3.1.3.dev28.dist-info/RECORD,,