feature-8791: Consent of refund policy for the attendee form (#8812)

Hieu Lam - TMA · khangon · odkhang · web-flow · commit 9ed888868c16 · 2023-06-23T21:44:50.000+09:00
* feature-8791: Consent of refund policy for the attendee form

* feature-8791: Merge code development

* feature-8791: Consent of refund policy for the attendee form

* feature-8791: Add translate

* feature-8791: Consent of refund policy for the attendee form

* feature-8791: Consent of refund policy for the attendee form

---------

Co-authored-by: Khang On - TMA &lt;135116292+khangon@users.noreply.github.com&gt;
Co-authored-by: khangon &lt;odkhang@tma.com.vn&gt;
Co-authored-by: Norbert Preining &lt;norbert@preining.info&gt;
diff --git a/app/components/forms/orders/order-form.js b/app/components/forms/orders/order-form.js
@@ -469,6 +469,17 @@ export default Component.extend(FormMixin, {
       ]
     };
 
+    const isConsentOfRefundPolicyValidation = {
+      optional : true,
+      rules    : [
+        {
+          type   : 'regExp',
+          value  : compulsoryProtocolValidUrlPattern,
+          prompt : this.l10n.t('Please enter a valid URL.')
+        }
+      ]
+    };
+
     const languageForm1Validation = {
       rules: [
         {
@@ -608,6 +619,7 @@ export default Component.extend(FormMixin, {
       validationRules.fields[`instagram_required_${  index}`] = instagramRequiredValidation;
       validationRules.fields[`linkedin_${  index}`] = linkedinValidation;
       validationRules.fields[`linkedin_required_${  index}`] = linkedinRequiredValidation;
+      validationRules.fields[`is_consent_of_refund_policy_required_${  index}`] = isConsentOfRefundPolicyValidation;
       validationRules.fields[`is_consent_form_field_${  index}`] = isConsentFormFieldValidation;
       validationRules.fields[`language_form_1_required_${  index}`] = languageForm1Validation;
       validationRules.fields[`language_form_2_required_${  index}`] = languageForm2Validation;
@@ -627,16 +639,28 @@ export default Component.extend(FormMixin, {
   },
 
   allFields: computed('fields', function() {
-    const requiredFixed = this.fields.toArray()?.filter(field => field.isFixed);
-    const customFields =  orderBy(this.fields.toArray()?.filter(field => !field.isFixed), ['position']);
+    let customFields = [];
+    const requiredFixed = [];
+    this.fields.forEach(field => {
+      if (field.isFixed) {
+        requiredFixed.push(field);
+      } else {
+        customFields.push(field);
+      }
+      field.nameConvert = field.name;
+      if (field.name === 'Consent of refund policy') {
+        field.nameConvert = 'I agree to the terms of the refund policy of the event.';
+      }
+    });
+    customFields =  orderBy(customFields, ['position']);
     return groupBy(requiredFixed.concat(customFields), field => field.get('form'));
   }),
 
   genders       : orderBy(genders, 'name'),
   ageGroups     : orderBy(ageGroups, 'position'),
   countries     : orderBy(countries, 'name'),
   years         : orderBy(years, 'year'),
-  languageForms : orderBy(languageForms, 'item'),
+  languageForms : orderBy(languageForms, 'name'),
   homeWikis     : orderBy(homeWikis, 'item'),
 
   actions: {
diff --git a/app/mixins/custom-form.js b/app/mixins/custom-form.js
@@ -661,12 +661,23 @@ export default Mixin.create(MutableArray, {
         isPublic        : false,
         event           : parent
       }),
+      this.store.createRecord('custom-form', {
+        name            : 'Consent of refund policy',
+        fieldIdentifier : 'is_consent_of_refund_policy',
+        formID          : _formID,
+        form            : 'attendee',
+        type            : 'checkbox',
+        isRequired      : false,
+        isIncluded      : false,
+        isPublic        : false,
+        event           : parent
+      }),
       this.store.createRecord('custom-form', {
         name            : 'Consent form field',
         fieldIdentifier : 'is_consent_form_field',
         formID          : _formID,
         form            : 'attendee',
-        type            : 'select',
+        type            : 'checkbox',
         isRequired      : false,
         isIncluded      : false,
         isPublic        : false,
diff --git a/app/models/attendee.js b/app/models/attendee.js
@@ -7,44 +7,45 @@ export default ModelBase.extend({
   /**
    * Attributes
    */
-  city                  : attr('string'),
-  firstname             : attr('string'),
-  lastname              : attr('string'),
-  isCheckedIn           : attr('boolean', { defaultValue: false }),
-  checkinTimes          : attr('string'),
-  checkoutTimes         : attr('string'),
-  state                 : attr('string'),
-  address               : attr('string'),
-  pdfUrl                : attr('string'),
-  country               : attr('string'),
-  email                 : attr('string'),
-  jobTitle              : attr('string'),
-  phone                 : attr('string'),
-  company               : attr('string'),
-  taxBusinessInfo       : attr('string'),
-  billingAddress        : attr('string'),
-  homeAddress           : attr('string'),
-  shippingAddress       : attr('string'),
-  workAddress           : attr('string'),
-  workPhone             : attr('string'),
-  website               : attr('string'),
-  blog                  : attr('string'),
-  twitter               : attr('string'),
-  facebook              : attr('string'),
-  github                : attr('string'),
-  instagram             : attr('string'),
-  linkedin              : attr('string'),
-  gender                : attr('string'),
-  ageGroup              : attr('string'),
-  acceptReceiveEmails   : attr('boolean', { defaultValue: true }),
-  acceptVideoRecording  : attr('boolean', { defaultValue: true }),
-  acceptShareDetails    : attr('boolean', { defaultValue: true }),
-  birthDate             : attr('moment'),
-  complexFieldValues    : attr(),
-  language_form_1       : attr('string'),
-  language_form_2       : attr('string'),
-  home_wiki             : attr('string'),
-  is_consent_form_field : attr('boolean', { defaultValue: false }),
+  city                        : attr('string'),
+  firstname                   : attr('string'),
+  lastname                    : attr('string'),
+  isCheckedIn                 : attr('boolean', { defaultValue: false }),
+  checkinTimes                : attr('string'),
+  checkoutTimes               : attr('string'),
+  state                       : attr('string'),
+  address                     : attr('string'),
+  pdfUrl                      : attr('string'),
+  country                     : attr('string'),
+  email                       : attr('string'),
+  jobTitle                    : attr('string'),
+  phone                       : attr('string'),
+  company                     : attr('string'),
+  taxBusinessInfo             : attr('string'),
+  billingAddress              : attr('string'),
+  homeAddress                 : attr('string'),
+  shippingAddress             : attr('string'),
+  workAddress                 : attr('string'),
+  workPhone                   : attr('string'),
+  website                     : attr('string'),
+  blog                        : attr('string'),
+  twitter                     : attr('string'),
+  facebook                    : attr('string'),
+  github                      : attr('string'),
+  instagram                   : attr('string'),
+  linkedin                    : attr('string'),
+  gender                      : attr('string'),
+  ageGroup                    : attr('string'),
+  acceptReceiveEmails         : attr('boolean', { defaultValue: true }),
+  acceptVideoRecording        : attr('boolean', { defaultValue: true }),
+  acceptShareDetails          : attr('boolean', { defaultValue: true }),
+  birthDate                   : attr('moment'),
+  complexFieldValues          : attr(),
+  is_consent_of_refund_policy : attr('boolean', { defaultValue: false }),
+  language_form_1             : attr('string'),
+  language_form_2             : attr('string'),
+  home_wiki                   : attr('string'),
+  is_consent_form_field       : attr('boolean', { defaultValue: false }),
 
   /**
    * Relationships
diff --git a/app/models/custom-form.js b/app/models/custom-form.js
@@ -82,35 +82,36 @@ export default ModelBase.extend({
   speaker: SPEAKER_FORM_FIELDS,
 
   attendee: {
-    firstname             : tn.t('First Name'),
-    lastname              : tn.t('Last Name'),
-    email                 : tn.t('Email'),
-    address               : tn.t('Address (Street, Building, Number etc.)'),
-    city                  : tn.t('City'),
-    state                 : tn.t('State'),
-    country               : tn.t('Country'),
-    jobTitle              : tn.t('Job Title'),
-    phone                 : tn.t('Phone'),
-    taxBusinessInfo       : tn.t('Tax Business Info'),
-    company               : tn.t('Organisation'),
-    workPhone             : tn.t('Work Phone'),
-    website               : tn.t('Website'),
-    blog                  : tn.t('Blog'),
-    twitter               : tn.t('Twitter'),
-    facebook              : tn.t('Facebook'),
-    github                : tn.t('GitHub'),
-    instagram             : tn.t('Instagram'),
-    linkedin              : tn.t('LinkedIn'),
-    mastodon              : tn.t('Mastodon'),
-    gender                : tn.t('Gender'),
-    acceptReceiveEmails   : tn.t('Email consent'),
-    acceptVideoRecording  : tn.t('Photo & video & text consent'),
-    acceptShareDetails    : tn.t('Partner contact consent'),
-    ageGroup              : tn.t('Age Group'),
-    homeWiki              : tn.t('What is your home wiki'),
-    languageForm1         : tn.t('What is your native language, or what language are you most fluent in?'),
-    languageForm2         : tn.t('Are you fluent in any other of the following languages?'),
-    is_consent_form_field : tn.t('Consent form field')
+    firstname               : tn.t('First Name'),
+    lastname                : tn.t('Last Name'),
+    email                   : tn.t('Email'),
+    address                 : tn.t('Address (Street, Building, Number etc.)'),
+    city                    : tn.t('City'),
+    state                   : tn.t('State'),
+    country                 : tn.t('Country'),
+    jobTitle                : tn.t('Job Title'),
+    phone                   : tn.t('Phone'),
+    taxBusinessInfo         : tn.t('Tax Business Info'),
+    company                 : tn.t('Organisation'),
+    workPhone               : tn.t('Work Phone'),
+    website                 : tn.t('Website'),
+    blog                    : tn.t('Blog'),
+    twitter                 : tn.t('Twitter'),
+    facebook                : tn.t('Facebook'),
+    github                  : tn.t('GitHub'),
+    instagram               : tn.t('Instagram'),
+    linkedin                : tn.t('LinkedIn'),
+    mastodon                : tn.t('Mastodon'),
+    gender                  : tn.t('Gender'),
+    acceptReceiveEmails     : tn.t('Email consent'),
+    acceptVideoRecording    : tn.t('Photo & video & text consent'),
+    acceptShareDetails      : tn.t('Partner contact consent'),
+    ageGroup                : tn.t('Age Group'),
+    isConsentOfRefundPolicy : tn.t('Consent of refund policy'),
+    homeWiki                : tn.t('What is your home wiki'),
+    languageForm1           : tn.t('What is your native language, or what language are you most fluent in?'),
+    languageForm2           : tn.t('Are you fluent in any other of the following languages?'),
+    is_consent_form_field   : tn.t('Consent form field')
   },
 
   ready() {
diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
@@ -225,6 +225,14 @@
                     <span> {{t 'and the'}} </span>
                     <a href="https://foundation.wikimedia.org/wiki/Policy:Friendly_space_policy">{{t 'Friendly Space Policy'}}</a>
                     <span> .</span>
+                {{else if (eq field.type 'checkbox')}}
+                  {{#if (and (not-eq field.fieldIdentifier "language_form_1") (not-eq field.fieldIdentifier "language_form_2"))}}     
+                    <UiCheckbox
+                      @checked={{get holder field.identifierPath}}         
+                      @name={{if field.isRequired (concat field.fieldIdentifier "_required_" index) (concat field.fieldIdentifier "_" index)}}       
+                      @onChange={{action (mut (get holder field.identifierPath))}}/>
+                      {{t field.nameConvert}}
+                  {{/if}}
                 {{/if}}
                 {{#if (eq field.type 'year')}}
                   <UiDropdown
diff --git a/translations/ar.po b/translations/ar.po
@@ -12106,6 +12106,12 @@ msgstr "ما هي لغتك الأم ، أو ما هي اللغة التي تتق
 msgid "Are you fluent in any other of the following languages?"
 msgstr "هل تتقن أي لغة أخرى من اللغات التالية؟"
 
+msgid "Consent of refund policy"
+msgstr ""
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr ""
+
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr ""
diff --git a/translations/bn.po b/translations/bn.po
@@ -11658,6 +11658,11 @@ msgstr "আপনার মাতৃভাষা কি, বা আপনি ক
 msgid "Are you fluent in any other of the following languages?"
 msgstr "আপনি কি নিচের অন্য কোন ভাষায় পারদর্শী?"
 
+msgid "Consent of refund policy"
+msgstr "ফেরত নীতির সম্মতি"
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr "আমি ইভেন্টের রিফান্ড নীতির শর্তাবলীতে সম্মত।"
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr "আমি শর্তাবলী সম্মত"
diff --git a/translations/de.po b/translations/de.po
@@ -11673,6 +11673,11 @@ msgstr "Was ist Ihre Muttersprache bzw. welche Sprache beherrschen Sie am besten
 msgid "Are you fluent in any other of the following languages?"
 msgstr "Beherrschen Sie eine der folgenden Sprachen fließend?"
 
+msgid "Consent of refund policy"
+msgstr "Zustimmung zur Rückerstattungsrichtlinie"
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr "Ich stimme den Bedingungen der Rückerstattungsrichtlinie der Veranstaltung zu."
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr "Ich stimme den Bedingungen zu"
diff --git a/translations/en.po b/translations/en.po
@@ -11668,6 +11668,11 @@ msgstr "What is your native language, or what language are you most fluent in?"
 msgid "Are you fluent in any other of the following languages?"
 msgstr "Are you fluent in any other of the following languages?"
 
+msgid "Consent of refund policy"
+msgstr "Consent of refund policy"
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr "I agree to the terms of the refund policy of the event."
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr "I agree to the terms of the"
diff --git a/translations/es.po b/translations/es.po
@@ -11657,6 +11657,11 @@ msgstr "¿Cuál es su idioma nativo, o qué idioma domina con mayor fluidez?"
 msgid "Are you fluent in any other of the following languages?"
 msgstr "¿Hablas con fluidez alguno de los siguientes idiomas?"
 
+msgid "Consent of refund policy"
+msgstr "Consentimiento de la política de reembolso"
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr "Acepto los términos de la política de reembolso del evento."
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr "Estoy de acuerdo con los términos del"
diff --git a/translations/fr.po b/translations/fr.po
@@ -12028,6 +12028,12 @@ msgstr "Quelle est votre langue maternelle ou quelle langue parlez-vous le plus
 msgid "Are you fluent in any other of the following languages?"
 msgstr "Parlez-vous couramment l'une des autres langues suivantes ?"
 
+msgid "Consent of refund policy"
+msgstr "Consentement à la politique de remboursement"
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr "J'accepte les termes de la politique de remboursement de l'événement."
+
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr "J'accepte les termes de la"
diff --git a/translations/hi.po b/translations/hi.po
@@ -11660,6 +11660,12 @@ msgstr "आपकी मूल भाषा कौन सी है, या आ
 msgid "Are you fluent in any other of the following languages?"
 msgstr "क्या आप निम्नलिखित में से किसी अन्य भाषा में पारंगत हैं?"
 
+msgid "Consent of refund policy"
+msgstr "रिफंड नीति पर सहमति"
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr "मैं इवेंट की रिफंड नीति की शर्तों से सहमत हूं।"
+
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr "मैं की शर्तों से सहमत हूं"
diff --git a/translations/id.po b/translations/id.po
@@ -11660,6 +11660,11 @@ msgstr "Apa bahasa asli Anda, atau bahasa apa yang paling Anda kuasai?"
 msgid "Are you fluent in any other of the following languages?"
 msgstr "Apakah Anda fasih dalam bahasa lain berikut ini?"
 
+msgid "Consent of refund policy"
+msgstr "Persetujuan kebijakan pengembalian dana"
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr "Saya setuju dengan ketentuan kebijakan pengembalian dana acara tersebut."
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr "Saya menyetujui persyaratan dari"
diff --git a/translations/ja.po b/translations/ja.po
@@ -11662,6 +11662,11 @@ msgstr "あなたの母国語は何ですか、または最も流暢に話せる
 msgid "Are you fluent in any other of the following languages?"
 msgstr "次の言語のうち他の言語を流暢に話せますか?"
 
+msgid "Consent of refund policy"
+msgstr "返金ポリシーへの同意"
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr "イベントの返金ポリシーの規約に同意します。"
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr "の規約に同意します"
diff --git a/translations/ko.po b/translations/ko.po
@@ -11661,6 +11661,11 @@ msgstr "당신의 모국어는 무엇입니까, 또는 당신이 가장 유창
 msgid "Are you fluent in any other of the following languages?"
 msgstr "다음 중 다른 언어에 능통합니까?"
 
+msgid "Consent of refund policy"
+msgstr "환불 정책 동의"
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr "이벤트 환불규정에 동의합니다."
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr "약관에 동의합니다."
diff --git a/translations/messages.pot b/translations/messages.pot
@@ -11659,6 +11659,12 @@ msgstr ""
 msgid "Are you fluent in any other of the following languages?"
 msgstr ""
 
+msgid "Consent of refund policy"
+msgstr ""
+
+msgid "I agree to the terms of the refund policy of the event."
+msgstr ""
+
 #: app/components/forms/wizard/custom-forms/table.hbs:56:25
 msgid "I agree to the terms of the"
 msgstr ""
@@ -11677,4 +11683,4 @@ msgstr ""
 
 #: app/models/custom-form.js:113:28
 msgid "Consent form field"
-msgstr ""
+msgstr ""
diff --git a/translations/nb_NO.po b/translations/nb_NO.po
diff --git a/translations/pl.po b/translations/pl.po
diff --git a/translations/ru.po b/translations/ru.po
diff --git a/translations/sv.po b/translations/sv.po
diff --git a/translations/th.po b/translations/th.po
diff --git a/translations/vi.po b/translations/vi.po
diff --git a/translations/zh_Hans.po b/translations/zh_Hans.po
diff --git a/translations/zh_Hant.po b/translations/zh_Hant.po
