Merge pull request #790 from PrestaShopCorp/fix-privacy-policy-link

Fix various links on configuration page
PrestaShopCorp · Jul 1, 2021 · 60b35ce · 60b35ce
2 parents 638edd0 + fc16e76
commit 60b35ce
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 7 deletions.
diff --git a/_dev/js/back/src/components/block/cb-inline-activate.vue b/_dev/js/back/src/components/block/cb-inline-activate.vue
@@ -63,10 +63,10 @@
             }}
 
             <a
-              href="https://www.prestashop.com/en/prestashop-checkout"
+              :href="pricingUrl"
               target="_blank"
             >
-              www.prestashop.com/en/prestashop-checkout
+              {{pricingUrl}}
             </a>
 
             {{
@@ -76,7 +76,7 @@
             }}
 
             <a href="#" @click.prevent="goToAuthenticate()">
-              Authentication tab
+              {{ $t('menu.authentication') }}
             </a>
 
             <br />
@@ -151,6 +151,9 @@
             value: !this.isHostedFieldsEnabled
           }
         ];
+      },
+      pricingUrl() {
+        return this.$store.state.context.pricingUrl;
       }
     }
   };

diff --git a/_dev/js/back/src/components/panel/psx-form.vue b/_dev/js/back/src/components/panel/psx-form.vue
@@ -398,7 +398,7 @@
           <p>
             <b-link
               id="privacy-link"
-              :href="$t('panel.psx-form.privacyLink')"
+              :href="privacyPolicyUrl"
               target="_blank"
             >
               {{ $t('panel.psx-form.privacyTextPart2') }}
@@ -480,6 +480,9 @@
         return `${this.$t('panel.psx-form.businessSubCategory')} (${this.$t(
           'panel.psx-form.optional'
         )})`;
+      },
+      privacyPolicyUrl() {
+        return this.$store.state.context.privacyPolicyUrl;
       }
     },
     methods: {

diff --git a/_dev/js/back/src/pages/Signup.vue b/_dev/js/back/src/pages/Signup.vue
@@ -93,7 +93,7 @@
                 </p>
                 <p>
                   <b-link
-                    :href="$t('pages.signup.mentionsTermsLinkPart2')"
+                    :href="privacyPolicyUrl"
                     target="_blank"
                   >
                     {{ $t('pages.signup.mentionsTermsLinkTextPart2') }}
@@ -185,6 +185,9 @@
           return this.terms.errorMessage;
         }
         return '';
+      },
+      privacyPolicyUrl() {
+        return this.$store.state.context.privacyPolicyUrl;
       }
     },
     methods: {

diff --git a/src/Presenter/Store/Modules/ContextModule.php b/src/Presenter/Store/Modules/ContextModule.php
@@ -143,6 +143,8 @@ public function present()
                 'translations' => $this->translations->getTranslations(),
                 'readmeUrl' => $this->getReadme(),
                 'cguUrl' => $this->getCgu(),
+                'privacyPolicyUrl' => $this->getPrivacyPolicyUrl(),
+                'pricingUrl' => $this->getPricingUrl(),
                 'roundingSettingsIsCorrect' => $this->paypalConfiguration->IsRoundingSettingsCorrect(),
                 'liveStepConfirmed' => $this->liveStep->isConfirmed(),
                 'liveStepViewed' => $this->liveStep->isViewed(),
@@ -354,4 +356,44 @@ private function getSubmitIdeaLink()
     {
         return 'https://portal.productboard.com/prestashop/1-prestashop-feedback-the-place-to-share-your-feedback-on-prestashop-s-next-features/tabs/9-prestashop-checkout';
     }
+
+    /**
+     * @return string
+     */
+    private function getPrivacyPolicyUrl()
+    {
+        $isoCode = $this->psContext->getLanguageIsoCode();
+
+        switch ($isoCode) {
+            case 'fr':
+                return 'https://www.prestashop.com/fr/politique-protection-donnees-prestashop-download';
+            default:
+                return 'https://www.prestashop.com/en/personal-data-protection-policy-prestashop-download';
+        }
+    }
+
+    /**
+     * @return string
+     */
+    private function getPricingUrl()
+    {
+        $isoCode = $this->psContext->getLanguageIsoCode();
+
+        switch ($isoCode) {
+            case 'fr':
+                return 'https://www.prestashop.com/fr/prestashop-checkout';
+            case 'es':
+                return 'https://www.prestashop.com/es/prestashop-checkout';
+            case 'it':
+                return 'https://www.prestashop.com/it/prestashop-checkout';
+            case 'nl':
+                return 'https://www.prestashop.com/nl/prestashop-checkout';
+            case 'pt':
+                return 'https://www.prestashop.com/pt/prestashop-checkout';
+            case 'pl':
+                return 'https://www.prestashop.com/pl/prestashop-checkout';
+            default:
+                return 'https://www.prestashop.com/en/prestashop-checkout';
+        }
+    }
 }
