Merge pull request #474 from magento-tango/MAGETWO-38049 (35a2d533) · Commits · KIII-12 / Magento

Commit 35a2d533 authored 9 years ago by

Kovsher, Iurii(ikovsher)

Merge pull request #474 from magento-tango/MAGETWO-38049

[Tango-API] Bug fix 38049 backend links in frontend emails

parents da06802e 9db19880

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Customer/view/frontend/email/account_new.html 3 additions, 3 deletions

...ode/Magento/Customer/view/frontend/email/account_new.html
app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html 3 additions, 3 deletions

...ustomer/view/frontend/email/account_new_confirmation.html
app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html 3 additions, 3 deletions

...o/Customer/view/frontend/email/account_new_confirmed.html
app/code/Magento/Customer/view/frontend/email/password_new.html 2 additions, 2 deletions

...de/Magento/Customer/view/frontend/email/password_new.html
app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html 2 additions, 2 deletions

...omer/view/frontend/email/password_reset_confirmation.html
app/code/Magento/Email/Model/AbstractTemplate.php 28 additions, 5 deletions

app/code/Magento/Email/Model/AbstractTemplate.php
app/code/Magento/Email/Model/BackendTemplate.php 3 additions, 0 deletions

app/code/Magento/Email/Model/BackendTemplate.php
app/code/Magento/Email/Model/Template.php 5 additions, 2 deletions

app/code/Magento/Email/Model/Template.php
app/code/Magento/Email/Model/Template/Filter.php 13 additions, 16 deletions

app/code/Magento/Email/Model/Template/Filter.php
app/code/Magento/Email/Test/Unit/Model/TemplateTest.php 11 additions, 1 deletion

app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
app/code/Magento/Email/etc/di.xml 10 additions, 0 deletions

app/code/Magento/Email/etc/di.xml
app/code/Magento/Newsletter/Model/Template.php 3 additions, 0 deletions

app/code/Magento/Newsletter/Model/Template.php
app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php 9 additions, 0 deletions

app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
app/code/Magento/Sales/view/frontend/email/creditmemo_new.html 2 additions, 2 deletions

...ode/Magento/Sales/view/frontend/email/creditmemo_new.html
app/code/Magento/Sales/view/frontend/email/creditmemo_update.html 2 additions, 2 deletions

.../Magento/Sales/view/frontend/email/creditmemo_update.html
app/code/Magento/Sales/view/frontend/email/invoice_new.html 2 additions, 2 deletions

app/code/Magento/Sales/view/frontend/email/invoice_new.html
app/code/Magento/Sales/view/frontend/email/invoice_update.html 2 additions, 2 deletions

...ode/Magento/Sales/view/frontend/email/invoice_update.html
app/code/Magento/Sales/view/frontend/email/order_new.html 1 addition, 1 deletion

app/code/Magento/Sales/view/frontend/email/order_new.html
app/code/Magento/Sales/view/frontend/email/order_update.html 2 additions, 2 deletions

app/code/Magento/Sales/view/frontend/email/order_update.html
app/code/Magento/Sales/view/frontend/email/shipment_new.html 2 additions, 2 deletions

app/code/Magento/Sales/view/frontend/email/shipment_new.html

with 108 additions and 50 deletions

Please register or to comment

Admin message

Merge pull request #474 from magento-tango/MAGETWO-38049