Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2016-06-06 19:31:56 +03:00
commit a27b8173cb
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/ClientPortalController.php
View File

@ -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) {

5
app/Http/Controllers/DocumentAPIController.php
View File

@ -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)

2
app/Services/PaymentService.php
View File

@ -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;
} }