Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for tests

Browse Source
This commit is contained in:
Hillel Coren 2016-06-21 12:40:10 +03:00
parent 3e068be315
commit 8a6227bf89
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,8 +107,6 @@ class ClientPortalController extends BaseController
}
}
$paymentDriver = $account->paymentDriver($invitation, GATEWAY_TYPE_CREDIT_CARD);
if ($wepayGateway = $account->getGatewayConfig(GATEWAY_WEPAY)){
$data['enableWePayACH'] = $wepayGateway->getAchEnabled();
}
@ -132,12 +130,19 @@ class ClientPortalController extends BaseController
'contact' => $contact,
'paymentTypes' => $paymentTypes,
'paymentURL' => $paymentURL,
'transactionToken' => $paymentDriver->createTransactionToken(),
'partialView' => $paymentDriver->partialView(),
'accountGateway' => $paymentDriver->accountGateway,
'phantomjs' => Input::has('phantomjs'),
);
if ($paymentDriver = $account->paymentDriver($invitation, GATEWAY_TYPE_CREDIT_CARD)) {
$data += [
'transactionToken' => $paymentDriver->createTransactionToken(),
'partialView' => $paymentDriver->partialView(),
'accountGateway' => $paymentDriver->accountGateway,
];
}
if($account->hasFeature(FEATURE_DOCUMENTS) && $this->canCreateZip()){
$zipDocs = $this->getInvoiceZipDocuments($invoice, $size);

4
resources/views/invoices/view.blade.php
View File

@ -22,7 +22,7 @@
}
</style>
@if ($accountGateway->gateway_id == GATEWAY_BRAINTREE && !empty($transactionToken))
@if (!empty($transactionToken) && $accountGateway->gateway_id == GATEWAY_BRAINTREE)
<div id="paypal-container"></div>
<script type="text/javascript" src="https://js.braintreegateway.com/js/braintree-2.23.0.min.js"></script>
<script type="text/javascript" >
@ -97,7 +97,7 @@
<div class="container">
@if ($partialView)
@if (!empty($partialView))
@include($partialView)
@else
<div class="pull-right" style="text-align:right">