Better message for invoices on disputes

Author: eldy

doc/Documentation SellYourSaas - Master and Deployment Servers - EN.asciidoc

@@ -4827,7 +4827,7 @@ mkdir /mnt/myimg;
 
 mount /dev/nbd0p1 /mnt/myimg
 rm -rf /mnt/myimg/tmp/*
-rm -f /mnt/myimg/var/log/*.gz /mnt/myimg/var/log/*.log /mnt/myimg/var/log/journal/*
+rm -fr /mnt/myimg/var/log/*.gz /mnt/myimg/var/log/*.log /mnt/myimg/var/log/journal/*
 umount /mnt/myimg
 
 zerofree -v /dev/nbd0p1

langs/en_US/sellyoursaas.lang

@@ -855,7 +855,7 @@ NewEmailToConfirm=New email to confirm
 UnitPriceOfLine=Unit price of line
 InvoicePaymentDisputed=Invoice payment disputed
 InvoicePaymentDisputedDesc=As soon as an invoice has been flagged to have a disputed payment, a message asking the customer to contact you is visible into its customer dashboard. Also, no other try to take payment will be done on the invoice as long as the invoice has this flag.
-InvoicePaymentDisputedMessage=The owner of the payment mode used to pay the invoice %s, created the %s, has an open dispute in bank to decline or cancel the payment. For this reason, your instance may have been suspended after the bank has contacted us, or may be suspended soon. Please contact us from the support menu to remove this alert and fix the situation.
+InvoicePaymentDisputedMessage=The owner of the payment mode used to pay this instances on this account has open a dispute in bank to decline or cancel the payment of the following invoice(s): %s. For this reason, your instance may have been suspended after the bank has contacted us, or may be suspended soon. Please contact us from the support menu to remove this alert and fix the situation.
 RuleForPassword=Password must contain at least %s characters, including UPPER/lowercase and numbers
 SepaSentToBank=SEPA direct debit sent to the bank
 SELLYOURSAAS_ENABLE_CUSTOMURL=Enable the "Custom URL" option

langs/fr_FR/sellyoursaas.lang

@@ -856,7 +856,7 @@ NewEmailToConfirm=Nouvel e-mail pour confirmer
 UnitPriceOfLine=Prix unitaire de la ligne
 InvoicePaymentDisputed=Paiement de facture contesté
 InvoicePaymentDisputedDesc=Dès qu'une facture est signalée comme ayant un paiement contesté, un message demandant au client de vous contacter est visible dans son tableau de bord client. De plus, aucune autre tentative de paiement ne sera effectuée sur la facture tant que celle-ci porte ce marquage.
-InvoicePaymentDisputedMessage=Le propriétaire du mode de paiement utilisé pour régler la facture %s, créée le %s, a un litige ouvert en banque pour refuser ou annuler le paiement. Pour cette raison, votre instance a peut-être été suspendue après que la banque nous a contactés, ou pourrait être suspendue prochainement. Veuillez nous contacter depuis le menu d'assistance pour supprimer cette alerte et résoudre la situation.
+InvoicePaymentDisputedMessage=Le propriétaire du mode de paiement, utilisé pour régler les instances sur ce compte, a ouvert un litige bancaire pour refuser ou annuler le paiement de la ou des factures suivantes : %s. De ce fait, votre instance a peut-être été suspendue après que la banque nous a contactés, ou pourrait l'être prochainement. Veuillez nous contacter depuis le menu d'assistance pour supprimer cette alerte et corriger le problème.
 RuleForPassword=Le mot de passe doit contenir au moins %s caractères, y compris MAJUSCULES/minuscules et chiffres
 SepaSentToBank=Prélèvement SEPA envoyé à la banque
 SELLYOURSAAS_ENABLE_CUSTOMURL=Activez l'option "URL personnalisée"

myaccount/index.php

@@ -3098,6 +3098,40 @@
 // Show warnings
 
 if (empty($welcomecid) && ! in_array($action, array('instanceverification', 'autoupgrade'))) {
+	// Show warnings on invoice dispute
+	$sql = 'SELECT f.rowid, f.ref, f.datef, f.datec, f.date_lim_reglement as date_due, f.dispute_status, fe.invoicepaymentdisputed';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facture_extrafields as fe';
+	$sql .= ' WHERE fe.fk_object = f.rowid AND f.fk_soc = '.((int) $mythirdpartyaccount->id);
+	$sql .= ' AND dispute_status = 1';
+	$sql .= ' ORDER BY f.datef';
+	$sql .= ' LIMIT 100';
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num_rows = $db->num_rows($resql);
+		$i=0;
+		if ($num_rows) {
+			$atleastoneinvoicedisputed++;
+			$listofreftoshow = '';
+
+			while ($obj = $db->fetch_object($resql)) {
+				$listofreftoshow .= ($listofreftoshow ? ', ' : $listofreftoshow).$obj->ref.' ('.dol_print_date($db->jdate($obj->datec), 'day', 'gmt').')';
+			}
+
+			if ($listofreftoshow) {
+				print '
+					<!-- Warnings disputed -->
+					<div class="note note-warning note-disputed">
+					<h4 class="block">'.$langs->trans("InvoicePaymentDisputedMessage", $listofreftoshow).'</h4>
+					</div>
+				';
+			}
+		}
+	} else {
+		dol_print_error($db);
+	}
+
+
 	$companypaymentmode = new CompanyPaymentMode($db);
 	$result = $companypaymentmode->fetch(0, null, $mythirdpartyaccount->id);
 
@@ -3396,33 +3430,6 @@
 	} else {
 		dol_print_error($db);
 	}
-
-	// Test if there is one invoice disputed
-	$sql = 'SELECT f.rowid, f.ref, f.datef, f.datec, f.date_lim_reglement as date_due, f.dispute_status, fe.invoicepaymentdisputed';
-	$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facture_extrafields as fe';
-	$sql .= ' WHERE fe.fk_object = f.rowid AND f.fk_soc = '.((int) $mythirdpartyaccount->id);
-	$sql .= ' AND dispute_status = 1';
-	$sql .= ' ORDER BY f.datef';
-	$sql .= ' LIMIT 1';
-
-	$resql = $db->query($sql);
-	if ($resql) {
-		$num_rows = $db->num_rows($resql);
-		$i=0;
-		if ($num_rows) {
-			$atleastoneinvoicedisputed++;
-
-			while ($obj = $db->fetch_object($resql)) {
-				print '
-					<div class="note note-warning note-disputed">
-					<h4 class="block">'.$langs->trans("InvoicePaymentDisputedMessage", $obj->ref, dol_print_date($db->jdate($obj->datec), 'day', 'gmt')).'</h4>
-					</div>
-				';
-			}
-		}
-	} else {
-		dol_print_error($db);
-	}
 }