Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 14:04:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove reactivate button after action

Browse Source
This commit is contained in:
David Bomba 2024-04-19 15:10:48 +10:00
parent 56fc585828
commit 8cc17afdeb
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Helpers/Invoice/InvoiceSum.php
View File

@ -227,12 +227,15 @@ class InvoiceSum
public function getRecurringInvoice() public function getRecurringInvoice()
{ {
$this->invoice->amount = $this->formatValue($this->getTotal(), $this->precision); // $this->invoice->amount = $this->formatValue($this->getTotal(), $this->precision);
$this->invoice->total_taxes = $this->getTotalTaxes(); // $this->invoice->total_taxes = $this->getTotalTaxes();
$this->invoice->balance = $this->formatValue($this->getTotal(), $this->precision);
$this->setCalculatedAttributes();
$this->invoice->balance = $this->invoice->amount;
$this->invoice->saveQuietly(); $this->invoice->saveQuietly();
// $this->invoice->saveQuietly();
return $this->invoice; return $this->invoice;
} }

6
app/Http/Controllers/ClientController.php
View File

@ -401,6 +401,12 @@ class ClientController extends BaseController
} }
$bounce_id = $resolved_bounce_id; $bounce_id = $resolved_bounce_id;
$record = $log->log;
$record['ID'] = '';
$log->log = $record;
$log->save();
} }
$postmark = new PostmarkClient(config('services.postmark.token')); $postmark = new PostmarkClient(config('services.postmark.token'));

5
app/Services/Invoice/AddGatewayFee.php
View File

@ -95,11 +95,6 @@ class AddGatewayFee extends AbstractService
if (floatval($new_balance) - floatval($balance) != 0) { if (floatval($new_balance) - floatval($balance) != 0) {
$adjustment = $new_balance - $balance; $adjustment = $new_balance - $balance;
// $this->invoice
// ->client
// ->service()
// ->updateBalance($adjustment);
$this->invoice $this->invoice
->ledger() ->ledger()
->updateInvoiceBalance($adjustment, 'Adjustment for adding gateway fee'); ->updateInvoiceBalance($adjustment, 'Adjustment for adding gateway fee');