From f6e440af803a0b60962465af909e815dbfe57850 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 5 Feb 2023 15:22:44 +1100 Subject: [PATCH 1/5] Add purge purchase orders to company deletes --- app/Http/Controllers/MigrationController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index 59f2a62e94af..0cfe59533b5b 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -179,6 +179,7 @@ class MigrationController extends BaseController $company->tasks()->forceDelete(); $company->vendors()->forceDelete(); $company->expenses()->forceDelete(); + $company->purchase_orders()->forceDelete(); $company->bank_transaction_rules()->forceDelete(); $company->bank_transactions()->forceDelete(); // $company->bank_integrations()->forceDelete(); From 385dd8606f6a9d6eb51f1d06c3c29aa3f72446fb Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 5 Feb 2023 15:25:52 +1100 Subject: [PATCH 2/5] Add vendor foreign key to purchase orders --- ..._05_042351_add_foreign_key_for_vendors.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php diff --git a/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php b/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php new file mode 100644 index 000000000000..805743e3dc6b --- /dev/null +++ b/database/migrations/2023_02_05_042351_add_foreign_key_for_vendors.php @@ -0,0 +1,32 @@ +foreign('vendor_id')->references('id')->on('vendors')->onDelete('cascade')->onUpdate('cascade'); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +}; From 44cbdc388e29f88d45b5cbff154c6443e0ad9319 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 5 Feb 2023 16:00:27 +1100 Subject: [PATCH 3/5] Add Discord to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a9bc5a50c46a..282a956bec50 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ## [Hosted](https://www.invoiceninja.com) | [Self-Hosted](https://www.invoiceninja.org) -Join us on [Slack](http://slack.invoiceninja.com), [Discourse](https://forum.invoiceninja.com) - +Join us on [Slack](http://slack.invoiceninja.com), [Discord](https://discord.com/channels/1071654583870435439/1071654584390537279) [Discourse](https://forum.invoiceninja.com) - or [StackOverflow](https://stackoverflow.com/tags/invoice-ninja/) if you like, just make sure to add the `invoice-ninja` tag to your question. From dba59c601e60990d171c8c06379c9bc3cd50ef33 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 5 Feb 2023 16:01:47 +1100 Subject: [PATCH 4/5] Update checkdata --- app/Console/Commands/CheckData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php index fa74167ae275..d8ce88c0ffeb 100644 --- a/app/Console/Commands/CheckData.php +++ b/app/Console/Commands/CheckData.php @@ -1138,7 +1138,7 @@ class CheckData extends Command $cc = ClientContact::on('db-ninja-01')->where('company_id', config('ninja.ninja_default_company_id'))->where('email', $cu->user->email)->first(); if($cc){ - $ninja_portal_url = "https://invoiceninja.invoicing.co/client/ninja/{$cc->contact_key}/{$cu->company->company_key}"; + $ninja_portal_url = "https://invoiceninja.invoicing.co/client/ninja/{$cc->contact_key}/{$cu->company->account->key}"; $cu->ninja_portal_url = $ninja_portal_url; $cu->save(); From 0c2e94b6ee28e7641d83555ac6301e388f20b4d3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 5 Feb 2023 17:03:55 +1100 Subject: [PATCH 5/5] Fixes for check data --- app/Console/Commands/CheckData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php index d8ce88c0ffeb..1c47c4b6d920 100644 --- a/app/Console/Commands/CheckData.php +++ b/app/Console/Commands/CheckData.php @@ -1138,7 +1138,7 @@ class CheckData extends Command $cc = ClientContact::on('db-ninja-01')->where('company_id', config('ninja.ninja_default_company_id'))->where('email', $cu->user->email)->first(); if($cc){ - $ninja_portal_url = "https://invoiceninja.invoicing.co/client/ninja/{$cc->contact_key}/{$cu->company->account->key}"; + $ninja_portal_url = "https://invoiceninja.invoicing.co/client/ninja/{$cc->contact_key}/{$cu->account->key}"; $cu->ninja_portal_url = $ninja_portal_url; $cu->save();