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

Fix for activity repo

Browse Source
This commit is contained in:
David Bomba 2020-07-17 19:47:17 +10:00
parent cd5bebbe5f
commit 439424b933
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/DemoMode.php
View File

@ -100,7 +100,7 @@ class DemoMode extends Command
$company = factory(\App\Models\Company::class)->create([ $company = factory(\App\Models\Company::class)->create([
'account_id' => $account->id, 'account_id' => $account->id,
'slack_webhook_url' => config('ninja.notification.slack'), 'slack_webhook_url' => config('ninja.notification.slack'),
'enabled_modules' => 4095, 'enabled_modules' => 8191,
]); ]);
$settings = $company->settings; $settings = $company->settings;

2
app/Factory/CompanyFactory.php
View File

@ -34,7 +34,7 @@ class CompanyFactory
//$company->custom_fields = (object) ['invoice1' => '1', 'invoice2' => '2', 'client1'=>'3']; //$company->custom_fields = (object) ['invoice1' => '1', 'invoice2' => '2', 'client1'=>'3'];
$company->custom_fields = (object) []; $company->custom_fields = (object) [];
$company->subdomain = ''; $company->subdomain = '';
$company->enabled_modules = 4095; //16383 $company->enabled_modules = 8191; //4095
return $company; return $company;
} }

1
app/Jobs/Util/Import.php
View File

@ -373,6 +373,7 @@ class Import implements ShouldQueue
$modified['company_id'] = $this->company->id; $modified['company_id'] = $this->company->id;
$modified['user_id'] = $this->processUserId($resource); $modified['user_id'] = $this->processUserId($resource);
$modified['balance'] = $modified['balance'] ?: 0; $modified['balance'] = $modified['balance'] ?: 0;
$modified['paid_to_date'] = $modified['paid_to_date'] ?: 0;
unset($modified['id']); unset($modified['id']);
unset($modified['contacts']); unset($modified['contacts']);

3
app/Repositories/Migration/PaymentMigrationRepository.php
View File

@ -23,6 +23,7 @@ use App\Models\Payment;
use App\Repositories\ActivityRepository; use App\Repositories\ActivityRepository;
use App\Repositories\BaseRepository; use App\Repositories\BaseRepository;
use App\Repositories\CreditRepository; use App\Repositories\CreditRepository;
use App\Utils\Ninja;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use App\Utils\Traits\SavesDocuments; use App\Utils\Traits\SavesDocuments;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -128,7 +129,7 @@ class PaymentMigrationRepository extends BaseRepository
foreach ($payment->invoices as $invoice) { foreach ($payment->invoices as $invoice) {
$fields->invoice_id = $invoice->id; $fields->invoice_id = $invoice->id;
$this->activity_repo->save($fields, $invoice); $this->activity_repo->save($fields, $invoice, Ninja::eventVars());
} }
if (count($invoices) == 0) { if (count($invoices) == 0) {

5
app/Services/Payment/RefundPayment.php
View File

@ -21,6 +21,7 @@ use App\Models\Credit;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\Payment; use App\Models\Payment;
use App\Repositories\ActivityRepository; use App\Repositories\ActivityRepository;
use App\Utils\Ninja;
class RefundPayment class RefundPayment
{ {
@ -114,10 +115,10 @@ class RefundPayment
if (isset($this->refund_data['invoices'])) { if (isset($this->refund_data['invoices'])) {
foreach ($this->refund_data['invoices'] as $invoice) { foreach ($this->refund_data['invoices'] as $invoice) {
$fields->invoice_id = $invoice['invoice_id']; $fields->invoice_id = $invoice['invoice_id'];
$activity_repo->save($fields, $this->payment); $activity_repo->save($fields, $this->payment, Ninja::eventVars());
} }
} else { } else {
$activity_repo->save($fields, $this->payment); $activity_repo->save($fields, $this->payment, Ninja::eventVars());
} }
return $this; return $this;

5
app/Utils/Traits/Payment/Refundable.php
View File

@ -20,6 +20,7 @@ use App\Models\Credit;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\Payment; use App\Models\Payment;
use App\Repositories\ActivityRepository; use App\Repositories\ActivityRepository;
use App\Utils\Ninja;
trait Refundable trait Refundable
{ {
@ -209,10 +210,10 @@ trait Refundable
foreach ($data['invoices'] as $invoice) { foreach ($data['invoices'] as $invoice) {
$fields->invoice_id = $invoice->id; $fields->invoice_id = $invoice->id;
$activity_repo->save($fields, $this); $activity_repo->save($fields, $this, Ninja::eventVars());
} }
} else { } else {
$activity_repo->save($fields, $this); $activity_repo->save($fields, $this, Ninja::eventVars());
} }
} }