Skip to content

Commit 17f8fce

Browse files
zanileezanilee
committed
Merge remote-tracking branch 'mainline/develop' into UI
2 parents f5b1626 + 404e40a commit 17f8fce

File tree

153 files changed

+2120
-1363
lines changed

Some content is hidden

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

153 files changed

+2120
-1363
lines changed

‎.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -167,6 +172,8 @@
167172
## http://developer.yahoo.com/performance/rules.html#expires
168173

169174
ExpiresDefault "access plus 1 year"
175+
ExpiresByType text/html A0
176+
ExpiresByType text/plain A0
170177

171178
</IfModule>
172179

‎.htaccess.sample

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -164,6 +169,8 @@
164169
## http://developer.yahoo.com/performance/rules.html#expires
165170

166171
ExpiresDefault "access plus 1 year"
172+
ExpiresByType text/html A0
173+
ExpiresByType text/plain A0
167174

168175
</IfModule>
169176

‎CHANGELOG.md

Lines changed: 212 additions & 41 deletions
Large diffs are not rendered by default.

‎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.42.0-beta11",
7-
"magento/module-backend": "0.42.0-beta11",
8-
"magento/module-media-storage": "0.42.0-beta11",
9-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-store": "0.74.0-beta1",
7+
"magento/module-backend": "0.74.0-beta1",
8+
"magento/module-media-storage": "0.74.0-beta1",
9+
"magento/framework": "0.74.0-beta1",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta11",
14+
"version": "0.74.0-beta1",
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.42.0-beta11",
7-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-backend": "0.74.0-beta1",
7+
"magento/framework": "0.74.0-beta1",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta11",
11+
"version": "0.74.0-beta1",
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.42.0-beta11",
7-
"magento/module-directory": "0.42.0-beta11",
8-
"magento/module-developer": "0.42.0-beta11",
9-
"magento/module-eav": "0.42.0-beta11",
10-
"magento/module-cron": "0.42.0-beta11",
11-
"magento/module-theme": "0.42.0-beta11",
12-
"magento/module-reports": "0.42.0-beta11",
13-
"magento/module-sales": "0.42.0-beta11",
14-
"magento/module-quote": "0.42.0-beta11",
15-
"magento/module-catalog": "0.42.0-beta11",
16-
"magento/module-user": "0.42.0-beta11",
17-
"magento/module-backup": "0.42.0-beta11",
18-
"magento/module-customer": "0.42.0-beta11",
19-
"magento/module-translation": "0.42.0-beta11",
20-
"magento/module-require-js": "0.42.0-beta11",
21-
"magento/module-config": "0.42.0-beta11",
22-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-store": "0.74.0-beta1",
7+
"magento/module-directory": "0.74.0-beta1",
8+
"magento/module-developer": "0.74.0-beta1",
9+
"magento/module-eav": "0.74.0-beta1",
10+
"magento/module-cron": "0.74.0-beta1",
11+
"magento/module-theme": "0.74.0-beta1",
12+
"magento/module-reports": "0.74.0-beta1",
13+
"magento/module-sales": "0.74.0-beta1",
14+
"magento/module-quote": "0.74.0-beta1",
15+
"magento/module-catalog": "0.74.0-beta1",
16+
"magento/module-user": "0.74.0-beta1",
17+
"magento/module-backup": "0.74.0-beta1",
18+
"magento/module-customer": "0.74.0-beta1",
19+
"magento/module-translation": "0.74.0-beta1",
20+
"magento/module-require-js": "0.74.0-beta1",
21+
"magento/module-config": "0.74.0-beta1",
22+
"magento/framework": "0.74.0-beta1",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.42.0-beta11",
26+
"version": "0.74.0-beta1",
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.42.0-beta11",
7-
"magento/module-backend": "0.42.0-beta11",
8-
"magento/module-cron": "0.42.0-beta11",
9-
"magento/framework": "0.42.0-beta11",
6+
"magento/module-store": "0.74.0-beta1",
7+
"magento/module-backend": "0.74.0-beta1",
8+
"magento/module-cron": "0.74.0-beta1",
9+
"magento/framework": "0.74.0-beta1",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.42.0-beta11",
13+
"version": "0.74.0-beta1",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Bundle/Model/Resource/Indexer/Price.php

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -529,27 +529,6 @@ protected function _prepareBundlePrice($entityIds = null)
529529
$this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED, $entityIds);
530530
$this->_prepareBundlePriceByType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC, $entityIds);
531531

