From ac97ba9e36f5a65d54368d361468f3013b68ddb5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 May 2018 20:41:01 +0200
Subject: [PATCH] Fix deletion of stripe card Solve validation of recurring
 invoice

---
 htdocs/compta/facture/class/facture-rec.class.php | 12 ++++++++----
 htdocs/societe/paymentmodes.php                   |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 40205ff0a97..dbf15ff0186 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -973,9 +973,11 @@ class FactureRec extends CommonInvoice
 	 *
 	 *  WARNING: This method change temporarly context $conf->entity to be in correct context for each recurring invoice found.
 	 *
-	 *  @return	int						0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
+	 *  @param	int		$restictoninvoiceid		0=All qualified template invoices found. > 0 = restrict action on invoice ID
+	 *  @param	int		$forcevalidation		1=Force validation of invoice whatever is template auto_validate flag.
+	 *  @return	int								0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	function createRecurringInvoices()
+	function createRecurringInvoices($restictoninvoiceid=0, $forcevalidation=0)
 	{
 		global $conf, $langs, $db, $user;
 
@@ -989,13 +991,15 @@ class FactureRec extends CommonInvoice
 		$tmparray=dol_getdate($now);
 		$today = dol_mktime(23,59,59,$tmparray['mon'],$tmparray['mday'],$tmparray['year']);   // Today is last second of current day
 
-		dol_syslog("createRecurringInvoices");
+		dol_syslog("createRecurringInvoices restictoninvoiceid=".$restictoninvoiceid." forcevalidation=".$forcevalidation);
+
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_rec';
 		$sql.= ' WHERE frequency > 0';      // A recurring invoice is an invoice with a frequency
 		$sql.= " AND (date_when IS NULL OR date_when <= '".$db->idate($today)."')";
 		$sql.= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
 		$sql.= ' AND suspended = 0';
 		$sql.= ' AND entity = '.$conf->entity;	// MUST STAY = $conf->entity here
+		if ($restictoninvoiceid > 0) $sql.=' AND rowid = '.$restictoninvoiceid;
 		$sql.= $db->order('entity', 'ASC');
 		//print $sql;exit;
 
@@ -1044,7 +1048,7 @@ class FactureRec extends CommonInvoice
 				        $this->error = $facture->error;
 				        $error++;
 				    }
-				    if (! $error && $facturerec->auto_validate)
+				    if (! $error && ($facturerec->auto_validate || $forcevalidation))
 				    {
 				        $result = $facture->validate($user);
 				        if ($result <= 0)
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 0baffe090d2..8b11ab9573b 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -614,7 +614,7 @@ if (empty($reshook))
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
 		}
-		elseif ($action == 'deletecard')
+		elseif ($action == 'deletecard' && $source)
 		{
 			try {
 				$cu=$stripe->customerStripe($object, $stripeacc, $servicestatus);
@@ -918,7 +918,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								print img_picto($langs->trans("Modify"),'edit');
 								print '</a>';
 								print '&nbsp;';
-								print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=deletecard">';
+								print '<a href="' . DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=deletecard">';	// source='.$companypaymentmodetemp->stripe_card_ref.'&
 								print img_picto($langs->trans("Delete"), 'delete');
 								print '</a>';
 							}