Merge pull request #355 from PrestaShopCorp/ACCOUNT-1795/fix/vue-comp…

…onent-fallback-backport

[ACCOUNT-1795] Use Vue component fallback by importing the init method

_dev/package.json

@@ -12,16 +12,16 @@
     "@prestashopcorp/ps-accounts-sdk": "^0.3.2",
     "@prestashopcorp/puik": "^1.2.0",
     "@splidejs/splide": "^4.0.8",
-    "prestashop_accounts_vue_components": "^4.2.7",
+    "prestashop_accounts_vue_components": "^5.0.0",
     "vue": "^3.2.38",
     "vue-i18n": "^9.2.2",
     "zoid": "9.0.63"
   },
   "devDependencies": {
-    "@types/node": "^18.16.2",
+    "@types/node": "^20.4.0",
     "@typescript-eslint/eslint-plugin": "^5.36.1",
     "@typescript-eslint/parser": "^5.36.1",
-    "@vitejs/plugin-vue": "^3.0.3",
+    "@vitejs/plugin-vue": "^4.2.3",
     "@vue/eslint-config-typescript": "^11.0.0",
     "autoprefixer": "^10.4.8",
     "eslint": "^8.23.0",
@@ -33,7 +33,7 @@
     "sass": "^1.54.8",
     "tailwindcss": "^3.1.8",
     "typescript": "^4.6.2",
-    "vite": "^3.0.9",
+    "vite": "^4.3.9",
     "vue-tsc": "^0.40.5"
   },
   "browserslist": [

_dev/src/App.vue

@@ -33,13 +33,13 @@
 <script setup lang="ts">
 import ConfigInformation from "@/components/ConfigInformation.vue";
 import { onMounted } from "vue";
+import { init } from "prestashop_accounts_vue_components"
   
 onMounted(async () => {
   if (window?.psaccountsVue) {
     return window?.psaccountsVue?.init();
   }
-  const accountFallback = (await import("prestashop_accounts_vue_components")).default;
-  accountFallback.init();
+  init();
 });
 </script>
   <style lang="scss">

_dev/src/types/window.d.ts

@@ -1,5 +1,3 @@
-declare module 'prestashop_accounts_vue_components';
-
 interface Window {
     psaccountsVue: any;
     signInComponent: any;

_dev/tsconfig.json

@@ -11,7 +11,8 @@
     "isolatedModules": true,
     "esModuleInterop": true,
     "lib": ["ESNext", "DOM"],
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "types": ["node"]
   },
   "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
   "references": [{ "path": "./tsconfig.node.json" }]

classes/Translations/SettingsTranslations.php

@@ -59,9 +59,9 @@ public function getTranslations()
             'configure' => [
                 'incentivePanel' => [
                     'title' => $this->module->l('Your PrestaShop account', $class),
-                    'howTo' => $this->module->l('One account to manage all your PrestaShop shops', $class),
+                    'howTo' => $this->module->l('One account to manage all your PrestaShop stores', $class),
                     'createPsAccount' => $this->module->l('Create your PrestaShop account or login to your existing account', $class),
-                    'linkPsAccount' => $this->module->l('Associate your shop with your account', $class),
+                    'linkPsAccount' => $this->module->l('Link your store to your account', $class),
                 ],
             ],
         ];

config.xml

@@ -3,7 +3,7 @@
     <name>ps_accounts</name>
     <displayName><![CDATA[PrestaShop Account]]></displayName>
     <version><![CDATA[5.3.2]]></version>
