Merge remote-tracking branch 'origin/develop' into PR-webdev (8bbc70b9) · Commits · KIII-12 / Magento

Commit 8bbc70b9 authored 9 years ago by

Olga Matviienko

Browse files

Merge remote-tracking branch 'origin/develop' into PR-webdev

parents 72aaaf7a a89acbbf

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Authorizenet/Model/Directpost.php 22 additions, 2 deletions

app/code/Magento/Authorizenet/Model/Directpost.php
app/code/Magento/Checkout/view/frontend/web/js/action/place-order.js 14 additions, 31 deletions

...gento/Checkout/view/frontend/web/js/action/place-order.js
app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js 13 additions, 11 deletions

...eckout/view/frontend/web/js/model/new-customer-address.js
app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js 27 additions, 0 deletions

...agento/Checkout/view/frontend/web/js/model/place-order.js
app/code/Magento/Checkout/view/frontend/web/js/model/quote.js 1 addition, 1 deletion

...code/Magento/Checkout/view/frontend/web/js/model/quote.js
app/code/Magento/Customer/Model/Address.php 28 additions, 0 deletions

app/code/Magento/Customer/Model/Address.php
app/code/Magento/Customer/Model/Address/AbstractAddress.php 1 addition, 1 deletion

app/code/Magento/Customer/Model/Address/AbstractAddress.php
app/code/Magento/Customer/Model/Address/CustomAttributeList.php 17 additions, 0 deletions

...de/Magento/Customer/Model/Address/CustomAttributeList.php
app/code/Magento/Customer/Model/Address/CustomAttributeListInterface.php 16 additions, 0 deletions

...o/Customer/Model/Address/CustomAttributeListInterface.php
app/code/Magento/Customer/etc/di.xml 2 additions, 0 deletions

app/code/Magento/Customer/etc/di.xml
app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js 1 addition, 0 deletions

...o/Customer/view/frontend/web/js/model/customer/address.js
app/code/Magento/Dhl/Model/Carrier.php 1 addition, 2 deletions

app/code/Magento/Dhl/Model/Carrier.php
app/code/Magento/Fedex/Model/Carrier.php 4 additions, 1 deletion

app/code/Magento/Fedex/Model/Carrier.php
app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php 29 additions, 14 deletions

.../Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php 0 additions, 1 deletion

...gento/Paypal/Controller/Express/AbstractExpress/Start.php
app/code/Magento/Paypal/Controller/Express/GetToken.php 2 additions, 1 deletion

app/code/Magento/Paypal/Controller/Express/GetToken.php
app/code/Magento/Paypal/Model/Api/Nvp.php 3 additions, 2 deletions

app/code/Magento/Paypal/Model/Api/Nvp.php
app/code/Magento/Paypal/Model/Api/ProcessableException.php 7 additions, 1 deletion

app/code/Magento/Paypal/Model/Api/ProcessableException.php
app/code/Magento/Paypal/Model/Express.php 1 addition, 0 deletions

app/code/Magento/Paypal/Model/Express.php
app/code/Magento/Paypal/Test/Unit/Model/Api/ProcessableExceptionTest.php 18 additions, 15 deletions

...o/Paypal/Test/Unit/Model/Api/ProcessableExceptionTest.php

with 207 additions and 83 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/develop' into PR-webdev