Merge remote-tracking branch 'upstream/develop' into MAGETWO-34625-ee-packages
Showing
- app/code/Magento/Checkout/Block/Cart/Shipping.php 3 additions, 3 deletionsapp/code/Magento/Checkout/Block/Cart/Shipping.php
- app/code/Magento/Checkout/composer.json 1 addition, 0 deletionsapp/code/Magento/Checkout/composer.json
- app/code/Magento/Dhl/Model/Carrier.php 5 additions, 5 deletionsapp/code/Magento/Dhl/Model/Carrier.php
- app/code/Magento/Fedex/Model/Carrier.php 2 additions, 2 deletionsapp/code/Magento/Fedex/Model/Carrier.php
- app/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php 2 additions, 2 deletionsapp/code/Magento/OfflineShipping/Model/Carrier/Flatrate.php
- app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php 2 additions, 2 deletions...de/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
- app/code/Magento/OfflineShipping/Model/Carrier/Pickup.php 2 additions, 2 deletionsapp/code/Magento/OfflineShipping/Model/Carrier/Pickup.php
- app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php 2 additions, 2 deletionsapp/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
- app/code/Magento/Payment/Model/Cart.php 18 additions, 1 deletionapp/code/Magento/Payment/Model/Cart.php
- app/code/Magento/Payment/Model/Cart/SalesModel/Factory.php 1 addition, 1 deletionapp/code/Magento/Payment/Model/Cart/SalesModel/Factory.php
- app/code/Magento/Payment/Model/Cart/SalesModel/SalesModelInterface.php 8 additions, 1 deletion...nto/Payment/Model/Cart/SalesModel/SalesModelInterface.php
- app/code/Magento/Payment/Model/Checks/PaymentMethodChecksInterface.php 6 additions, 0 deletions...nto/Payment/Model/Checks/PaymentMethodChecksInterface.php
- app/code/Magento/Payment/Model/Config.php 6 additions, 0 deletionsapp/code/Magento/Payment/Model/Config.php
- app/code/Magento/Payment/Model/InfoInterface.php 7 additions, 0 deletionsapp/code/Magento/Payment/Model/InfoInterface.php
- app/code/Magento/Payment/Model/Method/AbstractMethod.php 37 additions, 4 deletionsapp/code/Magento/Payment/Model/Method/AbstractMethod.php
- app/code/Magento/Payment/Model/Method/Cc.php 6 additions, 1 deletionapp/code/Magento/Payment/Model/Method/Cc.php
- app/code/Magento/Payment/Model/MethodInterface.php 3 additions, 0 deletionsapp/code/Magento/Payment/Model/MethodInterface.php
- app/code/Magento/Payment/Model/MethodList.php 5 additions, 4 deletionsapp/code/Magento/Payment/Model/MethodList.php
- app/code/Magento/Quote/Model/Quote.php 0 additions, 6 deletionsapp/code/Magento/Quote/Model/Quote.php
- app/code/Magento/Quote/Model/Quote/Address.php 2 additions, 2 deletionsapp/code/Magento/Quote/Model/Quote/Address.php
Please register or sign in to comment