-    <description><![CDATA[Associate your shop with your PrestaShop account to activate and manage your subscriptions in your back office. Do not uninstall this module if you have a current subscription.]]></description>
+    <description><![CDATA[Link your store to your PrestaShop account to activate and manage your subscriptions in your back office. Do not uninstall this module if you have a current subscription.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[administration]]></tab>
 	<confirmUninstall><![CDATA[This action will prevent immediately your PrestaShop services and Community services from working as they are using PrestaShop Accounts module for authentication.]]></confirmUninstall>

ps_accounts.php

@@ -109,8 +109,8 @@ public function __construct()
         parent::__construct();
 
         $this->displayName = $this->l('PrestaShop Account');
-        $this->description = $this->l('Associate your shop with your PrestaShop account to activate and manage your subscriptions in your back office. Do not uninstall this module if you have a current subscription.');
-        $this->description_full = $this->l('Associate your shop with your PrestaShop account to activate and manage your subscriptions in your back office. Do not uninstall this module if you have a current subscription.');
+        $this->description = $this->l('Link your store to your PrestaShop account to activate and manage your subscriptions in your back office. Do not uninstall this module if you have a current subscription.');
+        $this->description_full = $this->l('Link your store to your PrestaShop account to activate and manage your subscriptions in your back office. Do not uninstall this module if you have a current subscription.');
         $this->confirmUninstall = $this->l('This action will prevent immediately your PrestaShop services and Community services from working as they are using PrestaShop Accounts module for authentication.');
 
         $this->ps_versions_compliancy = ['min' => '1.6.1', 'max' => _PS_VERSION_];

translations/de.php

@@ -20,13 +20,13 @@
 global $_MODULE;
 $_MODULE = [];
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_40047b296fb8a4952e0512c7184e1ca3'] = 'PrestaShop Account';
-$_MODULE['<{ps_accounts}prestashop>ps_accounts_9006e8a0d8ca7f627146d32bc9c0eb73'] = 'Verknüpfen Sie Ihren Shop mit Ihrem PrestaShop Account, um Ihre Abonnements in Ihrem Backoffice zu aktivieren und zu verwalten. Deinstallieren Sie dieses Modul nicht, solange Sie ein aktives Abonnement haben.';
+$_MODULE['<{ps_accounts}prestashop>ps_accounts_248ed4a0f71472c36d19bb0f1bcb68a0'] = 'Verknüpfen Sie Ihren Shop mit Ihrem PrestaShop Account, um Ihre Abonnements in Ihrem Backoffice zu aktivieren und zu verwalten. Deinstallieren Sie dieses Modul nicht, solange Sie ein aktives Abonnement haben.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_ceeadaf870d9eaa81cf1fbe32614af64'] = 'Wenn Sie diese Aktion durchführen, werden Ihre PrestaShop-Dienste und Community-Dienste nicht mehr ordnungsgemäß funktionieren, da sie zur Authentifizierung das PrestaShop-Accounts-Modul nutzen.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_01a84505e1f42ba1b80ffed4f9f21221'] = 'Dieser Shop ist mit Ihrem PrestaShop Account verknüpft. Heben Sie die Verknüpfung Ihres Shops auf, wenn Ihre Live-Einstellungen nicht beeinträchtigt werden sollen.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_d82864f800210969f401370615e30568'] = 'Einige Shops sind mit Ihrem PrestaShop Account verknüpft. Wenn Sie diese Shops löschen, hat dies Auswirkungen auf Ihre Live-Einstellungen.';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_f4f70727dc34561dfde1a3c529b6205c'] = 'Einstellungen';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Hilfe';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_b7ca62f12bc3b8e0d6422c028473a265'] = 'Ihr PrestaShop Account';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_518d650937979216a269cf9830a7b484'] = 'Ein Konto zur zentralen Verwaltung all Ihrer PrestaShop-Shops';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_53c4c7fe12fffd658daacfa5b41eb495'] = 'Ein Konto zur zentralen Verwaltung all Ihrer PrestaShop-Shops';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_655aa4af96bbb20cf78e14b560affb38'] = 'Erstellen Sie Ihren PrestaShop Account oder melden Sie sich bei Ihrem bestehenden Konto an';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_d23c41d498fe8587fb2f6ac563426dce'] = 'Verknüpfen Sie Ihren Shop mit Ihrem Konto';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_a60d78ec73c0c133ce16b10419a3fdf6'] = 'Verknüpfen Sie Ihren Shop mit Ihrem Konto';

