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

Fixes for payment rpeo

Browse Source
This commit is contained in:
David Bomba 2020-06-30 13:31:30 +10:00
parent edc59d59c1
commit 263c1c04f0
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Repositories/BaseRepository.php
View File

@ -192,6 +192,11 @@ class BaseRepository
*/ */
protected function alternativeSave($data, $model) protected function alternativeSave($data, $model)
{ {
$new_entity = false;
if(!$model->id)
$new_entity = true;
$class = new ReflectionClass($model); $class = new ReflectionClass($model);
if (array_key_exists('client_id', $data)) { if (array_key_exists('client_id', $data)) {
@ -205,9 +210,7 @@ class BaseRepository
$lcfirst_resource_id = lcfirst($resource) . '_id'; $lcfirst_resource_id = lcfirst($resource) . '_id';
if ($class->name == Invoice::class || $class->name == Quote::class) { if ($class->name == Invoice::class || $class->name == Quote::class) {
info("class name = invoice");
$state['starting_amount'] = $model->amount; $state['starting_amount'] = $model->amount;
info("starting amount = {$model->amount}");
} }
if (!$model->id) { if (!$model->id) {
@ -231,6 +234,9 @@ class BaseRepository
$model->fill($tmp_data); $model->fill($tmp_data);
$model->save(); $model->save();
if($new_entity)
$this->newEntityEvent($model);
if (array_key_exists('documents', $data)) { if (array_key_exists('documents', $data)) {
$this->saveDocuments($data['documents'], $model); $this->saveDocuments($data['documents'], $model);
} }
@ -305,8 +311,6 @@ class BaseRepository
if(!$model->design_id) if(!$model->design_id)
$model->design_id = $this->decodePrimaryKey($client->getSetting('invoice_design_id')); $model->design_id = $this->decodePrimaryKey($client->getSetting('invoice_design_id'));
info("model design id = {$model->design_id}");
event(new InvoiceWasUpdated($model, $model->company)); event(new InvoiceWasUpdated($model, $model->company));
} }
@ -329,4 +333,16 @@ class BaseRepository
return $model->fresh(); return $model->fresh();
} }
public function newEntityEvent($model)
{
$className = $this->getEventClass($entity, 'Created');
if (class_exists($className)) {
event(new $className($model, $model->company));
}
}
} }

9
app/Repositories/PaymentRepository.php
View File

@ -115,20 +115,13 @@ class PaymentRepository extends BaseRepository
foreach ($data['invoices'] as $paid_invoice) { foreach ($data['invoices'] as $paid_invoice) {
$invoice = Invoice::whereId($paid_invoice['invoice_id'])->with('client')->first(); $invoice = Invoice::whereId($paid_invoice['invoice_id'])->first();
info("current client balance = {$invoice->client->balance}");
if ($invoice) { if ($invoice) {
info("apply payment amount {$paid_invoice['amount']}");
$invoice = $invoice->service()->markSent()->applyPayment($payment, $paid_invoice['amount'])->save(); $invoice = $invoice->service()->markSent()->applyPayment($payment, $paid_invoice['amount'])->save();
info("after processing invoice the client balance is now {$invoice->client->balance}");
} }
} }
} else { } else {