Merge pull request #429 from FJNR-inc/develop

New release
FJNR-inc · Mar 14, 2020 · d0d2526 · d0d2526
2 parents 697b5bb + 587b61e
commit d0d2526
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 10 deletions.
diff --git a/retirement/admin.py b/retirement/admin.py
@@ -17,6 +17,28 @@ class PictureAdminInline(admin.TabularInline):
     readonly_fields = ('picture_tag', )
 
 
+def make_reservation_refundable(self, request, queryset):
+
+    Reservation.objects.filter(
+        retreat__in=queryset
+    ).update(refundable=True)
+
+
+make_reservation_refundable.\
+    short_description = 'Make reservation refundable'
+
+
+def make_reservation_not_refundable(self, request, queryset):
+
+    Reservation.objects.filter(
+        retreat__in=queryset
+    ).update(refundable=False)
+
+
+make_reservation_not_refundable.\
+    short_description = 'Make reservation not refundable'
+
+
 class RetreatAdmin(SimpleHistoryAdmin,
                    ExportActionModelAdmin,
                    SafeDeleteAdmin,
@@ -45,7 +67,12 @@ class RetreatAdmin(SimpleHistoryAdmin,
         'id'
     ]
 
-    actions = ['undelete_selected', 'export_admin_action']
+    actions = [
+        'undelete_selected',
+        'export_admin_action',
+        make_reservation_not_refundable,
+        make_reservation_refundable
+    ]
 
 
 class PictureAdmin(SimpleHistoryAdmin, TranslationAdmin):

diff --git a/retirement/templates/cancelation.html b/retirement/templates/cancelation.html
@@ -92,7 +92,7 @@ <h1 class="email__content__title">
 
         {% if CUSTOM_MESSAGE %}
         <h2 class="email__content__subtitle">
-          Informations additionnels
+          Informations additionnelles
         </h2>
         <p>
           {{CUSTOM_MESSAGE}}

diff --git a/retirement/templates/cancelation.txt b/retirement/templates/cancelation.txt
@@ -12,7 +12,7 @@ Nous comprenons que la fermeture de l'espace peut affecter votre horaire et nous
 {% if CUSTOM_MESSAGE %}
 
 
-** INFORMATIONS ADDITIONNELS
+** INFORMATIONS ADDITIONNELLES
 ------------------------------------------------------------
 
 {{CUSTOM_MESSAGE}}

diff --git a/retirement/templates/exchange.html b/retirement/templates/exchange.html
@@ -108,7 +108,7 @@ <h1 class="email__content__title">
 
         {% if CUSTOM_MESSAGE %}
         <h2 class="email__content__subtitle">
-          Informations additionnels
+          Informations additionnelles
         </h2>
         <p>
           {{CUSTOM_MESSAGE}}

diff --git a/retirement/templates/exchange.txt b/retirement/templates/exchange.txt
@@ -18,7 +18,7 @@ Ceci est une confirmation d'échange. Merci d'en garder une copie.
 {% if CUSTOM_MESSAGE %}
 
 
-** INFORMATIONS ADDITIONNELS
+** INFORMATIONS ADDITIONNELLES
 ------------------------------------------------------------
 
 {{CUSTOM_MESSAGE}}

diff --git a/retirement/templates/refund.html b/retirement/templates/refund.html
@@ -110,7 +110,7 @@ <h1 class="email__content__title">
 
         {% if CUSTOM_MESSAGE %}
         <h2 class="email__content__subtitle">
-          Informations additionnels
+          Informations additionnelles
         </h2>
         <p>
           {{CUSTOM_MESSAGE}}

diff --git a/retirement/templates/refund.txt b/retirement/templates/refund.txt
@@ -20,7 +20,7 @@ Ceci est un reçu pour votre remboursement. Merci d'en garder une copie.
 {% if CUSTOM_MESSAGE %}
 
 
-** INFORMATIONS ADDITIONNELS
+** INFORMATIONS ADDITIONNELLES
 ------------------------------------------------------------
 
 {{CUSTOM_MESSAGE}}

diff --git a/store/templates/invoice.html b/store/templates/invoice.html
@@ -332,7 +332,7 @@ <h1 style="margin: 0 0 10px; font-size: 25px; line-height: 30px; color: #333333;
               <tr>
                 <td valign="middle" style="text-align: center; padding: 40px 20px; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #ffffff;">
                   <h2>
-                    Informations additionnels
+                    Informations additionnelles
                   </h2>
                   <p style="margin: 0;">
                     {{CUSTOM_MESSAGE}}

diff --git a/store/templates/invoice.txt b/store/templates/invoice.txt
@@ -22,7 +22,7 @@ Ceci est un reçu pour votre achat. Merci d'en garder une copie.
 {% if CUSTOM_MESSAGE %}
 
 
-** INFORMATIONS ADDITIONNELS
+** INFORMATIONS ADDITIONNELLES
 ------------------------------------------------------------
 
 {{CUSTOM_MESSAGE}}

diff --git a/workplace/templates/cancelation.txt b/workplace/templates/cancelation.txt
@@ -12,7 +12,7 @@ Nous comprenons que la fermeture de l'espace peut affecter votre horaire et nous
 {% if CUSTOM_MESSAGE %}
 
 
-** INFORMATIONS ADDITIONNELS
+** INFORMATIONS ADDITIONNELLES
 ------------------------------------------------------------
 
 {{CUSTOM_MESSAGE}}