Merge branch '1.0' into 2.0

* 1.0: Rename logo parameters to be consistent with others
Sylius · Dec 4, 2024 · 033dc4f · 033dc4f
2 parents a6b2b0f + 768e0a5
commit 033dc4f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -9,7 +9,7 @@ parameters:
 sylius_invoicing:
     pdf_generator:
         allowed_files:
-            - '%env(default:default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%'
+            - '%env(default:sylius_invoicing.default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%'
 
 sylius_mailer:
     emails:

diff --git a/config/services.xml b/config/services.xml
@@ -21,8 +21,8 @@
     </imports>
 
     <parameters>
-        <parameter key="default_logo_file">@SyliusInvoicingPlugin/assets/sylius-logo.png</parameter>
-        <parameter key="sylius.invoicing.template.logo_file">%env(default:default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%</parameter>
+        <parameter key="sylius_invoicing.default_logo_file">@SyliusInvoicingPlugin/assets/sylius-logo.png</parameter>
+        <parameter key="sylius_invoicing.template.logo_file">%env(default:sylius_invoicing.default_logo_file:resolve:SYLIUS_INVOICING_LOGO_FILE)%</parameter>
     </parameters>
 
     <services>

diff --git a/config/services/generators.xml b/config/services/generators.xml
@@ -49,7 +49,7 @@
             <argument type="service" id="file_locator" />
             <argument type="service" id="sylius_invoicing.generator.invoice_file_name" />
             <argument>@SyliusInvoicingPlugin/shared/download/pdf.html.twig</argument>
-            <argument>%sylius.invoicing.template.logo_file%</argument>
+            <argument>%sylius_invoicing.template.logo_file%</argument>
         </service>
         <service id="Sylius\InvoicingPlugin\Generator\InvoicePdfFileGeneratorInterface" alias="sylius_invoicing.generator.invoice_pdf_file" />