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

Fixes for recurring invoice edge case

Browse Source
This commit is contained in:
David Bomba 2022-11-24 17:23:36 +11:00
parent 264a4df13b
commit 8f5fb2ca9f
8 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Util/ReminderJob.php
View File

@ -215,7 +215,7 @@ class ReminderJob implements ShouldQueue
$client = $client->fresh(); $client = $client->fresh();
nlog('adjusting client balance and invoice balance by #'.$invoice->number.' '.($invoice->balance - $temp_invoice_balance)); nlog('adjusting client balance and invoice balance by #'.$invoice->number.' '.($invoice->balance - $temp_invoice_balance));
$client->service()->updateBalance($invoice->balance - $temp_invoice_balance)->save(); $client->service()->updateBalance($invoice->balance - $temp_invoice_balance);
$invoice->ledger()->updateInvoiceBalance($invoice->balance - $temp_invoice_balance, "Late Fee Adjustment for invoice {$invoice->number}"); $invoice->ledger()->updateInvoiceBalance($invoice->balance - $temp_invoice_balance, "Late Fee Adjustment for invoice {$invoice->number}");
$transaction = [ $transaction = [

1
app/Models/Company.php
View File

@ -125,6 +125,7 @@ class Company extends BaseModel
'invoice_task_project', 'invoice_task_project',
'report_include_deleted', 'report_include_deleted',
'invoice_task_lock', 'invoice_task_lock',
'use_vendor_currency',
]; ];
protected $hidden = [ protected $hidden = [

3
app/Models/PurchaseOrder.php
View File

@ -79,7 +79,8 @@ class PurchaseOrder extends BaseModel
'partial', 'partial',
'paid_to_date', 'paid_to_date',
'vendor_id', 'vendor_id',
'last_viewed' 'last_viewed',
'currency_id',
]; ];
protected $casts = [ protected $casts = [

3
app/Services/Client/ClientService.php
View File

@ -29,7 +29,6 @@ class ClientService
public function updateBalance(float $amount) public function updateBalance(float $amount)
{ {
// $this->client->balance += $amount;
\DB::connection(config('database.default'))->transaction(function () use($amount) { \DB::connection(config('database.default'))->transaction(function () use($amount) {
@ -44,8 +43,6 @@ class ClientService
public function updateBalanceAndPaidToDate(float $balance, float $paid_to_date) public function updateBalanceAndPaidToDate(float $balance, float $paid_to_date)
{ {
// $this->client->balance += $amount;
// $this->client->paid_to_date += $amount;
\DB::connection(config('database.default'))->transaction(function () use($balance, $paid_to_date) { \DB::connection(config('database.default'))->transaction(function () use($balance, $paid_to_date) {

2
app/Services/Invoice/InvoiceService.php
View File

@ -117,7 +117,7 @@ class InvoiceService
public function applyPayment(Payment $payment, float $payment_amount) public function applyPayment(Payment $payment, float $payment_amount)
{ {
// $this->deletePdf(); // $this->deletePdf();
$this->invoice = $this->markSent(); $this->invoice = $this->markSent()->save();
$this->invoice = (new ApplyPayment($this->invoice, $payment, $payment_amount))->run(); $this->invoice = (new ApplyPayment($this->invoice, $payment, $payment_amount))->run();

1
app/Transformers/CompanyTransformer.php
View File

@ -189,6 +189,7 @@ class CompanyTransformer extends EntityTransformer
'invoice_task_project' => (bool) $company->invoice_task_project, 'invoice_task_project' => (bool) $company->invoice_task_project,
'report_include_deleted' => (bool) $company->report_include_deleted, 'report_include_deleted' => (bool) $company->report_include_deleted,
'invoice_task_lock' => (bool) $company->invoice_task_lock, 'invoice_task_lock' => (bool) $company->invoice_task_lock,
'use_vendor_currency' => (bool) $company->use_vendor_currency,
]; ];
} }

1
app/Transformers/PurchaseOrderTransformer.php
View File

@ -132,6 +132,7 @@ class PurchaseOrderTransformer extends EntityTransformer
'paid_to_date' => (float)$purchase_order->paid_to_date, 'paid_to_date' => (float)$purchase_order->paid_to_date,
'subscription_id' => $this->encodePrimaryKey($purchase_order->subscription_id), 'subscription_id' => $this->encodePrimaryKey($purchase_order->subscription_id),
'expense_id' => $this->encodePrimaryKey($purchase_order->expense_id), 'expense_id' => $this->encodePrimaryKey($purchase_order->expense_id),
'currency_id' => $purchase_order->currency_id ? (string) $purchase_order->currency_id : '',
]; ];
} }

6
database/migrations/2022_11_22_215618_lock_tasks_when_invoiced.php
View File

@ -22,6 +22,12 @@ return new class extends Migration
Schema::table('companies', function (Blueprint $table) Schema::table('companies', function (Blueprint $table)
{ {
$table->boolean('invoice_task_lock')->default(false); $table->boolean('invoice_task_lock')->default(false);
$table->boolean('use_vendor_currency')->default(false);
});
Schema::table('purchase_orders', function (Blueprint $table)
{
$table->unsignedInteger('currency_id')->nullable();
}); });
Schema::table('bank_transactions', function (Blueprint $table) Schema::table('bank_transactions', function (Blueprint $table)