mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 08:21:34 +02:00
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
This commit is contained in:
commit
a27b8173cb
@ -225,6 +225,9 @@ class ClientPortalController extends BaseController
|
|||||||
|
|
||||||
|
|
||||||
foreach(Gateway::$paymentTypes as $type) {
|
foreach(Gateway::$paymentTypes as $type) {
|
||||||
|
if ($type == PAYMENT_TYPE_STRIPE) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if ($gateway = $account->getGatewayByType($type)) {
|
if ($gateway = $account->getGatewayByType($type)) {
|
||||||
if ($type == PAYMENT_TYPE_DIRECT_DEBIT) {
|
if ($type == PAYMENT_TYPE_DIRECT_DEBIT) {
|
||||||
if ($gateway->gateway_id == GATEWAY_STRIPE) {
|
if ($gateway->gateway_id == GATEWAY_STRIPE) {
|
||||||
|
@ -21,7 +21,10 @@ class DocumentAPIController extends BaseAPIController
|
|||||||
|
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
//stub
|
$documents = Document::scope();
|
||||||
|
|
||||||
|
return $this->listResponse($documents);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function show(DocumentRequest $request)
|
public function show(DocumentRequest $request)
|
||||||
|
@ -1005,7 +1005,7 @@ class PaymentService extends BaseService
|
|||||||
'transactionReference' => $payment->transaction_reference,
|
'transactionReference' => $payment->transaction_reference,
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($amount != ($payment->amount - $payment->refunded)) {
|
if ($accountGateway->gateway_id != GATEWAY_WEPAY || $amount != ($payment->amount - $payment->refunded)) {
|
||||||
$details['amount'] = $amount;
|
$details['amount'] = $amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user