Debug last stripe PR

htdocs/core/lib/company.lib.php

@@ -175,14 +175,21 @@ function societe_prepare_head(Societe $object)
         $h++;
     }
 
-    // Bank accounrs
+    // Bank accounts
     if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))
     {
     	$langs->load("banks");
 
+        $title = $langs->trans("BankAccounts");
+		if (! empty($conf->stripe->enabled))
+		{
+			$langs->load("stripe");
+			$title = $langs->trans("BankAccountsAndGateways");
+		}
+
         $nbBankAccount=0;
-        $head[$h][0] = DOL_URL_ROOT .'/societe/gateway.php?socid='.$object->id;
+        $head[$h][0] = DOL_URL_ROOT .'/societe/paymentmodes.php?socid='.$object->id;
-        $head[$h][1] = $langs->trans("Gateways");
+        $head[$h][1] = $title;
         $sql = "SELECT COUNT(n.rowid) as nb";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib as n";
         $sql.= " WHERE fk_soc = ".$object->id;

htdocs/langs/en_US/banks.lang

@@ -7,6 +7,7 @@ BankName=Bank name
 FinancialAccount=Account
 BankAccount=Bank account
 BankAccounts=Bank accounts
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Show Account
 AccountRef=Financial account ref
 AccountLabel=Financial account label

htdocs/langs/en_US/stripe.lang

@@ -43,3 +43,4 @@ ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when payment online pay
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
 ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeGateways=Stripe gateways

htdocs/societe/paymentmodes.php

@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+//require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
 $langs->load("companies");
 $langs->load("commercial");
@@ -331,10 +331,12 @@ if (empty($reshook))
 	$id = $savid;
 }
 
+if (class_exists('StripeConnexion'))
+{
 	$stripeconnect=new StripeConnexion($db);
-$customer=$stripeconnect->CustomerStripe($socid,$stripeconnect->GetStripeAccount($conf->entity));
+	$customerstripe=$stripeconnect->CustomerStripe($socid,$stripeconnect->GetStripeAccount($conf->entity));
-if ($customer->id) {
+	if ($customerstripe->id) {
-$cu = \Stripe\Customer::retrieve("".$customer->id."",array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));}
+	$cu = \Stripe\Customer::retrieve("".$customerstripe->id."",array("stripe_account" => $stripeconnect->GetStripeAccount($conf->entity)));}
 	$url=DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id;
 	if ($action == 'setasdefault')
 	{
@@ -351,6 +353,7 @@ $cu->sources->retrieve("$source")->delete();
 	header('Location: '.$url);
 	exit;
 	}
+}
 
 
 /*
@@ -403,16 +406,20 @@ if ($socid && $action != 'edit' && $action != "create")
 
 	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
-if (! (empty($conf->stripe->enabled))){
+
-print '<tr><td class="titlefield">';
+	if (! (empty($conf->stripe->enabled)))
-print $langs->trans('StripeGateways').'</td><td colspan="3">';
+	{
-if ($stripeconnect->GetStripeAccount($conf->entity)) {
+		print load_fiche_titre($langs->trans('StripeGateways'), '', '');
-$customer=$stripeconnect->CustomerStripe($object->id,$stripeconnect->GetStripeAccount($conf->entity));
+
+		if (is_object($stripeconnect) && $stripeconnect->GetStripeAccount($conf->entity))
+		{
+			$customerstripe=$stripeconnect->CustomerStripe($object->id,$stripeconnect->GetStripeAccount($conf->entity));
 		}
 
-if ($customer->id) {
+		if ($customerstripe->id) {
-$input=$customer->sources->data;
+			$input=$customerstripe->sources->data;
 		}
+
 		print '<table class="liste" width="100%">'."\n";
 		print '<tr class="liste_titre">';
 		print '<td align="left">'.$langs->trans('Type').'</td>';
@@ -421,10 +428,14 @@ print '<td align="left"></td>';
 		print '<td align="center">'.$langs->trans('Default').'</td>';
 		print "<td></td></tr>\n";
 
-foreach ($input as $src) {
+		if (is_array($input))
+		{
+			foreach ($input as $src)
+			{
 				print '<tr>';
 				print '<td>';
-if ($src->object=='card'){
+				if ($src->object=='card')
+				{
 					if ($src->brand == 'Visa') {$brand='cc-visa';}
 					elseif ($src->brand == 'MasterCard') {$brand='cc-mastercard';}
 					elseif ($src->brand == 'American Express') {$brand='cc-amex';}
@@ -434,7 +445,8 @@ elseif ($src->brand == 'Diners Club') {$brand='cc-diners-club';}
 					else {$brand='credit-card';}
 					print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
 				}
-elseif ($src->object=='source' && $src->type=='card'){
+				elseif ($src->object=='source' && $src->type=='card')
+				{
 					if ($src->card->brand == 'Visa') {$brand='cc-visa';}
 					elseif ($src->card->brand == 'MasterCard') {$brand='cc-mastercard';}
 					elseif ($src->card->brand == 'American Express') {$brand='cc-amex';}
@@ -442,14 +454,16 @@ elseif ($src->card->brand == 'Discover') {$brand='cc-discover';}
 					elseif ($src->card->brand == 'JCB') {$brand='cc-jcb';}
 					elseif ($src->card->brand == 'Diners Club') {$brand='cc-diners-club';}
 					else {$brand='credit-card';}
-
 					print '<span class="fa fa-'.$brand.' fa-3x fa-fw"></span>';
 				}
-elseif ($src->object=='source' && $src->type=='sepa_debit'){
+				elseif ($src->object=='source' && $src->type=='sepa_debit')
+				{
 					print '<span class="fa fa-university fa-3x fa-fw"></span>';
 				}
+
 				print'</td><td valign="middle">';
-if ($src->object=='card'){
+				if ($src->object=='card')
+				{
 					print '**** '.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
 					print '</td><td>';
 					if ($src->country)
@@ -460,9 +474,11 @@ print '</td><td>';
 					}
 					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 				}
-elseif ($src->object=='source' && $src->type=='card'){
+				elseif ($src->object=='source' && $src->type=='card')
+				{
 					print $src->owner->name.'<br>**** '.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
+
 				 	if ($src->card->country)
 					{
 						$img=picto_from_langcode($src->card->country);
@@ -471,7 +487,8 @@ print '</td><td>';
 					}
 					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 				}
-elseif ($src->object=='source' && $src->type=='sepa_debit'){
+				elseif ($src->object=='source' && $src->type=='sepa_debit')
+				{
 					print 'info sepa';
 					print '</td><td>';
 					if ($src->sepa_debit->country)
@@ -485,7 +502,8 @@ print '</td><td>';
 				print '</td>';
 				// Default
 				print '<td align="center" width="50">';
-            if (($cu->default_source!=$src->id)) {
+				if (($cu->default_source!=$src->id))
+				{
 				                print '<a href="' . DOL_URL_ROOT.'/societe/gateway.php?socid='.$object->id.'&source='.$src->id.'&action=setasdefault">';
 				                print "<SPAN class='fa fa-circle  fa-2x'></SPAN>";
 				                print '</a>';
@@ -506,6 +524,7 @@ print '<td align="center">';
 				}
 				print '</td></tr>';
 			}
+		}
 		if (empty($input))
 		{
 			print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("NoSource").'</td></tr>';
@@ -513,6 +532,7 @@ print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("NoSource").'</
 		print "</table>";
 	}
 
+
 	// List of bank accounts
 
 	$morehtmlright='<a href="rib.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("Add").'</a>';