translations/en.php

@@ -20,13 +20,13 @@
 global $_MODULE;
 $_MODULE = [];
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_40047b296fb8a4952e0512c7184e1ca3'] = 'PrestaShop Account';
-$_MODULE['<{ps_accounts}prestashop>ps_accounts_9006e8a0d8ca7f627146d32bc9c0eb73'] = 'Associate your shop with your PrestaShop account to activate and manage your subscriptions in your back office. Do not uninstall this module if you have a current subscription.';
+$_MODULE['<{ps_accounts}prestashop>ps_accounts_248ed4a0f71472c36d19bb0f1bcb68a0'] = 'Link your store to your PrestaShop account to activate and manage your subscriptions in your back office. Do not uninstall this module if you have a current subscription.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_ceeadaf870d9eaa81cf1fbe32614af64'] = 'This action will prevent immediately your PrestaShop services and Community services from working as they are using PrestaShop Accounts module for authentication.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_01a84505e1f42ba1b80ffed4f9f21221'] = 'This shop is linked to your PrestaShop account. Unlink your shop if you do not want to impact your live settings.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_d82864f800210969f401370615e30568'] = 'Some shops are linked to your PrestaShop account. Delete these shops will impact your live settings.';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_f4f70727dc34561dfde1a3c529b6205c'] = 'Settings';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Help';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_b7ca62f12bc3b8e0d6422c028473a265'] = 'Your PrestaShop account';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_518d650937979216a269cf9830a7b484'] = 'One account to manage all your PrestaShop shops';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_53c4c7fe12fffd658daacfa5b41eb495'] = 'One account to manage all your PrestaShop stores';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_655aa4af96bbb20cf78e14b560affb38'] = 'Create your PrestaShop account or login to your existing account';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_d23c41d498fe8587fb2f6ac563426dce'] = 'Associate your shop with your account';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_a60d78ec73c0c133ce16b10419a3fdf6'] = 'Link your store to your account';

translations/es.php

@@ -20,13 +20,13 @@
 global $_MODULE;
 $_MODULE = [];
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_40047b296fb8a4952e0512c7184e1ca3'] = 'PrestaShop Account';
-$_MODULE['<{ps_accounts}prestashop>ps_accounts_9006e8a0d8ca7f627146d32bc9c0eb73'] = 'Vincula tu tienda a tu cuenta PrestaShop para activar y gestionar tus suscripciones en tu back office. No desinstales este módulo si tienes una suscripción vigente.';
+$_MODULE['<{ps_accounts}prestashop>ps_accounts_248ed4a0f71472c36d19bb0f1bcb68a0'] = 'Vincula tu tienda a tu cuenta PrestaShop para activar y gestionar tus suscripciones en tu back office. No desinstales este módulo si tienes una suscripción vigente.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_ceeadaf870d9eaa81cf1fbe32614af64'] = 'Esta acción impedirá inmediatamente que tus servicios PrestaShop y los servicios de la Comunidad funcionen, ya que utilizan el módulo PrestaShop Account para la autenticación.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_01a84505e1f42ba1b80ffed4f9f21221'] = 'Esta tienda está vinculada a tu cuenta PrestaShop. Desvincula tu tienda si no quieres que afecte a tu configuración live.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_d82864f800210969f401370615e30568'] = 'Algunas tiendas están vinculadas a tu cuenta PrestaShop. La eliminación de estas tiendas afectará a tu configuración live.';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_f4f70727dc34561dfde1a3c529b6205c'] = 'Configuración';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Centro de ayuda';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_b7ca62f12bc3b8e0d6422c028473a265'] = 'Tu cuenta PrestaShop';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_518d650937979216a269cf9830a7b484'] = 'Una cuenta para gestionar todas tus tiendas PrestaShop';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_53c4c7fe12fffd658daacfa5b41eb495'] = 'Una cuenta para gestionar todas tus tiendas PrestaShop';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_655aa4af96bbb20cf78e14b560affb38'] = 'Crea tu cuenta PrestaShop o inicia sesión en tu cuenta existente';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_d23c41d498fe8587fb2f6ac563426dce'] = 'Vincula tu tienda a tu cuenta';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_a60d78ec73c0c133ce16b10419a3fdf6'] = 'Vincula tu tienda a tu cuenta';

