From b2d54662a1772f2382333514d7e8da42596bcc85 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 2 May 2019 13:34:34 +0200 Subject: [PATCH 1/5] FIX : https in stripe webhook/ipn url --- htdocs/stripe/admin/stripe.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index 91254e540a4..8d61407dcc0 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -197,12 +197,12 @@ if (empty($conf->stripeconnect->enabled)) print ''.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").''; if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { print ''; - print '   '.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx
'; + print '   '.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx
'; } print ''; print '   '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx'; $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForTestWebhook").' '; - $url = dol_buildpath('/public/stripe/ipn.php?test', 3); + $url = dol_buildpath('/public/stripe/ipn.php?test', 2); $out.= ''; $out.= ajax_autoselect("onlinetestwebhookurl", 0); print '
'.$out; @@ -269,13 +269,13 @@ if (empty($conf->stripeconnect->enabled)) print ''; print ''.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").''; if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { - print ''; - print '   '.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx
'; + print ''; + print '   '.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx
'; } print ''; print '   '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx'; $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForLiveWebhook").' '; - $url = dol_buildpath('/public/stripe/ipn.php', 3); + $url = dol_buildpath('/public/stripe/ipn.php', 2); $out.= ''; $out.= ajax_autoselect("onlinelivewebhookurl", 0); print '
'.$out; From 4a83036a8e49e04676132e9cab5c571e64990902 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 2 May 2019 13:38:47 +0200 Subject: [PATCH 2/5] Update stripe.php --- htdocs/stripe/admin/stripe.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index 8d61407dcc0..504b8cb7bfb 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -2,7 +2,7 @@ /* Copyright (C) 2017 Alexandre Spangaro * Copyright (C) 2017 Olivier Geffroy * Copyright (C) 2017 Saasprov - * Copyright (C) 2018 Thibault FOUCART + * Copyright (C) 2018-2019 Thibault FOUCART * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify @@ -201,7 +201,7 @@ if (empty($conf->stripeconnect->enabled)) } print ''; print '   '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx'; - $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForTestWebhook").' '; + $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForTestWebhook").' '; $url = dol_buildpath('/public/stripe/ipn.php?test', 2); $out.= ''; $out.= ajax_autoselect("onlinetestwebhookurl", 0); @@ -221,7 +221,7 @@ if (empty($conf->stripeconnect->enabled)) $endpoint->disabled = false; } } - $endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 3); + $endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 2); $endpoint->save(); if ($endpoint->status == 'enabled') { @@ -294,7 +294,7 @@ if (empty($conf->stripeconnect->enabled)) $endpoint->disabled = false; } } - $endpoint->url = dol_buildpath('/public/stripe/ipn.php', 3); + $endpoint->url = dol_buildpath('/public/stripe/ipn.php', 2); $endpoint->save(); if ($endpoint->status == 'enabled') { From d09de303d2ed9e7b38478cf1b7210f1a1071ccc8 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 2 May 2019 14:38:18 +0200 Subject: [PATCH 3/5] Update stripe.php --- htdocs/stripe/admin/stripe.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index 504b8cb7bfb..9b9914d6c7e 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -2,7 +2,7 @@ /* Copyright (C) 2017 Alexandre Spangaro * Copyright (C) 2017 Olivier Geffroy * Copyright (C) 2017 Saasprov - * Copyright (C) 2018-2019 Thibault FOUCART + * Copyright (C) 2018-2019 Thibault FOUCART * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify @@ -202,7 +202,7 @@ if (empty($conf->stripeconnect->enabled)) print ''; print '   '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx'; $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForTestWebhook").' '; - $url = dol_buildpath('/public/stripe/ipn.php?test', 2); + $url = dol_buildpath('/public/stripe/ipn.php?test', 3); $out.= ''; $out.= ajax_autoselect("onlinetestwebhookurl", 0); print '
'.$out; @@ -221,7 +221,7 @@ if (empty($conf->stripeconnect->enabled)) $endpoint->disabled = false; } } - $endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 2); + $endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 3); $endpoint->save(); if ($endpoint->status == 'enabled') { @@ -275,7 +275,7 @@ if (empty($conf->stripeconnect->enabled)) print ''; print '   '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx'; $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForLiveWebhook").' '; - $url = dol_buildpath('/public/stripe/ipn.php', 2); + $url = dol_buildpath('/public/stripe/ipn.php', 3); $out.= ''; $out.= ajax_autoselect("onlinelivewebhookurl", 0); print '
'.$out; @@ -294,7 +294,7 @@ if (empty($conf->stripeconnect->enabled)) $endpoint->disabled = false; } } - $endpoint->url = dol_buildpath('/public/stripe/ipn.php', 2); + $endpoint->url = dol_buildpath('/public/stripe/ipn.php', 3); $endpoint->save(); if ($endpoint->status == 'enabled') { From 3ddd5110efc54a6185770f8cbf07a43f6312d68c Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 9 May 2019 13:42:32 +0200 Subject: [PATCH 4/5] Update adherent.class.php --- htdocs/adherents/class/adherent.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 68575d2e279..540ae425cb2 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1279,7 +1279,7 @@ class Adherent extends CommonObject $this->login = $obj->login; $this->societe = $obj->company; $this->company = $obj->company; - $this->fk_soc = $obj->fk_soc; + $this->socid = $obj->fk_soc; $this->address = $obj->address; $this->zip = $obj->zip; $this->town = $obj->town; From d78900478290f33441eeb7ef0a69ae8771a6b741 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 May 2019 15:35:55 +0200 Subject: [PATCH 5/5] Update adherent.class.php --- htdocs/adherents/class/adherent.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 540ae425cb2..fc61e56115c 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1280,6 +1280,7 @@ class Adherent extends CommonObject $this->societe = $obj->company; $this->company = $obj->company; $this->socid = $obj->fk_soc; + $this->fk_soc = $obj->fk_soc; // For backward comaptibility $this->address = $obj->address; $this->zip = $obj->zip; $this->town = $obj->town;