Skip to content

Commit 37bde8a

Browse files
ctubioctubio
committed
Merge remote-tracking branch 'upstream/develop' into generator_phrases_error
2 parents f96096b + b90dafd commit 37bde8a

File tree

311 files changed

+9942
-1988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+9942
-1988
lines changed

‎CHANGELOG.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
0.74.0-beta6
2+
=============
3+
* Framework improvements
4+
* Implemented a default exception handler for blocks
5+
* Updated the root composer.json file
6+
* Updated the setup tool to support different editions
7+
* Added an ability to operate with Sales & Checkout APIs as guests and registered users
8+
* Implemented the additional Sales & Checkout APIs for registered customers and guests
9+
* Added unit tests to cover Sales & Checkout services code
10+
* Various
11+
* Standardized the hierarchy of exceptions
12+
* Added bundle product API integration to Catalog
13+
* Fixed bugs
14+
* Fixed an issue where it was impossible to place an order using multiple address checkout
15+
* Fixed an issue where DB timestamp columns with current_timestamp on update were not handled correctly
16+
* Fixed an issue with FPT in partial invoices
17+
* Fixed a performance issue in benchmark test
18+
* Fixed the incorrect Exception class in the Magento_CurrencySymbol module
19+
* Fixed an issue by letting MySQL determine a database table type instead of MyISAM
20+
* Fixed an issue where test failures occurred when the database and the application were in different time zones
21+
* Fixed an issue where \Magento\Framework\Phrase omitted placeholder values if no renderer was set
22+
123
0.74.0-beta5
224
=============
325
* Various
@@ -29,10 +51,10 @@
2951
* Obsolete code tests did not cover Tests folders
3052
* Random fail of Magento\Log\Test\Unit\Model\VisitorTest
3153
* GitHub issues:
32-
* [#1149] -- Checkout Grand Total amount miscalculation
33-
* [#1165] -- Fix typos
34-
* [#1182] -- Update system.xml for 'fix' sortOrder in adminhtml
35-
* [#1186] -- SalesSequence: Fixed composer installer dependency
54+
* [#1149] (https://github.com/magento/magento2/issues/1149) -- Checkout Grand Total amount miscalculation
55+
* [#1165] (https://github.com/magento/magento2/pull/1165) -- Fix typos
56+
* [#1182] (https://github.com/magento/magento2/pull/1182) -- Update system.xml for 'fix' sortOrder in adminhtml
57+
* [#1186] (https://github.com/magento/magento2/pull/1186) -- SalesSequence: Fixed composer installer dependency
3658

3759
0.74.0-beta4
3860
=============

‎app/code/Magento/AdminNotification/Setup/InstallSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
4545
'date_added',
4646
\Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
4747
null,
48-
['nullable' => false],
48+
['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
4949
'Create date'
5050
)->addColumn(
5151
'title',
@@ -112,7 +112,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
112112
'created_at',
113113
\Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
114114
null,
115-
['nullable' => false],
115+
['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
116116
'Create date'
117117
)->setComment(
118118
'Admin System Messages'

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-backend": "0.74.0-beta5",
8-
"magento/module-media-storage": "0.74.0-beta5",
9-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-backend": "0.74.0-beta6",
8+
"magento/module-media-storage": "0.74.0-beta6",
9+
"magento/framework": "0.74.0-beta6",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta5",
14+
"version": "0.74.0-beta6",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta5",
7-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-backend": "0.74.0-beta6",
7+
"magento/framework": "0.74.0-beta6",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta5",
11+
"version": "0.74.0-beta6",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-directory": "0.74.0-beta5",
8-
"magento/module-developer": "0.74.0-beta5",
9-
"magento/module-eav": "0.74.0-beta5",
10-
"magento/module-cron": "0.74.0-beta5",
11-
"magento/module-theme": "0.74.0-beta5",
12-
"magento/module-reports": "0.74.0-beta5",
13-
"magento/module-sales": "0.74.0-beta5",
14-
"magento/module-quote": "0.74.0-beta5",
15-
"magento/module-catalog": "0.74.0-beta5",
16-
"magento/module-user": "0.74.0-beta5",
17-
"magento/module-backup": "0.74.0-beta5",
18-
"magento/module-customer": "0.74.0-beta5",
19-
"magento/module-translation": "0.74.0-beta5",
20-
"magento/module-require-js": "0.74.0-beta5",
21-
"magento/module-config": "0.74.0-beta5",
22-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-directory": "0.74.0-beta6",
8+
"magento/module-developer": "0.74.0-beta6",
9+
"magento/module-eav": "0.74.0-beta6",
10+
"magento/module-cron": "0.74.0-beta6",
11+
"magento/module-theme": "0.74.0-beta6",
12+
"magento/module-reports": "0.74.0-beta6",
13+
"magento/module-sales": "0.74.0-beta6",
14+
"magento/module-quote": "0.74.0-beta6",
15+
"magento/module-catalog": "0.74.0-beta6",
16+
"magento/module-user": "0.74.0-beta6",
17+
"magento/module-backup": "0.74.0-beta6",
18+
"magento/module-customer": "0.74.0-beta6",
19+
"magento/module-translation": "0.74.0-beta6",
20+
"magento/module-require-js": "0.74.0-beta6",
21+
"magento/module-config": "0.74.0-beta6",
22+
"magento/framework": "0.74.0-beta6",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta5",
26+
"version": "0.74.0-beta6",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backup/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-backend": "0.74.0-beta5",
8-
"magento/module-cron": "0.74.0-beta5",
9-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-backend": "0.74.0-beta6",
8+
"magento/module-cron": "0.74.0-beta6",
9+
"magento/framework": "0.74.0-beta6",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta5",
13+
"version": "0.74.0-beta6",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Bundle/Api/Data/LinkInterface.php

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,24 @@
99

1010
interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
1111
{
12+
const PRICE_TYPE_FIXED = 0;
13+
const PRICE_TYPE_PERCENT = 1;
14+
15+
/**
16+
* Get the identifier
17+
*
18+
* @return string|null
19+
*/
20+
public function getId();
21+
22+
/**
23+
* Set id
24+
*
25+
* @param string $id
26+
* @return $this
27+
*/
28+
public function setId($id);
29+
1230
/**
1331
* Get linked product sku
1432
*
@@ -69,21 +87,6 @@ public function getPosition();
6987
*/
7088
public function setPosition($position);
7189

72-
/**
73-
* Get is defined
74-
*
75-
* @return bool|null
76-
*/
77-
public function getIsDefined();
78-
79-
/**
80-
* Set is defined
81-
*
82-
* @param bool $isDefined
83-
* @return $this
84-
*/
85-
public function setIsDefined($isDefined);
86-
8790
/**
8891
* Get is default
8992
*

‎app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ interface ProductLinkManagementInterface
1111
/**
1212
* Get all children for Bundle product
1313
*
14-
* @param string $productId
14+
* @param string $productSku
15+
* @param int $optionId
1516
* @return \Magento\Bundle\Api\Data\LinkInterface[]
1617
* @throws \Magento\Framework\Exception\NoSuchEntityException
1718
* @throws \Magento\Framework\Exception\InputException
1819
*/
19-
public function getChildren($productId);
20+
public function getChildren($productSku, $optionId = null);
2021

2122
/**
2223
* Add child product to specified Bundle option by product sku
@@ -31,10 +32,23 @@ public function getChildren($productId);
3132
*/
3233
public function addChildByProductSku($sku, $optionId, \Magento\Bundle\Api\Data\LinkInterface $linkedProduct);
3334

35+
/**
36+
* @param string $sku
37+
* @param \Magento\Bundle\Api\Data\LinkInterface $linkedProduct
38+
* @throws \Magento\Framework\Exception\NoSuchEntityException
39+
* @throws \Magento\Framework\Exception\CouldNotSaveException
40+
* @throws \Magento\Framework\Exception\InputException
41+
* @return bool
42+
*/
43+
public function saveChild(
44+
$sku,
45+
\Magento\Bundle\Api\Data\LinkInterface $linkedProduct
46+
);
47+
3448
/**
3549
* @param \Magento\Catalog\Api\Data\ProductInterface $product
3650
* @param int $optionId
37-
* @param Data\LinkInterface $linkedProduct
51+
* @param \Magento\Bundle\Api\Data\LinkInterface $linkedProduct
3852
* @throws \Magento\Framework\Exception\NoSuchEntityException
3953
* @throws \Magento\Framework\Exception\CouldNotSaveException
4054
* @throws \Magento\Framework\Exception\InputException

‎app/code/Magento/Bundle/Model/Link.php

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,34 @@ class Link extends \Magento\Framework\Model\AbstractExtensibleModel implements
1616
/**#@+
1717
* Constants
1818
*/
19+
const KEY_ID = 'id';
1920
const KEY_SKU = 'sku';
2021
const KEY_OPTION_ID = 'option_id';
2122
const KEY_QTY = 'qty';
2223
const KEY_POSITION = 'position';
23-
const KEY_IS_DEFINED = 'is_defined';
2424
const KEY_IS_DEFAULT = 'is_default';
2525
const KEY_PRICE = 'price';
2626
const KEY_PRICE_TYPE = 'price_type';
27-
const KEY_CAN_CHANGE_QUANTITY = 'can_change_quantity';
27+
const KEY_CAN_CHANGE_QUANTITY = 'selection_can_change_quantity';
2828
/**#@-*/
2929

30+
/**
31+
* {@inheritdoc}
32+
*/
33+
public function getId()
34+
{
35+
return $this->getData(self::KEY_ID);
36+
}
37+
38+
/**
39+
* {@inheritdoc}
40+
*/
41+
public function setId($id)
42+
{
43+
return $this->setData(self::KEY_ID, $id);
44+
}
45+
46+
3047
/**
3148
* {@inheritdoc}
3249
*/
@@ -59,14 +76,6 @@ public function getPosition()
5976
return $this->getData(self::KEY_POSITION);
6077
}
6178

62-
/**
63-
* {@inheritdoc}
64-
*/
65-
public function getIsDefined()
66-
{
67-
return $this->getData(self::KEY_IS_DEFINED);
68-
}
69-
7079
/**
7180
* {@inheritdoc}
7281
*/
@@ -143,17 +152,6 @@ public function setPosition($position)
143152
return $this->setData(self::KEY_POSITION, $position);
144153
}
145154

146-
/**
147-
* Set is defined
148-
*
149-
* @param bool $isDefined
150-
* @return $this
151-
*/
152-
public function setIsDefined($isDefined)
153-
{
154-
return $this->setData(self::KEY_IS_DEFINED, $isDefined);
155-
}
156-
157155
/**
158156
* Set is default
159157
*

0 commit comments

Comments
 (0)