translations/fr.php

@@ -20,13 +20,13 @@
 global $_MODULE;
 $_MODULE = [];
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_40047b296fb8a4952e0512c7184e1ca3'] = 'PrestaShop Account';
-$_MODULE['<{ps_accounts}prestashop>ps_accounts_9006e8a0d8ca7f627146d32bc9c0eb73'] = 'Associez votre boutique à votre compte PrestaShop pour activer et gérer vos abonnements dans votre back office. Ne désinstallez pas ce module si vous avez un abonnement en cours.';
+$_MODULE['<{ps_accounts}prestashop>ps_accounts_248ed4a0f71472c36d19bb0f1bcb68a0'] = 'Associez votre boutique à votre compte PrestaShop pour activer et gérer vos abonnements dans votre back office. Ne désinstallez pas ce module si vous avez un abonnement en cours.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_ceeadaf870d9eaa81cf1fbe32614af64'] = 'Cette action empêchera immédiatement vos services PrestaShop et Community Services de fonctionner car ils utilisent le module PrestaShop Account pour l\'authentification.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_01a84505e1f42ba1b80ffed4f9f21221'] = 'Votre boutique est liée avec PrestaShop account. Veuillez délier votre boutique si vous ne voulez pas impacter les changements sur Prestashop account.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_d82864f800210969f401370615e30568'] = 'Certaines de vos boutiques sont liées avec PrestaShop account. Supprimer une de ces boutiques impactera les changements sur Prestashop account.';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_f4f70727dc34561dfde1a3c529b6205c'] = 'Paramètres';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Aide';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_b7ca62f12bc3b8e0d6422c028473a265'] = 'Votre compte PrestaShop';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_518d650937979216a269cf9830a7b484'] = 'Un seul compte pour gérer toutes vos boutiques PrestaShop';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_53c4c7fe12fffd658daacfa5b41eb495'] = 'Un seul compte pour gérer tous vos abonnements PrestaShop';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_655aa4af96bbb20cf78e14b560affb38'] = 'Créer votre compte PrestaShop ou vous connecter à votre compte existant';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_d23c41d498fe8587fb2f6ac563426dce'] = 'Associez votre boutique à votre compte';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_a60d78ec73c0c133ce16b10419a3fdf6'] = 'Associez votre boutique à votre compte';

translations/it.php

