CET-579/feat: Multiple invoice email support #62
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brtkwr
reviewed
Jan 28, 2025
Model/Config/Repository.php
Outdated
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function isMultipleInvoiceEmailsEnabled(?int $storeId = null): bool |
There was a problem hiding this comment.
nitpick: can we please drop the "Multiple" part? Gives that part too much emphasis IMO :D this is just about whether to enable invoice email or not.
brtkwr
reviewed
Jan 28, 2025
Model/Config/Repository.php
Outdated
| */ | ||
| public function isMultipleInvoiceEmailsEnabled(?int $storeId = null): bool | ||
| { | ||
| return $this->isSetFlag(self::XML_PATH_ENABLE_MULTIPLE_INVOICE_EMAILS, $storeId); |
brtkwr
reviewed
Jan 28, 2025
Model/Ui/ConfigProvider.php
Outdated
| @@ -91,6 +91,7 @@ public function getConfig(): array | |||
| 'checkoutPageUrl' => $this->configRepository->getCheckoutPageUrl(), | |||
| 'redirectUrlCookieCode' => UrlCookie::COOKIE_NAME, | |||
| 'isOrderIntentEnabled' => $this->configRepository->isOrderIntentEnabled(), | |||
| 'isMultipleInvoiceEmailsEnabled' => $this->configRepository->isMultipleInvoiceEmailsEnabled(), | |||
brtkwr
reviewed
Jan 28, 2025
Observer/DataAssignObserver.php
Outdated
| @@ -24,6 +24,7 @@ class DataAssignObserver extends AbstractDataAssignObserver | |||
| 'department', | |||
| 'orderNote', | |||
| 'poNumber', | |||
| 'multipleInvoiceEmails' | |||
brtkwr
reviewed
Jan 28, 2025
| <input | ||
| type="text" | ||
| id="multiple_invoice_emails" | ||
| data-bind="value: multipleInvoiceEmails, event: { change: validateMultipleEmails }" |
brtkwr
reviewed
Jan 28, 2025
| @@ -172,6 +172,19 @@ | |||
| /> | |||
| </div> | |||
| </div> | |||
| <div class="field field-text" data-bind="visible: isMultipleInvoiceEmailsEnabled"> | |||
| <label for="multiple_invoice_emails" class="label"> | |||
brtkwr
reviewed
Jan 28, 2025
| @@ -392,7 +424,8 @@ define([ | |||
| project: this.project(), | |||
| department: this.department(), | |||
| orderNote: this.orderNote(), | |||
| poNumber: this.poNumber() | |||
| poNumber: this.poNumber(), | |||
| multipleInvoiceEmails: this.multipleInvoiceEmails() | |||
brtkwr
reviewed
Jan 28, 2025
| }, duration); | ||
| } | ||
| }, | ||
| validateMultipleEmails: function () { |
brtkwr
reviewed
Jan 28, 2025
| @@ -67,6 +69,7 @@ define([ | |||
| autofillToken: '', | |||
| companyName: ko.observable(''), | |||
| companyId: ko.observable(''), | |||
| multipleInvoiceEmails: ko.observable(''), | |||
brtkwr
reviewed
Jan 28, 2025
etc/config.xml
Outdated
| @@ -18,6 +18,7 @@ | |||
| <days_on_invoice>14</days_on_invoice> | |||
| <finalize_purchase>1</finalize_purchase> | |||
| <enable_order_intent>1</enable_order_intent> | |||
| <enable_multiple_invoice_emails>0</enable_multiple_invoice_emails> | |||
brtkwr
reviewed
Jan 28, 2025
etc/adminhtml/system.xml
Outdated
| @@ -158,6 +158,16 @@ | |||
| </depends> | |||
| <config_path>payment/two_payment/enable_order_intent</config_path> | |||
| </field> | |||
| <field id="enable_multiple_invoice_emails" translate="label" type="select" sortOrder="75" showInDefault="1" | |||
| showInWebsite="1" showInStore="1"> | |||
| <label>Enable multiple invoice emails</label> | |||
brtkwr
reviewed
Jan 28, 2025
Api/Config/RepositoryInterface.php
Outdated
| * | ||
| * @return bool | ||
| */ | ||
| public function isMultipleInvoiceEmailsEnabled(?int $storeId = null): bool; |
brtkwr
reviewed
Jan 28, 2025
Api/Config/RepositoryInterface.php
Outdated
| @@ -122,6 +123,15 @@ public function isCompanySearchEnabled(?int $storeId = null): bool; | |||
| */ | |||
| public function isOrderIntentEnabled(?int $storeId = null): bool; | |||
|
|
|||
| /** | |||
| * Check if order intent is enabled | |||
There was a problem hiding this comment.
Updated with all other comments on the naming adjustment
brtkwr
reviewed
Jan 28, 2025
i18n/en_US.csv
Outdated
| @@ -113,3 +113,5 @@ Version,Version | |||
| "Your request to %1 failed. Reason: %2","Your request to %1 failed. Reason: %2" | |||
| "Your sole trader account could not be verified.","Your sole trader account could not be verified." | |||
| "Zip/Postal Code is not valid.","Zip/Postal Code is not valid." | |||
| "Forward invoice to email list (optional)","Forward invoice to email list (optional)" | |||
There was a problem hiding this comment.
Sorry I missed this earlier, can we drop the (optional) and keep the wording similar to Woocom here?
There was a problem hiding this comment.
Updated to match Woocom
brtkwr
reviewed
Jan 29, 2025
i18n/sv_SE.csv
Outdated
| @@ -113,3 +113,5 @@ Version,Version | |||
| "Your request to %1 failed. Reason: %2","Din begäran till %1 misslyckades. Orsak: %2" | |||
| "Your sole trader account could not be verified.","Ditt enskild näringsidkarekonto kunde inte verifieras." | |||
| "Zip/Postal Code is not valid.","Postnummer är inte giltigt." | |||
| "Invoice email address","E-postadress för faktura" | |||
| "Please ensure your forward to email list only contains valid emails seperated by commas.","Se till att din vidarebefordran till e-postlista endast innehåller giltiga e-postmeddelanden separerade med kommatecken." | |||
There was a problem hiding this comment.
can you please reword "Please ensure your forward to email list only contains valid emails seperated by commas" to "Please ensure that your invoice email address list only contains valid email addresses separated by commas"
brtkwr
approved these changes
Jan 29, 2025
SalmanTwo
deleted the
shabib/cet-579-adding-support-for-multiple-invoice-emails-in-magento
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Feature branch for additional invoice emails input on order checkout