';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 41764c38bd6..fdc414a2fba 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1359,7 +1359,7 @@ class Adherent extends CommonObject
* @param string $num_chq Numero cheque (if Id bank account provided)
* @param string $emetteur_nom Name of cheque writer
* @param string $emetteur_banque Name of bank of cheque
- * @param string $autocreatethirdparty Auto create new thirdparty if member not linked to a thirdparty and we request an option that generate invoice.
+ * @param string $autocreatethirdparty Auto create new thirdparty if member not yet linked to a thirdparty and we request an option that generate invoice.
* @return int <0 if KO, >0 if OK
*/
function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom='', $emetteur_banque='', $autocreatethirdparty=0)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0419e2cfc68..a21c7ac310f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1141,8 +1141,9 @@ class Form
if (count($scrit) > 1) $sql.=")";
if (! empty($conf->barcode->enabled))
{
- $sql .= " OR s.barcode LIKE '".$this->db->escape($filterkey)."%'";
+ $sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
}
+ $sql.= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";
$sql.=")";
}
$sql.=$this->db->order("nom","ASC");
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 97b8c68fd9b..a130ce82f79 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -72,7 +72,7 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
NoLimit=No limit
ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commercial proposals from %s
+WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
SignatureProposalRef=Signature of quote/commercial proposal %s
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 9eac3a0c542..44599d15451 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -188,7 +188,6 @@ MembersByNature=This screen show you statistics on members by nature.
MembersByRegion=This screen show you statistics on members by region.
VATToUseForSubscriptions=VAT rate to use for subscriptions
NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
NameOrCompany=Name or company
SubscriptionRecorded=Subscription recorded
diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
index c7e7bd38bdc..89e7ff48b79 100644
--- a/htdocs/langs/en_US/paybox.lang
+++ b/htdocs/langs/en_US/paybox.lang
@@ -3,7 +3,7 @@ PayBoxSetup=PayBox module setup
PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
ThisIsInformationOnPayment=This is information on payment to do
ToComplete=To complete
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 1cb88cd15e8..ecd176a0ae7 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -4,7 +4,7 @@ StripeDesc=Module to offer an online payment page accepting payments with Credit
StripeOrCBDoPayment=Pay with credit card or Stripe
FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
+WelcomeOnPaymentPage=Welcome to our online payment service
ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
ThisIsInformationOnPayment=This is information on payment to do
ToComplete=To complete
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index df1a5758478..dd9676a6813 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -221,8 +221,8 @@ print '';
print '';
print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").' ';
-print ' ';
print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").' ';
-print ' ';
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 78cf69d8337..47e22e12c8b 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -87,10 +87,8 @@ if (empty($paymentmethod))
dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
exit;
}
-else
-{
- dol_syslog("paymentmethod=".$paymentmethod);
-}
+
+dol_syslog("***** paymentok.php is called paymentmethod=".$paymentmethod." FULLTAG=".$FULLTAG." REQUEST_URI=".$_SERVER["REQUEST_URI"], LOG_DEBUG, 0, '_payment');
$validpaymentmethod=array();
@@ -194,7 +192,7 @@ if (! empty($conf->paypal->enabled))
// From env
$ipaddress = $_SESSION['ipaddress'];
- dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
+ dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
// Validate record
if (! empty($paymentType))
@@ -266,6 +264,9 @@ $fulltag = $FULLTAG;
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
+dol_syslog("ispaymentok=".$ispaymentok, LOG_DEBUG, 0, '_payment');
+
+
// Make complementary actions
$ispostactionok = 0;
$postactionmessages = array();
@@ -372,6 +373,8 @@ if ($ispaymentok)
// Create subscription
if (! $error)
{
+ dol_syslog("Call ->subscription to create subscription", LOG_DEBUG, 0, '_payment');
+
$crowid=$object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
if ($crowid <= 0)
{
@@ -389,11 +392,15 @@ if ($ispaymentok)
if (! $error)
{
- $autocreatethirdparty = 1;
+ dol_syslog("Call ->subscriptionComplementaryActions option=".$option, LOG_DEBUG, 0, '_payment');
+
+ $autocreatethirdparty = 1; // will create thirdparty if member not yet linked to a thirdparty
$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque, $autocreatethirdparty);
if ($result < 0)
{
+ dol_syslog("Error ".$object->error." ".join(',', $object->errors), LOG_DEBUG, 0, '_payment');
+
$error++;
$postactionmessages[] = $object->error;
$postactionmessages = array_merge($postactionmessages, $object->errors);
@@ -401,9 +408,21 @@ if ($ispaymentok)
}
else
{
- if ($option == 'bankviainvoice') $postactionmessages[] = 'Invoice, payment and bank record created';
- if ($option == 'bankdirect') $postactionmessages[] = 'Bank record created';
- if ($option == 'invoiceonly') $postactionmessages[] = 'Invoice recorded';
+ if ($option == 'bankviainvoice')
+ {
+ $postactionmessages[] = 'Invoice, payment and bank record created';
+ dol_syslog("Invoice, payment and bank record created", LOG_DEBUG, 0, '_payment');
+ }
+ if ($option == 'bankdirect')
+ {
+ $postactionmessages[] = 'Bank record created';
+ dol_syslog("Bank record created", LOG_DEBUG, 0, '_payment');
+ }
+ if ($option == 'invoiceonly')
+ {
+ $postactionmessages[] = 'Invoice recorded';
+ dol_syslog("Invoice recorded", LOG_DEBUG, 0, '_payment');
+ }
$ispostactionok = 1;
// If an invoice was created, it is into $object->invoice
@@ -416,7 +435,7 @@ if ($ispaymentok)
{
$thirdparty_id = $object->fk_soc;
- dol_syslog("Search existing Stripe customer profile for thirdparty_id=".$thirdparty_id, LOG_DEBUG, 0, '_stripe');
+ dol_syslog("Search existing Stripe customer profile for thirdparty_id=".$thirdparty_id, LOG_DEBUG, 0, '_payment');
$service = 'StripeTest';
$servicestatus = 0;
@@ -436,6 +455,8 @@ if ($ispaymentok)
if (! $customer && $TRANSACTIONID) // Not linked to a stripe customer, we make the link
{
+ dol_syslog("No stripe profile found, so we add it", LOG_DEBUG, 0, '_payment');
+
$ch = \Stripe\Charge::retrieve($TRANSACTIONID); // contains the charge id
$stripecu = $ch->customer; // value 'cus_....'
@@ -462,9 +483,11 @@ if ($ispaymentok)
$db->rollback();
}
- // Send email
+ // Send email to member
if (! $error)
{
+ dol_syslog("Send email to customer to ".$object->email." if we have to (sendalsoemail = ".$sendalsoemail.")", LOG_DEBUG, 0, '_payment');
+
// Send confirmation Email
if ($object->email && $sendalsoemail)
{
@@ -629,7 +652,7 @@ if ($ispaymentok)
}
else
{
- $postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. Not way to record the payment.';
+ $postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
$ispostactionok = -1;
$error++;
}
@@ -691,7 +714,9 @@ if ($ispaymentok)
$tmptag=dolExplodeIntoArray($fulltag,'.','=');
- // Send an email
+ dol_syslog("Send email to admins if we have to (sendemail = ".$sendemail.")", LOG_DEBUG, 0, '_payment');
+
+ // Send an email to admins
if ($sendemail)
{
$companylangs = new Translate('', $conf);
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index e142ca524b4..19d12a33005 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -307,8 +307,8 @@ print ' ';
print '';
print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").' ';
-print '