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

Working on task invoices

Browse Source
This commit is contained in:
Hillel Coren 2017-06-20 09:41:08 +03:00
parent c4fd95756a
commit e180601898
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountGatewayController.php
View File

@ -91,7 +91,7 @@ class AccountGatewayController extends BaseController
$accountGatewaysIds = $account->gatewayIds(); $accountGatewaysIds = $account->gatewayIds();
$otherProviders = Input::get('other_providers'); $otherProviders = Input::get('other_providers');
if (! Utils::isNinja() || ! env('WEPAY_CLIENT_ID') || Gateway::hasStandardGateway($accountGatewaysIds)) { if (! env('WEPAY_CLIENT_ID') || Gateway::hasStandardGateway($accountGatewaysIds)) {
$otherProviders = true; $otherProviders = true;
} }

1
app/Models/Invoice.php
View File

@ -896,6 +896,7 @@ class Invoice extends EntityModel implements BalanceAffecting
'tax_rate1', 'tax_rate1',
'tax_name2', 'tax_name2',
'tax_rate2', 'tax_rate2',
'invoice_item_type_id',
]); ]);
} }

2
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

4
resources/assets/js/script.js
View File

@ -660,8 +660,8 @@ function calculateAmounts(invoice) {
invoice.has_product_key = true; invoice.has_product_key = true;
} }
var hasStandard; var hasStandard = false;
var hasTask; var hasTask = false;
// sum line item // sum line item
for (var i=0; i<invoice.invoice_items.length; i++) { for (var i=0; i<invoice.invoice_items.length; i++) {

5
resources/views/invoices/edit_table.blade.php
View File

@ -77,9 +77,8 @@
<div class="line-total" data-bind="text: totals.total"></div> <div class="line-total" data-bind="text: totals.total"></div>
</td> </td>
<td style="cursor:pointer" class="hide-border td-icon"> <td style="cursor:pointer" class="hide-border td-icon">
<i style="padding-left:2px" data-bind="click: $parent.removeItem, visible: actionsVisible() &amp;&amp; <i style="padding-left:2px" data-bind="click: $parent.removeItem, visible: actionsVisible() &amp;&amp; !isEmpty()"
$index() < ($parent.invoice_items().length - 1) &amp;&amp; class="fa fa-minus-circle redlink" title="Remove item"/>
$parent.invoice_items().length > 1" class="fa fa-minus-circle redlink" title="Remove item"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>