Skip to content

Commit

Permalink
fix the subscription when plan has expired (#556)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClaraLpresta authored Sep 13, 2024
1 parent 4d42005 commit 446dda7
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion _dev/src/assets/json/translations/fr/ui.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
}
},
},
Expand Down
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ps_facebook.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down

0 comments on commit 446dda7

Please sign in to comment.