@@ -20,13 +20,13 @@
 global $_MODULE;
 $_MODULE = [];
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_40047b296fb8a4952e0512c7184e1ca3'] = 'Account PrestaShop';
-$_MODULE['<{ps_accounts}prestashop>ps_accounts_9006e8a0d8ca7f627146d32bc9c0eb73'] = 'Associa il tuo negozio al tuo account PrestaShop per attivare e gestire i tuoi abbonamenti nel tuo back office. Non disinstallare questo modulo se hai un abbonamento in corso.';
+$_MODULE['<{ps_accounts}prestashop>ps_accounts_248ed4a0f71472c36d19bb0f1bcb68a0'] = 'Associa il tuo negozio al tuo account PrestaShop per attivare e gestire i tuoi abbonamenti nel tuo back office. Non disinstallare questo modulo se hai un abbonamento in corso.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_ceeadaf870d9eaa81cf1fbe32614af64'] = 'Questa azione impedirà immediatamente il funzionamento dei tuoi servizi PrestaShop e di quelli della Community che utilizzano il modulo PrestaShop Accounts per l\'autenticazione.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_01a84505e1f42ba1b80ffed4f9f21221'] = 'Questo negozio è collegato al tuo account PrestaShop. Disconnetti il tuo negozio se non vuoi avere un impatto sulle tue impostazioni live.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_d82864f800210969f401370615e30568'] = 'Alcuni negozi sono collegati al tuo account PrestaShop. La cancellazione di questi negozi avrà un impatto sulle tue impostazioni live.';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_f4f70727dc34561dfde1a3c529b6205c'] = 'Impostazioni';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Assistenza';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_b7ca62f12bc3b8e0d6422c028473a265'] = 'Il tuo account PrestaShop';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_518d650937979216a269cf9830a7b484'] = 'Un solo account per gestire tutti i tuoi negozi PrestaShop';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_53c4c7fe12fffd658daacfa5b41eb495'] = 'Un solo account per gestire tutti i tuoi negozi PrestaShop';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_655aa4af96bbb20cf78e14b560affb38'] = 'Crea il tuo account PrestaShop o accedi al tuo account esistente';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_d23c41d498fe8587fb2f6ac563426dce'] = 'Collega il tuo negozio al tuo account';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_a60d78ec73c0c133ce16b10419a3fdf6'] = 'Collega il tuo negozio al tuo account';

translations/nl.php

@@ -20,13 +20,13 @@
 global $_MODULE;
 $_MODULE = [];
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_40047b296fb8a4952e0512c7184e1ca3'] = 'PrestaShop-account';
-$_MODULE['<{ps_accounts}prestashop>ps_accounts_9006e8a0d8ca7f627146d32bc9c0eb73'] = 'Koppel uw winkel aan uw PrestaShop account om uw abonnementen te activeren en te beheren in uw backoffice. De-installeer deze module niet als u een lopend abonnement hebt.';
+$_MODULE['<{ps_accounts}prestashop>ps_accounts_248ed4a0f71472c36d19bb0f1bcb68a0'] = 'Koppel uw winkel aan uw PrestaShop account om uw abonnementen te activeren en te beheren in uw backoffice. De-installeer deze module niet als u een lopend abonnement hebt.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_ceeadaf870d9eaa81cf1fbe32614af64'] = 'Deze actie zal onmiddellijk voorkomen dat uw PrestaShop diensten en communautaire diensten werken als ze PrestaShop Accounts module voor authenticatie gebruiken.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_01a84505e1f42ba1b80ffed4f9f21221'] = 'Deze winkel is gekoppeld aan uw PrestaShop account. Unlink uw winkel als u niet wilt dat uw live-instellingen beïnvloeden.';
 $_MODULE['<{ps_accounts}prestashop>ps_accounts_d82864f800210969f401370615e30568'] = 'Sommige winkels zijn gekoppeld aan uw PrestaShop account. Verwijderen van deze winkels zal invloed hebben op uw live-instellingen.';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_f4f70727dc34561dfde1a3c529b6205c'] = 'Instellingen';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Help';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_b7ca62f12bc3b8e0d6422c028473a265'] = 'Uw PrestaShop account';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_518d650937979216a269cf9830a7b484'] = 'Eén account om al uw PrestaShop winkels te beheren';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_53c4c7fe12fffd658daacfa5b41eb495'] = 'Eén account om al uw PrestaShop winkels te beheren';
 $_MODULE['<{ps_accounts}prestashop>settingstranslations_655aa4af96bbb20cf78e14b560affb38'] = 'Maak uw PrestaShop account aan of log in op uw bestaande account';
-$_MODULE['<{ps_accounts}prestashop>settingstranslations_d23c41d498fe8587fb2f6ac563426dce'] = 'Koppel uw winkel aan uw account';
+$_MODULE['<{ps_accounts}prestashop>settingstranslations_a60d78ec73c0c133ce16b10419a3fdf6'] = 'Koppel uw winkel aan uw account';