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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-23 14:57:55 +02:00
commit 29979a8429
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/commondocgenerator.class.php
View File

@ -33,7 +33,11 @@
*/ */
abstract class CommonDocGenerator abstract class CommonDocGenerator
{ {
var $error=''; /**
* @var string Error code (or message)
*/
public $error='';
protected $db; protected $db;

7
htdocs/stripe/transaction.php
View File

@ -173,13 +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";