Merge branch 'm2ce_public_dev' into MAGETWO-33528 (a1432b56) · Commits · KIII-12 / Magento

Commit a1432b56 authored 10 years ago by

Michael Logvin

Browse files

Merge branch 'm2ce_public_dev' into MAGETWO-33528

parents 3f0412c2 1b0c1654

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Customer/Model/Customer.php 6 additions, 0 deletions

app/code/Magento/Customer/Model/Customer.php
app/code/Magento/Sales/Model/Order.php 20 additions, 27 deletions

app/code/Magento/Sales/Model/Order.php
app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php 30 additions, 10 deletions

...ales/Model/Order/Email/Sender/CreditmemoCommentSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php 31 additions, 11 deletions

...gento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php 31 additions, 10 deletions

...o/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php 32 additions, 12 deletions

.../Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php 30 additions, 9 deletions

...nto/Sales/Model/Order/Email/Sender/OrderCommentSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php 29 additions, 9 deletions

...de/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php 31 additions, 10 deletions

.../Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php 32 additions, 11 deletions

...Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php 6 additions, 0 deletions

...Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php 2 additions, 1 deletion

.../Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php 2 additions, 1 deletion

...st/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php 2 additions, 1 deletion

...nit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php 2 additions, 1 deletion

.../Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php 2 additions, 1 deletion

.../Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php 2 additions, 1 deletion

...es/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php 2 additions, 1 deletion

...it/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php 2 additions, 1 deletion

...Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
dev/tools/Magento/Tools/I18n/Pack/Generator.php 1 addition, 1 deletion

dev/tools/Magento/Tools/I18n/Pack/Generator.php

with 295 additions and 118 deletions

Please register or to comment

Admin message

Merge branch 'm2ce_public_dev' into MAGETWO-33528