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..53533d7f9 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 @@ -68,20 +69,21 @@ jobs: needs: build steps: - name: Download artifact - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: ${{ github.event.repository.name }} + path: ./${{ github.event.repository.name }} - 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 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 @@ -91,9 +93,10 @@ jobs: needs: build steps: - name: Download artifact - uses: actions/download-artifact@v1 + 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 @@ -105,20 +108,19 @@ 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 }} - 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: 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 diff --git a/_dev/src/assets/json/translations/fr/ui.json b/_dev/src/assets/json/translations/fr/ui.json index f8d6352f5..ef24a0dc5 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..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 ce7a30776..f30f8f19b 100644 --- a/_dev/src/components/configuration/onboarding-deps-container.vue +++ b/_dev/src/components/configuration/onboarding-deps-container.vue @@ -5,12 +5,12 @@ /> help{{ $t("help.title") }} - 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, }; }, diff --git a/config.xml b/config.xml index 6bb5aaf7e..02e038b2c 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_facebook - + diff --git a/controllers/admin/AdminPsfacebookModuleController.php b/controllers/admin/AdminPsfacebookModuleController.php index ad3c5b36f..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; @@ -158,7 +151,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'), diff --git a/ps_facebook.php b/ps_facebook.php index 15acb5b72..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.0'; + $this->version = '1.38.2'; $this->author = 'PrestaShop'; $this->need_instance = 0; $this->module_key = '860395eb54512ec72d98615805274591';