Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit d068360

Browse files
okolesnykokolesnyk
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into mtf-eol-pr
2 parents a9cf09d + b92e6d3 commit d068360

File tree

23 files changed

+291
-88
lines changed

23 files changed

+291
-88
lines changed

‎app/code/Magento/Customer/Model/Options.php

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
use Magento\Config\Model\Config\Source\Nooptreq as NooptreqSource;
99
use Magento\Customer\Helper\Address as AddressHelper;
1010
use Magento\Framework\Escaper;
11+
use Magento\Store\Api\Data\StoreInterface;
1112

13+
/**
14+
* Customer Options.
15+
*/
1216
class Options
1317
{
1418
/**
@@ -38,7 +42,7 @@ public function __construct(
3842
/**
3943
* Retrieve name prefix dropdown options
4044
*
41-
* @param null $store
45+
* @param null|string|bool|int|StoreInterface $store
4246
* @return array|bool
4347
*/
4448
public function getNamePrefixOptions($store = null)
@@ -52,7 +56,7 @@ public function getNamePrefixOptions($store = null)
5256
/**
5357
* Retrieve name suffix dropdown options
5458
*
55-
* @param null $store
59+
* @param null|string|bool|int|StoreInterface $store
5660
* @return array|bool
5761
*/
5862
public function getNameSuffixOptions($store = null)
@@ -64,7 +68,9 @@ public function getNameSuffixOptions($store = null)
6468
}
6569

6670
/**
67-
* @param $options
71+
* Unserialize and clear name prefix or suffix options.
72+
*
73+
* @param string $options
6874
* @param bool $isOptional
6975
* @return array|bool
7076
*
@@ -78,6 +84,7 @@ protected function _prepareNamePrefixSuffixOptions($options, $isOptional = false
7884

7985
/**
8086
* Unserialize and clear name prefix or suffix options
87+
*
8188
* If field is optional, add an empty first option.
8289
*
8390
* @param string $options
@@ -91,7 +98,7 @@ private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
9198
return false;
9299
}
93100
$result = [];
94-
$options = explode(';', $options);
101+
$options = array_filter(explode(';', $options));
95102
foreach ($options as $value) {
96103
$value = $this->escaper->escapeHtml(trim($value));
97104
$result[$value] = $value;

‎app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
1818
/**
1919
* Basic import model
2020
*
21-
* @var \Magento\ImportExport\Model\Import
21+
* @var Import
2222
*/
2323
protected $_importModel;
2424

@@ -77,8 +77,10 @@ protected function _prepareForm()
7777
);
7878

