lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9584 from ptibogxiv/patch-54

Browse Source 
fix link with connect transaction.php
This commit is contained in:
Laurent Destailleur 2018-09-21 09:59:57 +02:00 committed by GitHub
commit 90b327af1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
htdocs/stripe/transaction.php
View File

@ -26,9 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
if (! empty($conf->accounting->enabled)) { if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
}
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe')); $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
@ -65,16 +63,16 @@ llxHeader('', $langs->trans("StripeTransactionList"));
if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))) if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
{ {
$service = 'StripeTest'; $service = 'StripeTest';
$servicestatus = '0'; $servicestatus = '0';
dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
} }
else else
{ {
$service = 'StripeLive'; $service = 'StripeLive';
$servicestatus = '1'; $servicestatus = '1';
} }
$stripeaccount = $stripe->getStripeAccount($service); $stripeacc = $stripe->getStripeAccount($service);
/*if (empty($stripeaccount)) /*if (empty($stripeaccount))
{ {
print $langs->trans('ErrorStripeAccountNotDefined'); print $langs->trans('ErrorStripeAccountNotDefined');
@ -83,9 +81,8 @@ $stripeaccount = $stripe->getStripeAccount($service);
if (! $rowid) { if (! $rowid) {
print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">'; print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
if ($optioncss != '') { if ($optioncss != '')
print '<input type="hidden" name="optioncss" value="' . $optioncss . '">'; print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
}
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'; print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">'; print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
print '<input type="hidden" name="action" value="list">'; print '<input type="hidden" name="action" value="list">';
@ -94,7 +91,7 @@ if (! $rowid) {
print '<input type="hidden" name="page" value="' . $page . '">'; print '<input type="hidden" name="page" value="' . $page . '">';
$title=$langs->trans("StripeTransactionList"); $title=$langs->trans("StripeTransactionList");
$title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeaccount.')':' (Stripe connection with keys from Stripe module setup)'); $title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)');
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
@ -115,9 +112,9 @@ if (! $rowid) {
print "</tr>\n"; print "</tr>\n";
if ($stripeaccount) if ($stripeacc)
{ {
$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeaccount)); $txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
} }
else else
{ {
@ -164,8 +161,9 @@ if (! $rowid) {
print '<tr class="oddeven">'; print '<tr class="oddeven">';
// Ref // Ref
if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/'; if (!empty($stripeacc)) $connect=$stripeacc.'/';
// Ref
if (preg_match('/po_/i', $txn->source)){ if (preg_match('/po_/i', $txn->source)){
$origin="payouts"; $origin="payouts";
} elseif (preg_match('/fee_/i', $txn->source)) { } elseif (preg_match('/fee_/i', $txn->source)) {
@ -175,15 +173,14 @@ if (! $rowid) {
} }
$url='https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source; $url='https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source;
if ($servicestatus)
if ($servicestatus) {
{ $url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
$url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source; }
}
if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') { if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
print "<td>".$txn->type."</td>"; print "<td>".$txn->type."</td>";
} else print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n"; } else print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n";
// Stripe customer // Stripe customer
//print "<td>".$charge->customer."</td>\n"; //print "<td>".$charge->customer."</td>\n";
// Link // Link
@ -198,16 +195,15 @@ if (! $rowid) {
} }
print "</td>\n";*/ print "</td>\n";*/
// Origine // Origine
//print "<td>"; //print "<td>";
////if ($charge->metadata->dol_type=="order"){ ////if ($charge->metadata->dol_type=="order"){
// $object = new Commande($db); // $object = new Commande($db);
// $object->fetch($charge->metadata->dol_id); // $object->fetch($charge->metadata->dol_id);
// print "<A href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</A>"; // print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
//} elseif ($charge->metadata->dol_type=="invoice"){ //} elseif ($charge->metadata->dol_type=="invoice"){
// $object = new Facture($db); // $object = new Facture($db);
// $object->fetch($charge->metadata->dol_id); // $object->fetch($charge->metadata->dol_id);
// print "<A href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</A>"; // print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
//} //}
//print "</td>\n"; //print "</td>\n";
// Date payment // Date payment
@ -219,13 +215,12 @@ if (! $rowid) {
print "<td align=\"right\">" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>"; print "<td align=\"right\">" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
// Status // Status
print "<td align='right'>"; print "<td align='right'>";
if ($txn->status=='available') { if ($txn->status=='available')
print img_picto($langs->trans("".$txn->status.""),'statut4'); {print img_picto($langs->trans("".$txn->status.""),'statut4');}
} elseif ($txn->status=='pending') { elseif ($txn->status=='pending')
print img_picto($langs->trans("".$txn->status.""),'statut7'); {print img_picto($langs->trans("".$txn->status.""),'statut7');}
} elseif ($txn->status=='failed') { elseif ($txn->status=='failed')
print img_picto($langs->trans("".$txn->status.""),'statut8'); {print img_picto($langs->trans("".$txn->status.""),'statut8');}
}
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
} }