Skip to content

Commit 13ec629

Browse files
vrannvrann
authored
Merge pull request #984 from magento-engcom/develop-prs
[EngCom] Public Pull Requests
2 parents 99e85cb + 753f25d commit 13ec629

File tree

34 files changed

+169
-60
lines changed

34 files changed

+169
-60
lines changed

‎.travis.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,31 @@ env:
1515
global:
1616
- COMPOSER_BIN_DIR=~/bin
1717
- INTEGRATION_SETS=3
18+
- NODE_JS_VERSION=6
1819
matrix:
1920
- TEST_SUITE=unit
2021
- TEST_SUITE=integration INTEGRATION_INDEX=1
2122
- TEST_SUITE=integration INTEGRATION_INDEX=2
2223
- TEST_SUITE=integration INTEGRATION_INDEX=3
2324
- TEST_SUITE=static
25+
- TEST_SUITE=js
2426
cache:
2527
apt: true
26-
directories: $HOME/.composer/cache
28+
directories:
29+
- $HOME/.composer/cache
30+
- $HOME/.nvm
31+
- $HOME/node_modules
32+
- $HOME/yarn.lock
2733
matrix:
2834
exclude:
2935
- php: 5.6.29
3036
env: TEST_SUITE=static
37+
- php: 5.6.29
38+
env: TEST_SUITE=js
3139
before_install: ./dev/travis/before_install.sh
3240
install: composer install --no-interaction --prefer-dist
3341
before_script: ./dev/travis/before_script.sh
3442
script:
3543
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
36-
- phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER
44+
- if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
45+
- if [ $TEST_SUITE == "js" ]; then grunt spec; fi

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"require": {
55
"php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
66
"magento/module-backend": "100.2.*",
7-
"magento/module-admin-notification": "100.2.*",
87
"magento/module-config": "100.2.*",
98
"magento/module-integration": "100.2.*",
109
"magento/module-store": "100.2.*",

‎app/code/Magento/Analytics/etc/module.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<module name="Magento_Backend"/>
1313
<module name="Magento_Store"/>
1414
<module name="Magento_Config"/>
15-
<module name="Magento_AdminNotification"/>
1615
</sequence>
1716
</module>
1817
</config>

‎app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ private function updateQuote(Quote $quote, array $details)
8484

8585
$quote->collectTotals();
8686

87+
/**
88+
* Unset shipping assignment to prevent from saving / applying outdated data
89+
* @see \Magento\Quote\Model\QuoteRepository\SaveHandler::processShippingAssignment
90+
*/
91+
if ($quote->getExtensionAttributes()) {
92+
$quote->getExtensionAttributes()->setShippingAssignments(null);
93+
}
94+
8795
$this->quoteRepository->save($quote);
8896
}
8997

@@ -122,6 +130,11 @@ private function updateShippingAddress(Quote $quote, array $details)
122130
$shippingAddress->setCollectShippingRates(true);
123131

124132
$this->updateAddressData($shippingAddress, $details['shippingAddress']);
133+
134+
// PayPal's address supposes not saving against customer account
135+
$shippingAddress->setSaveInAddressBook(false);
136+
$shippingAddress->setSameAsBilling(false);
137+
$shippingAddress->unsCustomerAddressId();
125138
}
126139

