mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for deleting invitations after a contact has been deleted
This commit is contained in:
parent
9672cfb34f
commit
33a9cad32a
@ -56,7 +56,7 @@ class ReactBuilder extends Command
|
|||||||
$directoryIterator = new \RecursiveDirectoryIterator(public_path('react'), \RecursiveDirectoryIterator::SKIP_DOTS);
|
$directoryIterator = new \RecursiveDirectoryIterator(public_path('react'), \RecursiveDirectoryIterator::SKIP_DOTS);
|
||||||
|
|
||||||
foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
|
foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
|
||||||
if (str_contains($file->getFileName(), '.js')) {
|
if (str_contains($file->getFileName(), '.js') && !strpos($file->getFileName(), '.json')) {
|
||||||
if (str_contains($file->getFileName(), 'index.')) {
|
if (str_contains($file->getFileName(), 'index.')) {
|
||||||
$includes .= '<script type="module" crossorigin src="/react/'.$file->getFileName().'"></script>'."\n";
|
$includes .= '<script type="module" crossorigin src="/react/'.$file->getFileName().'"></script>'."\n";
|
||||||
} else {
|
} else {
|
||||||
|
@ -181,6 +181,11 @@ class ClientContact extends Authenticatable implements HasLocalePreference
|
|||||||
return $this->hasMany(InvoiceInvitation::class);
|
return $this->hasMany(InvoiceInvitation::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function recurring_invoice_invitations()
|
||||||
|
{
|
||||||
|
return $this->hasMany(RecurringInvoiceInvitation::class);
|
||||||
|
}
|
||||||
|
|
||||||
public function quote_invitations()
|
public function quote_invitations()
|
||||||
{
|
{
|
||||||
return $this->hasMany(QuoteInvitation::class);
|
return $this->hasMany(QuoteInvitation::class);
|
||||||
|
@ -48,6 +48,7 @@ class ClientContactObserver
|
|||||||
$clientContact->invoice_invitations()->delete();
|
$clientContact->invoice_invitations()->delete();
|
||||||
$clientContact->quote_invitations()->delete();
|
$clientContact->quote_invitations()->delete();
|
||||||
$clientContact->credit_invitations()->delete();
|
$clientContact->credit_invitations()->delete();
|
||||||
|
$clientContact->recurring_invoice_invitations()->delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -58,9 +59,9 @@ class ClientContactObserver
|
|||||||
*/
|
*/
|
||||||
public function restored(ClientContact $clientContact)
|
public function restored(ClientContact $clientContact)
|
||||||
{
|
{
|
||||||
$clientContact->invoice_invitations()->restore();
|
// $clientContact->invoice_invitations()->restore();
|
||||||
$clientContact->quote_invitations()->restore();
|
// $clientContact->quote_invitations()->restore();
|
||||||
$clientContact->credit_invitations()->restore();
|
// $clientContact->credit_invitations()->restore();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -225,6 +225,7 @@ use App\Listeners\User\UpdateUserLastLogin;
|
|||||||
use App\Listeners\User\UpdatedUserActivity;
|
use App\Listeners\User\UpdatedUserActivity;
|
||||||
use App\Models\Account;
|
use App\Models\Account;
|
||||||
use App\Models\Client;
|
use App\Models\Client;
|
||||||
|
use App\Models\ClientContact;
|
||||||
use App\Models\Company;
|
use App\Models\Company;
|
||||||
use App\Models\CompanyGateway;
|
use App\Models\CompanyGateway;
|
||||||
use App\Models\CompanyToken;
|
use App\Models\CompanyToken;
|
||||||
@ -241,6 +242,7 @@ use App\Models\Subscription;
|
|||||||
use App\Models\Task;
|
use App\Models\Task;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Observers\AccountObserver;
|
use App\Observers\AccountObserver;
|
||||||
|
use App\Observers\ClientContactObserver;
|
||||||
use App\Observers\ClientObserver;
|
use App\Observers\ClientObserver;
|
||||||
use App\Observers\CompanyGatewayObserver;
|
use App\Observers\CompanyGatewayObserver;
|
||||||
use App\Observers\CompanyObserver;
|
use App\Observers\CompanyObserver;
|
||||||
@ -633,6 +635,7 @@ class EventServiceProvider extends ServiceProvider
|
|||||||
Account::observe(AccountObserver::class);
|
Account::observe(AccountObserver::class);
|
||||||
Subscription::observe(SubscriptionObserver::class);
|
Subscription::observe(SubscriptionObserver::class);
|
||||||
Client::observe(ClientObserver::class);
|
Client::observe(ClientObserver::class);
|
||||||
|
ClientContact::observe(ClientContactObserver::class);
|
||||||
Company::observe(CompanyObserver::class);
|
Company::observe(CompanyObserver::class);
|
||||||
CompanyGateway::observe(CompanyGatewayObserver::class);
|
CompanyGateway::observe(CompanyGatewayObserver::class);
|
||||||
CompanyToken::observe(CompanyTokenObserver::class);
|
CompanyToken::observe(CompanyTokenObserver::class);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user