From 1d4e36ba3dbf64e6e4753af7269b6fedcc2fea44 Mon Sep 17 00:00:00 2001
From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com>
Date: Tue, 21 Jan 2020 10:04:49 +0100
Subject: [PATCH 1/2] Add Link to Pay if Online payment is used
Before : URL to Online Payment never shown.
Now : URL shown when PayPal, Stripe or PayBox are used.
---
.../modules/facture/doc/pdf_crabe.modules.php | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index ed99a04fcc2..2eb844fcb80 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1037,7 +1037,22 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY($posxval, $posy);
$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+
+ // Show online payment link
+ $useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
+ if ($object->mode_reglement_code == 'CB' || $object->mode_reglement_code == 'VAD' && $object->statut != Facture::STATUS_DRAFT && $useonlinepayment) {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+ global $langs;
+
+ $langs->loadLangs(array('payment', 'paybox'));
+ $servicename=$langs->transnoentities('Online');
+ $paiement_url = getOnlinePaymentUrl('', 'invoice', $object->ref, '', '','' );
+ $linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' '.$outputlangs->transnoentities("ClickHere").'';
+
+ $pdf->writeHTMLCell(80, 10, '', '',dol_htmlentitiesbr($linktopay), 0, 1);
+ }
+
$posy=$pdf->GetY()+2;
}
From b864325041becf8f37d13327b3eb8859c74bd6be Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Tue, 21 Jan 2020 09:07:14 +0000
Subject: [PATCH 2/2] Fixing style errors.
---
htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 2eb844fcb80..278a6caf8b6 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1047,10 +1047,10 @@ class pdf_crabe extends ModelePDFFactures
$langs->loadLangs(array('payment', 'paybox'));
$servicename=$langs->transnoentities('Online');
- $paiement_url = getOnlinePaymentUrl('', 'invoice', $object->ref, '', '','' );
+ $paiement_url = getOnlinePaymentUrl('', 'invoice', $object->ref, '', '', '');
$linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' '.$outputlangs->transnoentities("ClickHere").'';
- $pdf->writeHTMLCell(80, 10, '', '',dol_htmlentitiesbr($linktopay), 0, 1);
+ $pdf->writeHTMLCell(80, 10, '', '', dol_htmlentitiesbr($linktopay), 0, 1);
}
$posy=$pdf->GetY()+2;