127140
/**
@@ -144,6 +157,11 @@ private function updateBillingAddress(Quote $quote, array $details)
144157
$billingAddress->setFirstname($details['firstName']);
145158
$billingAddress->setLastname($details['lastName']);
146159
$billingAddress->setEmail($details['email']);
160+
161+
// PayPal's address supposes not saving against customer account
162+
$billingAddress->setSaveInAddressBook(false);
163+
$billingAddress->setSameAsBilling(false);
164+
$billingAddress->unsCustomerAddressId();
147165
}
148166

149167
/**

‎app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public function getConfig()
5555
'isAllowShippingAddressOverride' => $this->config->isAllowToEditShippingAddress(),
5656
'merchantName' => $this->config->getMerchantName(),
5757
'locale' => strtolower($this->resolver->getLocale()),
58-
'paymentAcceptanceMarkSrc' => 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
58+
'paymentAcceptanceMarkSrc' =>
59+
'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
5960
'vaultCode' => self::PAYPAL_VAULT_CODE,
6061
'skipOrderReview' => $this->config->isSkipOrderReview(),
6162
'paymentIcon' => $this->config->getPayPalIcon(),

‎app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,10 @@ public function modifyMeta(array $meta)
134134
'autoRender' => false,
135135
'componentType' => 'insertListing',
136136
'dataScope' => 'bundle_product_listing',
137-
'externalProvider' => 'bundle_product_listing.bundle_product_listing_data_source',
138-
'selectionsProvider' => 'bundle_product_listing.bundle_product_listing.product_columns.ids',
137+
'externalProvider' =>
138+
'bundle_product_listing.bundle_product_listing_data_source',
139+
'selectionsProvider' =>
140+
'bundle_product_listing.bundle_product_listing.product_columns.ids',
139141
'ns' => 'bundle_product_listing',
140142
'render_url' => $this->urlBuilder->getUrl('mui/index/render'),
141143
'realTimeLink' => false,

‎app/code/Magento/Catalog/etc/acl.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<acl>
1010
<resources>
1111
<resource id="Magento_Backend::admin">
12-
<resource id="Magento_Catalog::catalog" title="Products" translate="title" sortOrder="30">
12+
<resource id="Magento_Catalog::catalog" title="Catalog" translate="title" sortOrder="30">
1313
<resource id="Magento_Catalog::catalog_inventory" title="Inventory" translate="title" sortOrder="10">
14-
<resource id="Magento_Catalog::products" title="Catalog" translate="title" sortOrder="10" />
14+
<resource id="Magento_Catalog::products" title="Products" translate="title" sortOrder="10" />
1515
<resource id="Magento_Catalog::categories" title="Categories" translate="title" sortOrder="20" />
1616
</resource>
1717
</resource>

‎app/code/Magento/CatalogImportExport/Model/Import/Product.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,6 +1529,9 @@ protected function _saveProducts()
15291529
$existingImages = $this->getExistingImages($bunch);
15301530

15311531
foreach ($bunch as $rowNum => $rowData) {
1532+
// reset category processor's failed categories array
1533+
$this->categoryProcessor->clearFailedCategories();
1534+
15321535
if (!$this->validateRow($rowData, $rowNum)) {
15331536
continue;
15341537
}

‎app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ protected function initCategories()
7979
for ($i = 1; $i < $pathSize; $i++) {
8080
$path[] = $collection->getItemById((int)$structure[$i])->getName();
8181
}
82-
$index = implode(self::DELIMITER_CATEGORY, $path);
82+
/** @var string $index */
83+
$index = $this->standardizeString(
84+
implode(self::DELIMITER_CATEGORY, $path)
85+
);
8386
$this->categories[$index] = $category->getId();
8487
}
8588
}
@@ -123,13 +126,16 @@ protected function createCategory($name, $parentId)
123126
*/
124127
protected function upsertCategory($categoryPath)
125128
{
126-
if (!isset($this->categories[$categoryPath])) {
129+
/** @var string $index */
130+
$index = $this->standardizeString($categoryPath);
131+
132+
if (!isset($this->categories[$index])) {
127133
$pathParts = explode(self::DELIMITER_CATEGORY, $categoryPath);
128134
$parentId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
129135
$path = '';
130136

131137
foreach ($pathParts as $pathPart) {
132-
$path .= $pathPart;
138+
$path .= $this->standardizeString($pathPart);
133139
if (!isset($this->categories[$path])) {
134140
$this->categories[$path] = $this->createCategory($pathPart, $parentId);
135141
}
@@ -138,7 +144,7 @@ protected function upsertCategory($categoryPath)
138144
}
139145
}
140146

141-
return $this->categories[$categoryPath];
147+
return $this->categories[$index];
142148
}
143149

144150
/**
@@ -171,7 +177,7 @@ public function upsertCategories($categoriesString, $categoriesSeparator)
171177
* @param string $category
172178
* @param \Magento\Framework\Exception\AlreadyExistsException $exception
173179
*
174-
* @return array
180+
* @return $this
175181
*/
176182
private function addFailedCategory($category, $exception)
177183
{
@@ -190,7 +196,18 @@ private function addFailedCategory($category, $exception)
190196
*/
191197
public function getFailedCategories()
192198
{
193-
return $this->failedCategories;
199+
return $this->failedCategories;
200+
}
201+
202+
/**
203+
* Resets failed categories' array
204+
*
205+
* @return $this
206+
*/
207+
public function clearFailedCategories()
208+
{
209+
$this->failedCategories = [];
210+
return $this;
194211
}
195212

196213
/**
@@ -204,4 +221,17 @@ public function getCategoryById($categoryId)
204221
{
205222
return isset($this->categoriesCache[$categoryId]) ? $this->categoriesCache[$categoryId] : null;
206223
}
224+
225+
/**
226+
* Standardize a string.
227+
* For now it performs only a lowercase action, this method is here to include more complex checks in the future
228+
* if needed.
229+
*
230+
* @param string $string
231+
* @return string
232+
*/
233+
private function standardizeString($string)
234+
{
235+
return mb_strtolower($string);
236+
}
207237
}

‎app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected function setUp()
4444
->disableOriginalConstructor()
4545
->getMock();
4646
$childCategory->method('getId')->will($this->returnValue(self::CHILD_CATEGORY_ID));
47-
$childCategory->method('getName')->will($this->returnValue('Child'));
47+
$childCategory->method('getName')->will($this->returnValue(self::CHILD_CATEGORY_NAME));
4848
$childCategory->method('getPath')->will($this->returnValue(
4949
self::PARENT_CATEGORY_ID . CategoryProcessor::DELIMITER_CATEGORY
5050
. self::CHILD_CATEGORY_ID
@@ -115,6 +115,22 @@ public function testUpsertCategories()
115115
$this->assertArrayHasKey(self::CHILD_CATEGORY_ID, array_flip($categoryIds));
116116
}
117117

118+
public function testClearFailedCategories()
119+
{
120+
$dummyFailedCategory = [
121+
[
122+
'category' => 'dummy category',
123+
'exception' => 'dummy exception',
124+
]
125+
];
126+
127+
$this->setPropertyValue($this->categoryProcessor, 'failedCategories', $dummyFailedCategory);
128+
$this->assertCount(count($dummyFailedCategory), $this->categoryProcessor->getFailedCategories());
129+
130+
$this->categoryProcessor->clearFailedCategories();
131+
$this->assertEmpty($this->categoryProcessor->getFailedCategories());
132+
}
133+
118134
/**
119135
* Cover getCategoryById().
120136
*

0 commit comments

Comments
 (0)