diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index c2a2bdac8e..2e1130dc00 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -1180,7 +1180,7 @@ $elements[] = $element; $_variables = array_key_exists('variables', $this->context) ? $this->context['variables'] - : ['values' => ['$entity.public_notes' => $this->entity->public_notes, '$entity.terms' => $this->entity->terms, '$entity_footer' => $this->entity->footer], 'labels' => []]; + : ['values' => ['$entity.public_notes' => $this->entity->public_notes ?? '', '$entity.terms' => $this->entity->terms ?? '', '$entity_footer' => $this->entity->footer ?? ''], 'labels' => []]; $variables = $this->context['pdf_variables']['total_columns']; $show_terms_label = $this->entityVariableCheck('$entity.terms') ? 'display: none;' : ''; diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php index d9e8061d34..f74692abca 100644 --- a/app/Services/Template/TemplateService.php +++ b/app/Services/Template/TemplateService.php @@ -141,7 +141,7 @@ class TemplateService $this->twig->addFilter($filter); $allowedTags = ['if', 'for', 'set', 'filter']; - $allowedFilters = ['format_spellout_number','split','replace', 'escape', 'e', 'upper', 'lower', 'capitalize', 'filter', 'length', 'merge','format_currency', 'format_number','format_percent_number','map', 'join', 'first', 'date', 'sum', 'number_format','nl2br','striptags','markdown_to_html']; + $allowedFilters = ['round','format_spellout_number','split','replace', 'escape', 'e', 'upper', 'lower', 'capitalize', 'filter', 'length', 'merge','format_currency', 'format_number','format_percent_number','map', 'join', 'first', 'date', 'sum', 'number_format','nl2br','striptags','markdown_to_html']; $allowedFunctions = ['range', 'cycle', 'constant', 'date','img','t']; $allowedProperties = ['type_id']; // $allowedMethods = ['img','t']; diff --git a/database/migrations/2025_01_22_013047_2025_01_22_add_verification_setting_to_gocardless.php b/database/migrations/2025_01_22_013047_2025_01_22_add_verification_setting_to_gocardless.php new file mode 100644 index 0000000000..8529fe9686 --- /dev/null +++ b/database/migrations/2025_01_22_013047_2025_01_22_add_verification_setting_to_gocardless.php @@ -0,0 +1,34 @@ +where('gateway_key','b9886f9257f0c6ee7c302f1c74475f6c') + ->cursor() + ->each(function ($cg){ + + $cg->setConfigField('verifyBankAccount',false); + $cg->save(); + + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + + } +}; diff --git a/database/seeders/PaymentLibrariesSeeder.php b/database/seeders/PaymentLibrariesSeeder.php index ff5d7b6a2b..f271630922 100644 --- a/database/seeders/PaymentLibrariesSeeder.php +++ b/database/seeders/PaymentLibrariesSeeder.php @@ -82,7 +82,7 @@ class PaymentLibrariesSeeder extends Seeder ['id' => 49, 'name' => 'WePay', 'provider' => 'WePay', 'is_offsite' => false, 'sort_order' => 3, 'key' => '8fdeed552015b3c7b44ed6c8ebd9e992', 'fields' => '{"accountId":"","accessToken":"","type":"goods","testMode":false,"feePayer":"payee"}'], ['id' => 50, 'name' => 'Braintree', 'provider' => 'Braintree', 'sort_order' => 3, 'key' => 'f7ec488676d310683fb51802d076d713', 'fields' => '{"merchantId":"","merchantAccountId":"","publicKey":"","privateKey":"","testMode":false,"threeds":false}'], ['id' => 51, 'name' => 'FirstData Payeezy', 'provider' => 'FirstData_Payeezy', 'key' => '30334a52fb698046572c627ca10412e8', 'fields' => '{"gatewayId":"","password":"","keyId":"","hmac":"","testMode":false}'], - ['id' => 52, 'name' => 'GoCardless', 'provider' => 'GoCardless', 'sort_order' => 9, 'is_offsite' => true, 'key' => 'b9886f9257f0c6ee7c302f1c74475f6c', 'fields' => '{"accessToken":"","webhookSecret":"","testMode":true}'], + ['id' => 52, 'name' => 'GoCardless', 'provider' => 'GoCardless', 'sort_order' => 9, 'is_offsite' => true, 'key' => 'b9886f9257f0c6ee7c302f1c74475f6c', 'fields' => '{"accessToken":"","webhookSecret":"", "verifyBankAccount":false, "testMode":true}'], ['id' => 53, 'name' => 'PagSeguro', 'provider' => 'PagSeguro', 'key' => 'ef498756b54db63c143af0ec433da803', 'fields' => '{"email":"","token":"","sandbox":false}'], ['id' => 54, 'name' => 'PAYMILL', 'provider' => 'Paymill', 'key' => 'ca52f618a39367a4c944098ebf977e1c', 'fields' => '{"apiKey":""}'], ['id' => 55, 'name' => 'Custom', 'provider' => 'Custom', 'is_offsite' => true, 'sort_order' => 21, 'key' => '54faab2ab6e3223dbe848b1686490baa', 'fields' => '{"name":"","text":""}'], diff --git a/lang/en/texts.php b/lang/en/texts.php index 9d5c10c8f2..dfbe3adc86 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5495,6 +5495,7 @@ $lang = array( 'subscription_unavailable' => 'This item is no longer available', 'currency_samoan_tala' => 'Samoan Tala', 'confirm_duplicate_gateway' => 'Are you sure you want to create another connection?', + 'clients_limit' => 'You have reached your client limit. Please upgrade your plan.', ); return $lang;