From 4d42005a79ac99c3f1a815db8406cc5b14dd9610 Mon Sep 17 00:00:00 2001 From: Clara <76918665+ClaraLpresta@users.noreply.github.com> Date: Wed, 11 Sep 2024 18:08:32 +0200 Subject: [PATCH 01/18] version of artifact action is updated (#555) * version of artifact action is updated * include hidden files in artifact actions * version of artifact action is updated * fix erreur in build-release.yml file * fix erreur in publish.yml file --- .github/workflows/build-release.yml | 5 +++-- .github/workflows/publish.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index cc66a483d..5e2583a43 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -38,7 +38,8 @@ jobs: uses: PrestaShopCorp/github-action-clean-before-deploy@v1.0 - name: Create & upload artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: ${{ github.event.repository.name }} - path: ../ + path: ./ + include-hidden-files: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6af0f65d3..77cd6cccb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -57,10 +57,11 @@ jobs: paths: 'crowdin.yml' - name: Create & upload artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: ${{ github.event.repository.name }} - path: ../ + path: ./ + include-hidden-files: true upload_release_asset_production: name: Upload the production zip asset to the release From 446dda7d745539cce7b52a9c42e414c3d25c28fb Mon Sep 17 00:00:00 2001 From: Clara <76918665+ClaraLpresta@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:27:14 +0200 Subject: [PATCH 02/18] fix the subscription when plan has expired (#556) --- _dev/src/assets/json/translations/fr/ui.json | 2 +- .../configuration/alert-subscription-cancelled.vue | 2 +- .../configuration/onboarding-deps-container.vue | 8 ++++---- config.xml | 2 +- ps_facebook.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_dev/src/assets/json/translations/fr/ui.json b/_dev/src/assets/json/translations/fr/ui.json index 0f0686c7c..5d10a3b22 100644 --- a/_dev/src/assets/json/translations/fr/ui.json +++ b/_dev/src/assets/json/translations/fr/ui.json @@ -81,7 +81,7 @@ }, "alertBillingCancelled": { "title": "Vous avez annulé votre abonnement à PrestaShop Social.", - "explanationBeforeCancellationDate": "Votre abonnement restera actif jusqu'à {date}, Vous pouvez vous réabonner à tout moment pour continuer à utiliser le module.", + "explanationBeforeCancellationDate": "Votre abonnement restera actif jusqu'à {date}, vous pouvez vous réabonner à tout moment pour continuer à utiliser le module.", "explanationFromCancellationDate": "Votre abonnement a pris fin le {date}, vous pouvez vous abonner à tout moment pour continuer à utiliser le module." }, "billingFacade": { diff --git a/_dev/src/components/configuration/alert-subscription-cancelled.vue b/_dev/src/components/configuration/alert-subscription-cancelled.vue index ac49a34c7..c69c539b3 100644 --- a/_dev/src/components/configuration/alert-subscription-cancelled.vue +++ b/_dev/src/components/configuration/alert-subscription-cancelled.vue @@ -31,7 +31,7 @@ {{ $t('cta.resubscribe') }} diff --git a/_dev/src/components/configuration/onboarding-deps-container.vue b/_dev/src/components/configuration/onboarding-deps-container.vue index ce7a30776..066ca0377 100644 --- a/_dev/src/components/configuration/onboarding-deps-container.vue +++ b/_dev/src/components/configuration/onboarding-deps-container.vue @@ -5,12 +5,12 @@ /> ps_facebook - + diff --git a/ps_facebook.php b/ps_facebook.php index 15acb5b72..88453650b 100644 --- a/ps_facebook.php +++ b/ps_facebook.php @@ -89,7 +89,7 @@ public function __construct() { $this->name = 'ps_facebook'; $this->tab = 'advertising_marketing'; - $this->version = '1.38.0'; + $this->version = '1.38.1'; $this->author = 'PrestaShop'; $this->need_instance = 0; $this->module_key = '860395eb54512ec72d98615805274591'; From 151303a0d524efc255d471705b94807ac6c37d96 Mon Sep 17 00:00:00 2001 From: Clara <76918665+ClaraLpresta@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:48:06 +0200 Subject: [PATCH 03/18] Fix actions (#557) * fix the subscription when plan has expired * updated of download artifact action to v4 --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 77cd6cccb..1e25ce721 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -69,7 +69,7 @@ jobs: needs: build steps: - name: Download artifact - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: ${{ github.event.repository.name }} @@ -92,7 +92,7 @@ jobs: needs: build steps: - name: Download artifact - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: ${{ github.event.repository.name }} From 8cada40718f75fbbd9d1bf5e08bd8b60bee3af57 Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 11:58:44 +0200 Subject: [PATCH 04/18] add debug stage --- .github/workflows/publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1e25ce721..5e619abd7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -73,6 +73,11 @@ jobs: with: name: ${{ github.event.repository.name }} + - name: Debug + run: | + pwd + ls -la + - name: Prepare the production zip run: | cd ${{ github.event.repository.name }} From 05371a7813c133c0512059bb0ccfea0dbe1c9505 Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 12:04:58 +0200 Subject: [PATCH 05/18] remove debug and cd --- .github/workflows/publish.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5e619abd7..526fb4ba8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -73,14 +73,8 @@ jobs: with: name: ${{ github.event.repository.name }} - - name: Debug - run: | - pwd - ls -la - - name: Prepare the production zip run: | - cd ${{ github.event.repository.name }} zip -r ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.zip ${{ github.event.repository.name }} -x '*.git*' - name: Publish the production zip uses: shogo82148/actions-upload-release-asset@v1 From 52233f2e3da80b0ba40689107829057ebc29c965 Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 12:08:23 +0200 Subject: [PATCH 06/18] move one level up --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 526fb4ba8..7735e6ba4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -75,6 +75,7 @@ jobs: - name: Prepare the production zip run: | + cd .. zip -r ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.zip ${{ github.event.repository.name }} -x '*.git*' - name: Publish the production zip uses: shogo82148/actions-upload-release-asset@v1 From b799f62f8b6a420b20ecf775220bf2fc14e184ef Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 12:15:46 +0200 Subject: [PATCH 07/18] add step to move to parent directory --- .github/workflows/publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7735e6ba4..045f1beab 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -77,6 +77,7 @@ jobs: run: | cd .. zip -r ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.zip ${{ github.event.repository.name }} -x '*.git*' + - name: Publish the production zip uses: shogo82148/actions-upload-release-asset@v1 with: @@ -96,6 +97,10 @@ jobs: with: name: ${{ github.event.repository.name }} + - name: Move to parent directory + run: | + cd .. + - name: Set up Cloud SDK uses: google-github-actions/setup-gcloud@v0 with: From b765e0fe5f6db4dd6468f34b4a911c621677945a Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 12:16:57 +0200 Subject: [PATCH 08/18] remove cd --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 045f1beab..d2b94c9ba 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -117,8 +117,8 @@ jobs: - name: Prepare the integration zip run: | - cd ${{ github.event.repository.name }} zip -r ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}_integration.zip ${{ github.event.repository.name }} -x '*.git*' + - name: Publish the integration zip uses: shogo82148/actions-upload-release-asset@v1 with: From 7d736ebe4081a5b7573c15c55c1864518bf84565 Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 12:30:48 +0200 Subject: [PATCH 09/18] change download path --- .github/workflows/publish.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d2b94c9ba..5dfd5fc32 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -72,10 +72,11 @@ jobs: uses: actions/download-artifact@v4 with: name: ${{ github.event.repository.name }} + path: '.' - name: Prepare the production zip run: | - cd .. + cd ${{ github.event.repository.name }} zip -r ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.zip ${{ github.event.repository.name }} -x '*.git*' - name: Publish the production zip @@ -96,10 +97,13 @@ jobs: uses: actions/download-artifact@v4 with: name: ${{ github.event.repository.name }} + path: '.' - - name: Move to parent directory - run: | - cd .. + + - name: Download artifact + uses: actions/download-artifact@v4 + with: + name: ${{ github.event.repository.name }} - name: Set up Cloud SDK uses: google-github-actions/setup-gcloud@v0 @@ -117,8 +121,8 @@ jobs: - name: Prepare the integration zip run: | + cd ${{ github.event.repository.name }} zip -r ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}_integration.zip ${{ github.event.repository.name }} -x '*.git*' - - name: Publish the integration zip uses: shogo82148/actions-upload-release-asset@v1 with: From 4780d16351a8783080c285cb2bcef8061e8263b8 Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 12:54:33 +0200 Subject: [PATCH 10/18] try new path --- .github/workflows/publish.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5dfd5fc32..71cf86494 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -72,7 +72,7 @@ jobs: uses: actions/download-artifact@v4 with: name: ${{ github.event.repository.name }} - path: '.' + path: ./${{ github.event.repository.name }} - name: Prepare the production zip run: | @@ -97,13 +97,7 @@ jobs: uses: actions/download-artifact@v4 with: name: ${{ github.event.repository.name }} - path: '.' - - - - name: Download artifact - uses: actions/download-artifact@v4 - with: - name: ${{ github.event.repository.name }} + path: ./${{ github.event.repository.name }} - name: Set up Cloud SDK uses: google-github-actions/setup-gcloud@v0 From d84d0281a8775890d355e5a975e43d0f15292115 Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 13:03:16 +0200 Subject: [PATCH 11/18] remove cd --- .github/workflows/publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 71cf86494..f6c76e214 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -76,7 +76,6 @@ jobs: - name: Prepare the production zip run: | - cd ${{ github.event.repository.name }} zip -r ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.zip ${{ github.event.repository.name }} -x '*.git*' - name: Publish the production zip @@ -115,7 +114,6 @@ jobs: - name: Prepare the integration zip run: | - cd ${{ github.event.repository.name }} zip -r ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}_integration.zip ${{ github.event.repository.name }} -x '*.git*' - name: Publish the integration zip uses: shogo82148/actions-upload-release-asset@v1 From 6e16f901dda129793e6dd7549786acb6e39acdc9 Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 13:17:03 +0200 Subject: [PATCH 12/18] change env path --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f6c76e214..d4056ec72 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -108,7 +108,7 @@ jobs: - name: Copy env files run: | gcloud components install beta - gcloud beta secrets versions access latest --secret="${{env.GLOUD_SECRET_NAME}}" >> ${{ github.event.repository.name }}/${{ github.event.repository.name }}/.env + gcloud beta secrets versions access latest --secret="${{env.GLOUD_SECRET_NAME}}" >> ./${{ github.event.repository.name }}/.env env: GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.G_CREDENTIAL_INTEGRATION }} From b96c4fc09fc45aa118bc0f9da24f691e0584f2b3 Mon Sep 17 00:00:00 2001 From: Sacha Avazashvili Date: Fri, 13 Sep 2024 13:30:11 +0200 Subject: [PATCH 13/18] fix assets path --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d4056ec72..53533d7f9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -83,7 +83,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} upload_url: ${{ github.event.release.upload_url }} - asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.zip + asset_path: ./${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.zip asset_name: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.zip asset_content_type: application/zip @@ -120,7 +120,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} upload_url: ${{ github.event.release.upload_url }} - asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}-${{ github.event.release.tag_name }}_integration.zip + asset_path: ./${{ github.event.repository.name }}-${{ github.event.release.tag_name }}_integration.zip asset_name: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}_integration.zip asset_content_type: application/zip From e9c2ef7e55971163acfe931066e51d78448ffa1e Mon Sep 17 00:00:00 2001 From: Clara <76918665+ClaraLpresta@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:08:10 +0200 Subject: [PATCH 14/18] Emktg 3265 fix subscription billing (#559) * fix the subscription when plan has expired * fix the subscription when plan has expired * fix the subscription when plan has expired * fix eslint --- .../configuration/alert-subscription-cancelled.vue | 5 ++++- .../components/configuration/onboarding-deps-container.vue | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/_dev/src/components/configuration/alert-subscription-cancelled.vue b/_dev/src/components/configuration/alert-subscription-cancelled.vue index c69c539b3..4d6a7c894 100644 --- a/_dev/src/components/configuration/alert-subscription-cancelled.vue +++ b/_dev/src/components/configuration/alert-subscription-cancelled.vue @@ -31,7 +31,10 @@ {{ $t('cta.resubscribe') }} diff --git a/_dev/src/components/configuration/onboarding-deps-container.vue b/_dev/src/components/configuration/onboarding-deps-container.vue index 066ca0377..f30f8f19b 100644 --- a/_dev/src/components/configuration/onboarding-deps-container.vue +++ b/_dev/src/components/configuration/onboarding-deps-container.vue @@ -5,12 +5,12 @@ /> Date: Fri, 11 Oct 2024 11:30:23 +0200 Subject: [PATCH 15/18] Activate multishop support --- controllers/admin/AdminPsfacebookModuleController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminPsfacebookModuleController.php b/controllers/admin/AdminPsfacebookModuleController.php index ad3c5b36f..9605fcf5b 100644 --- a/controllers/admin/AdminPsfacebookModuleController.php +++ b/controllers/admin/AdminPsfacebookModuleController.php @@ -158,7 +158,7 @@ public function initContent() ->present($this->module->name), 'psAccountsToken' => $psAccountsData['psAccountsToken'], 'defaultCategory' => $this->shopRepository->getDefaultCategoryShop(), - 'psAccountShopInConflict' => $this->multishopDataProvider->isCurrentShopInConflict($this->context->shop), + 'psAccountShopInConflict' => false, 'psFacebookAppId' => $this->env->get('PSX_FACEBOOK_APP_ID'), 'psFacebookFbeUiUrl' => $this->env->get('PSX_FACEBOOK_UI_URL'), 'psFacebookSegmentId' => $this->env->get('PSX_FACEBOOK_SEGMENT_API_KEY'), From a570a118fb4a2b649dd0ae1c58a9fcf992c8864f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20S=C3=A9ghair?= Date: Fri, 11 Oct 2024 11:37:07 +0200 Subject: [PATCH 16/18] Remove unread variable --- controllers/admin/AdminPsfacebookModuleController.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/controllers/admin/AdminPsfacebookModuleController.php b/controllers/admin/AdminPsfacebookModuleController.php index 9605fcf5b..08d293925 100644 --- a/controllers/admin/AdminPsfacebookModuleController.php +++ b/controllers/admin/AdminPsfacebookModuleController.php @@ -23,7 +23,6 @@ use PrestaShop\Module\PrestashopFacebook\Config\Env; use PrestaShop\Module\PrestashopFacebook\Handler\ErrorHandler\ErrorHandler; use PrestaShop\Module\PrestashopFacebook\Presenter\ModuleUpgradePresenter; -use PrestaShop\Module\PrestashopFacebook\Provider\MultishopDataProvider; use PrestaShop\Module\PrestashopFacebook\Repository\ShopRepository; use PrestaShop\PrestaShop\Core\Addon\Module\ModuleManagerBuilder; use PrestaShop\PsAccountsInstaller\Installer\Facade\PsAccounts; @@ -50,11 +49,6 @@ class AdminPsfacebookModuleController extends ModuleAdminController */ private $moduleUpgradePresenter; - /** - * @var MultishopDataProvider - */ - private $multishopDataProvider; - /** * @var ShopRepository */ @@ -69,7 +63,6 @@ public function __construct() $this->configurationAdapter = $this->module->getService(ConfigurationAdapter::class); $this->env = $this->module->getService(Env::class); $this->moduleUpgradePresenter = $this->module->getService(ModuleUpgradePresenter::class); - $this->multishopDataProvider = $this->module->getService(MultishopDataProvider::class); $this->shopRepository = $this->module->getService(ShopRepository::class); $this->module->getService(ErrorHandler::class); $this->bootstrap = false; From aff22f48e95b9f2cb76873b1c2bfe205f41e8d33 Mon Sep 17 00:00:00 2001 From: Clara <76918665+ClaraLpresta@users.noreply.github.com> Date: Wed, 23 Oct 2024 09:55:13 +0200 Subject: [PATCH 17/18] SC-45 : help center url changed (#561) * feat: help center url changed * fix: deleted debug console --- _dev/src/assets/json/translations/de/ui.json | 3 ++- _dev/src/assets/json/translations/en/ui.json | 3 ++- _dev/src/assets/json/translations/es/ui.json | 3 ++- _dev/src/assets/json/translations/fr/ui.json | 3 ++- _dev/src/assets/json/translations/it/ui.json | 3 ++- _dev/src/assets/json/translations/nl/ui.json | 3 ++- _dev/src/assets/json/translations/pl/ui.json | 3 ++- _dev/src/assets/json/translations/pt/ui.json | 3 ++- _dev/src/assets/json/translations/ro/ui.json | 3 ++- _dev/src/assets/json/translations/ru/ui.json | 3 ++- _dev/src/components/help/card-faq.vue | 1 - _dev/src/views/help.vue | 2 +- 12 files changed, 21 insertions(+), 12 deletions(-) diff --git a/_dev/src/assets/json/translations/de/ui.json b/_dev/src/assets/json/translations/de/ui.json index 1b15af85a..898a7af8b 100644 --- a/_dev/src/assets/json/translations/de/ui.json +++ b/_dev/src/assets/json/translations/de/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "PDF herunterladen", "couldntFindAnyAnswer": "Konnten Sie keine Antwort auf Ihre Frage finden?", "contactUs": "Kontaktieren Sie uns" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/gb/contact-us" }, "faq": { "title": "FAQ", diff --git a/_dev/src/assets/json/translations/en/ui.json b/_dev/src/assets/json/translations/en/ui.json index d441bad0f..523185390 100644 --- a/_dev/src/assets/json/translations/en/ui.json +++ b/_dev/src/assets/json/translations/en/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "Download PDF", "couldntFindAnyAnswer": "Couldn't find any answer to your question?", "contactUs": "Contact us" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/gb/contact-us" }, "faq": { "title": "FAQ", diff --git a/_dev/src/assets/json/translations/es/ui.json b/_dev/src/assets/json/translations/es/ui.json index 53b94d25a..d19b6723c 100644 --- a/_dev/src/assets/json/translations/es/ui.json +++ b/_dev/src/assets/json/translations/es/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "Descargar PDF", "couldntFindAnyAnswer": "¿No has encontrado ninguna respuesta a tu pregunta?", "contactUs": "Contacto" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/es/contactenos" }, "faq": { "title": "FAQ", diff --git a/_dev/src/assets/json/translations/fr/ui.json b/_dev/src/assets/json/translations/fr/ui.json index 5d10a3b22..ef24a0dc5 100644 --- a/_dev/src/assets/json/translations/fr/ui.json +++ b/_dev/src/assets/json/translations/fr/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "Télécharger le PDF", "couldntFindAnyAnswer": "Vous n'avez pas trouvé de réponse à votre question ?", "contactUs": "Nous contacter" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/fr/nous-contacter" }, "faq": { "title": "FAQ", diff --git a/_dev/src/assets/json/translations/it/ui.json b/_dev/src/assets/json/translations/it/ui.json index 2b1cf1475..7ee7db713 100644 --- a/_dev/src/assets/json/translations/it/ui.json +++ b/_dev/src/assets/json/translations/it/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "Scarica PDF", "couldntFindAnyAnswer": "Non hai ancora trovato le risposte che cercavi?", "contactUs": "Contattaci" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/it/contattaci" }, "faq": { "title": "FAQ", diff --git a/_dev/src/assets/json/translations/nl/ui.json b/_dev/src/assets/json/translations/nl/ui.json index dca050242..2c4863315 100644 --- a/_dev/src/assets/json/translations/nl/ui.json +++ b/_dev/src/assets/json/translations/nl/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "Download de PDF", "couldntFindAnyAnswer": "Kon u geen antwoord vinden op uw vraag?", "contactUs": "Neem contact met ons op" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/gb/contact-us" }, "faq": { "title": "FAQ", diff --git a/_dev/src/assets/json/translations/pl/ui.json b/_dev/src/assets/json/translations/pl/ui.json index d0b6e98ae..de052caf8 100644 --- a/_dev/src/assets/json/translations/pl/ui.json +++ b/_dev/src/assets/json/translations/pl/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "Pobierz plik PDF", "couldntFindAnyAnswer": "Nie znalazłeś/aś odpowiedzi na swoje pytanie?", "contactUs": "Skontaktuj się z nami" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/gb/contact-us" }, "faq": { "title": "FAQ", diff --git a/_dev/src/assets/json/translations/pt/ui.json b/_dev/src/assets/json/translations/pt/ui.json index 27697b5dd..0271e75cc 100644 --- a/_dev/src/assets/json/translations/pt/ui.json +++ b/_dev/src/assets/json/translations/pt/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "Descarregar PDF", "couldntFindAnyAnswer": "Não encontrou resposta para a sua pergunta?", "contactUs": "Contacte-nos" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/gb/contact-us" }, "faq": { "title": "Perguntas frequentes", diff --git a/_dev/src/assets/json/translations/ro/ui.json b/_dev/src/assets/json/translations/ro/ui.json index 9398b1cd6..229f0a128 100644 --- a/_dev/src/assets/json/translations/ro/ui.json +++ b/_dev/src/assets/json/translations/ro/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "Descarcă PDF", "couldntFindAnyAnswer": "Nu ai găsit niciun răspuns la întrebarea ta?", "contactUs": "Contactează-ne" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/gb/contact-us" }, "faq": { "title": "ÎNTREBĂRI FRECVENTE", diff --git a/_dev/src/assets/json/translations/ru/ui.json b/_dev/src/assets/json/translations/ru/ui.json index 3aa902a6b..a38e80271 100644 --- a/_dev/src/assets/json/translations/ru/ui.json +++ b/_dev/src/assets/json/translations/ru/ui.json @@ -369,7 +369,8 @@ "downloadPdf": "Скачать PDF", "couldntFindAnyAnswer": "Не смогли найти ответ на свой вопрос?", "contactUs": "Свяжитесь с нами" - } + }, + "helpCenterUrl": "https://prestashop-academy.com/gb/contact-us" }, "faq": { "title": "ЧАСТО ЗАДАВАЕМЫЕ ВОПРОСЫ", diff --git a/_dev/src/components/help/card-faq.vue b/_dev/src/components/help/card-faq.vue index a3ee84747..20884c177 100644 --- a/_dev/src/components/help/card-faq.vue +++ b/_dev/src/components/help/card-faq.vue @@ -21,7 +21,6 @@ - diff --git a/_dev/src/views/help.vue b/_dev/src/views/help.vue index 170cbcaa0..79966d38a 100644 --- a/_dev/src/views/help.vue +++ b/_dev/src/views/help.vue @@ -51,7 +51,7 @@ export default defineComponent({ return { faq: {}, docLink: '', - contactUsLink: 'https://help-center.prestashop.com/contact', + contactUsLink: this.$i18n.t('help.helpCenterUrl'), loading: true, }; }, From edc51611ee32fe3259bbaebac52223948f858fa0 Mon Sep 17 00:00:00 2001 From: Clara <76918665+ClaraLpresta@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:42:34 +0200 Subject: [PATCH 18/18] new version (#562) * new version * new version --- config.xml | 2 +- ps_facebook.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.xml b/config.xml index 998cb2e05..02e038b2c 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_facebook - + diff --git a/ps_facebook.php b/ps_facebook.php index 88453650b..4bac67a51 100644 --- a/ps_facebook.php +++ b/ps_facebook.php @@ -89,7 +89,7 @@ public function __construct() { $this->name = 'ps_facebook'; $this->tab = 'advertising_marketing'; - $this->version = '1.38.1'; + $this->version = '1.38.2'; $this->author = 'PrestaShop'; $this->need_instance = 0; $this->module_key = '860395eb54512ec72d98615805274591';