Merge branch 'master' into l10n_master

.github/workflows/build-release.yml

@@ -38,7 +38,8 @@ jobs:
         uses: PrestaShopCorp/[email protected]
 
       - 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

.github/workflows/publish.yml

@@ -57,31 +57,33 @@ 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
     runs-on: ubuntu-latest
     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
 

_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": {

_dev/src/components/configuration/alert-subscription-cancelled.vue

@@ -31,7 +31,10 @@
         <b-button
           class="mx-1 mt-3 mt-md-0 mr-md-1 text-nowrap ml-auto"
           variant="outline-primary"
-          @click="$emit('startSubscription', 'subscription_reactivation')"
+          @click="$emit(
+            'startSubscription',
+            isSubscriptionRunning ? 'subscription_reactivation' : 'subscription_funnel'
+          )"
         >
           {{ $t('cta.resubscribe') }}
         </b-button>

_dev/src/components/configuration/onboarding-deps-container.vue

@@ -5,12 +5,12 @@
     />
     <alert-subscribe-to-continue
       v-else-if="!billingRunning && !billingSubscription && facebookOnboarded"
-      @startSubscription="startSubscription"
+      @startSubscription="handleStartSubscription('subscription_reactivation')"
     />
     <alert-subscription-cancelled
       v-else-if="billingSubscription && billingSubscription.cancelled_at"
       :subscription="billingSubscription"
-      @startSubscription="startSubscription"
+      @startSubscription="handleStartSubscription($event)"
     />
     <modal-module-upgrade-for-billing
       v-if="!billingContext && facebookOnboarded"
@@ -150,9 +150,9 @@ export default defineComponent({
       );
       this.openBillingModal = openCheckout;
     },
-    startSubscription($event: string): void {
+    handleStartSubscription(subscriptionActionType) {
       if (this.openBillingModal) {
-        this.openBillingModal($event);
+        this.openBillingModal(subscriptionActionType);
       }
     },
   },

_dev/src/components/help/card-faq.vue

@@ -21,7 +21,6 @@
     <template #header>
       <i class="material-icons material-icons-round">help</i>{{ $t("help.title") }}
     </template>
-
     <b-card-body
       class="p-3"
     >

_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,
     };
   },

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>ps_facebook</name>
     <displayName><![CDATA[PS Social with Facebook & Instagram]]></displayName>
-    <version><![CDATA[1.38.0]]></version>
+    <version><![CDATA[1.38.2]]></version>
     <description><![CDATA[PS Social with Facebook & Instagram gives you all the tools you need to successfully sell and market across Facebook and Instagram. Discover new opportunities to help you scale and grow your business, and manage all your Facebook accounts and products from one place.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[advertising_marketing]]></tab>

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'),

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';