From dc5d4f03880da10249b97993a8d658dc9afd2429 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 23 Nov 2022 22:21:12 +1100 Subject: [PATCH 1/3] Fixes for SEPA EPC QR Codes --- app/Helpers/Epc/EpcQrGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/Epc/EpcQrGenerator.php b/app/Helpers/Epc/EpcQrGenerator.php index d308f7188b..1bfbff2f95 100644 --- a/app/Helpers/Epc/EpcQrGenerator.php +++ b/app/Helpers/Epc/EpcQrGenerator.php @@ -76,7 +76,7 @@ class EpcQrGenerator $this->formatMoney($this->amount), $this->sepa['purpose'], substr($this->invoice->number,0,34), - substr($this->invoice->public_notes,0,139), + '', '' )), "\n"); From 1ef260cb1488705e6aeb4cbacda243da6a9de583 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 23 Nov 2022 22:28:22 +1100 Subject: [PATCH 2/3] Purge company transactions/integrations --- app/Http/Controllers/MigrationController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index 121502d300..fab87c414d 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -181,7 +181,10 @@ 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(); + $company->all_activities()->forceDelete(); $settings = $company->settings; From 9718e657cdc3a387687f56ed7263501b265c3697 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 24 Nov 2022 07:39:06 +1100 Subject: [PATCH 3/3] minor fixes for invoice controller bulk actions --- app/Http/Controllers/InvoiceController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 723cf5978a..73c0ba94a0 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -698,7 +698,7 @@ class InvoiceController extends BaseController /*If we are using bulk actions, we don't want to return anything */ switch ($action) { case 'auto_bill': - $invoice = AutoBill::dispatch($invoice->id, $invoice->company->db); + AutoBill::dispatch($invoice->id, $invoice->company->db); return $this->itemResponse($invoice); case 'clone_to_invoice':