Merge remote-tracking branch 'mainline/develop' into publication (8763e1b2) · Commits · KIII-12 / Magento

Commit 8763e1b2 authored 10 years ago by

Vladimir Pelipenko

Merge remote-tracking branch 'mainline/develop' into publication

Conflicts:
	app/code/Magento/Checkout/composer.json

parents 5e59d46d bbe02685

Branches

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Bundle/Model/Plugin/QuoteItem.php 1 addition, 1 deletion

app/code/Magento/Bundle/Model/Plugin/QuoteItem.php
app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml 2 additions, 1 deletion

...alog/view/frontend/templates/product/view/addtocart.phtml
app/code/Magento/Catalog/view/frontend/web/product/view/validation.js 1 addition, 1 deletion

...ento/Catalog/view/frontend/web/product/view/validation.js
app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php 0 additions, 1 deletion

app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
app/code/Magento/Checkout/Service/V1/Address/Billing/ReadService.php 0 additions, 58 deletions

...gento/Checkout/Service/V1/Address/Billing/ReadService.php
app/code/Magento/Checkout/Service/V1/Address/Billing/ReadServiceInterface.php 0 additions, 19 deletions

...ckout/Service/V1/Address/Billing/ReadServiceInterface.php
app/code/Magento/Checkout/Service/V1/Address/Converter.php 0 additions, 111 deletions

app/code/Magento/Checkout/Service/V1/Address/Converter.php
app/code/Magento/Checkout/Service/V1/Address/Shipping/ReadService.php 0 additions, 71 deletions

...ento/Checkout/Service/V1/Address/Shipping/ReadService.php
app/code/Magento/Checkout/Service/V1/Address/Shipping/ReadServiceInterface.php 0 additions, 19 deletions

...kout/Service/V1/Address/Shipping/ReadServiceInterface.php
app/code/Magento/Checkout/Service/V1/Cart/ReadService.php 0 additions, 192 deletions

app/code/Magento/Checkout/Service/V1/Cart/ReadService.php
app/code/Magento/Checkout/Service/V1/Cart/WriteService.php 0 additions, 190 deletions

app/code/Magento/Checkout/Service/V1/Cart/WriteService.php
app/code/Magento/Checkout/Service/V1/Coupon/ReadService.php 0 additions, 59 deletions

app/code/Magento/Checkout/Service/V1/Coupon/ReadService.php
app/code/Magento/Checkout/Service/V1/Coupon/ReadServiceInterface.php 0 additions, 21 deletions

...gento/Checkout/Service/V1/Coupon/ReadServiceInterface.php
app/code/Magento/Checkout/Service/V1/Data/Cart/Address/Region.php 0 additions, 62 deletions

.../Magento/Checkout/Service/V1/Data/Cart/Address/Region.php
app/code/Magento/Checkout/Service/V1/Data/Cart/AddressBuilder.php 0 additions, 261 deletions

.../Magento/Checkout/Service/V1/Data/Cart/AddressBuilder.php
app/code/Magento/Checkout/Service/V1/Data/Cart/Coupon.php 0 additions, 29 deletions

app/code/Magento/Checkout/Service/V1/Data/Cart/Coupon.php
app/code/Magento/Checkout/Service/V1/Data/Cart/CouponBuilder.php 0 additions, 23 deletions

...e/Magento/Checkout/Service/V1/Data/Cart/CouponBuilder.php
app/code/Magento/Checkout/Service/V1/Data/Cart/Customer.php 0 additions, 201 deletions

app/code/Magento/Checkout/Service/V1/Data/Cart/Customer.php
app/code/Magento/Checkout/Service/V1/Data/Cart/CustomerBuilder.php 0 additions, 179 deletions

...Magento/Checkout/Service/V1/Data/Cart/CustomerBuilder.php
app/code/Magento/Checkout/Service/V1/Data/Cart/CustomerMapper.php 0 additions, 41 deletions

.../Magento/Checkout/Service/V1/Data/Cart/CustomerMapper.php

with 4 additions and 1540 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into publication