[API] Order confirmation email sending #11754
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
probot-autolabeler
bot
added
Admin
GSadee
approved these changes
Aug 20, 2020
src/Sylius/Bundle/CoreBundle/Resources/views/Email/Blocks/OrderConfirmation/_content.html.twig
Outdated
Show resolved
Hide resolved
| @@ -0,0 +1,28 @@ | |||
| {% block body %} | |||
| {% autoescape false %} | |||
| {% set logo = channel.hostname is not null ? 'http://' ~ channel.hostname ~ asset('assets/shop/img/logo.png') : absolute_url(asset('assets/shop/img/logo.png')) %} | |||
There was a problem hiding this comment.
Logo is taken from shop namespace, I'm not sure if it is coupling CoreBundle with ShopBundle
There was a problem hiding this comment.
It is just an asset. Perhaps we should move some image to CoreBundle as well, but it should allow the application to be run without the Shop bundle.
There was a problem hiding this comment.
It may not render a logo if shop is not enabled.
src/Sylius/Bundle/CoreBundle/Tests/Mailer/OrderEmailManagerTest.php
Outdated
Show resolved
Hide resolved
lchrusciel
commented
Aug 21, 2020
| @@ -25,7 +25,7 @@ | |||
| "require": { | |||
| "php": "^7.3", | |||
| "api-platform/core": "^2.5", | |||
| "sylius/core-bundle": "^1.7", | |||
| "sylius/core-bundle": "dev-master", | |||
There was a problem hiding this comment.
Let's try composer replace
There was a problem hiding this comment.
Will be part of separate PR
There was a problem hiding this comment.
@SirDomin can you try to remove this line?
src/Sylius/Bundle/AdminBundle/Resources/views/Email/orderConfirmation.html.twig
Show resolved
Hide resolved
lchrusciel
force-pushed
the
api-mailing
branch
from
45f570a
to
5650bb6
Compare
GSadee
approved these changes
Aug 21, 2020
lchrusciel
force-pushed
the
api-mailing
branch
2 times, most recently
from
0f2a51d
to
045e812
Compare
|
This PR extracted mailing from Shop to Core. This move allowed us to use the same email code and twig files in both Shop, Admin, and API context. Templates are moved, but in order to provide backward compatibility, files where they were used before, are left and include content from the core. To finish this PR, we should:
|
SirDomin
force-pushed
the
api-mailing
branch
from
045e812
to
b2cf1f0
Compare
GSadee
approved these changes
Nov 11, 2020
SirDomin
force-pushed
the
api-mailing
branch
2 times, most recently
from
cac900e
to
34d7283
Compare
SirDomin
force-pushed
the
api-mailing
branch
from
34d7283
to
0a838f2
Compare
SirDomin
force-pushed
the
api-mailing
branch
from
0a838f2
to
6598363
Compare
GSadee
approved these changes
Nov 16, 2020
| /** | ||
| * @Given I have proceeded through checkout process in the :localeCode locale with email :email | ||
| */ | ||
| public function iHaveProceededThroughCheckoutProcessInTheLocaleWithEmail(string $localeCode, string $email) |
There was a problem hiding this comment.
Suggested change
| public function iHaveProceededThroughCheckoutProcessInTheLocaleWithEmail(string $localeCode, string $email) | |
| public function iHaveProceededThroughCheckoutProcessInTheLocaleWithEmail(string $localeCode, string $email): void |
|
Thank you, Łukasz! 🥇 |
Merged
GSadee
added a commit
that referenced
this pull request
Nov 19, 2020
This PR was merged into the 1.9-dev branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | not sure | Related tickets | refactoring the way we handle emails implemented in #11754 | License | MIT <!-- - Bug fixes must be submitted against the 1.7 or 1.8 branch (the lowest possible) - Features and deprecations must be submitted against the master branch - Make sure that the correct base branch is set To be sure you are not breaking any Backward Compatibilities, check the documentation: https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html --> Commits ------- c0d8f32 [API] Order confirmation email sending 85b296b [Core] Extract mailer sender from ShopBundle a73d321 fix composer.json api platform, tests for api mailing added 24ac912 command added 18818a7 mailing is handled with commands da13fb2 pr fix, behat + spec fixed b10b272 pr-fix 0def0d8 introduce event bus
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.
This PR introduce mailing refactor, which should be continued in the future. Bigger description and ADR in progress.