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 gateway fees

Browse Source
This commit is contained in:
Hillel Coren 2017-03-17 13:47:16 +02:00
parent 23eee0183e
commit 293c4f2743
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/InvoiceItem.php
View File

@ -39,6 +39,7 @@ class InvoiceItem extends EntityModel
'tax_rate1', 'tax_rate1',
'tax_name2', 'tax_name2',
'tax_rate2', 'tax_rate2',
'invoice_item_type_id',
]; ];
/** /**

29
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -623,7 +623,11 @@ class InvoiceRepository extends BaseRepository
} }
if ($productKey = trim($item['product_key'])) { if ($productKey = trim($item['product_key'])) {
if (\Auth::user()->account->update_products && ! $invoice->has_tasks && ! $invoice->has_expenses) { if (\Auth::user()->account->update_products
&& ! $invoice->has_tasks
&& ! $invoice->has_expenses
&& $productKey != trans('texts.surcharge')
) {
$product = Product::findProductByKey($productKey); $product = Product::findProductByKey($productKey);
if (! $product) { if (! $product) {
if (Auth::user()->can('create', ENTITY_PRODUCT)) { if (Auth::user()->can('create', ENTITY_PRODUCT)) {
@ -644,6 +648,7 @@ class InvoiceRepository extends BaseRepository
} }
$invoiceItem = InvoiceItem::createNew(); $invoiceItem = InvoiceItem::createNew();
$invoiceItem->fill($item);
$invoiceItem->product_id = isset($product) ? $product->id : null; $invoiceItem->product_id = isset($product) ? $product->id : null;
$invoiceItem->product_key = isset($item['product_key']) ? (trim($invoice->is_recurring ? $item['product_key'] : Utils::processVariables($item['product_key']))) : ''; $invoiceItem->product_key = isset($item['product_key']) ? (trim($invoice->is_recurring ? $item['product_key'] : Utils::processVariables($item['product_key']))) : '';
$invoiceItem->notes = trim($invoice->is_recurring ? $item['notes'] : Utils::processVariables($item['notes'])); $invoiceItem->notes = trim($invoice->is_recurring ? $item['notes'] : Utils::processVariables($item['notes']));
@ -1010,8 +1015,13 @@ class InvoiceRepository extends BaseRepository
$account = $invoice->account; $account = $invoice->account;
$location = $account->gateway_fee_location; $location = $account->gateway_fee_location;
if (! $location || $invoice->amount != $invoice->balance) { if (! $location) {
return; return false;
}
// once an invoice with fee surcharge has been paid don't clear it
if (($location == FEE_LOCATION_CHARGE1 || $location == FEE_LOCATION_CHARGE2) && $invoice->amount != $invoice->balance) {
return false;
} }
if (! $invoice->relationLoaded('invoice_items')) { if (! $invoice->relationLoaded('invoice_items')) {
@ -1022,15 +1032,17 @@ class InvoiceRepository extends BaseRepository
$data = $invoice->toArray(); $data = $invoice->toArray();
foreach ($data['invoice_items'] as $key => $item) { foreach ($data['invoice_items'] as $key => $item) {
if ($item['invoice_item_type_id'] == INVOICE_ITEM_TYPE_PENDING_GATEWAY_FEE) { if ($item['invoice_item_type_id'] == INVOICE_ITEM_TYPE_PENDING_GATEWAY_FEE) {
unset($data[$key]); unset($data['invoice_items'][$key]);
$this->save($data, $invoice);
$invoice->load('invoice_items');
break;
} }
} }
//dd($data['invoice_items']);
} else { } else {
if ($invoice->$location != 0) { if ($invoice->$location != 0) {
$data = $invoice->toArray(); $data = $invoice->toArray();
$data[$location] = 0; $data[$location] = 0;
$invoice = $this->save($data, $invoice); $this->save($data, $invoice);
} }
} }
} }
@ -1046,6 +1058,11 @@ class InvoiceRepository extends BaseRepository
} }
$this->clearGatewayFee($invoice); $this->clearGatewayFee($invoice);
if (! $settings) {
return;
}
$data = $invoice->toArray(); $data = $invoice->toArray();
if ($location == FEE_LOCATION_ITEM) { if ($location == FEE_LOCATION_ITEM) {