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] 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 0f0686c7..5d10a3b2 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 ac49a34c..c69c539b 100644
--- a/_dev/src/components/configuration/alert-subscription-cancelled.vue
+++ b/_dev/src/components/configuration/alert-subscription-cancelled.vue
@@ -31,7 +31,7 @@
         <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')"
         >
           {{ $t('cta.resubscribe') }}
         </b-button>
diff --git a/_dev/src/components/configuration/onboarding-deps-container.vue b/_dev/src/components/configuration/onboarding-deps-container.vue
index ce7a3077..066ca037 100644
--- a/_dev/src/components/configuration/onboarding-deps-container.vue
+++ b/_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_funnel')"
     />
     <alert-subscription-cancelled
       v-else-if="billingSubscription && billingSubscription.cancelled_at"
       :subscription="billingSubscription"
-      @startSubscription="startSubscription"
+      @startSubscription="handleStartSubscription('subscription_reactivation')"
     />
     <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);
       }
     },
   },
diff --git a/config.xml b/config.xml
index 6bb5aaf7..998cb2e0 100644
--- a/config.xml
+++ b/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.1]]></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>
diff --git a/ps_facebook.php b/ps_facebook.php
index 15acb5b7..88453650 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';