From 53d2f8eaee539dbe5aabeea25c84a2cdd48a006b Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Fri, 21 Apr 2023 15:51:25 +0200
Subject: [PATCH] pay whole contract

---
 htdocs/public/payment/paymentok.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 0c731d99ca4..0f43a2ec454 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1579,7 +1579,7 @@ if ($ispaymentok) {
 			$postactionmessages[] = 'Invoice paid '.$tmptag['ATT'].' was not found';
 			$ispostactionok = -1;
 		}
-	} elseif (array_key_exists('CON', $tmptag) && array_key_exists('COL', $tmptag) && $tmptag['CON'] > 0 && $tmptag['COL'] > 0) {
+	} elseif (array_key_exists('CON', $tmptag) && $tmptag['CON'] > 0) {
 			include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
 			$object = new Contrat($db);
 			$result = $object->fetch((int) $tmptag['CON']);
@@ -1613,13 +1613,14 @@ if ($ispaymentok) {
 				}
 
 				$currencyCodeType = $_SESSION['currencyCodeType'];
+				$contract_lines = (array_key_exists('COL', $tmptag) && $tmptag['COL'] > 0) ? $tmptag['COL'] : null;
 	
 				// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 				if (isModEnabled('facture')) {
 					if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
 						include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 						$invoice = new Facture($db);
-						$result = $invoice->createFromContract($object, $user, array((int) $tmptag['COL']));
+						$result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
 						if ($result > 0) {
 							// $object->classifyBilled($user);
 							$invoice->validate($user);
@@ -1685,11 +1686,13 @@ if ($ispaymentok) {
 								$db->rollback();
 							}
 						} else {
-							$postactionmessages[] = 'Failed to create invoice form contract ' . $tmptag['CON'] . ' and col '. $tmptag['COL'] .'.';
+							$msg = 'Failed to create invoice form contract ' . $tmptag['CON'];
+							if (!empty($cols)) $msg .= ' and col '. $cols .'.';
+							$postactionmessages[] = $msg;
 							$ispostactionok = -1;
 						}
 					} else {
-						$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of contract ' . $tmptag['CON'] . ' and col '. $tmptag['COL'] .'. Maybe payment was already recorded.';
+						$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of contract ' . $tmptag['CON'] .'. Maybe payment was already recorded.';
 						$ispostactionok = -1;
 					}
 				} else {
@@ -1697,7 +1700,9 @@ if ($ispaymentok) {
 					$ispostactionok = -1;
 				}
 			} else {
-				$postactionmessages[] = 'Contract paid ' . $tmptag['CON'] . ' was not found for col '. $tmptag['COL'] .'.';
+				 $msg = 'Contract paid ' . $tmptag['CON'] . ' was not found';
+				 if (!empty($cols))  $msg .= ' for col '.$tmptag['COL'] .'.';
+				 $postactionmessages[] = $msg;
 				$ispostactionok = -1;
 			}
 		}