532-
/**
533-
* Add possibility modify prices from external events
534-
*/
535-
$select = $this->_getWriteAdapter()->select()->join(
536-
['wd' => $this->_getWebsiteDateTable()],
537-
'i.website_id = wd.website_id',
538-
[]
539-
);
540-
$this->_eventManager->dispatch(
541-
'prepare_catalog_product_price_index_table',
542-
[
543-
'index_table' => ['i' => $this->_getBundlePriceTable()],
544-
'select' => $select,
545-
'entity_id' => 'i.entity_id',
546-
'customer_group_id' => 'i.customer_group_id',
547-
'website_id' => 'i.website_id',
548-
'website_date' => 'wd.website_date',
549-
'update_fields' => ['price', 'min_price', 'max_price']
550-
]
551-
);
552-
553532
$this->_calculateBundleOptionPrice();
554533
$this->_applyCustomOption();
555534

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta11",
7-
"magento/module-catalog": "0.42.0-beta11",
8-
"magento/module-tax": "0.42.0-beta11",
9-
"magento/module-backend": "0.42.0-beta11",
10-
"magento/module-sales": "0.42.0-beta11",
11-
"magento/module-checkout": "0.42.0-beta11",
12-
"magento/module-catalog-inventory": "0.42.0-beta11",
13-
"magento/module-customer": "0.42.0-beta11",
14-
"magento/module-catalog-rule": "0.42.0-beta11",
15-
"magento/module-eav": "0.42.0-beta11",
16-
"magento/module-config": "0.42.0-beta11",
17-
"magento/module-gift-message": "0.42.0-beta11",
18-
"magento/framework": "0.42.0-beta11",
19-
"magento/module-quote": "0.42.0-beta11",
20-
"magento/module-media-storage": "0.42.0-beta11",
6+
"magento/module-store": "0.74.0-beta1",
7+
"magento/module-catalog": "0.74.0-beta1",
8+
"magento/module-tax": "0.74.0-beta1",
9+
"magento/module-backend": "0.74.0-beta1",
10+
"magento/module-sales": "0.74.0-beta1",
11+
"magento/module-checkout": "0.74.0-beta1",
12+
"magento/module-catalog-inventory": "0.74.0-beta1",
13+
"magento/module-customer": "0.74.0-beta1",
14+
"magento/module-catalog-rule": "0.74.0-beta1",
15+
"magento/module-eav": "0.74.0-beta1",
16+
"magento/module-config": "0.74.0-beta1",
17+
"magento/module-gift-message": "0.74.0-beta1",
18+
"magento/framework": "0.74.0-beta1",
19+
"magento/module-quote": "0.74.0-beta1",
20+
"magento/module-media-storage": "0.74.0-beta1",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.42.0-beta11"
24+
"magento/module-webapi": "0.74.0-beta1"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.42.0-beta11",
27+
"version": "0.74.0-beta1",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<input class="bundle-option-<?php echo $_option->getId() ?> checkbox product bundle option change-container-classname"
3030
id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
3131
type="checkbox"
32-
<?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
32+
<?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $_option->getId() . ']&quot;]:checked\'}"'?>
3333
name="bundle_option[<?php echo $_option->getId() ?>][<?php echo $_selection->getId() ?>]"
3434
<?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
3535
<?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>

0 commit comments

Comments
 (0)