diff --git a/translations/en.php b/translations/en.php
@@ -445,7 +445,7 @@
 $_MODULE['<{ps_checkout}prestashop>translations_19146f30e246bba7235f1f052711fe74'] = 'What is the difference between Integrated Credit Card fields & PayPal branded Credit Card Fields ?';
 $_MODULE['<{ps_checkout}prestashop>translations_ff8313e7d0a38ececa23e28fd77421de'] = 'When to use PayPal branded Credit Card fields ?';
 $_MODULE['<{ps_checkout}prestashop>translations_4cb668c4f89af857decf3d6ce310cd77'] = 'Integrated Credit Card fields provide the best payment experience you can find in PrestaShop. Well integrated in your checkout process, not branded, with the fewest number of fields, and lowest fee rates (see them on';
-$_MODULE['<{ps_checkout}prestashop>translations_3a8e02212752fecc2b5eb72111cdc40d'] = ') : we highly recommend to use these ones, by default. But you need PayPal full approval for accepting Credit Cards payment with the fields. You can see the status of this approval in the';
+$_MODULE['<{ps_checkout}prestashop>translations_3a8e02212752fecc2b5eb72111cdc40d'] = ') : we highly recommend to use these ones, by default. But you need PayPal full approval for accepting Credit Cards payment with the fields. You can see the status of this approval on';
 $_MODULE['<{ps_checkout}prestashop>translations_15c52cd080705793a4aef0f321a0f592'] = 'If approval is pending or issues are encountered with the Integrated fields, you can activate these fields as a backup, only if Integrated fields are not available or deactivated. The fees are the same as PayPal payment method.';
 $_MODULE['<{ps_checkout}prestashop>translations_3e335cc9a3b59223da56df9434994954'] = 'Integrated Credit Card Fields';
 $_MODULE['<{ps_checkout}prestashop>translations_c1053fd298c615d9bb6e45a1d9d763d6'] = 'PayPal branded Credit Card Fields';

diff --git a/translations/fr.php b/translations/fr.php
@@ -347,7 +347,7 @@
 $_MODULE['<{ps_checkout}prestashop>translations_19146f30e246bba7235f1f052711fe74'] = 'Quelle est la différence entre entre les Champs de Carte Intégrés et les Champs de Carte Alternatifs de Paypal ?';
 $_MODULE['<{ps_checkout}prestashop>translations_ff8313e7d0a38ececa23e28fd77421de'] = 'Quand faut-il utiliser les Champs de Carte Alternatifs de PayPal ?';
 $_MODULE['<{ps_checkout}prestashop>translations_4cb668c4f89af857decf3d6ce310cd77'] = 'Les Champs de Carte Intégrés proposent la meilleure expérience d\'achat sur PrestaShop. Bien intégrés dans le parcours d\'achat, sans marque, avec un nombre réduits de champs, et les frais de comissions les plus bas, (voir sur ';
-$_MODULE['<{ps_checkout}prestashop>translations_3a8e02212752fecc2b5eb72111cdc40d'] = ') : nous vous recommandons de les privilégier. Votre compte PayPal doit avoir été totalement approuvé afin d\'en bénéficier. Vous pouvez voir le statut d\'approbation de votre compte PayPal dans le';
+$_MODULE['<{ps_checkout}prestashop>translations_3a8e02212752fecc2b5eb72111cdc40d'] = ') : nous vous recommandons de les privilégier. Votre compte PayPal doit avoir été totalement approuvé afin d\'en bénéficier. Vous pouvez voir le statut d\'approbation de votre compte PayPal dans le menu';
 $_MODULE['<{ps_checkout}prestashop>translations_15c52cd080705793a4aef0f321a0f592'] = 'Si la validation de votre compte PayPal tarde, ou que vous rencontrez des problèmes de paiement avec les Champs de Carte Intégrés, vous pouvez activer ces champs alternatifs, comme solution temporaire, seulement si les Champs de Carte Intégrés sont indisponibles ou désactivés. Les comissions appliquées sont les mêmes que pour le paiement par PayPal.';
 $_MODULE['<{ps_checkout}prestashop>translations_3e335cc9a3b59223da56df9434994954'] = 'Champs de Carte Intégrés';
 $_MODULE['<{ps_checkout}prestashop>translations_c1053fd298c615d9bb6e45a1d9d763d6'] = 'Champs de Carte Alternatifs de Paypal';