Skip to content

Commit 033dc4f

Browse files
committed
Merge branch '1.0' into 2.0
* 1.0: Rename logo parameters to be consistent with others
2 parents a6b2b0f + 768e0a5 commit 033dc4f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

config/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
sylius_invoicing:
1010
pdf_generator:
1111
allowed_files:
12-
- '%env(default:default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%'
12+
- '%env(default:sylius_invoicing.default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%'
1313

1414
sylius_mailer:
1515
emails:

config/services.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
</imports>
2222

2323
<parameters>
24-
<parameter key="default_logo_file">@SyliusInvoicingPlugin/assets/sylius-logo.png</parameter>
25-
<parameter key="sylius.invoicing.template.logo_file">%env(default:default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%</parameter>
24+
<parameter key="sylius_invoicing.default_logo_file">@SyliusInvoicingPlugin/assets/sylius-logo.png</parameter>
25+
<parameter key="sylius_invoicing.template.logo_file">%env(default:sylius_invoicing.default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%</parameter>
2626
</parameters>
2727

2828
<services>

config/services/generators.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<argument type="service" id="file_locator" />
5050
<argument type="service" id="sylius_invoicing.generator.invoice_file_name" />
5151
<argument>@SyliusInvoicingPlugin/shared/download/pdf.html.twig</argument>
52-
<argument>%sylius.invoicing.template.logo_file%</argument>
52+
<argument>%sylius_invoicing.template.logo_file%</argument>
5353
</service>
5454
<service id="Sylius\InvoicingPlugin\Generator\InvoicePdfFileGeneratorInterface" alias="sylius_invoicing.generator.invoice_pdf_file" />
5555

0 commit comments

Comments
 (0)