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

replace html code by html5 in stripe

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-02-23 19:55:06 +01:00
parent ea5313382c
commit c000f03e56
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
5 changed files with 75 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/stripe/charge.php
View File

@ -101,10 +101,10 @@ if (!$rowid)
print_liste_field_titre("StripeCustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder);
print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"');
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
print "</tr>\n";
print "</tr>\n";
@ -149,9 +149,9 @@ if (!$rowid)
}
print '<tr class="oddeven">';
if (!empty($stripeacc)) $connect=$stripeacc.'/';
// Ref
$url='https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
if ($servicestatus)
@ -169,7 +169,7 @@ if (!$rowid)
$url='https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
}
print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'object_globe').' '.$charge->customer.'</a>';
print "</td>\n";
// Link
print "<td>";
@ -199,7 +199,7 @@ if (!$rowid)
} else print $FULLTAG;
print "</td>\n";
// Date payment
print '<td align="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
// Type
print '<td>';
if ($charge->source->object=='card')
@ -213,9 +213,9 @@ if (!$rowid)
}
print '</td>';
// Amount
print "<td align=\"right\">".price(($charge->amount-$charge->amount_refunded)/100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
print '<td class="right">'.price(($charge->amount-$charge->amount_refunded)/100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
// Status
print '<td align="right">';
print '<td class="right">';
if ($charge->refunded=='1'){
print img_picto($langs->trans("refunded"), 'statut6');
} elseif ($charge->paid=='1'){

8
htdocs/stripe/class/actions_stripe.class.php
View File

@ -95,7 +95,7 @@ class ActionsStripeconnect
$this->resprints.= '<tr><td>';
$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
$this->resprints.= $langs->trans('StripeCustomer');
$this->resprints.= '<td><td align="right">';
$this->resprints.= '<td><td class="right">';
// $this->resprints.= '<a href="'.$dolibarr_main_url_root.dol_buildpath('/dolipress/card.php?socid='.$object->id, 1).'">'.img_edit().'</a>';
$this->resprints.= '</td></tr></table>';
$this->resprints.= '</td>';
@ -114,7 +114,7 @@ class ActionsStripeconnect
$this->resprints.= '<tr><td>';
$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
$this->resprints.= $langs->trans('StripeCustomer');
$this->resprints.= '<td><td align="right">';
$this->resprints.= '<td><td class="right">';
$this->resprints.= '</td></tr></table>';
$this->resprints.= '</td>';
$this->resprints.= '<td colspan="3">';
@ -132,7 +132,7 @@ class ActionsStripeconnect
$this->resprints.= '<tr><td>';
$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
$this->resprints.= $langs->trans('SubscriptionStripe');
$this->resprints.= '<td><td align="right">';
$this->resprints.= '<td><td class="right">';
$this->resprints.= '</td></tr></table>';
$this->resprints.= '</td>';
$this->resprints.= '<td colspan="3">';
@ -151,7 +151,7 @@ class ActionsStripeconnect
$this->resprints.= '<tr><td>';
$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
$this->resprints.= $langs->trans('PlanStripe');
$this->resprints.= '<td><td align="right">';
$this->resprints.= '<td><td class="right">';
// $this->resprints.= '<a href="'.$dolibarr_main_url_root.dol_buildpath('/dolipress/card.php?socid='.$object->id, 1).'">'.img_edit().'</a>';
$this->resprints.= '</td></tr></table>';
$this->resprints.= '</td>';

66
htdocs/stripe/payment.php
View File

@ -633,7 +633,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
foreach ($customerstripe->sources->data as $src) {
print '<tr>';
print '<td align="center" width="20" ';
print '<td class="center" width="20" ';
if (($action == 'add_paiement' && $src->id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) {
print'class="opacitymedium"';
}
@ -697,7 +697,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
print '</td>';
// Default
print '<td align="center" width="50" ';
print '<td class="center" width="50" ';
if (($action == 'add_paiement' && $src->id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) {
print'class="opacitymedium"';
}
@ -716,7 +716,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if (($account->type=='custom' or $account->type=='express') && $entity==1) {
print '<tr class="oddeven">';
print '<td align="center" width="20" ';
print '<td class="center" width="20" ';
if ($action == 'add_paiement' && $stripe->getStripeCustomerAccount($facture->socid)!=$source) {
print'class="opacitymedium"';
}
@ -745,7 +745,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '</td>';
// Default
print '<td align="center" width="50" ';
print '<td class="center" width="50" ';
if ($action == 'add_paiement' && $src->id!=$source) {
print'class="opacitymedium"';
}
@ -823,21 +823,21 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$arraytitle.'</td>';
print '<td align="center">'.$langs->trans('Date').'</td>';
print '<td class="center">'.$langs->trans('Date').'</td>';
if (!empty($conf->multicurrency->enabled)) {
print '<td>'.$langs->trans('Currency').'</td>';
print '<td align="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
print '<td align="right">'.$multicurrencyalreadypayedlabel.'</td>';
print '<td align="right">'.$multicurrencyremaindertopay.'</td>';
print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
print '<td class="right">'.$multicurrencyalreadypayedlabel.'</td>';
print '<td class="right">'.$multicurrencyremaindertopay.'</td>';
}
print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
print '<td align="right">'.$alreadypayedlabel.'</td>';
print '<td align="right">'.$remaindertopay.'</td>';
print '<td align="right">'.$langs->trans('PaymentAmount').'</td>';
print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
print '<td class="right">'.$alreadypayedlabel.'</td>';
print '<td class="right">'.$remaindertopay.'</td>';
print '<td class="right">'.$langs->trans('PaymentAmount').'</td>';
if (!empty($conf->multicurrency->enabled)) {
print '<td align="right">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
print '<td class="right">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
}
print '<td align="right">&nbsp;</td>';
print '<td class="right">&nbsp;</td>';
print "</tr>\n";
$total=0;
@ -878,20 +878,20 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print "</td>\n";
// Date
print '<td align="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
// Currency
if (!empty($conf->multicurrency->enabled)) print '<td align="center">'.$objp->multicurrency_code."</td>\n";
if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$objp->multicurrency_code."</td>\n";
// Multicurrency Price
if (!empty($conf->multicurrency->enabled))
{
print '<td align="right">';
print '<td class="right">';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
print '</td>';
// Multicurrency Price
print '<td align="right">';
print '<td class="right">';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
{
print price($sign * $multicurrency_payment);
@ -901,26 +901,26 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '</td>';
// Multicurrency Price
print '<td align="right">';
print '<td class="right">';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
print '</td>';
}
// Price
print '<td align="right">'.price($sign * $objp->total_ttc).'</td>';
print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
// Received or paid back
print '<td align="right">'.price($sign * $paiement);
print '<td class="right">'.price($sign * $paiement);
if ($creditnotes) print '+'.price($creditnotes);
if ($deposits) print '+'.price($deposits);
print '</td>';
// Remain to take or to pay back
print '<td align="right">'.price($sign * $remaintopay).'</td>';
print '<td class="right">'.price($sign * $remaintopay).'</td>';
//$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
// Amount
print '<td align="right">';
print '<td class="right">';
// Add remind amount
$namef = 'amount_'.$objp->facid;
@ -943,7 +943,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Multicurrency Price
if (! empty($conf->multicurrency->enabled))
{
print '<td align="right">';
print '<td class="right">';
// Add remind multicurrency amount
$namef = 'multicurrency_amount_'.$objp->facid;
@ -968,7 +968,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
// Warning
print '<td align="center" width="16">';
print '<td class="center" width="16">';
//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id])))
@ -994,21 +994,21 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$amount=round(price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT'))*100);
// Print total
print '<tr class="liste_total">';
print '<td colspan="2" align="left">'.$langs->trans('TotalTTC').'</td>';
print '<td colspan="2" class="left">'.$langs->trans('TotalTTC').'</td>';
if (!empty($conf->multicurrency->enabled)) {
print '<td></td>';
print '<td></td>';
print '<td></td>';
}
print '<td align="right"><b>'.price($sign * $total_ttc).'</b></td>';
print '<td align="right"><b>'.price($sign * $totalrecu);
print '<td class="right"><b>'.price($sign * $total_ttc).'</b></td>';
print '<td class="right"><b>'.price($sign * $totalrecu);
if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
if ($totalrecudeposits) print '+'.price($totalrecudeposits);
print '</b></td>';
print '<td align="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
print '<td align="right" id="result" style="font-weight: bold;"></td>';
print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
print '<td class="right" id="result" style="font-weight: bold;"></td>';
if (!empty($conf->multicurrency->enabled)) {
print '<td align="right" id="multicurrency_result" style="font-weight: bold;"></td>';
print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
}
print "</tr>\n";
}
@ -1105,7 +1105,7 @@ if (! GETPOST('action'))
print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'ref', '', '', '', $sortfield, $sortorder);
print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'dp', '', '', '', $sortfield, $sortorder);
print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'libelle', '', '', '', $sortfield, $sortorder);
print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', 'align="right"', $sortfield, $sortorder);
print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', '', $sortfield, $sortorder, 'right ');
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
print "</tr>\n";
@ -1116,7 +1116,7 @@ if (! GETPOST('action'))
print '<td><a href="'.DOL_URL_ROOT.'compta/facture/card.php?facid='.$objp->facid.'">'.$objp->ref."</a></td>\n";
print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
print '<td>'.$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
print '<td align="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
print '<td class="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
$parameters=array();
$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook

22
htdocs/stripe/payout.php
View File

@ -103,12 +103,12 @@ if (! $rowid) {
//print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder);
print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"');
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("DateOperation", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
print "</tr>\n";
print "</tr>\n";
@ -198,16 +198,16 @@ if (! $rowid) {
//}
//print "</td>\n";
// Date payment
print '<td align="center">' . dol_print_date($payout->created, '%d/%m/%Y %H:%M') . "</td>\n";
print '<td class="center">' . dol_print_date($payout->created, '%d/%m/%Y %H:%M') . "</td>\n";
// Date payment
print '<td align="center">' . dol_print_date($payout->arrival_date, '%d/%m/%Y %H:%M') . "</td>\n";
print '<td class="center">' . dol_print_date($payout->arrival_date, '%d/%m/%Y %H:%M') . "</td>\n";
// Type
print '<td>' . $payout->description . '</td>';
// Amount
print "<td align=\"right\">" . price(($payout->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . "</td>";
print "<td align=\"right\">" . price(($payout->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . "</td>";
print '<td class="right">' . price(($payout->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . "</td>";
print '<td class="right">' . price(($payout->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($payout->currency)) . "</td>";
// Status
print "<td align='right'>";
print "<td class='right'>";
if ($payout->status=='paid') {
print img_picto($langs->trans("".$payout->status.""), 'statut4');
} elseif ($payout->status=='pending') {

33
htdocs/stripe/transaction.php
View File

@ -102,11 +102,11 @@ if (! $rowid) {
//print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder);
print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"');
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right_');
print "</tr>\n";
print "</tr>\n";
@ -161,7 +161,7 @@ if (! $rowid) {
// Ref
if (!empty($stripeacc)) $connect=$stripeacc.'/';
// Ref
if (preg_match('/po_/i', $txn->source)){
$origin="payouts";
@ -207,20 +207,21 @@ if (! $rowid) {
//}
//print "</td>\n";
// Date payment
print '<td align="center">' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "</td>\n";
print '<td class="center">' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "</td>\n";
// Type
print '<td>' . $txn->type . '</td>';
// Amount
print "<td align=\"right\">" . price(($txn->amount) / 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>";
print '<td class="right">' . price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
print '<td class="right">' . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
// Status
print "<td align='right'>";
if ($txn->status=='available')
{print img_picto($langs->trans("".$txn->status.""), 'statut4');}
elseif ($txn->status=='pending')
{print img_picto($langs->trans("".$txn->status.""), 'statut7');}
elseif ($txn->status=='failed')
{print img_picto($langs->trans("".$txn->status.""), 'statut8');}
print "<td class='right'>";
if ($txn->status=='available') {
print img_picto($langs->trans("".$txn->status.""), 'statut4');
} elseif ($txn->status=='pending') {
print img_picto($langs->trans("".$txn->status.""), 'statut7');
} elseif ($txn->status=='failed') {
print img_picto($langs->trans("".$txn->status.""), 'statut8');
}
print '</td>';
print "</tr>\n";
}