Add invoice filename setting

Signed-off-by: Anton Fedurtsya <[email protected]>
Fresh-Advance · Oct 1, 2024 · 623d7d2 · 623d7d2
1 parent be5a2c8
commit 623d7d2
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 3 deletions.
diff --git a/src/Settings/ModuleSettings.php b/src/Settings/ModuleSettings.php
@@ -19,6 +19,7 @@ class ModuleSettings implements ModuleSettingsInterface
     public const SETTING_INVOICE_NUMBER_FORMAT = 'fa_invoice_InvoiceNumberFormat';
     public const SETTING_INVOICE_DATE_FORMAT = 'fa_invoice_InvoiceDateFormat';
     public const SETTING_SEND_INVOICE_ON_USER_ORDER_EMAIL = 'fa_invoice_SendInvoiceOnUserOrderEmail';
+    public const SETTING_INVOICE_ON_ORDER_EMAIL_FILENAME = 'fa_invoice_InvoiceOnOrderEmailFilename';
 
     public function __construct(
         private ModuleSettingServiceInterface $moduleSettingService
@@ -48,6 +49,11 @@ public function getInvoiceDateFormat(): string
         return $this->getStringSetting(self::SETTING_INVOICE_DATE_FORMAT);
     }
 
+    public function getInvoiceInOrderEmailFilename(): string
+    {
+        return $this->getStringSetting(self::SETTING_INVOICE_ON_ORDER_EMAIL_FILENAME);
+    }
+
     private function getStringSetting(string $key): string
     {
         return $this->moduleSettingService

diff --git a/src/Settings/ModuleSettingsInterface.php b/src/Settings/ModuleSettingsInterface.php
@@ -20,4 +20,6 @@ public function getInvoiceNumberFormat(): string;
     public function getInvoiceDateFormat(): string;
 
     public function isSendInvoiceOnUserOrderEmailActive(): bool;
+
+    public function getInvoiceInOrderEmailFilename(): string;
 }
diff --git a/src/Transition/Core/Email.php b/src/Transition/Core/Email.php
@@ -47,9 +47,11 @@ public function sendOrderEmailToUser($order, $subject = null)
     public function send()
     {
         if ($this->attachInvoice) {
+            $moduleSettings = $this->getServiceFromContainer(ModuleSettingsInterface::class);
+
             $this->addAttachment(
                 path: $this->attachInvoice,
-                name: 'invoice.pdf',
+                name: $moduleSettings->getInvoiceInOrderEmailFilename(),
             );
             $this->attachInvoice = null;
         }

diff --git a/tests/Integration/Transition/Core/EmailTest.php b/tests/Integration/Transition/Core/EmailTest.php
@@ -32,7 +32,8 @@ public function testInvoiceGeneratedAndAttachedWithOptionOn(): void
                 invoiceDataService: $invoiceDataService = $this->createMock(Invoice::class),
                 invoiceGenerator: $invoiceGeneratorSpy = $this->createMock(InvoiceGeneratorInterface::class),
                 moduleSettings: $this->createConfiguredMock(ModuleSettingsInterface::class, [
-                    'isSendInvoiceOnUserOrderEmailActive' => true
+                    'isSendInvoiceOnUserOrderEmailActive' => true,
+                    'getInvoiceInOrderEmailFilename' => $fileName = uniqid()
                 ]),
             )
         );
@@ -53,7 +54,7 @@ public function testInvoiceGeneratedAndAttachedWithOptionOn(): void
         $this->assertSame($parentOrderEmailSendResult, $sut->sendOrderEmailToUser($order, $emailSubject));
 
         $sut->expects($this->once())->method('addAttachment')
-            ->with($invoicePath, 'invoice.pdf');
+            ->with($invoicePath, $fileName);
         $sut->method('faCallParentSend')->willReturn($parentSendResult = uniqid());
 
         $this->assertSame($parentSendResult, $sut->send());

diff --git a/tests/Unit/Settings/ModuleSettingsTest.php b/tests/Unit/Settings/ModuleSettingsTest.php
@@ -61,6 +61,19 @@ public function testGetInvoiceNumberFormat(): void
         $this->assertSame($value, $sut->getInvoiceNumberFormat());
     }
 
+    public function testGetInvoiceInOrderEmailFilename(): void
+    {
+        $value = uniqid();
+
+        $mssMock = $this->createMock(ModuleSettingServiceInterface::class);
+        $mssMock->method('getString')->willReturnMap([
+            [ModuleSettings::SETTING_INVOICE_ON_ORDER_EMAIL_FILENAME, Module::MODULE_ID, new UnicodeString($value)]
+        ]);
+
+        $sut = new ModuleSettings($mssMock);
+        $this->assertSame($value, $sut->getInvoiceInOrderEmailFilename());
+    }
+
     public function testGetInvoiceDateFormat(): void
     {
         $value = uniqid();

diff --git a/views/admin_twig/de/fainvoice_lang.php b/views/admin_twig/de/fainvoice_lang.php
@@ -41,4 +41,5 @@
     # Module settings invoice mails
     'SHOP_MODULE_GROUP_fa_invoice_emails' => 'E-Mail-Optionen',
     'SHOP_MODULE_fa_invoice_SendInvoiceOnUserOrderEmail' => 'Rechnung generieren und an Bestellbestätigungs-E-Mail des Kunden anhängen',
+    'SHOP_MODULE_fa_invoice_InvoiceOnOrderEmailFilename' => 'Dateiname für an Bestellbestätigungs-E-Mail angehängte Rechnung',
 ]);
diff --git a/views/admin_twig/en/fainvoice_lang.php b/views/admin_twig/en/fainvoice_lang.php
@@ -41,4 +41,5 @@
     # Module settings invoice mails
     'SHOP_MODULE_GROUP_fa_invoice_emails' => 'Email options',
     'SHOP_MODULE_fa_invoice_SendInvoiceOnUserOrderEmail' => 'Generate and attach invoice to Customer order confirmation email',
+    'SHOP_MODULE_fa_invoice_InvoiceOnOrderEmailFilename' => 'Filename for invoice attached to order confirmation email',
 ]);
diff --git a/views/admin_twig/lt/fainvoice_lang.php b/views/admin_twig/lt/fainvoice_lang.php
@@ -41,4 +41,5 @@
     # Module settings invoice mails
     'SHOP_MODULE_GROUP_fa_invoice_emails' => 'Email options',
     'SHOP_MODULE_fa_invoice_SendInvoiceOnUserOrderEmail' => 'Generate and attach invoice to Customer order confirmation email',
+    'SHOP_MODULE_fa_invoice_InvoiceOnOrderEmailFilename' => 'Filename for invoice attached to order confirmation email',
 ]);