Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 03:54:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes for currency type

Browse Source
This commit is contained in:
David Bomba 2020-06-15 16:06:32 +10:00
parent 6af50df3df
commit 70c5913f1d
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/Util/UploadAvatar.php
View File

@ -47,6 +47,9 @@ class UploadAvatar implements ShouldQueue
$path = Storage::putFile('public/' . $this->directory, new File(sys_get_temp_dir().'/'.$tmp_file)); $path = Storage::putFile('public/' . $this->directory, new File(sys_get_temp_dir().'/'.$tmp_file));
info($path);
info($tmp_file);
$url = Storage::url($path); $url = Storage::url($path);
//return file path //return file path

3
app/Models/Currency.php
View File

@ -25,6 +25,7 @@ class Currency extends StaticModel
'updated_at' => 'timestamp', 'updated_at' => 'timestamp',
'created_at' => 'timestamp', 'created_at' => 'timestamp',
'deleted_at' => 'timestamp', 'deleted_at' => 'timestamp',
'precision' => 'integer', 'precision' => 'string',
//'precision' => 'integer',
]; ];
} }

42
app/Services/Invoice/HandleReversal.php
View File

@ -45,15 +45,13 @@ class HandleReversal extends AbstractService
} }
if($this->invoice->status_id == Invoice::STATUS_CANCELLED) if($this->invoice->status_id == Invoice::STATUS_CANCELLED)
$this->invoice->service()->reverseCancellation(); $this->invoice = $this->invoice->service()->reverseCancellation()->save();
/*Consider if we have just cancelled the invoice here... this is broken!*/
$balance_remaining = $this->invoice->balance; $balance_remaining = $this->invoice->balance;
$total_paid = $this->invoice->amount - $this->invoice->balance; $total_paid = $this->invoice->amount - $this->invoice->balance;
/*Adjust payment applied and the paymentables to the correct amount */ /*Adjust payment applied and the paymentables to the correct amount */
$paymentables = Paymentable::wherePaymentableType(Invoice::class) $paymentables = Paymentable::wherePaymentableType(Invoice::class)
->wherePaymentableId($this->invoice->id) ->wherePaymentableId($this->invoice->id)
->get(); ->get();
@ -115,6 +113,42 @@ class HandleReversal extends AbstractService
return $this->invoice; return $this->invoice;
//create a ledger row for this with the resulting Credit ( also include an explanation in the notes section ) //create a ledger row for this with the resulting Credit ( also include an explanation in the notes section )
} }
// public function run2()
// {
// /* Check again!! */
// if (!$this->invoice->invoiceReversable($this->invoice)) {
// return $this->invoice;
// }
// if($this->invoice->status_id == Invoice::STATUS_CANCELLED)
// $this->invoice = $this->invoice->service()->reverseCancellation()->save();
// //$balance_remaining = $this->invoice->balance;
// //$total_paid = $this->invoice->amount - $this->invoice->balance;
// /*Adjust payment applied and the paymentables to the correct amount */
// $paymentables = Paymentable::wherePaymentableType(Invoice::class)
// ->wherePaymentableId($this->invoice->id)
// ->get();
// $total_paid = 0;
// $paymentables->each(function ($paymentable) use ($total_paid) {
// $reversable_amount = $paymentable->amount - $paymentable->refunded;
// $total_paid -= $reversable_amount;
// $paymentable->amount = $paymentable->refunded;
// $paymentable->save();
// });
// //Unwinding any payments made to this invoice
// }
} }
// The client paid to date amount is reduced by the calculated amount of (invoice balance - invoice amount).