From 04728bffb110e050698feeac887345fa75a2168b Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Mon, 3 Jul 2023 12:47:30 +0000 Subject: [PATCH 01/69] Do not add filterCategoryRef if category is other (#593) --- src/Addons/Provider/LinksProvider.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Addons/Provider/LinksProvider.php b/src/Addons/Provider/LinksProvider.php index 104e32364..f43dc459d 100644 --- a/src/Addons/Provider/LinksProvider.php +++ b/src/Addons/Provider/LinksProvider.php @@ -133,9 +133,12 @@ public function getCategoryLink(string $categoryName): string { $category = $this->getCategoryByName($categoryName); - return $this->router->generate('admin_mbo_catalog_module', [ - 'filterCategoryRef' => $category ? $category->refMenu : '', - ]); + $routeParams = []; + if ($category && 'other' !== mb_strtolower($categoryName)) { + $routeParams['filterCategoryRef'] = $category->refMenu; + } + + return $this->router->generate('admin_mbo_catalog_module', $routeParams); } /** From 1478fd1fe3fb4956421fe2eafb5f6851cd37eaee Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Tue, 13 Jun 2023 11:27:35 +0000 Subject: [PATCH 02/69] [MBO-829] Redirect to Modules catalog if contextual tabClassName is not given --- .../Admin/ModuleRecommendedController.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Controller/Admin/ModuleRecommendedController.php b/src/Controller/Admin/ModuleRecommendedController.php index d70121f85..421d310c5 100644 --- a/src/Controller/Admin/ModuleRecommendedController.php +++ b/src/Controller/Admin/ModuleRecommendedController.php @@ -23,7 +23,9 @@ use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController; use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RequestStack; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException; /** @@ -47,14 +49,23 @@ public function __construct( } /** - * @return JsonResponse + * @return JsonResponse|RedirectResponse */ - public function indexAction(): JsonResponse + public function indexAction(): Response { $response = new JsonResponse(); try { - $tabCollection = $this->get('mbo.tab.collection.provider')->getTabCollection(); $tabClassName = $this->requestStack->getCurrentRequest()->get('tabClassName'); + if (null === $tabClassName) { // In case the recommended modules page is requested without giving tab context, we redirect to Modules catalog page + $routeParams = []; + $query = \Tools::getValue('bo_query'); + if (false !== $query && !empty(trim($query))) { + $routeParams['keyword'] = trim($query); + } + + return $this->redirectToRoute('admin_mbo_catalog_module', $routeParams); + } + $tabCollection = $this->get('mbo.tab.collection.provider')->getTabCollection(); $tab = $tabCollection->getTab($tabClassName); $context = $this->get('mbo.cdc.context_builder')->getRecommendedModulesContext($tab); $context['recommendation_format'] = $this->requestStack->getCurrentRequest()->get('recommendation_format'); From 42977dbb8d83f200e0658f03b8b60cdd6490ca92 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Thu, 15 Jun 2023 09:28:02 +0000 Subject: [PATCH 03/69] Add htaccess to forbid directory listing and access to env files --- .htaccess | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .htaccess diff --git a/.htaccess b/.htaccess new file mode 100644 index 000000000..1c55a9a4e --- /dev/null +++ b/.htaccess @@ -0,0 +1,13 @@ +# Disable index view +Options -Indexes + +# Hide a specific file + + Order allow,deny + Deny from all + + + + Order allow,deny + Deny from all + From 4bf8daf461d66b5a162331a54b0320d12cba472e Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Mon, 3 Jul 2023 12:47:30 +0000 Subject: [PATCH 04/69] Do not add filterCategoryRef if category is other (#593) --- src/Addons/Provider/LinksProvider.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Addons/Provider/LinksProvider.php b/src/Addons/Provider/LinksProvider.php index 104e32364..f43dc459d 100644 --- a/src/Addons/Provider/LinksProvider.php +++ b/src/Addons/Provider/LinksProvider.php @@ -133,9 +133,12 @@ public function getCategoryLink(string $categoryName): string { $category = $this->getCategoryByName($categoryName); - return $this->router->generate('admin_mbo_catalog_module', [ - 'filterCategoryRef' => $category ? $category->refMenu : '', - ]); + $routeParams = []; + if ($category && 'other' !== mb_strtolower($categoryName)) { + $routeParams['filterCategoryRef'] = $category->refMenu; + } + + return $this->router->generate('admin_mbo_catalog_module', $routeParams); } /** From 0e32434ee1f2c84392ada8cf17aeb3c8518b4a61 Mon Sep 17 00:00:00 2001 From: Vincent Garcia Date: Mon, 3 Jul 2023 14:39:30 +0200 Subject: [PATCH 05/69] feat(Context): :sparkles: Add data in context. Adding Module catalog URL & Theme catalog URL to be sure to have them everytime with the correct token. Adding PHP version for future use. --- src/Service/View/ContextBuilder.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Service/View/ContextBuilder.php b/src/Service/View/ContextBuilder.php index 48711f469..e773fcb07 100644 --- a/src/Service/View/ContextBuilder.php +++ b/src/Service/View/ContextBuilder.php @@ -177,6 +177,9 @@ private function getCommonContextContent(): array 'accounts_user_id' => $this->accountsDataProvider->getAccountsUserId(), 'accounts_shop_id' => $this->accountsDataProvider->getAccountsShopId(), 'accounts_token' => $this->accountsDataProvider->getAccountsToken(), + 'module_catalog_url' => $this->router->generate('admin_mbo_catalog_module'), + 'theme_catalog_url' => $this->router->generate('admin_mbo_catalog_theme'), + 'php_version' => phpversion(), ]; } From 434846ffb2e6c5d8109b012da28f7ac2f4d558a0 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:30 +0000 Subject: [PATCH 06/69] New translations ModulesMboErrors.en-US.xlf (Romanian) --- translations/ro-RO/ModulesMboErrors.ro-RO.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ro-RO/ModulesMboErrors.ro-RO.xlf b/translations/ro-RO/ModulesMboErrors.ro-RO.xlf index 0920341e8..31ce8228f 100644 --- a/translations/ro-RO/ModulesMboErrors.ro-RO.xlf +++ b/translations/ro-RO/ModulesMboErrors.ro-RO.xlf @@ -5,7 +5,7 @@ PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. - Line: 105 + Line: 104 From a2f3b5dc84dd42f1ead0a2401044efb857a483f9 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:31 +0000 Subject: [PATCH 07/69] New translations ModulesMboErrors.en-US.xlf (French) --- translations/fr-FR/ModulesMboErrors.fr-FR.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/fr-FR/ModulesMboErrors.fr-FR.xlf b/translations/fr-FR/ModulesMboErrors.fr-FR.xlf index d408b13ce..8410dcda1 100644 --- a/translations/fr-FR/ModulesMboErrors.fr-FR.xlf +++ b/translations/fr-FR/ModulesMboErrors.fr-FR.xlf @@ -5,7 +5,7 @@ PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. PrestaShop n'a pas pu se connecter à Addons. Veuillez vérifier vos identifiants et votre connexion Internet. - Line: 105 + Line: 104 From 03006dd3ca8e256796fae007289ae0ebf9d86e59 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:32 +0000 Subject: [PATCH 08/69] New translations ModulesMboErrors.en-US.xlf (Spanish) --- translations/es-ES/ModulesMboErrors.es-ES.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/es-ES/ModulesMboErrors.es-ES.xlf b/translations/es-ES/ModulesMboErrors.es-ES.xlf index 6dd9bbcb1..5d10e0ae4 100644 --- a/translations/es-ES/ModulesMboErrors.es-ES.xlf +++ b/translations/es-ES/ModulesMboErrors.es-ES.xlf @@ -5,7 +5,7 @@ PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. PrestaShop no pudo iniciar sesión en Addons. Por favor verifica tus datos de acceso y tu conexión de Internet. - Line: 105 + Line: 104 From 6518324b4ef66092b9154104788888090a2d9771 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:33 +0000 Subject: [PATCH 09/69] New translations ModulesMboErrors.en-US.xlf (German) --- translations/de-DE/ModulesMboErrors.de-DE.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/de-DE/ModulesMboErrors.de-DE.xlf b/translations/de-DE/ModulesMboErrors.de-DE.xlf index 74121a6bd..7d1122e68 100644 --- a/translations/de-DE/ModulesMboErrors.de-DE.xlf +++ b/translations/de-DE/ModulesMboErrors.de-DE.xlf @@ -5,7 +5,7 @@ PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. PrestaShop konnte sich nicht bei Addons anmelden. Überprüfen Sie bitte Ihre Zugangsdaten und Ihre Internetverbindung. - Line: 105 + Line: 104 From 6c49e62d32ba0d165a78540b8542b1fcc8a15037 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:34 +0000 Subject: [PATCH 10/69] New translations ModulesMboErrors.en-US.xlf (Italian) --- translations/it-IT/ModulesMboErrors.it-IT.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/it-IT/ModulesMboErrors.it-IT.xlf b/translations/it-IT/ModulesMboErrors.it-IT.xlf index 2d2161d97..a807fb3d9 100644 --- a/translations/it-IT/ModulesMboErrors.it-IT.xlf +++ b/translations/it-IT/ModulesMboErrors.it-IT.xlf @@ -5,7 +5,7 @@ PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. PrestaShop non ha potuto accedere ad Addons. Si prega di controllare le tue credenziali e la tua connessione Internet. - Line: 105 + Line: 104 From b21871332dda442f81db34f400d79cb9b05a92a3 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:35 +0000 Subject: [PATCH 11/69] New translations ModulesMboErrors.en-US.xlf (Dutch) --- translations/nl-NL/ModulesMboErrors.nl-NL.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/nl-NL/ModulesMboErrors.nl-NL.xlf b/translations/nl-NL/ModulesMboErrors.nl-NL.xlf index 9bebde7d6..bf0d80755 100644 --- a/translations/nl-NL/ModulesMboErrors.nl-NL.xlf +++ b/translations/nl-NL/ModulesMboErrors.nl-NL.xlf @@ -5,7 +5,7 @@ PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. Prestashop is er niet in geslaagd om u aan te melden bij Addons, check uw gegevens en uw internet connectie. - Line: 105 + Line: 104 From ebbee9f667852a3276085197c283b4699faf9e7e Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:36 +0000 Subject: [PATCH 12/69] New translations ModulesMboErrors.en-US.xlf (Polish) --- translations/pl-PL/ModulesMboErrors.pl-PL.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/pl-PL/ModulesMboErrors.pl-PL.xlf b/translations/pl-PL/ModulesMboErrors.pl-PL.xlf index 38d810f31..5c839e6cc 100644 --- a/translations/pl-PL/ModulesMboErrors.pl-PL.xlf +++ b/translations/pl-PL/ModulesMboErrors.pl-PL.xlf @@ -5,7 +5,7 @@ PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. PrestaShop nie mógł zalogować się do Dodatków, sprawdź swoje uprawnienia i połączenie internetowe. - Line: 105 + Line: 104 From 3a59cbf557dafa606a67f89a214101e038db360c Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:37 +0000 Subject: [PATCH 13/69] New translations ModulesMboErrors.en-US.xlf (Portuguese) --- translations/pt-PT/ModulesMboErrors.pt-PT.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/pt-PT/ModulesMboErrors.pt-PT.xlf b/translations/pt-PT/ModulesMboErrors.pt-PT.xlf index 5004f6df6..57f351104 100644 --- a/translations/pt-PT/ModulesMboErrors.pt-PT.xlf +++ b/translations/pt-PT/ModulesMboErrors.pt-PT.xlf @@ -5,7 +5,7 @@ PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. PrestaShop não conseguiu autenticar-se nos Addons. Por favor verifique as suas credenciais e se está ligado à internet. - Line: 105 + Line: 104 @@ -13,7 +13,7 @@ It looks like we have trouble connecting to Addons. Please refresh the page or check your firewall configuration. - Parece que nós temos problemas em ligar aos «Extars». Por favor, atualzie a página ou verifique a configuração da sua <i>firewall</i>. + Parece que nós temos problemas em ligar aos «Extars». Por favor, atualzie a página ou verifique a configuração da sua firewall. Line: 32 From 881557a7e5462f22bdb378e9ce20ee27b2845f81 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:38 +0000 Subject: [PATCH 14/69] New translations ModulesMboErrors.en-US.xlf (Russian) --- translations/ru-RU/ModulesMboErrors.ru-RU.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ru-RU/ModulesMboErrors.ru-RU.xlf b/translations/ru-RU/ModulesMboErrors.ru-RU.xlf index f72efda08..f854117d0 100644 --- a/translations/ru-RU/ModulesMboErrors.ru-RU.xlf +++ b/translations/ru-RU/ModulesMboErrors.ru-RU.xlf @@ -5,7 +5,7 @@ PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection. PrestaShop не может войти в систему Addons, пожалуйста, проверьте свои данные и интернет-соединение. - Line: 105 + Line: 104 From 257f62817309d5ab8bffde50d0f5d9c2d40a0b80 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:39 +0000 Subject: [PATCH 15/69] New translations ModulesMboGlobal.en-US.xlf (Romanian) --- translations/ro-RO/ModulesMboGlobal.ro-RO.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/ro-RO/ModulesMboGlobal.ro-RO.xlf b/translations/ro-RO/ModulesMboGlobal.ro-RO.xlf index cf1c02c9c..4c02e2088 100644 --- a/translations/ro-RO/ModulesMboGlobal.ro-RO.xlf +++ b/translations/ro-RO/ModulesMboGlobal.ro-RO.xlf @@ -24,17 +24,17 @@ Oh no.. something went wrong Oh no.. something went wrong - Line: 5 + Line: 23 There has been a problem on our side. Refresh your page and if the problem persists, try again later. There has been a problem on our side. Refresh your page and if the problem persists, try again later. - Line: 8 + Line: 26 Refresh page Refresh page - Line: 13 + Line: 31 From 9d8d79a9f47af7b897cd95fbe1dc78a614f8e69e Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:40 +0000 Subject: [PATCH 16/69] New translations ModulesMboGlobal.en-US.xlf (French) --- translations/fr-FR/ModulesMboGlobal.fr-FR.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/fr-FR/ModulesMboGlobal.fr-FR.xlf b/translations/fr-FR/ModulesMboGlobal.fr-FR.xlf index 70466e799..4ae66e6b6 100644 --- a/translations/fr-FR/ModulesMboGlobal.fr-FR.xlf +++ b/translations/fr-FR/ModulesMboGlobal.fr-FR.xlf @@ -24,17 +24,17 @@ Oh no.. something went wrong Oh non... Quelque chose s'est mal passé - Line: 5 + Line: 23 There has been a problem on our side. Refresh your page and if the problem persists, try again later. Il y a eu un problème de notre côté. Actualisez votre page et si le problème persiste, réessayez plus tard. - Line: 8 + Line: 26 Refresh page Rafraîchir la page - Line: 13 + Line: 31 From 111c9a51938c314ac27c6ecd9623a21ccd114183 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:40 +0000 Subject: [PATCH 17/69] New translations ModulesMboGlobal.en-US.xlf (Spanish) --- translations/es-ES/ModulesMboGlobal.es-ES.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/es-ES/ModulesMboGlobal.es-ES.xlf b/translations/es-ES/ModulesMboGlobal.es-ES.xlf index 04b2bb05d..c5c276b7f 100644 --- a/translations/es-ES/ModulesMboGlobal.es-ES.xlf +++ b/translations/es-ES/ModulesMboGlobal.es-ES.xlf @@ -24,17 +24,17 @@ Oh no.. something went wrong Oh no... algo salió mal - Line: 5 + Line: 23 There has been a problem on our side. Refresh your page and if the problem persists, try again later. Ha habido un problema por nuestro lado. Actualice su página y si el problema persiste, inténtelo de nuevo más tarde. - Line: 8 + Line: 26 Refresh page Actualizar la página - Line: 13 + Line: 31 From a5c2d3800cbf0176c16feceedd431b7ef032e346 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:41 +0000 Subject: [PATCH 18/69] New translations ModulesMboGlobal.en-US.xlf (German) --- translations/de-DE/ModulesMboGlobal.de-DE.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/de-DE/ModulesMboGlobal.de-DE.xlf b/translations/de-DE/ModulesMboGlobal.de-DE.xlf index 806993567..d1547cf71 100644 --- a/translations/de-DE/ModulesMboGlobal.de-DE.xlf +++ b/translations/de-DE/ModulesMboGlobal.de-DE.xlf @@ -24,17 +24,17 @@ Oh no.. something went wrong Oh nein... etwas ist schief gelaufen - Line: 5 + Line: 23 There has been a problem on our side. Refresh your page and if the problem persists, try again later. Es gab ein Problem auf unserer Seite. Aktualisieren Sie Ihre Seite und wenn das Problem weiterhin besteht, versuchen Sie es später erneut. - Line: 8 + Line: 26 Refresh page Seite aktualisieren - Line: 13 + Line: 31 From 0c300fe7130da1f47762b361f5fe9f79bf5a234c Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:42 +0000 Subject: [PATCH 19/69] New translations ModulesMboGlobal.en-US.xlf (Italian) --- translations/it-IT/ModulesMboGlobal.it-IT.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/it-IT/ModulesMboGlobal.it-IT.xlf b/translations/it-IT/ModulesMboGlobal.it-IT.xlf index b7a25ebae..c5ca4e72f 100644 --- a/translations/it-IT/ModulesMboGlobal.it-IT.xlf +++ b/translations/it-IT/ModulesMboGlobal.it-IT.xlf @@ -24,17 +24,17 @@ Oh no.. something went wrong Oh no... qualcosa è andato storto - Line: 5 + Line: 23 There has been a problem on our side. Refresh your page and if the problem persists, try again later. C'è stato un problema da parte nostra. Aggiorna la tua pagina e se il problema persiste, riprova più tardi. - Line: 8 + Line: 26 Refresh page Aggiorna la pagina - Line: 13 + Line: 31 From 8d5e9fd247da64714ffb117e01095e7ece3467e6 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:43 +0000 Subject: [PATCH 20/69] New translations ModulesMboGlobal.en-US.xlf (Dutch) --- translations/nl-NL/ModulesMboGlobal.nl-NL.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/nl-NL/ModulesMboGlobal.nl-NL.xlf b/translations/nl-NL/ModulesMboGlobal.nl-NL.xlf index 7a5cfb114..56330cc0b 100644 --- a/translations/nl-NL/ModulesMboGlobal.nl-NL.xlf +++ b/translations/nl-NL/ModulesMboGlobal.nl-NL.xlf @@ -24,17 +24,17 @@ Oh no.. something went wrong Oh nee... er is iets misgegaan - Line: 5 + Line: 23 There has been a problem on our side. Refresh your page and if the problem persists, try again later. Er was een probleem aan onze kant. Vernieuw uw pagina en als het probleem zich blijft voordoen, probeer het later opnieuw. - Line: 8 + Line: 26 Refresh page Vernieuw pagina - Line: 13 + Line: 31 From e80dfe8cc1f591fc3d743f9d6642711949869ab3 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:44 +0000 Subject: [PATCH 21/69] New translations ModulesMboGlobal.en-US.xlf (Polish) --- translations/pl-PL/ModulesMboGlobal.pl-PL.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/pl-PL/ModulesMboGlobal.pl-PL.xlf b/translations/pl-PL/ModulesMboGlobal.pl-PL.xlf index 2eafca514..f46e3c5ae 100644 --- a/translations/pl-PL/ModulesMboGlobal.pl-PL.xlf +++ b/translations/pl-PL/ModulesMboGlobal.pl-PL.xlf @@ -24,17 +24,17 @@ Oh no.. something went wrong O nie... coś poszło nie tak - Line: 5 + Line: 23 There has been a problem on our side. Refresh your page and if the problem persists, try again later. Po naszej stronie wystąpił problem. Odśwież stronę, a jeśli problem będzie się powtarzał, spróbuj ponownie później. - Line: 8 + Line: 26 Refresh page Odśwież stronę - Line: 13 + Line: 31 From ecb9127415b75fd2676b8536bf9a883ee67e0025 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:45 +0000 Subject: [PATCH 22/69] New translations ModulesMboGlobal.en-US.xlf (Portuguese) --- translations/pt-PT/ModulesMboGlobal.pt-PT.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/pt-PT/ModulesMboGlobal.pt-PT.xlf b/translations/pt-PT/ModulesMboGlobal.pt-PT.xlf index 39104e189..f1f2c0072 100644 --- a/translations/pt-PT/ModulesMboGlobal.pt-PT.xlf +++ b/translations/pt-PT/ModulesMboGlobal.pt-PT.xlf @@ -24,17 +24,17 @@ Oh no.. something went wrong Oh não... algo correu mal - Line: 5 + Line: 23 There has been a problem on our side. Refresh your page and if the problem persists, try again later. Houve um problema em nosso lado. Atualize sua página e, se o problema persistir, tente novamente mais tarde. - Line: 8 + Line: 26 Refresh page Atualizar página - Line: 13 + Line: 31 From dc46c14798200a24954357b8868c695695382bbf Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:46 +0000 Subject: [PATCH 23/69] New translations ModulesMboGlobal.en-US.xlf (Russian) --- translations/ru-RU/ModulesMboGlobal.ru-RU.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/ru-RU/ModulesMboGlobal.ru-RU.xlf b/translations/ru-RU/ModulesMboGlobal.ru-RU.xlf index 8138266ec..fa7977506 100644 --- a/translations/ru-RU/ModulesMboGlobal.ru-RU.xlf +++ b/translations/ru-RU/ModulesMboGlobal.ru-RU.xlf @@ -24,17 +24,17 @@ Oh no.. something went wrong О нет! Что-то пошло не так - Line: 5 + Line: 23 There has been a problem on our side. Refresh your page and if the problem persists, try again later. Возникла проблема с нашей стороной. Обновите страницу, и если проблема не устранена, попробуйте позже. - Line: 8 + Line: 26 Refresh page Обновить страницу - Line: 13 + Line: 31 From d2c3aa5b36909400a9eadd11d02401ee0b572e05 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:47 +0000 Subject: [PATCH 24/69] New translations ModulesMboLinks.en-US.xlf (Romanian) --- translations/ro-RO/ModulesMboLinks.ro-RO.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/ro-RO/ModulesMboLinks.ro-RO.xlf b/translations/ro-RO/ModulesMboLinks.ro-RO.xlf index b6e3a1f6f..07d2b6e92 100644 --- a/translations/ro-RO/ModulesMboLinks.ro-RO.xlf +++ b/translations/ro-RO/ModulesMboLinks.ro-RO.xlf @@ -2,15 +2,15 @@ - - https://accounts.distribution.prestashop.net/en/sign-up - https://accounts.distribution.prestashop.net/en/sign-up - Line: 123 + + https://authv2.prestashop.com/register + https://authv2.prestashop.com/register + Line: 122 - - https://auth.prestashop.com/en/password/request - https://auth.prestashop.com/en/password/request - Line: 130 + + https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request + Line: 129 From 86a6219ca522f664a43c0fc76be5fe40dbe1c7aa Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:48 +0000 Subject: [PATCH 25/69] New translations ModulesMboLinks.en-US.xlf (French) --- translations/fr-FR/ModulesMboLinks.fr-FR.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/fr-FR/ModulesMboLinks.fr-FR.xlf b/translations/fr-FR/ModulesMboLinks.fr-FR.xlf index 40e6fd16b..fca4ebe34 100644 --- a/translations/fr-FR/ModulesMboLinks.fr-FR.xlf +++ b/translations/fr-FR/ModulesMboLinks.fr-FR.xlf @@ -2,15 +2,15 @@ - - https://accounts.distribution.prestashop.net/en/sign-up - https://accounts.distribution.prestashop.net/fr/sign-up - Line: 123 + + https://authv2.prestashop.com/register + https://authv2.prestashop.com/register + Line: 122 - - https://auth.prestashop.com/en/password/request - https://auth.prestashop.com/fr/mot-de-passe/demande-de-reinitialisation - Line: 130 + + https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request + Line: 129 From 98920752b911f07b765fc426224b13047882b407 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:49 +0000 Subject: [PATCH 26/69] New translations ModulesMboLinks.en-US.xlf (Spanish) --- translations/es-ES/ModulesMboLinks.es-ES.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/es-ES/ModulesMboLinks.es-ES.xlf b/translations/es-ES/ModulesMboLinks.es-ES.xlf index 711405841..2d20e7e0e 100644 --- a/translations/es-ES/ModulesMboLinks.es-ES.xlf +++ b/translations/es-ES/ModulesMboLinks.es-ES.xlf @@ -2,15 +2,15 @@ - - https://accounts.distribution.prestashop.net/en/sign-up - https://accounts.distribution.prestashop.net/es/sign-up - Line: 123 + + https://authv2.prestashop.com/register + https://authv2.prestashop.com/register + Line: 122 - - https://auth.prestashop.com/en/password/request - https://auth.prestashop.com/es/contrasena/solicitud - Line: 130 + + https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request + Line: 129 From b8fcc840f76cb6e8384ce69f2e3569df1087cb55 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:49 +0000 Subject: [PATCH 27/69] New translations ModulesMboLinks.en-US.xlf (German) --- translations/de-DE/ModulesMboLinks.de-DE.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/de-DE/ModulesMboLinks.de-DE.xlf b/translations/de-DE/ModulesMboLinks.de-DE.xlf index 5058ff4e8..9432c76b0 100644 --- a/translations/de-DE/ModulesMboLinks.de-DE.xlf +++ b/translations/de-DE/ModulesMboLinks.de-DE.xlf @@ -2,15 +2,15 @@ - - https://accounts.distribution.prestashop.net/en/sign-up - https://accounts.distribution.prestashop.net/de/sign-up - Line: 123 + + https://authv2.prestashop.com/register + https://authv2.prestashop.com/register + Line: 122 - - https://auth.prestashop.com/en/password/request - https://auth.prestashop.com/de/passwort/anforderung - Line: 130 + + https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request + Line: 129 From 91d22f40687113f838625ceb07875b5e509a8495 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:50 +0000 Subject: [PATCH 28/69] New translations ModulesMboLinks.en-US.xlf (Italian) --- translations/it-IT/ModulesMboLinks.it-IT.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/it-IT/ModulesMboLinks.it-IT.xlf b/translations/it-IT/ModulesMboLinks.it-IT.xlf index cbd7899c9..552c05651 100644 --- a/translations/it-IT/ModulesMboLinks.it-IT.xlf +++ b/translations/it-IT/ModulesMboLinks.it-IT.xlf @@ -2,15 +2,15 @@ - - https://accounts.distribution.prestashop.net/en/sign-up - https://accounts.distribution.prestashop.net/it/sign-up - Line: 123 + + https://authv2.prestashop.com/register + https://authv2.prestashop.com/register + Line: 122 - - https://auth.prestashop.com/en/password/request - https://auth.prestashop.com/it/password/richiesta - Line: 130 + + https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request + Line: 129 From a4438ce442ef3659649e2d68ea80292fbd264dbc Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:51 +0000 Subject: [PATCH 29/69] New translations ModulesMboLinks.en-US.xlf (Dutch) --- translations/nl-NL/ModulesMboLinks.nl-NL.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/nl-NL/ModulesMboLinks.nl-NL.xlf b/translations/nl-NL/ModulesMboLinks.nl-NL.xlf index 28aab5c48..fd5800be4 100644 --- a/translations/nl-NL/ModulesMboLinks.nl-NL.xlf +++ b/translations/nl-NL/ModulesMboLinks.nl-NL.xlf @@ -2,15 +2,15 @@ - - https://accounts.distribution.prestashop.net/en/sign-up - https://accounts.distribution.prestashop.net/nl/sign-up - Line: 123 + + https://authv2.prestashop.com/register + https://authv2.prestashop.com/register + Line: 122 - - https://auth.prestashop.com/en/password/request - https://auth.prestashop.com/nl/wachtwoord/verzoek - Line: 130 + + https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request + Line: 129 From f3dc0f537e6a94b48785db1290b5676ab429dd2b Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:52 +0000 Subject: [PATCH 30/69] New translations ModulesMboLinks.en-US.xlf (Polish) --- translations/pl-PL/ModulesMboLinks.pl-PL.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/pl-PL/ModulesMboLinks.pl-PL.xlf b/translations/pl-PL/ModulesMboLinks.pl-PL.xlf index c8831d743..99a983c4d 100644 --- a/translations/pl-PL/ModulesMboLinks.pl-PL.xlf +++ b/translations/pl-PL/ModulesMboLinks.pl-PL.xlf @@ -2,15 +2,15 @@ - - https://accounts.distribution.prestashop.net/en/sign-up - https://accounts.distribution.prestashop.net/pl/sign-up - Line: 123 + + https://authv2.prestashop.com/register + https://authv2.prestashop.com/register + Line: 122 - - https://auth.prestashop.com/en/password/request - https://auth.prestashop.com/pl/haslo/zadanie - Line: 130 + + https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request + Line: 129 From 14060da5de39c9e7072d862e146eca305f10099a Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:53 +0000 Subject: [PATCH 31/69] New translations ModulesMboLinks.en-US.xlf (Portuguese) --- translations/pt-PT/ModulesMboLinks.pt-PT.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/pt-PT/ModulesMboLinks.pt-PT.xlf b/translations/pt-PT/ModulesMboLinks.pt-PT.xlf index c327bd1ad..eac4d28f0 100644 --- a/translations/pt-PT/ModulesMboLinks.pt-PT.xlf +++ b/translations/pt-PT/ModulesMboLinks.pt-PT.xlf @@ -2,15 +2,15 @@ - - https://accounts.distribution.prestashop.net/en/sign-up - https://accounts.distribution.prestashop.net/pt/sign-up - Line: 123 + + https://authv2.prestashop.com/register + https://authv2.prestashop.com/register + Line: 122 - - https://auth.prestashop.com/en/password/request - https://auth.prestashop.com/pt/senha/solicite-uma-nova-senh?lang=pt - Line: 130 + + https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request + Line: 129 From 7895f6aa8c01077c34ca4a78084a5a06485d1418 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:54 +0000 Subject: [PATCH 32/69] New translations ModulesMboLinks.en-US.xlf (Russian) --- translations/ru-RU/ModulesMboLinks.ru-RU.xlf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translations/ru-RU/ModulesMboLinks.ru-RU.xlf b/translations/ru-RU/ModulesMboLinks.ru-RU.xlf index 4973f14b4..75faa0c15 100644 --- a/translations/ru-RU/ModulesMboLinks.ru-RU.xlf +++ b/translations/ru-RU/ModulesMboLinks.ru-RU.xlf @@ -2,15 +2,15 @@ - - https://accounts.distribution.prestashop.net/en/sign-up - https://accounts.distribution.prestashop.net/en/sign-up - Line: 123 + + https://authv2.prestashop.com/register + https://authv2.prestashop.com/register + Line: 122 - - https://auth.prestashop.com/en/password/request - https://auth.prestashop.com/ru/пароль/запрос - Line: 130 + + https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request + Line: 129 From 771736458e8d8c98f67993f3d87e23396e342e89 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:55 +0000 Subject: [PATCH 33/69] New translations ModulesMboModulescatalog.en-US.xlf (Romanian) --- .../ro-RO/ModulesMboModulescatalog.ro-RO.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/ro-RO/ModulesMboModulescatalog.ro-RO.xlf b/translations/ro-RO/ModulesMboModulescatalog.ro-RO.xlf index 33cbbb6c4..e5ce030c5 100644 --- a/translations/ro-RO/ModulesMboModulescatalog.ro-RO.xlf +++ b/translations/ro-RO/ModulesMboModulescatalog.ro-RO.xlf @@ -5,17 +5,17 @@ Synchronized with Addons marketplace! Synchronized with Addons marketplace! - Line: 145 + Line: 143 Connected Connected - Line: 157 + Line: 155 Connected as Connected as - Line: 159 + Line: 156 @@ -24,17 +24,17 @@ Module %module% successfully upgraded. Module %module% successfully upgraded. - Line: 172 + Line: 171 Upgrade of module %module% failed. %error% Upgrade of module %module% failed. %error% - Line: 208 + Line: 207 Module %module% is already up to date Module %module% is already up to date - Line: 195 + Line: 194 @@ -52,7 +52,7 @@ Check for updates Check for updates - Line: 38 + Line: 46 From 2aa7228d52aba0393902ace06c0168f1ef9ed4b9 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:56 +0000 Subject: [PATCH 34/69] New translations ModulesMboModulescatalog.en-US.xlf (French) --- .../fr-FR/ModulesMboModulescatalog.fr-FR.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/fr-FR/ModulesMboModulescatalog.fr-FR.xlf b/translations/fr-FR/ModulesMboModulescatalog.fr-FR.xlf index 56742f2aa..8ad48af2a 100644 --- a/translations/fr-FR/ModulesMboModulescatalog.fr-FR.xlf +++ b/translations/fr-FR/ModulesMboModulescatalog.fr-FR.xlf @@ -5,17 +5,17 @@ Synchronized with Addons marketplace! Synchronisé avec PrestaShop Addons ! - Line: 145 + Line: 143 Connected Connecté - Line: 157 + Line: 155 Connected as Connecté en tant que - Line: 159 + Line: 156 @@ -24,17 +24,17 @@ Module %module% successfully upgraded. Le module %module% a été mis à jour avec succès. - Line: 172 + Line: 171 Upgrade of module %module% failed. %error% La mise à jour du module %module% a échoué. %error% - Line: 208 + Line: 207 Module %module% is already up to date Le module %module% est déjà à jour - Line: 195 + Line: 194 @@ -52,7 +52,7 @@ Check for updates Vérifier les mises à jour - Line: 38 + Line: 46 From 182c54a9fbc270e95a460454586b2fbb9c5d2150 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:57 +0000 Subject: [PATCH 35/69] New translations ModulesMboModulescatalog.en-US.xlf (Spanish) --- .../es-ES/ModulesMboModulescatalog.es-ES.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/es-ES/ModulesMboModulescatalog.es-ES.xlf b/translations/es-ES/ModulesMboModulescatalog.es-ES.xlf index 68821815a..346dbad55 100644 --- a/translations/es-ES/ModulesMboModulescatalog.es-ES.xlf +++ b/translations/es-ES/ModulesMboModulescatalog.es-ES.xlf @@ -5,17 +5,17 @@ Synchronized with Addons marketplace! ¡Sincronizado con Addons marketplace! - Line: 145 + Line: 143 Connected Conectado - Line: 157 + Line: 155 Connected as Conectado como - Line: 159 + Line: 156 @@ -24,17 +24,17 @@ Module %module% successfully upgraded. Módulo %module% actualizado con éxito. - Line: 172 + Line: 171 Upgrade of module %module% failed. %error% La actualización del módulo %module% ha fallado. %error% - Line: 208 + Line: 207 Module %module% is already up to date El módulo %module% ya está actualizado - Line: 195 + Line: 194 @@ -52,7 +52,7 @@ Check for updates Buscar actualizaciones - Line: 38 + Line: 46 From bfd27b127279cee2fcbd3da1f2f5dbdcdf5155ec Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:58 +0000 Subject: [PATCH 36/69] New translations ModulesMboModulescatalog.en-US.xlf (German) --- .../de-DE/ModulesMboModulescatalog.de-DE.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/de-DE/ModulesMboModulescatalog.de-DE.xlf b/translations/de-DE/ModulesMboModulescatalog.de-DE.xlf index 0d7834b26..096758cad 100644 --- a/translations/de-DE/ModulesMboModulescatalog.de-DE.xlf +++ b/translations/de-DE/ModulesMboModulescatalog.de-DE.xlf @@ -5,17 +5,17 @@ Synchronized with Addons marketplace! Mit dem Addons Marktplatz verbunden! - Line: 145 + Line: 143 Connected Angemeldet - Line: 157 + Line: 155 Connected as Angemeldet als - Line: 159 + Line: 156 @@ -24,17 +24,17 @@ Module %module% successfully upgraded. Modul %module% wurde erfolgreich aktualisiert. - Line: 172 + Line: 171 Upgrade of module %module% failed. %error% Upgrade des Moduls %module% fehlgeschlagen. %error% - Line: 208 + Line: 207 Module %module% is already up to date Modul %module% ist bereits auf dem neuesten Stand - Line: 195 + Line: 194 @@ -52,7 +52,7 @@ Check for updates Auf Update prüfen - Line: 38 + Line: 46 From 0ed45c0af33473c2130bc5f12d059c4b5d79235d Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:23:59 +0000 Subject: [PATCH 37/69] New translations ModulesMboModulescatalog.en-US.xlf (Italian) --- .../it-IT/ModulesMboModulescatalog.it-IT.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/it-IT/ModulesMboModulescatalog.it-IT.xlf b/translations/it-IT/ModulesMboModulescatalog.it-IT.xlf index e9ce137ba..ac3f556be 100644 --- a/translations/it-IT/ModulesMboModulescatalog.it-IT.xlf +++ b/translations/it-IT/ModulesMboModulescatalog.it-IT.xlf @@ -5,17 +5,17 @@ Synchronized with Addons marketplace! Sincronizzato con il marketplace degli addons! - Line: 145 + Line: 143 Connected Collegato - Line: 157 + Line: 155 Connected as Collegato come - Line: 159 + Line: 156 @@ -24,17 +24,17 @@ Module %module% successfully upgraded. Il modulo %module% è stato aggiornato con successo. - Line: 172 + Line: 171 Upgrade of module %module% failed. %error% Aggiornamento del modulo %module% fallito. %error% - Line: 208 + Line: 207 Module %module% is already up to date Il modulo %module% è già aggiornato - Line: 195 + Line: 194 @@ -52,7 +52,7 @@ Check for updates Cerca aggiornamenti - Line: 38 + Line: 46 From e091e98af1711eec0dd4af9148b31de7a544060a Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:00 +0000 Subject: [PATCH 38/69] New translations ModulesMboModulescatalog.en-US.xlf (Dutch) --- .../nl-NL/ModulesMboModulescatalog.nl-NL.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/nl-NL/ModulesMboModulescatalog.nl-NL.xlf b/translations/nl-NL/ModulesMboModulescatalog.nl-NL.xlf index a94aacfbc..d1302b6cf 100644 --- a/translations/nl-NL/ModulesMboModulescatalog.nl-NL.xlf +++ b/translations/nl-NL/ModulesMboModulescatalog.nl-NL.xlf @@ -5,17 +5,17 @@ Synchronized with Addons marketplace! Gesynchroniseerd met Addons! - Line: 145 + Line: 143 Connected Ingelogd - Line: 157 + Line: 155 Connected as Ingelogd als - Line: 159 + Line: 156 @@ -24,17 +24,17 @@ Module %module% successfully upgraded. Module %module% succesvol geüpgraded. - Line: 172 + Line: 171 Upgrade of module %module% failed. %error% Upgrade van module %module% mislukt. %error% - Line: 208 + Line: 207 Module %module% is already up to date Module %module% is al up to date - Line: 195 + Line: 194 @@ -52,7 +52,7 @@ Check for updates Op updates controleren - Line: 38 + Line: 46 From 61a00237599097e69ae24d037dca8376a927ea35 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:01 +0000 Subject: [PATCH 39/69] New translations ModulesMboModulescatalog.en-US.xlf (Polish) --- .../pl-PL/ModulesMboModulescatalog.pl-PL.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/pl-PL/ModulesMboModulescatalog.pl-PL.xlf b/translations/pl-PL/ModulesMboModulescatalog.pl-PL.xlf index bacc4e16b..62160840e 100644 --- a/translations/pl-PL/ModulesMboModulescatalog.pl-PL.xlf +++ b/translations/pl-PL/ModulesMboModulescatalog.pl-PL.xlf @@ -5,17 +5,17 @@ Synchronized with Addons marketplace! Zsynchronizowane z Addons marketplace! - Line: 145 + Line: 143 Connected Połączony - Line: 157 + Line: 155 Connected as Połączony jako - Line: 159 + Line: 156 @@ -24,17 +24,17 @@ Module %module% successfully upgraded. Moduł %module% został pomyślnie zaktualizowany. - Line: 172 + Line: 171 Upgrade of module %module% failed. %error% Aktualizacja modułu %modułe% nie powiodła się. %error% - Line: 208 + Line: 207 Module %module% is already up to date Moduł %module% jest już aktualny - Line: 195 + Line: 194 @@ -52,7 +52,7 @@ Check for updates Sprawdź aktualizacje - Line: 38 + Line: 46 From 516bd697989a92c2763f124d12815fe601f2a27a Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:02 +0000 Subject: [PATCH 40/69] New translations ModulesMboModulescatalog.en-US.xlf (Portuguese) --- .../pt-PT/ModulesMboModulescatalog.pt-PT.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/pt-PT/ModulesMboModulescatalog.pt-PT.xlf b/translations/pt-PT/ModulesMboModulescatalog.pt-PT.xlf index 0b9e11d95..468da7396 100644 --- a/translations/pt-PT/ModulesMboModulescatalog.pt-PT.xlf +++ b/translations/pt-PT/ModulesMboModulescatalog.pt-PT.xlf @@ -5,17 +5,17 @@ Synchronized with Addons marketplace! Sincronizado com o Addons Marketplace! - Line: 145 + Line: 143 Connected Ligado - Line: 157 + Line: 155 Connected as Ligado como - Line: 159 + Line: 156 @@ -24,17 +24,17 @@ Module %module% successfully upgraded. Módulo %module% actualizado com sucesso. - Line: 172 + Line: 171 Upgrade of module %module% failed. %error% Actualização do módulo %module% falhou. %error% - Line: 208 + Line: 207 Module %module% is already up to date Módulo %module% já está actualizado - Line: 195 + Line: 194 @@ -52,7 +52,7 @@ Check for updates Verificar atualizações - Line: 38 + Line: 46 From 23d98feafdc2af772ada9c4e96433faeefd785be Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:04 +0000 Subject: [PATCH 41/69] New translations ModulesMboModulescatalog.en-US.xlf (Russian) --- .../ru-RU/ModulesMboModulescatalog.ru-RU.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/ru-RU/ModulesMboModulescatalog.ru-RU.xlf b/translations/ru-RU/ModulesMboModulescatalog.ru-RU.xlf index 235437464..06608672b 100644 --- a/translations/ru-RU/ModulesMboModulescatalog.ru-RU.xlf +++ b/translations/ru-RU/ModulesMboModulescatalog.ru-RU.xlf @@ -5,17 +5,17 @@ Synchronized with Addons marketplace! Синхронизировано с магазином Расширений! - Line: 145 + Line: 143 Connected подключен - Line: 157 + Line: 155 Connected as Вы вошли как - Line: 159 + Line: 156 @@ -24,17 +24,17 @@ Module %module% successfully upgraded. Модуль %module% успешно обновлен. - Line: 172 + Line: 171 Upgrade of module %module% failed. %error% Обновление модуля %module% не удалось. %error% - Line: 208 + Line: 207 Module %module% is already up to date Модуль %module% уже обновлен - Line: 195 + Line: 194 @@ -52,7 +52,7 @@ Check for updates Проверить обновления - Line: 38 + Line: 46 From f6aa1995db3d61a4a21d71ec1fec5494ceb40b5d Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:10 +0000 Subject: [PATCH 42/69] New translations ModulesMboRecommendedmodulesandservices.en-US.xlf (Romanian) --- ...MboRecommendedmodulesandservices.ro-RO.xlf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/ro-RO/ModulesMboRecommendedmodulesandservices.ro-RO.xlf b/translations/ro-RO/ModulesMboRecommendedmodulesandservices.ro-RO.xlf index 417c68f06..05e563dcb 100644 --- a/translations/ro-RO/ModulesMboRecommendedmodulesandservices.ro-RO.xlf +++ b/translations/ro-RO/ModulesMboRecommendedmodulesandservices.ro-RO.xlf @@ -15,92 +15,92 @@ Create a discount strategy Creează o strategie de reducere - Line: 276 + Line: 277 Customize pages Personalizează paginile - Line: 279 + Line: 280 Improve customer experience Îmbunătățirea experienței clienților - Line: 284 + Line: 285 Improve customer targeting Îmbunătățirea direcționării clienților - Line: 287 + Line: 288 Improve data strategy Îmbunătățirea strategiei de date - Line: 290 + Line: 291 Improve SEO Îmbunătățirea SEO - Line: 294 + Line: 295 Improve shipping Îmbunătățirea expedierii - Line: 297 + Line: 298 Improve the checkout experience Îmbunătățește experiența de checkout - Line: 300 + Line: 301 Improve visuals Îmbunătățește imaginile - Line: 303 + Line: 304 Make shipping easier Facilitarea expedierii - Line: 306 + Line: 307 Make your deliveries easier Facilitează-ți livrările - Line: 309 + Line: 310 Optimize order management Optimizarea gestionării comenzilor - Line: 312 + Line: 313 Optimize product catalog Optimizarea catalogului de produse - Line: 315 + Line: 316 Optimize product creation Optimizarea creării de produse - Line: 318 + Line: 319 Promote brands Promovarea mărcilor - Line: 321 + Line: 322 Simplify accounting Simplificarea contabilității - Line: 325 + Line: 326 Simplify store management Simplifică gestionarea magazinului - Line: 328 + Line: 329 Recommended modules Module recomandate - Line: 331 + Line: 332 From a5f812dcd9cf8f7ca4923eba532ac312a020af47 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:11 +0000 Subject: [PATCH 43/69] New translations ModulesMboRecommendedmodulesandservices.en-US.xlf (French) --- ...MboRecommendedmodulesandservices.fr-FR.xlf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/fr-FR/ModulesMboRecommendedmodulesandservices.fr-FR.xlf b/translations/fr-FR/ModulesMboRecommendedmodulesandservices.fr-FR.xlf index 0d0c85643..d8a972f9d 100644 --- a/translations/fr-FR/ModulesMboRecommendedmodulesandservices.fr-FR.xlf +++ b/translations/fr-FR/ModulesMboRecommendedmodulesandservices.fr-FR.xlf @@ -15,92 +15,92 @@ Create a discount strategy Créer une stratégie de remise - Line: 276 + Line: 277 Customize pages Personnaliser les pages - Line: 279 + Line: 280 Improve customer experience Améliorer l'expérience client - Line: 284 + Line: 285 Improve customer targeting Améliorer le ciblage des clients - Line: 287 + Line: 288 Improve data strategy Améliorer la stratégie de données - Line: 290 + Line: 291 Improve SEO Améliorer le référencement - Line: 294 + Line: 295 Improve shipping Améliorer l'expédition - Line: 297 + Line: 298 Improve the checkout experience Améliorer l'expérience de paiement - Line: 300 + Line: 301 Improve visuals Améliorer les visuels - Line: 303 + Line: 304 Make shipping easier Facilitez l'expédition - Line: 306 + Line: 307 Make your deliveries easier Facilitez vos livraisons - Line: 309 + Line: 310 Optimize order management Optimiser la gestion des commandes - Line: 312 + Line: 313 Optimize product catalog Optimiser le catalogue de produits - Line: 315 + Line: 316 Optimize product creation Optimiser la création de produits - Line: 318 + Line: 319 Promote brands Promouvoir les marques - Line: 321 + Line: 322 Simplify accounting Simplifier la comptabilité - Line: 325 + Line: 326 Simplify store management Simplifier la gestion de la boutique - Line: 328 + Line: 329 Recommended modules Modules recommandés - Line: 331 + Line: 332 From 4a63c6e28ba5bb7168d5c10726b0d1c897c3b2fb Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:12 +0000 Subject: [PATCH 44/69] New translations ModulesMboRecommendedmodulesandservices.en-US.xlf (Spanish) --- ...MboRecommendedmodulesandservices.es-ES.xlf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/es-ES/ModulesMboRecommendedmodulesandservices.es-ES.xlf b/translations/es-ES/ModulesMboRecommendedmodulesandservices.es-ES.xlf index 7480ed9a4..12adac720 100644 --- a/translations/es-ES/ModulesMboRecommendedmodulesandservices.es-ES.xlf +++ b/translations/es-ES/ModulesMboRecommendedmodulesandservices.es-ES.xlf @@ -15,92 +15,92 @@ Create a discount strategy Crear una estrategia de descuentos - Line: 276 + Line: 277 Customize pages Personalizar páginas - Line: 279 + Line: 280 Improve customer experience Mejorar la experiencia del cliente - Line: 284 + Line: 285 Improve customer targeting Mejorar la selección de clientes - Line: 287 + Line: 288 Improve data strategy Mejorar la estrategia de datos - Line: 290 + Line: 291 Improve SEO Mejorar el posicionamiento - Line: 294 + Line: 295 Improve shipping Mejorar el transporte - Line: 297 + Line: 298 Improve the checkout experience Mejorar la experiencia de pago - Line: 300 + Line: 301 Improve visuals Mejorar la imagen - Line: 303 + Line: 304 Make shipping easier Facilitar el envío - Line: 306 + Line: 307 Make your deliveries easier Facilita las entregas - Line: 309 + Line: 310 Optimize order management Optimizar la gestión de pedidos - Line: 312 + Line: 313 Optimize product catalog Optimizar el catálogo de productos - Line: 315 + Line: 316 Optimize product creation Optimizar la creación de productos - Line: 318 + Line: 319 Promote brands Promover marcas - Line: 321 + Line: 322 Simplify accounting Simplificar la contabilidad - Line: 325 + Line: 326 Simplify store management Simplificar la gestión de la tienda - Line: 328 + Line: 329 Recommended modules Módulos recomendados - Line: 331 + Line: 332 From 8d7a6fe45732e90fcc7bc4760255c464bdc97247 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:13 +0000 Subject: [PATCH 45/69] New translations ModulesMboRecommendedmodulesandservices.en-US.xlf (German) --- ...MboRecommendedmodulesandservices.de-DE.xlf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/de-DE/ModulesMboRecommendedmodulesandservices.de-DE.xlf b/translations/de-DE/ModulesMboRecommendedmodulesandservices.de-DE.xlf index 5737fa07a..c43e90659 100644 --- a/translations/de-DE/ModulesMboRecommendedmodulesandservices.de-DE.xlf +++ b/translations/de-DE/ModulesMboRecommendedmodulesandservices.de-DE.xlf @@ -15,92 +15,92 @@ Create a discount strategy Rabattstrategie erstellen - Line: 276 + Line: 277 Customize pages Seiten individuell anpassen - Line: 279 + Line: 280 Improve customer experience Kundenerlebnis verbessern - Line: 284 + Line: 285 Improve customer targeting Kundenansprache verbessern - Line: 287 + Line: 288 Improve data strategy Datenstrategie verbessern - Line: 290 + Line: 291 Improve SEO SEO verbessern - Line: 294 + Line: 295 Improve shipping Versand verbessern - Line: 297 + Line: 298 Improve the checkout experience Kundenerfahrung an der Kasse verbessern - Line: 300 + Line: 301 Improve visuals Erscheinungsbild verbessern - Line: 303 + Line: 304 Make shipping easier Versand vereinfachen - Line: 306 + Line: 307 Make your deliveries easier Lieferungen leichter machen - Line: 309 + Line: 310 Optimize order management Auftragsverwaltung verbessern - Line: 312 + Line: 313 Optimize product catalog Den Produktkatalog optimieren - Line: 315 + Line: 316 Optimize product creation Die Produktgestaltung optimieren - Line: 318 + Line: 319 Promote brands Marken bewerben - Line: 321 + Line: 322 Simplify accounting Buchhaltung vereinfachen - Line: 325 + Line: 326 Simplify store management Ladenverwaltung verbessern - Line: 328 + Line: 329 Recommended modules Empfohlene Module - Line: 331 + Line: 332 From 6197dda3757cd201cc517a7493c9f1184ccbfe13 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:14 +0000 Subject: [PATCH 46/69] New translations ModulesMboRecommendedmodulesandservices.en-US.xlf (Italian) --- ...MboRecommendedmodulesandservices.it-IT.xlf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/it-IT/ModulesMboRecommendedmodulesandservices.it-IT.xlf b/translations/it-IT/ModulesMboRecommendedmodulesandservices.it-IT.xlf index b587b048f..11ac3bbdd 100644 --- a/translations/it-IT/ModulesMboRecommendedmodulesandservices.it-IT.xlf +++ b/translations/it-IT/ModulesMboRecommendedmodulesandservices.it-IT.xlf @@ -15,92 +15,92 @@ Create a discount strategy Creare una strategia di sconto - Line: 276 + Line: 277 Customize pages Personalizzare le pagine - Line: 279 + Line: 280 Improve customer experience Migliorare l'esperienza del cliente - Line: 284 + Line: 285 Improve customer targeting Migliorare il targeting dei clienti - Line: 287 + Line: 288 Improve data strategy Migliorare la strategia dei dati - Line: 290 + Line: 291 Improve SEO Migliorare la SEO - Line: 294 + Line: 295 Improve shipping Migliorare la spedizione - Line: 297 + Line: 298 Improve the checkout experience Migliorare l'esperienza di pagamento - Line: 300 + Line: 301 Improve visuals Migliorare la grafica - Line: 303 + Line: 304 Make shipping easier Facilitare la spedizione - Line: 306 + Line: 307 Make your deliveries easier Semplificare le consegne - Line: 309 + Line: 310 Optimize order management Ottimizzare la gestione degli ordini - Line: 312 + Line: 313 Optimize product catalog Ottimizzare il catalogo prodotti - Line: 315 + Line: 316 Optimize product creation Ottimizzare la creazione di prodotti - Line: 318 + Line: 319 Promote brands Promuovere i marchi - Line: 321 + Line: 322 Simplify accounting Semplificare la contabilità - Line: 325 + Line: 326 Simplify store management Semplificare la gestione del negozio - Line: 328 + Line: 329 Recommended modules Moduli raccomandati - Line: 331 + Line: 332 From 8bd67b555a1d0c3af6d3a1cd5d69acb659b8a378 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:15 +0000 Subject: [PATCH 47/69] New translations ModulesMboRecommendedmodulesandservices.en-US.xlf (Dutch) --- ...MboRecommendedmodulesandservices.nl-NL.xlf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/nl-NL/ModulesMboRecommendedmodulesandservices.nl-NL.xlf b/translations/nl-NL/ModulesMboRecommendedmodulesandservices.nl-NL.xlf index 94ec4ff1e..abd4999fb 100644 --- a/translations/nl-NL/ModulesMboRecommendedmodulesandservices.nl-NL.xlf +++ b/translations/nl-NL/ModulesMboRecommendedmodulesandservices.nl-NL.xlf @@ -15,92 +15,92 @@ Create a discount strategy Maak een kortingsstrategie - Line: 276 + Line: 277 Customize pages Aanpassen van pagina's - Line: 279 + Line: 280 Improve customer experience De klantervaring verbeteren - Line: 284 + Line: 285 Improve customer targeting De klantgerichtheid verbeteren - Line: 287 + Line: 288 Improve data strategy Gegevensstrategie verbeteren - Line: 290 + Line: 291 Improve SEO SEO verbeteren - Line: 294 + Line: 295 Improve shipping Verbeter de verzending - Line: 297 + Line: 298 Improve the checkout experience De kassa-ervaring verbeteren - Line: 300 + Line: 301 Improve visuals Verbeteren van visuals - Line: 303 + Line: 304 Make shipping easier Maak het verzenden gemakkelijker - Line: 306 + Line: 307 Make your deliveries easier Maak je bezorgingen eenvoudiger - Line: 309 + Line: 310 Optimize order management Orderbeheer optimaliseren - Line: 312 + Line: 313 Optimize product catalog Productcatalogus optimaliseren - Line: 315 + Line: 316 Optimize product creation Productcreatie optimaliseren - Line: 318 + Line: 319 Promote brands Merken promoten - Line: 321 + Line: 322 Simplify accounting Vereenvoudig de boekouding - Line: 325 + Line: 326 Simplify store management Winkelbeheer vereenvoudigen - Line: 328 + Line: 329 Recommended modules Aanbevolen modules - Line: 331 + Line: 332 From 9a929a6036d864d61781def4603591bb6abaaada Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:15 +0000 Subject: [PATCH 48/69] New translations ModulesMboRecommendedmodulesandservices.en-US.xlf (Polish) --- ...MboRecommendedmodulesandservices.pl-PL.xlf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/pl-PL/ModulesMboRecommendedmodulesandservices.pl-PL.xlf b/translations/pl-PL/ModulesMboRecommendedmodulesandservices.pl-PL.xlf index af9b1f3fe..29c75df53 100644 --- a/translations/pl-PL/ModulesMboRecommendedmodulesandservices.pl-PL.xlf +++ b/translations/pl-PL/ModulesMboRecommendedmodulesandservices.pl-PL.xlf @@ -15,92 +15,92 @@ Create a discount strategy Stwórz strategię rabatów - Line: 276 + Line: 277 Customize pages Dostosuj strony - Line: 279 + Line: 280 Improve customer experience Popraw doświadczenie klienta - Line: 284 + Line: 285 Improve customer targeting Lepiej targetuj klientów - Line: 287 + Line: 288 Improve data strategy Popraw strategię w zakresie danych - Line: 290 + Line: 291 Improve SEO Popraw SEO - Line: 294 + Line: 295 Improve shipping Usprawnij wysyłkę - Line: 297 + Line: 298 Improve the checkout experience Usprawnij obsługę płatności - Line: 300 + Line: 301 Improve visuals Popraw wizualizacje - Line: 303 + Line: 304 Make shipping easier Uprość wysyłkę - Line: 306 + Line: 307 Make your deliveries easier Ułatw dostawy - Line: 309 + Line: 310 Optimize order management Optymalizuj zarządzanie zamówieniami - Line: 312 + Line: 313 Optimize product catalog Optymalizuj katalog produktów - Line: 315 + Line: 316 Optimize product creation Optymalizuj tworzenie produktów - Line: 318 + Line: 319 Promote brands Promuj marki - Line: 321 + Line: 322 Simplify accounting Uprość księgowość - Line: 325 + Line: 326 Simplify store management Uprość zarządzanie sklepem - Line: 328 + Line: 329 Recommended modules Zalecane moduły - Line: 331 + Line: 332 From a9ab501940db3178d2e9eeade278d96cbb455476 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:16 +0000 Subject: [PATCH 49/69] New translations ModulesMboRecommendedmodulesandservices.en-US.xlf (Portuguese) --- ...MboRecommendedmodulesandservices.pt-PT.xlf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/pt-PT/ModulesMboRecommendedmodulesandservices.pt-PT.xlf b/translations/pt-PT/ModulesMboRecommendedmodulesandservices.pt-PT.xlf index d643a5d1f..0d23761f7 100644 --- a/translations/pt-PT/ModulesMboRecommendedmodulesandservices.pt-PT.xlf +++ b/translations/pt-PT/ModulesMboRecommendedmodulesandservices.pt-PT.xlf @@ -15,92 +15,92 @@ Create a discount strategy Criar uma estratégia de desconto - Line: 276 + Line: 277 Customize pages Personalizar páginas - Line: 279 + Line: 280 Improve customer experience Melhorar a experiência do cliente - Line: 284 + Line: 285 Improve customer targeting Melhorar a segmentação dos clientes - Line: 287 + Line: 288 Improve data strategy Melhorar a estratégia de dados - Line: 290 + Line: 291 Improve SEO Melhorar o SEO - Line: 294 + Line: 295 Improve shipping Melhorar a expedição - Line: 297 + Line: 298 Improve the checkout experience Melhorar a experiência de checkout - Line: 300 + Line: 301 Improve visuals Melhorar os visuais - Line: 303 + Line: 304 Make shipping easier Facilitar a expedição - Line: 306 + Line: 307 Make your deliveries easier Facilitar as suas entregas - Line: 309 + Line: 310 Optimize order management Otimizar a gestão de encomendas - Line: 312 + Line: 313 Optimize product catalog Optimizar o catálogo de produtos - Line: 315 + Line: 316 Optimize product creation Otimizar a criação de produtos - Line: 318 + Line: 319 Promote brands Promover as marcas - Line: 321 + Line: 322 Simplify accounting Simplificar a contabilidade - Line: 325 + Line: 326 Simplify store management Simplificar a gestão da loja - Line: 328 + Line: 329 Recommended modules Módulos recomendados - Line: 331 + Line: 332 From 3cfbe2e15f4c13214561f2f5c41eead0d4c4246a Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 09:24:17 +0000 Subject: [PATCH 50/69] New translations ModulesMboRecommendedmodulesandservices.en-US.xlf (Russian) --- ...MboRecommendedmodulesandservices.ru-RU.xlf | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/ru-RU/ModulesMboRecommendedmodulesandservices.ru-RU.xlf b/translations/ru-RU/ModulesMboRecommendedmodulesandservices.ru-RU.xlf index 77c44e0da..18df55f27 100644 --- a/translations/ru-RU/ModulesMboRecommendedmodulesandservices.ru-RU.xlf +++ b/translations/ru-RU/ModulesMboRecommendedmodulesandservices.ru-RU.xlf @@ -15,92 +15,92 @@ Create a discount strategy Создавайте стратегии скидок - Line: 276 + Line: 277 Customize pages Создавайте персонализированные страницы - Line: 279 + Line: 280 Improve customer experience Улучшить клиентский опыт - Line: 284 + Line: 285 Improve customer targeting Улучшайте таргетинг клиентов - Line: 287 + Line: 288 Improve data strategy Совершенствование стратегии работы с данными - Line: 290 + Line: 291 Improve SEO Используйте поисковую оптимизацию - Line: 294 + Line: 295 Improve shipping Оптимизируйте доставку - Line: 297 + Line: 298 Improve the checkout experience Улучшите процесс оформления заказа - Line: 300 + Line: 301 Improve visuals Улучшайте рекламные материалы - Line: 303 + Line: 304 Make shipping easier Пользуйтесь удобной доставкой - Line: 306 + Line: 307 Make your deliveries easier Упростите процесс доставки - Line: 309 + Line: 310 Optimize order management Оптимизируйте управление заказами - Line: 312 + Line: 313 Optimize product catalog Оптимизация каталога товаров - Line: 315 + Line: 316 Optimize product creation Оптимизируйте создание продуктов - Line: 318 + Line: 319 Promote brands Продвигайте бренды - Line: 321 + Line: 322 Simplify accounting Упрощайте бухгалтерский учет - Line: 325 + Line: 326 Simplify store management Упростите управление магазином - Line: 328 + Line: 329 Recommended modules Рекомендованные Модули - Line: 331 + Line: 332 From 426553120117265e7cbeb6a9213eb68db3610b44 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 10:21:49 +0000 Subject: [PATCH 51/69] New translations ModulesMboLinks.en-US.xlf (Romanian) --- translations/ro-RO/ModulesMboLinks.ro-RO.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/ro-RO/ModulesMboLinks.ro-RO.xlf b/translations/ro-RO/ModulesMboLinks.ro-RO.xlf index 07d2b6e92..a7105b6b0 100644 --- a/translations/ro-RO/ModulesMboLinks.ro-RO.xlf +++ b/translations/ro-RO/ModulesMboLinks.ro-RO.xlf @@ -4,12 +4,12 @@ https://authv2.prestashop.com/register - https://authv2.prestashop.com/register + https://authv2.prestashop.com/register Line: 122 https://authv2.prestashop.com/password/request - https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request Line: 129 From ff09ddf814e0d4aecd49093bc7998f11a0a7ab34 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 10:21:53 +0000 Subject: [PATCH 52/69] New translations ModulesMboLinks.en-US.xlf (French) --- translations/fr-FR/ModulesMboLinks.fr-FR.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/fr-FR/ModulesMboLinks.fr-FR.xlf b/translations/fr-FR/ModulesMboLinks.fr-FR.xlf index fca4ebe34..465459169 100644 --- a/translations/fr-FR/ModulesMboLinks.fr-FR.xlf +++ b/translations/fr-FR/ModulesMboLinks.fr-FR.xlf @@ -4,12 +4,12 @@ https://authv2.prestashop.com/register - https://authv2.prestashop.com/register + https://authv2.prestashop.com/register Line: 122 https://authv2.prestashop.com/password/request - https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request Line: 129 From 2455b23ad686314ad2741a3ef7f29cad67cea152 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 10:21:57 +0000 Subject: [PATCH 53/69] New translations ModulesMboLinks.en-US.xlf (Spanish) --- translations/es-ES/ModulesMboLinks.es-ES.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/es-ES/ModulesMboLinks.es-ES.xlf b/translations/es-ES/ModulesMboLinks.es-ES.xlf index 2d20e7e0e..475f82fb4 100644 --- a/translations/es-ES/ModulesMboLinks.es-ES.xlf +++ b/translations/es-ES/ModulesMboLinks.es-ES.xlf @@ -4,12 +4,12 @@ https://authv2.prestashop.com/register - https://authv2.prestashop.com/register + https://authv2.prestashop.com/register Line: 122 https://authv2.prestashop.com/password/request - https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request Line: 129 From e076db5b3bba565dba5278e4f722cc2a3aa4164e Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 10:22:01 +0000 Subject: [PATCH 54/69] New translations ModulesMboLinks.en-US.xlf (German) --- translations/de-DE/ModulesMboLinks.de-DE.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/de-DE/ModulesMboLinks.de-DE.xlf b/translations/de-DE/ModulesMboLinks.de-DE.xlf index 9432c76b0..d0f2b4be9 100644 --- a/translations/de-DE/ModulesMboLinks.de-DE.xlf +++ b/translations/de-DE/ModulesMboLinks.de-DE.xlf @@ -4,12 +4,12 @@ https://authv2.prestashop.com/register - https://authv2.prestashop.com/register + https://authv2.prestashop.com/register Line: 122 https://authv2.prestashop.com/password/request - https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request Line: 129 From 2f4d063e0e286452d197c6aed8c7fa0f94582322 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 10:22:06 +0000 Subject: [PATCH 55/69] New translations ModulesMboLinks.en-US.xlf (Italian) --- translations/it-IT/ModulesMboLinks.it-IT.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/it-IT/ModulesMboLinks.it-IT.xlf b/translations/it-IT/ModulesMboLinks.it-IT.xlf index 552c05651..d474428ec 100644 --- a/translations/it-IT/ModulesMboLinks.it-IT.xlf +++ b/translations/it-IT/ModulesMboLinks.it-IT.xlf @@ -4,12 +4,12 @@ https://authv2.prestashop.com/register - https://authv2.prestashop.com/register + https://authv2.prestashop.com/register Line: 122 https://authv2.prestashop.com/password/request - https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request Line: 129 From bc22a4899a073a57a1c20791afc7c1fbe1a9a156 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 10:22:10 +0000 Subject: [PATCH 56/69] New translations ModulesMboLinks.en-US.xlf (Dutch) --- translations/nl-NL/ModulesMboLinks.nl-NL.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/nl-NL/ModulesMboLinks.nl-NL.xlf b/translations/nl-NL/ModulesMboLinks.nl-NL.xlf index fd5800be4..eb2fc64ee 100644 --- a/translations/nl-NL/ModulesMboLinks.nl-NL.xlf +++ b/translations/nl-NL/ModulesMboLinks.nl-NL.xlf @@ -4,12 +4,12 @@ https://authv2.prestashop.com/register - https://authv2.prestashop.com/register + https://authv2.prestashop.com/register Line: 122 https://authv2.prestashop.com/password/request - https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request Line: 129 From 59f9178cdd27e805f43905eea2a1dec9f7ea365f Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 10:22:15 +0000 Subject: [PATCH 57/69] New translations ModulesMboLinks.en-US.xlf (Polish) --- translations/pl-PL/ModulesMboLinks.pl-PL.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/pl-PL/ModulesMboLinks.pl-PL.xlf b/translations/pl-PL/ModulesMboLinks.pl-PL.xlf index 99a983c4d..d814d61b1 100644 --- a/translations/pl-PL/ModulesMboLinks.pl-PL.xlf +++ b/translations/pl-PL/ModulesMboLinks.pl-PL.xlf @@ -4,12 +4,12 @@ https://authv2.prestashop.com/register - https://authv2.prestashop.com/register + https://authv2.prestashop.com/register Line: 122 https://authv2.prestashop.com/password/request - https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request Line: 129 From 3070cbdca65a6ff0baff155a3c99106d243deb43 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 10:22:19 +0000 Subject: [PATCH 58/69] New translations ModulesMboLinks.en-US.xlf (Portuguese) --- translations/pt-PT/ModulesMboLinks.pt-PT.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/pt-PT/ModulesMboLinks.pt-PT.xlf b/translations/pt-PT/ModulesMboLinks.pt-PT.xlf index eac4d28f0..0cf1064eb 100644 --- a/translations/pt-PT/ModulesMboLinks.pt-PT.xlf +++ b/translations/pt-PT/ModulesMboLinks.pt-PT.xlf @@ -4,12 +4,12 @@ https://authv2.prestashop.com/register - https://authv2.prestashop.com/register + https://authv2.prestashop.com/register Line: 122 https://authv2.prestashop.com/password/request - https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request Line: 129 From 6c168f0ec6713bd7dfc5871c2f05202862cf0a98 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Fri, 2 Jun 2023 10:22:23 +0000 Subject: [PATCH 59/69] New translations ModulesMboLinks.en-US.xlf (Russian) --- translations/ru-RU/ModulesMboLinks.ru-RU.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/ru-RU/ModulesMboLinks.ru-RU.xlf b/translations/ru-RU/ModulesMboLinks.ru-RU.xlf index 75faa0c15..968d2d24f 100644 --- a/translations/ru-RU/ModulesMboLinks.ru-RU.xlf +++ b/translations/ru-RU/ModulesMboLinks.ru-RU.xlf @@ -4,12 +4,12 @@ https://authv2.prestashop.com/register - https://authv2.prestashop.com/register + https://authv2.prestashop.com/register Line: 122 https://authv2.prestashop.com/password/request - https://authv2.prestashop.com/password/request + https://authv2.prestashop.com/password/request Line: 129 From f546b12af18be867d9e98933668d3e6133047723 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Mon, 10 Jul 2023 09:10:21 +0000 Subject: [PATCH 60/69] Update config.xml (#598) --- config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.xml b/config.xml index 229ee0443..fb8f69bb3 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_mbo - + From 5d79858c90aa044fb5e74d7ba51b5ff79fb346cc Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Mon, 10 Jul 2023 09:11:13 +0000 Subject: [PATCH 61/69] Bump version to 4.4.4 (#599) --- ps_mbo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ps_mbo.php b/ps_mbo.php index 39620b7b7..a3f44b9ad 100755 --- a/ps_mbo.php +++ b/ps_mbo.php @@ -53,7 +53,7 @@ class ps_mbo extends Module /** * @var string */ - public const VERSION = '4.4.3'; + public const VERSION = '4.4.4'; public const CONTROLLERS_WITH_CONNECTION_TOOLBAR = [ 'AdminPsMboModule', @@ -104,7 +104,7 @@ class ps_mbo extends Module public function __construct() { $this->name = 'ps_mbo'; - $this->version = '4.4.3'; + $this->version = '4.4.4'; $this->author = 'PrestaShop'; $this->tab = 'administration'; $this->module_key = '6cad5414354fbef755c7df4ef1ab74eb'; From 760c6687f16e155de9ff26522f4c5888b096a35f Mon Sep 17 00:00:00 2001 From: Vincent Garcia Date: Mon, 10 Jul 2023 18:02:05 +0200 Subject: [PATCH 62/69] feat(Version): :tag: Bump version to 4.5.0 --- config.xml | 2 +- ps_mbo.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.xml b/config.xml index fb8f69bb3..f7a037309 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_mbo - + diff --git a/ps_mbo.php b/ps_mbo.php index a3f44b9ad..6c709e6ac 100755 --- a/ps_mbo.php +++ b/ps_mbo.php @@ -53,7 +53,7 @@ class ps_mbo extends Module /** * @var string */ - public const VERSION = '4.4.4'; + public const VERSION = '4.5.0'; public const CONTROLLERS_WITH_CONNECTION_TOOLBAR = [ 'AdminPsMboModule', @@ -104,7 +104,7 @@ class ps_mbo extends Module public function __construct() { $this->name = 'ps_mbo'; - $this->version = '4.4.4'; + $this->version = '4.5.0'; $this->author = 'PrestaShop'; $this->tab = 'administration'; $this->module_key = '6cad5414354fbef755c7df4ef1ab74eb'; From 02165a012fb3ad2bf2e53e8d63ef20fd66945386 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Mon, 24 Jul 2023 09:57:40 +0000 Subject: [PATCH 63/69] [MBO-1170] Check if container is set before calling method (#603) * Check if container is set before calling method * Use simple SQL query to get MBO Api user --- ps_mbo.php | 2 +- .../UseActionObjectEmployeeUpdateBefore.php | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ps_mbo.php b/ps_mbo.php index 6c709e6ac..15d7050c2 100755 --- a/ps_mbo.php +++ b/ps_mbo.php @@ -366,7 +366,7 @@ public function getAdminAuthenticationProvider(): AdminAuthenticationProvider $this->container = SymfonyContainer::getInstance(); } - return $this->container->has('mbo.security.admin_authentication.provider') ? + return null !== $this->container && $this->container->has('mbo.security.admin_authentication.provider') ? $this->get('mbo.security.admin_authentication.provider') : new AdminAuthenticationProvider( $this->get('doctrine.dbal.default_connection'), diff --git a/src/Traits/Hooks/UseActionObjectEmployeeUpdateBefore.php b/src/Traits/Hooks/UseActionObjectEmployeeUpdateBefore.php index b4aa1f194..63743992b 100644 --- a/src/Traits/Hooks/UseActionObjectEmployeeUpdateBefore.php +++ b/src/Traits/Hooks/UseActionObjectEmployeeUpdateBefore.php @@ -21,6 +21,8 @@ namespace PrestaShop\Module\Mbo\Traits\Hooks; +use PrestaShop\Module\Mbo\Helpers\Config; + trait UseActionObjectEmployeeUpdateBefore { /** @@ -31,7 +33,7 @@ public function hookActionObjectEmployeeUpdateBefore($params): void if (empty($params) || empty($params['object']) || !$params['object'] instanceof \Employee) { return; } - $currentApiUser = $this->getAdminAuthenticationProvider()->getApiUser(); + $currentApiUser = $this->getApiUser(); if (!$currentApiUser) { return; } @@ -44,4 +46,17 @@ public function hookActionObjectEmployeeUpdateBefore($params): void $params['object']->active = true; } } + + private function getApiUser() + { + $apiUserId = \Db::getInstance()->getValue( + 'SELECT `id_employee` FROM `' . _DB_PREFIX_ . 'employee` WHERE `email` = "' . pSQL(Config::getShopMboAdminMail()) . '" AND active = 1' + ); + + if (!$apiUserId) { + return null; + } + + return new \Employee((int) $apiUserId); + } } From 8b35e8b83eb7682c748e8c2e9cc30a0b2a5e7540 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Mon, 24 Jul 2023 10:01:37 +0000 Subject: [PATCH 64/69] Release 4.5.1 (#605) --- config.xml | 2 +- ps_mbo.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.xml b/config.xml index f7a037309..c106bc990 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_mbo - + diff --git a/ps_mbo.php b/ps_mbo.php index 15d7050c2..d94649a06 100755 --- a/ps_mbo.php +++ b/ps_mbo.php @@ -53,7 +53,7 @@ class ps_mbo extends Module /** * @var string */ - public const VERSION = '4.5.0'; + public const VERSION = '4.5.1'; public const CONTROLLERS_WITH_CONNECTION_TOOLBAR = [ 'AdminPsMboModule', @@ -104,7 +104,7 @@ class ps_mbo extends Module public function __construct() { $this->name = 'ps_mbo'; - $this->version = '4.5.0'; + $this->version = '4.5.1'; $this->author = 'PrestaShop'; $this->tab = 'administration'; $this->module_key = '6cad5414354fbef755c7df4ef1ab74eb'; From 642cd47a14f47a1438182c67e6c6d1980c8c52d3 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Thu, 3 Aug 2023 13:58:03 +0000 Subject: [PATCH 65/69] Create module cache dir in recursive mode + Bump to 4.5.2 --- config.xml | 2 +- ps_mbo.php | 6 +++--- src/Traits/HaveShopOnExternalService.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.xml b/config.xml index c106bc990..d24486bbb 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_mbo - + diff --git a/ps_mbo.php b/ps_mbo.php index d94649a06..e0f0a3bf5 100755 --- a/ps_mbo.php +++ b/ps_mbo.php @@ -53,7 +53,7 @@ class ps_mbo extends Module /** * @var string */ - public const VERSION = '4.5.1'; + public const VERSION = '4.5.2'; public const CONTROLLERS_WITH_CONNECTION_TOOLBAR = [ 'AdminPsMboModule', @@ -104,7 +104,7 @@ class ps_mbo extends Module public function __construct() { $this->name = 'ps_mbo'; - $this->version = '4.5.1'; + $this->version = '4.5.2'; $this->author = 'PrestaShop'; $this->tab = 'administration'; $this->module_key = '6cad5414354fbef755c7df4ef1ab74eb'; @@ -440,7 +440,7 @@ public function postponeTabsTranslations(): void $lockFile = $this->moduleCacheDir . 'translate_tabs.lock'; if (!file_exists($lockFile)) { if (!is_dir($this->moduleCacheDir)) { - mkdir($this->moduleCacheDir); + mkdir($this->moduleCacheDir, 0777, true); } $f = fopen($lockFile, 'w+'); fclose($f); diff --git a/src/Traits/HaveShopOnExternalService.php b/src/Traits/HaveShopOnExternalService.php index d1d8c0098..231b66fd4 100644 --- a/src/Traits/HaveShopOnExternalService.php +++ b/src/Traits/HaveShopOnExternalService.php @@ -111,7 +111,7 @@ private function callServiceWithLockFile(string $method, array $params = []): vo // Create the lock file if (!file_exists($lockFile)) { if (!is_dir($this->moduleCacheDir)) { - mkdir($this->moduleCacheDir); + mkdir($this->moduleCacheDir, 0777, true); } $f = fopen($lockFile, 'w+'); fclose($f); From 60cb2902975cb346e69ffa3084245e51fd14186d Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Wed, 30 Aug 2023 17:54:52 +0000 Subject: [PATCH 66/69] Fix MBO uninstall with files deletion --- src/Traits/Hooks/UseActionBeforeUninstallModule.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Traits/Hooks/UseActionBeforeUninstallModule.php b/src/Traits/Hooks/UseActionBeforeUninstallModule.php index 2676a89a8..e871b68cb 100644 --- a/src/Traits/Hooks/UseActionBeforeUninstallModule.php +++ b/src/Traits/Hooks/UseActionBeforeUninstallModule.php @@ -26,6 +26,7 @@ use PrestaShop\PrestaShop\Adapter\Module\ModuleDataProvider; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Session\SessionInterface; +use Symfony\Component\HttpKernel\KernelEvents; trait UseActionBeforeUninstallModule { @@ -45,6 +46,13 @@ public function hookActionBeforeUninstallModule(array $params): void if ('ps_mbo' === $moduleName) { $this->storeAddonsCredentials($params, 'uninstall'); + + // If MBO is uninstalled with sources deletion, we disable the AddonsCredentialsEncryptionListener + $deleteFiles = (bool) (\Tools::getValue('actionParams', [])['deletion'] ?? false); + if ($deleteFiles) { + $addonsEncryptionListener = $this->get('service_container')->get('mbo.addons.event_listener.addons_credentials_encryption_listener'); + $this->get('event_dispatcher')->removeListener(KernelEvents::RESPONSE, [$addonsEncryptionListener, 'onKernelResponse']); + } } } } From 89815e8e3907eb2d94bd543a0b7ccb516920a1e4 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Tue, 29 Aug 2023 15:48:47 +0000 Subject: [PATCH 67/69] [MBO-1038][MBO-1040] Employee menu and Search panel links to Marketplace (#613) * [MBO-1040] Give catalog_url to Distribution API to replace Marketplace in Employee menu (#610) * Give catalog_url to Distribution API to replace Marketplace in Employee Menu + Add utm_mbo_source for tracking * [MBO-1038] Redirect to Modules catalogue from Search Panel (#608) * Redirect to Modules catalogue from Search Panel + Add utm_mbo_source for tracking * Introduce employee menu same page links --- config.xml | 2 +- ps_mbo.php | 4 +- src/Distribution/BaseClient.php | 2 + src/Distribution/Client.php | 18 +++++++++ src/Distribution/ConnectedClient.php | 4 +- .../UseActionGetAlternativeSearchPanels.php | 38 ++++++++++--------- .../UseDisplayBackOfficeEmployeeMenu.php | 10 ++++- translations/de-DE/ModulesMboSearch.de-DE.xlf | 16 ++++---- translations/en-US/ModulesMboSearch.en-US.xlf | 16 ++++---- translations/en-US/index.php | 30 --------------- translations/es-ES/ModulesMboSearch.es-ES.xlf | 16 ++++---- translations/fr-FR/ModulesMboSearch.fr-FR.xlf | 16 ++++---- translations/it-IT/ModulesMboSearch.it-IT.xlf | 16 ++++---- translations/nl-NL/ModulesMboSearch.nl-NL.xlf | 16 ++++---- translations/pl-PL/ModulesMboSearch.pl-PL.xlf | 16 ++++---- translations/pt-PT/ModulesMboSearch.pt-PT.xlf | 16 ++++---- translations/ro-RO/ModulesMboSearch.ro-RO.xlf | 16 ++++---- translations/ru-RU/ModulesMboSearch.ru-RU.xlf | 16 ++++---- 18 files changed, 135 insertions(+), 133 deletions(-) delete mode 100644 translations/en-US/index.php diff --git a/config.xml b/config.xml index d24486bbb..a6f04afc0 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_mbo - + diff --git a/ps_mbo.php b/ps_mbo.php index e0f0a3bf5..7bc2cbd2b 100755 --- a/ps_mbo.php +++ b/ps_mbo.php @@ -53,7 +53,7 @@ class ps_mbo extends Module /** * @var string */ - public const VERSION = '4.5.2'; + public const VERSION = '4.5.3'; public const CONTROLLERS_WITH_CONNECTION_TOOLBAR = [ 'AdminPsMboModule', @@ -104,7 +104,7 @@ class ps_mbo extends Module public function __construct() { $this->name = 'ps_mbo'; - $this->version = '4.5.2'; + $this->version = '4.5.3'; $this->author = 'PrestaShop'; $this->tab = 'administration'; $this->module_key = '6cad5414354fbef755c7df4ef1ab74eb'; diff --git a/src/Distribution/BaseClient.php b/src/Distribution/BaseClient.php index 7b7e0e266..a485bbd7e 100644 --- a/src/Distribution/BaseClient.php +++ b/src/Distribution/BaseClient.php @@ -26,6 +26,7 @@ use GuzzleHttp\Exception\GuzzleException; use PrestaShop\Module\Mbo\Helpers\Config; use ps_mbo; +use Symfony\Component\Routing\Router; class BaseClient { @@ -61,6 +62,7 @@ class BaseClient 'iso_code', 'addons_username', 'addons_pwd', + 'catalogUrl', ]; /** * @var array diff --git a/src/Distribution/Client.php b/src/Distribution/Client.php index c31cd61e7..1132432b3 100644 --- a/src/Distribution/Client.php +++ b/src/Distribution/Client.php @@ -25,9 +25,22 @@ use GuzzleHttp\Exception\GuzzleException; use PrestaShop\Module\Mbo\Helpers\Config; use stdClass; +use Symfony\Component\Routing\Router; class Client extends BaseClient { + /** + * @var Router + */ + private $router; + + public function setRouter(Router $router): self + { + $this->router = $router; + + return $this; + } + /** * Get a new key from Distribution API. * @@ -107,9 +120,14 @@ public function getEmployeeMenu() return $this->cacheProvider->fetch($cacheKey); } + $catalogUrlParams = [ + 'utm_mbo_source' => 'menu-user-back-office', + ]; + $this->setQueryParams([ 'isoLang' => $languageIsoCode, 'shopVersion' => _PS_VERSION_, + 'catalogUrl' => $this->router ? $this->router->generate('admin_mbo_catalog_module', $catalogUrlParams, Router::ABSOLUTE_PATH) : '#', ]); try { $conf = $this->processRequestAndDecode('shops/employee-menu'); diff --git a/src/Distribution/ConnectedClient.php b/src/Distribution/ConnectedClient.php index d30e13389..ab55ce621 100644 --- a/src/Distribution/ConnectedClient.php +++ b/src/Distribution/ConnectedClient.php @@ -26,6 +26,7 @@ use GuzzleHttp\Client as HttpClient; use PrestaShop\Module\Mbo\Addons\User\UserInterface; use PrestaShop\Module\Mbo\Helpers\Config; +use Symfony\Component\Routing\Router; class ConnectedClient extends BaseClient { @@ -36,7 +37,8 @@ class ConnectedClient extends BaseClient /** * @param HttpClient $httpClient - * @param \Doctrine\Common\Cache\CacheProvider $cacheProvider + * @param CacheProvider $cacheProvider + * @param UserInterface $user */ public function __construct(HttpClient $httpClient, CacheProvider $cacheProvider, UserInterface $user) { diff --git a/src/Traits/Hooks/UseActionGetAlternativeSearchPanels.php b/src/Traits/Hooks/UseActionGetAlternativeSearchPanels.php index 0b8c87546..0ec9f4537 100644 --- a/src/Traits/Hooks/UseActionGetAlternativeSearchPanels.php +++ b/src/Traits/Hooks/UseActionGetAlternativeSearchPanels.php @@ -22,6 +22,7 @@ namespace PrestaShop\Module\Mbo\Traits\Hooks; use PrestaShop\PrestaShop\Core\Search\SearchPanel; +use Symfony\Component\Routing\Router; trait UseActionGetAlternativeSearchPanels { @@ -36,29 +37,30 @@ trait UseActionGetAlternativeSearchPanels */ public function hookActionGetAlternativeSearchPanels(array $params): array { - $searchedExpression = $params['bo_query']; - - $version = defined('_PS_VERSION_') ? _PS_VERSION_ : ''; - if ($lastDotIndex = strrpos($version, '.')) { - $trailingVersion = str_replace('.', '_', substr($version, 0, $lastDotIndex)); - } else { - $trailingVersion = ''; + try { + /** @var \Symfony\Bundle\FrameworkBundle\Routing\Router $router */ + $router = $this->get('router'); + } catch (\Exception $e) { + return ''; } - $queryParams = [ - 'search_query' => $searchedExpression, - 'utm_source' => 'back-office', - 'utm_medium' => 'search', - 'utm_campaign' => 'back-office-' . $this->context->language->iso_code, - 'utm_content' => 'download' . $trailingVersion, - ]; + $catalogUrl = $router->generate('admin_mbo_catalog_module', [], Router::ABSOLUTE_PATH); + $catalogUrlPath = parse_url($catalogUrl, PHP_URL_PATH); + parse_str(parse_url($catalogUrl, PHP_URL_QUERY), $catalogUrlParams); + + $searchedExpression = $params['bo_query']; + if (!empty(trim($searchedExpression))) { + $catalogUrlParams['keyword'] = trim($searchedExpression); + } + $catalogUrlParams['utm_mbo_source'] = 'search-back-office'; + $catalogUrlParams['mbo_cdc_path'] = '/#/modules'; $searchPanels = []; $searchPanels[] = new SearchPanel( - $this->trans('Search addons.prestashop.com', [], 'Modules.Mbo.Search'), - $this->trans('Go to Addons', [], 'Modules.Mbo.Search'), - 'https://addons.prestashop.com/search.php', - $queryParams + $this->trans('Find modules to grow your business', [], 'Modules.Mbo.Search'), + $this->trans('Explore PrestaShop Marketplace', [], 'Modules.Mbo.Search'), + $catalogUrlPath, + $catalogUrlParams ); return $searchPanels; diff --git a/src/Traits/Hooks/UseDisplayBackOfficeEmployeeMenu.php b/src/Traits/Hooks/UseDisplayBackOfficeEmployeeMenu.php index 0edb4d1b2..b7b80fb41 100644 --- a/src/Traits/Hooks/UseDisplayBackOfficeEmployeeMenu.php +++ b/src/Traits/Hooks/UseDisplayBackOfficeEmployeeMenu.php @@ -51,7 +51,14 @@ public function hookDisplayBackOfficeEmployeeMenu(array $params): void } try { - $config = $apiClient->getEmployeeMenu(); + /** @var \Symfony\Component\Routing\Router $router */ + $router = $this->get('router'); + } catch (\Exception $e) { + return; + } + + try { + $config = $apiClient->setRouter($router)->getEmployeeMenu(); if (empty($config) || empty($config->userMenu) || !is_array($config->userMenu)) { return; } @@ -67,6 +74,7 @@ public function hookDisplayBackOfficeEmployeeMenu(array $params): void [ 'link' => $link->link, 'icon' => $link->icon, + 'samePage' => $link->same_page ?? false, ], $link->name ) diff --git a/translations/de-DE/ModulesMboSearch.de-DE.xlf b/translations/de-DE/ModulesMboSearch.de-DE.xlf index efa80de86..87acfe263 100644 --- a/translations/de-DE/ModulesMboSearch.de-DE.xlf +++ b/translations/de-DE/ModulesMboSearch.de-DE.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Durchsuche addons.prestashop.com - Line: 58 + + Find modules to grow your business + Finden Sie Module, mit denen Sie Ihr Geschäft ausbauen können + Line: 60 - - Go to Addons - Zu Addons wechseln - Line: 59 + + Explore PrestaShop Marketplace + Entdecken Sie PrestaShop Marketplace + Line: 61 diff --git a/translations/en-US/ModulesMboSearch.en-US.xlf b/translations/en-US/ModulesMboSearch.en-US.xlf index 14ef903c2..0d4ecf59d 100644 --- a/translations/en-US/ModulesMboSearch.en-US.xlf +++ b/translations/en-US/ModulesMboSearch.en-US.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Search addons.prestashop.com - Line: 58 + + Find modules to grow your business + Find modules to grow your business + Line: 60 - - Go to Addons - Go to Addons - Line: 59 + + Explore PrestaShop Marketplace + Explore PrestaShop Marketplace + Line: 61 diff --git a/translations/en-US/index.php b/translations/en-US/index.php deleted file mode 100644 index 58b8b4731..000000000 --- a/translations/en-US/index.php +++ /dev/null @@ -1,30 +0,0 @@ - - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 - */ - - -header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); -header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); - -header('Cache-Control: no-store, no-cache, must-revalidate'); -header('Cache-Control: post-check=0, pre-check=0', false); -header('Pragma: no-cache'); - -header('Location: ../'); -exit; diff --git a/translations/es-ES/ModulesMboSearch.es-ES.xlf b/translations/es-ES/ModulesMboSearch.es-ES.xlf index 5d905eb73..8f474cf23 100644 --- a/translations/es-ES/ModulesMboSearch.es-ES.xlf +++ b/translations/es-ES/ModulesMboSearch.es-ES.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Buscar addons.prestashop.com - Line: 58 + + Find modules to grow your business + Encuentre módulos para hacer crecer su negocio + Line: 60 - - Go to Addons - Ir a Addons - Line: 59 + + Explore PrestaShop Marketplace + Explorar PrestaShop Marketplace + Line: 61 diff --git a/translations/fr-FR/ModulesMboSearch.fr-FR.xlf b/translations/fr-FR/ModulesMboSearch.fr-FR.xlf index 9a42652e3..51ff2a9ca 100644 --- a/translations/fr-FR/ModulesMboSearch.fr-FR.xlf +++ b/translations/fr-FR/ModulesMboSearch.fr-FR.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Rechercher sur addons.prestashop.com - Line: 58 + + Find modules to grow your business + Trouvez des modules pour développer votre entreprise + Line: 60 - - Go to Addons - Rendez-vous sur Addons - Line: 59 + + Explore PrestaShop Marketplace + Explorer la PrestaShop Marketplace + Line: 61 diff --git a/translations/it-IT/ModulesMboSearch.it-IT.xlf b/translations/it-IT/ModulesMboSearch.it-IT.xlf index 3f60a45c2..bd968c88b 100644 --- a/translations/it-IT/ModulesMboSearch.it-IT.xlf +++ b/translations/it-IT/ModulesMboSearch.it-IT.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Cerca addons.prestashop.com - Line: 58 + + Find modules to grow your business + Trova i moduli per far crescere la tua attività + Line: 60 - - Go to Addons - Vai agli Addons - Line: 59 + + Explore PrestaShop Marketplace + Esplora PrestaShop Marketplace + Line: 61 diff --git a/translations/nl-NL/ModulesMboSearch.nl-NL.xlf b/translations/nl-NL/ModulesMboSearch.nl-NL.xlf index 6125a8c43..5f1420191 100644 --- a/translations/nl-NL/ModulesMboSearch.nl-NL.xlf +++ b/translations/nl-NL/ModulesMboSearch.nl-NL.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Doorzoek addons.prestashop.com - Line: 58 + + Find modules to grow your business + Vind modules om uw bedrijf te laten groeien + Line: 60 - - Go to Addons - Ga naar Addons - Line: 59 + + Explore PrestaShop Marketplace + Ontdek PrestaShop Marketplace + Line: 61 diff --git a/translations/pl-PL/ModulesMboSearch.pl-PL.xlf b/translations/pl-PL/ModulesMboSearch.pl-PL.xlf index 19f1d7094..4f82d863a 100644 --- a/translations/pl-PL/ModulesMboSearch.pl-PL.xlf +++ b/translations/pl-PL/ModulesMboSearch.pl-PL.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Szukaj addons.prestashop.com - Line: 58 + + Find modules to grow your business + Znajdź moduły, dzięki którym rozwiniesz swoją firmę + Line: 60 - - Go to Addons - Idź do Addons - Line: 59 + + Explore PrestaShop Marketplace + Poznaj PrestaShop Marketplace + Line: 61 diff --git a/translations/pt-PT/ModulesMboSearch.pt-PT.xlf b/translations/pt-PT/ModulesMboSearch.pt-PT.xlf index 8b42bd4ec..0bd8a108f 100644 --- a/translations/pt-PT/ModulesMboSearch.pt-PT.xlf +++ b/translations/pt-PT/ModulesMboSearch.pt-PT.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Pesquisar em addons.prestashop.com - Line: 58 + + Find modules to grow your business + Encontre módulos para fazer crescer o seu negócio + Line: 60 - - Go to Addons - Ver os «Addons» - Line: 59 + + Explore PrestaShop Marketplace + Explorar o PrestaShop Marketplace + Line: 61 diff --git a/translations/ro-RO/ModulesMboSearch.ro-RO.xlf b/translations/ro-RO/ModulesMboSearch.ro-RO.xlf index caae042b0..79358ed64 100644 --- a/translations/ro-RO/ModulesMboSearch.ro-RO.xlf +++ b/translations/ro-RO/ModulesMboSearch.ro-RO.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Search addons.prestashop.com - Line: 58 + + Find modules to grow your business + Găsiți module pentru a vă dezvolta afacerea + Line: 60 - - Go to Addons - Go to Addons - Line: 59 + + Explore PrestaShop Marketplace + Explorați PrestaShop Marketplace + Line: 61 diff --git a/translations/ru-RU/ModulesMboSearch.ru-RU.xlf b/translations/ru-RU/ModulesMboSearch.ru-RU.xlf index d546be456..38120e33c 100644 --- a/translations/ru-RU/ModulesMboSearch.ru-RU.xlf +++ b/translations/ru-RU/ModulesMboSearch.ru-RU.xlf @@ -2,15 +2,15 @@ - - Search addons.prestashop.com - Поиск на addons.prestashop.com - Line: 58 + + Find modules to grow your business + Найдите модули для развития вашего бизнеса + Line: 60 - - Go to Addons - Перейти к дополнениям - Line: 59 + + Explore PrestaShop Marketplace + Изучите PrestaShop Marketplace + Line: 61 From d9433e9c2a2bb20d8f4c39f0338f799f119fd3a7 Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Tue, 29 Aug 2023 15:49:19 +0000 Subject: [PATCH 68/69] Add mbo_cdc_path to empty category URL (#618) --- src/Addons/Provider/LinksProvider.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Addons/Provider/LinksProvider.php b/src/Addons/Provider/LinksProvider.php index f43dc459d..534dd1c7e 100644 --- a/src/Addons/Provider/LinksProvider.php +++ b/src/Addons/Provider/LinksProvider.php @@ -136,6 +136,7 @@ public function getCategoryLink(string $categoryName): string $routeParams = []; if ($category && 'other' !== mb_strtolower($categoryName)) { $routeParams['filterCategoryRef'] = $category->refMenu; + $routeParams['mbo_cdc_path'] = '/#/modules'; } return $this->router->generate('admin_mbo_catalog_module', $routeParams); From cb13f23c5c1f98064465abaea67abe2714aebbef Mon Sep 17 00:00:00 2001 From: Ibrahima SOW Date: Tue, 29 Aug 2023 15:51:32 +0000 Subject: [PATCH 69/69] Bump version to 4.5.2 --- config.xml | 2 +- ps_mbo.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.xml b/config.xml index a6f04afc0..d24486bbb 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_mbo - + diff --git a/ps_mbo.php b/ps_mbo.php index 7bc2cbd2b..e0f0a3bf5 100755 --- a/ps_mbo.php +++ b/ps_mbo.php @@ -53,7 +53,7 @@ class ps_mbo extends Module /** * @var string */ - public const VERSION = '4.5.3'; + public const VERSION = '4.5.2'; public const CONTROLLERS_WITH_CONNECTION_TOOLBAR = [ 'AdminPsMboModule', @@ -104,7 +104,7 @@ class ps_mbo extends Module public function __construct() { $this->name = 'ps_mbo'; - $this->version = '4.5.3'; + $this->version = '4.5.2'; $this->author = 'PrestaShop'; $this->tab = 'administration'; $this->module_key = '6cad5414354fbef755c7df4ef1ab74eb';