7979
// base fieldset
80-
$fieldsets['base'] = $form->addFieldset('base_fieldset', ['legend' => __('Import Settings')]);
81-
$fieldsets['base']->addField(
80+
$fieldsets['base'] = $form->addFieldset(
81+
'base_fieldset',
82+
['legend' => __('Import Settings')]
83+
)->addField(
8284
'entity',
8385
'select',
8486
[
@@ -95,12 +97,11 @@ protected function _prepareForm()
9597
// add behaviour fieldsets
9698
$uniqueBehaviors = $this->_importModel->getUniqueEntityBehaviors();
9799
foreach ($uniqueBehaviors as $behaviorCode => $behaviorClass) {
98-
$fieldsets[$behaviorCode] = $form->addFieldset(
100+
$fieldset = $form->addFieldset(
99101
$behaviorCode . '_fieldset',
100102
['legend' => __('Import Behavior'), 'class' => 'no-display']
101103
);
102-
/** @var $behaviorSource \Magento\ImportExport\Model\Source\Import\AbstractBehavior */
103-
$fieldsets[$behaviorCode]->addField(
104+
$fieldset->addField(
104105
$behaviorCode,
105106
'select',
106107
[
@@ -116,13 +117,13 @@ protected function _prepareForm()
116117
'after_element_html' => $this->getImportBehaviorTooltip(),
117118
]
118119
);
119-
$fieldsets[$behaviorCode]->addField(
120-
$behaviorCode . \Magento\ImportExport\Model\Import::FIELD_NAME_VALIDATION_STRATEGY,
120+
$fieldset->addField(
121+
$behaviorCode . Import::FIELD_NAME_VALIDATION_STRATEGY,
121122
'select',
122123
[
123-
'name' => \Magento\ImportExport\Model\Import::FIELD_NAME_VALIDATION_STRATEGY,
124-
'title' => __(' '),
125-
'label' => __(' '),
124+
'name' => Import::FIELD_NAME_VALIDATION_STRATEGY,
125+
'title' => __('Validation Strategy'),
126+
'label' => __('Validation Strategy'),
126127
'required' => true,
127128
'class' => $behaviorCode,
128129
'disabled' => true,
@@ -133,11 +134,11 @@ protected function _prepareForm()
133134
'after_element_html' => $this->getDownloadSampleFileHtml(),
134135
]
135136
);
136-
$fieldsets[$behaviorCode]->addField(
137-
$behaviorCode . '_' . \Magento\ImportExport\Model\Import::FIELD_NAME_ALLOWED_ERROR_COUNT,
137+
$fieldset->addField(
138+
$behaviorCode . '_' . Import::FIELD_NAME_ALLOWED_ERROR_COUNT,
138139
'text',
139140
[
140-
'name' => \Magento\ImportExport\Model\Import::FIELD_NAME_ALLOWED_ERROR_COUNT,
141+
'name' => Import::FIELD_NAME_ALLOWED_ERROR_COUNT,
141142
'label' => __('Allowed Errors Count'),
142143
'title' => __('Allowed Errors Count'),
143144
'required' => true,
@@ -149,11 +150,11 @@ protected function _prepareForm()
149150
),
150151
]
151152
);
152-
$fieldsets[$behaviorCode]->addField(
153-
$behaviorCode . '_' . \Magento\ImportExport\Model\Import::FIELD_FIELD_SEPARATOR,
153+
$fieldset->addField(
154+
$behaviorCode . '_' . Import::FIELD_FIELD_SEPARATOR,
154155
'text',
155156
[
156-
'name' => \Magento\ImportExport\Model\Import::FIELD_FIELD_SEPARATOR,
157+
'name' => Import::FIELD_FIELD_SEPARATOR,
157158
'label' => __('Field separator'),
158159
'title' => __('Field separator'),
159160
'required' => true,
@@ -162,11 +163,11 @@ protected function _prepareForm()
162163
'value' => ',',
163164
]
164165
);
165-
$fieldsets[$behaviorCode]->addField(
166-
$behaviorCode . \Magento\ImportExport\Model\Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR,
166+
$fieldset->addField(
167+
$behaviorCode . Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR,
167168
'text',
168169
[
169-
'name' => \Magento\ImportExport\Model\Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR,
170+
'name' => Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR,
170171
'label' => __('Multiple value separator'),
171172
'title' => __('Multiple value separator'),
172173
'required' => true,
@@ -175,11 +176,11 @@ protected function _prepareForm()
175176
'value' => Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
176177
]
177178
);
178-
$fieldsets[$behaviorCode]->addField(
179-
$behaviorCode . \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
179+
$fieldset->addField(
180+
$behaviorCode . Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
180181
'text',
181182
[
182-
'name' => \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
183+
'name' => Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
183184
'label' => __('Empty attribute value constant'),
184185
'title' => __('Empty attribute value constant'),
185186
'required' => true,
@@ -188,28 +189,29 @@ protected function _prepareForm()
188189
'value' => Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
189190
]
190191
);
191-
$fieldsets[$behaviorCode]->addField(
192-
$behaviorCode . \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE,
192+
$fieldset->addField(
193+
$behaviorCode . Import::FIELDS_ENCLOSURE,
193194
'checkbox',
194195
[
195-
'name' => \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE,
196+
'name' => Import::FIELDS_ENCLOSURE,
196197
'label' => __('Fields enclosure'),
197198
'title' => __('Fields enclosure'),
198199
'value' => 1,
199200
]
200201
);
202+
$fieldsets[$behaviorCode] = $fieldset;
201203
}
202204

203205
// fieldset for file uploading
204-
$fieldsets['upload'] = $form->addFieldset(
206+
$fieldset = $form->addFieldset(
205207
'upload_file_fieldset',
206208
['legend' => __('File to Import'), 'class' => 'no-display']
207209
);
208-
$fieldsets['upload']->addField(
209-
\Magento\ImportExport\Model\Import::FIELD_NAME_SOURCE_FILE,
210+
$fieldset->addField(
211+
Import::FIELD_NAME_SOURCE_FILE,
210212
'file',
211213
[
212-
'name' => \Magento\ImportExport\Model\Import::FIELD_NAME_SOURCE_FILE,
214+
'name' => Import::FIELD_NAME_SOURCE_FILE,
213215
'label' => __('Select File to Import'),
214216
'title' => __('Select File to Import'),
215217
'required' => true,
@@ -219,11 +221,11 @@ protected function _prepareForm()
219221
),
220222
]
221223
);
222-
$fieldsets['upload']->addField(
223-
\Magento\ImportExport\Model\Import::FIELD_NAME_IMG_FILE_DIR,
224+
$fieldset->addField(
225+
Import::FIELD_NAME_IMG_FILE_DIR,
224226
'text',
225227
[
226-
'name' => \Magento\ImportExport\Model\Import::FIELD_NAME_IMG_FILE_DIR,
228+
'name' => Import::FIELD_NAME_IMG_FILE_DIR,
227229
'label' => __('Images File Directory'),
228230
'title' => __('Images File Directory'),
229231
'required' => false,
@@ -234,6 +236,7 @@ protected function _prepareForm()
234236
),
235237
]
236238
);
239+
$fieldsets['upload'] = $fieldset;
237240

238241
$form->setUseContainer(true);
239242
$this->setForm($form);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Import,Import
1818
"Import Settings","Import Settings"
1919
"Import Behavior","Import Behavior"
2020
" "," "
21+
"Validation Strategy","Validation Strategy"
2122
"Stop on Error","Stop on Error"
2223
"Skip error entries","Skip error entries"
2324
"Allowed Errors Count","Allowed Errors Count"

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ private function extractValuesFromAttributes(array $attributes, int $storeId): a
203203
if (isset($defaultValue) && !isset($formValues[$code])) {
204204
$formValues[$code] = $defaultValue;
205205
}
206-
if ($code === 'group_id' && empty($defaultValue)) {
206+
if ($code === 'group_id' && empty($formValues[$code])) {
207207
$formValues[$code] = $this->getDefaultCustomerGroup($storeId);
208208
}
209209
}

‎app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ class OrderSender extends Sender
5555
* @param OrderIdentity $identityContainer
5656
* @param Order\Email\SenderBuilderFactory $senderBuilderFactory
5757
* @param \Psr\Log\LoggerInterface $logger
58+
* @param Renderer $addressRenderer
5859
* @param PaymentHelper $paymentHelper
5960
* @param OrderResource $orderResource
6061
* @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
61-
* @param Renderer $addressRenderer
6262
* @param ManagerInterface $eventManager
6363
*/
6464
public function __construct(
@@ -97,7 +97,7 @@ public function __construct(
9797
*/
9898
public function send(Order $order, $forceSyncMode = false)
9999
{
100-
$order->setSendEmail(true);
100+
$order->setSendEmail($this->identityContainer->isEnabled());
101101

102102
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
103103
if ($this->checkAndSend($order)) {

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
<element name="SubmitOrder" type="button" selector="#submit_order_top_button" timeout="30"/>
1313
<element name="Cancel" type="button" selector="#reset_order_top_button" timeout="30"/>
1414
<element name="CreateNewCustomer" type="button" selector="#order-customer-selector .actions button.primary" timeout="30"/>
15+
<element name="submitOrder" type="button" selector="#submit_order_top_button" timeout="30"/>
16+
<element name="cancel" type="button" selector="#reset_order_top_button" timeout="30"/>
17+
<element name="createNewCustomer" type="button" selector="#order-customer-selector .actions button.primary" timeout="30"/>
1518
</section>
16-
</sections>
19+
</sections>

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
6464

6565
$this->orderMock->expects($this->once())
6666
->method('setSendEmail')
67-
->with(true);
67+
->with($emailSendingResult);
6868

6969
$this->globalConfig->expects($this->once())
7070
->method('getValue')
7171
->with($configPath)
7272
->willReturn($configValue);
7373

7474
if (!$configValue || $forceSyncMode) {
75-
$this->identityContainerMock->expects($this->once())
75+
$this->identityContainerMock->expects($this->exactly(2))
7676
->method('isEnabled')
7777
->willReturn($emailSendingResult);
7878

@@ -118,7 +118,7 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
118118

119119
$this->orderMock->expects($this->once())
120120
->method('setEmailSent')
121-
->with(true);
121+
->with($emailSendingResult);
122122

123123
$this->orderResourceMock->expects($this->once())
124124
->method('saveAttribute')
@@ -210,7 +210,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
210210
->with('sales_email/general/async_sending')
211211
->willReturn(false);
212212

213-
$this->identityContainerMock->expects($this->once())
213+
$this->identityContainerMock->expects($this->exactly(2))
214214
->method('isEnabled')
215215
->willReturn(true);
216216

0 commit comments

Comments
 (0)