Version 4.7.6
This commit is contained in:
1 parent
8ba7d43898
commit
7b7404e741
1085 files changed
+30590
-7837
No files matched your search
@@ -157,7 +157,7 @@ class _Transaction extends \IPS\Patterns\ActiveRecord
|
||||
'view' => array(
|
||||
'icon' => 'search',
|
||||
'title' => 'transaction_view',
|
||||
'link' => \IPS\Http\Url::internal( "app=nexus&module=payments&controller=transactions&do=view&id={$row['t_id']}" )
|
||||
'link' => \IPS\Http\Url::internal( "app=nexus&module=payments&controller=transactions&do=view&id={$row['t_id']}" )->getSafeUrlFromFilters()
|
||||
),
|
||||
), \IPS\nexus\Transaction::constructFromData( $row )->buttons( $ref ) );
|
||||
};
|
||||
@@ -966,12 +966,12 @@ class _Transaction extends \IPS\Patterns\ActiveRecord
|
||||
$return = array();
|
||||
|
||||
/* Approve button */
|
||||
if ( \in_array( $this->status, array( static::STATUS_WAITING, static::STATUS_HELD, static::STATUS_REVIEW ) ) and \IPS\Member::loggedIn()->hasAcpRestriction( 'nexus', 'payments', 'transactions_edit' ) )
|
||||
if ( $this->method and \in_array( $this->status, array( static::STATUS_WAITING, static::STATUS_HELD, static::STATUS_REVIEW ) ) and \IPS\Member::loggedIn()->hasAcpRestriction( 'nexus', 'payments', 'transactions_edit' ) )
|
||||
{
|
||||
$return['approve'] = array(
|
||||
'title' => $this->auth ? 'transaction_capture' : 'transaction_approve',
|
||||
'icon' => 'check',
|
||||
'link' => $url->setQueryString( array( 'do' => 'approve' ) )->csrf(),
|
||||
'link' => $url->setQueryString( array( 'do' => 'approve' ) )->csrf()->getSafeUrlFromFilters(),
|
||||
'data' => array( 'confirm' => '' )
|
||||
);
|
||||
}
|
||||
@@ -982,7 +982,7 @@ class _Transaction extends \IPS\Patterns\ActiveRecord
|
||||
$return['review'] = array(
|
||||
'title' => 'transaction_flag_review',
|
||||
'icon' => 'flag',
|
||||
'link' => $url->setQueryString( array( 'do' => 'review' ) )->csrf(),
|
||||
'link' => $url->setQueryString( array( 'do' => 'review' ) )->csrf()->getSafeUrlFromFilters(),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -992,7 +992,7 @@ class _Transaction extends \IPS\Patterns\ActiveRecord
|
||||
$return['void'] = array(
|
||||
'title' => 'transaction_void',
|
||||
'icon' => 'times',
|
||||
'link' => $url->setQueryString( array( 'do' => 'void' ) )->csrf(),
|
||||
'link' => $url->setQueryString( array( 'do' => 'void' ) )->csrf()->getSafeUrlFromFilters(),
|
||||
'data' => array( 'confirm' => '' )
|
||||
);
|
||||
}
|
||||
@@ -1025,11 +1025,10 @@ class _Transaction extends \IPS\Patterns\ActiveRecord
|
||||
$return['delete'] = array(
|
||||
'title' => 'delete',
|
||||
'icon' => 'times-circle',
|
||||
'link' => $url->setQueryString( 'do', 'delete' )->csrf(),
|
||||
'link' => $url->setQueryString( 'do', 'delete' )->csrf()->getSafeUrlFromFilters(),
|
||||
'data' => array( 'confirm' => '', 'confirmSubMessage' => \IPS\Member::loggedIn()->language()->addToStack('trans_delete_warning') )
|
||||
);
|
||||
}
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
@@ -1094,4 +1093,4 @@ class _Transaction extends \IPS\Patterns\ActiveRecord
|
||||
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user