Skip to content

Commit da698dd

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'remotes/mainline/develop' into MAGETWO-44459-Check-javascript-function-calls-and-labels-are-translatable
# Conflicts: # app/code/Magento/Backend/i18n/de_DE.csv # app/code/Magento/Backend/i18n/en_US.csv # app/code/Magento/Backend/i18n/es_ES.csv # app/code/Magento/Backend/i18n/fr_FR.csv # app/code/Magento/Backend/i18n/nl_NL.csv # app/code/Magento/Backend/i18n/pt_BR.csv # app/code/Magento/Backend/i18n/zh_Hans_CN.csv # app/code/Magento/Customer/i18n/de_DE.csv # app/code/Magento/Customer/i18n/en_US.csv # app/code/Magento/Customer/i18n/es_ES.csv # app/code/Magento/Customer/i18n/fr_FR.csv # app/code/Magento/Customer/i18n/nl_NL.csv # app/code/Magento/Customer/i18n/pt_BR.csv # app/code/Magento/Customer/i18n/zh_Hans_CN.csv # app/code/Magento/User/i18n/de_DE.csv # app/code/Magento/User/i18n/en_US.csv # app/code/Magento/User/i18n/es_ES.csv # app/code/Magento/User/i18n/fr_FR.csv # app/code/Magento/User/i18n/nl_NL.csv # app/code/Magento/User/i18n/pt_BR.csv # app/code/Magento/User/i18n/zh_Hans_CN.csv
2 parents 953f5e5 + 80c5e2b commit da698dd

File tree

161 files changed

+8263
-3966
lines changed

Some content is hidden

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

161 files changed

+8263
-3966
lines changed

‎app/code/Magento/Backend/i18n/de_DE.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,4 +606,12 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"
609617
"VAT number","VAT number"

‎app/code/Magento/Backend/i18n/en_US.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,4 +606,12 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"
609617
"VAT number","VAT number"

‎app/code/Magento/Backend/i18n/es_ES.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,4 +606,12 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"
609617
"VAT number","VAT number"

‎app/code/Magento/Backend/i18n/fr_FR.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,4 +606,12 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"
609617
"VAT number","VAT number"

‎app/code/Magento/Backend/i18n/nl_NL.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,4 +606,12 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"
609617
"VAT number","VAT number"

‎app/code/Magento/Backend/i18n/pt_BR.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,4 +606,12 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"
609617
"VAT number","VAT number"

‎app/code/Magento/Backend/i18n/zh_Hans_CN.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,4 +606,12 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"
609617
"VAT number","VAT number"

‎app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
/** @var $block \Magento\Braintree\Block\Creditcard\Management */
1010

1111
echo $block->getLayout()->getMessagesBlock()->getGroupedHtml();
12-
$defaultExpMonth = $block->getTodayMonth();
13-
$defaultExpYear = $block->getTodayYear();
12+
$defaultExpMonth = '';
13+
$defaultExpYear = '';
1414
$countrySpecificCardTypeConfig = $block->getCountrySpecificCardTypeConfig();
1515
$applicableCardTypeConfig = $block->getCcApplicableTypes();
1616
if ($block->isEditMode()) {

‎app/code/Magento/Bundle/Block/Adminhtml/Order/Create/Sidebar.php

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Bundle\Block\Adminhtml\Order\Create;
7+
8+
class Sidebar
9+
{
10+
/**
11+
* Get item qty
12+
*
13+
* @param \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar $subject
14+
* @param callable $proceed
15+
* @param \Magento\Framework\DataObject $item
16+
*
17+
* @return string
18+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
19+
*/
20+
public function aroundGetItemQty(
21+
\Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar $subject,
22+
\Closure $proceed,
23+
\Magento\Framework\DataObject $item
24+
) {
25+
if ($item->getProduct()->getTypeId() == \Magento\Bundle\Model\Product\Type::TYPE_CODE) {
26+
return '';
27+
}
28+
return $proceed($item);
29+
}
30+
31+
/**
32+
* Check whether product configuration is required before adding to order
33+
*
34+
* @param \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar $subject
35+
* @param callable $proceed
36+
* @param string $productType
37+
*
38+
* @return bool
39+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
40+
*/
41+
public function aroundIsConfigurationRequired(
42+
\Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar $subject,
43+
\Closure $proceed,
44+
$productType
45+
) {
46+
if ($productType == \Magento\Bundle\Model\Product\Type::TYPE_CODE) {
47+
return true;
48+
}
49+
return $proceed($productType);
50+
}
51+
}

‎app/code/Magento/Bundle/Model/Product/Type.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
*/
2020
class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
2121
{
22+
/**
23+
* Product type
24+
*/
25+
const TYPE_CODE = 'bundle';
26+
2227
/**
2328
* Product is composite
2429
*

0 commit comments

Comments
 (0)