Skip to content

Commit 59cda3c

Browse files
vzabaznovvzabaznov
committed
Merge remote-tracking branch 'mainline/develop' into pr-539
2 parents 3b06adc + e04ef1b commit 59cda3c

File tree

35 files changed

+546
-248
lines changed

35 files changed

+546
-248
lines changed

‎app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function afterInitialize(
7777
if (!$linkData || (isset($linkData['is_delete']) && (bool)$linkData['is_delete'])) {
7878
continue;
7979
} else {
80-
unset($linkData['link_id']);
80+
//unset($linkData['link_id']);
8181
// TODO: need to implement setLinkFileContent()
8282
$link = $this->linkFactory->create(['data' => $linkData]);
8383
if (isset($linkData['type'])) {
@@ -89,7 +89,9 @@ public function afterInitialize(
8989
if (isset($linkData['file_content'])) {
9090
$link->setLinkFileContent($linkData['file_content']);
9191
}
92-
$link->setId(null);
92+
if (isset($linkData['link_id'])) {
93+
$link->setId($linkData['link_id']);
94+
}
9395
if (isset($linkData['sample']['type'])) {
9496
$link->setSampleType($linkData['sample']['type']);
9597
}
@@ -125,10 +127,11 @@ public function afterInitialize(
125127
if (!$sampleData || (isset($sampleData['is_delete']) && (bool)$sampleData['is_delete'])) {
126128
continue;
127129
} else {
128-
unset($sampleData['sample_id']);
129130
$sample = $this->sampleFactory->create(['data' => $sampleData]);
130-
$sample->setId(null);
131131
$sample->setStoreId($product->getStoreId());
132+
if (isset($sampleData['sample_id'])) {
133+
$sample->setId($sampleData['sample_id']);
134+
}
132135
if (isset($sampleData['type'])) {
133136
$sample->setSampleType($sampleData['type']);
134137
}

‎app/code/Magento/Downloadable/Model/Link/SaveHandler.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,26 @@ public function __construct(LinkRepository $linkRepository)
3636
*/
3737
public function execute($entityType, $entity, $arguments = [])
3838
{
39+
/** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
3940
if ($entity->getTypeId() !== 'downloadable') {
4041
return $entity;
4142
}
42-
/** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
43-
foreach ($this->linkRepository->getList($entity->getSku()) as $link) {
44-
$this->linkRepository->delete($link->getId());
45-
}
43+
44+
$oldLinks = $this->linkRepository->getList($entity->getSku());
4645
$links = $entity->getExtensionAttributes()->getDownloadableProductLinks() ?: [];
46+
$updatedLinkIds = [];
4747
foreach ($links as $link) {
48+
if ($link->getId()) {
49+
$updatedLinkIds[] = $link->getId();
50+
}
4851
$this->linkRepository->save($entity->getSku(), $link, !(bool)$entity->getStoreId());
4952
}
53+
foreach ($oldLinks as $link) {
54+
if (!in_array($link->getId(), $updatedLinkIds)) {
55+
$this->linkRepository->delete($link->getId());
56+
}
57+
}
58+
5059
return $entity;
5160
}
5261
}

‎app/code/Magento/Downloadable/Model/Sample/SaveHandler.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,22 @@ public function execute($entityType, $entity, $arguments = [])
3939
if ($entity->getTypeId() != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
4040
return $entity;
4141
}
42-
/** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
43-
foreach ($this->sampleRepository->getList($entity->getSku()) as $sample) {
44-
$this->sampleRepository->delete($sample->getId());
45-
}
42+
43+
$oldSamples = $this->sampleRepository->getList($entity->getSku());
4644
$samples = $entity->getExtensionAttributes()->getDownloadableProductSamples() ?: [];
45+
$updatedSampleIds = [];
4746
foreach ($samples as $sample) {
47+
if ($sample->getId()) {
48+
$updatedSampleIds[] = $sample->getId();
49+
}
4850
$this->sampleRepository->save($entity->getSku(), $sample, !(bool)$entity->getStoreId());
4951
}
52+
foreach ($oldSamples as $sample) {
53+
if (!in_array($sample->getId(), $updatedSampleIds)) {
54+
$this->sampleRepository->delete($sample->getId());
55+
}
56+
}
57+
5058
return $entity;
5159
}
5260
}

‎app/code/Magento/Payment/Model/Method/Cc.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ public function validate()
144144
'|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}' .
145145
'|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}' .
146146
'|5[0-9]{14}))$/',
147+
'MI' => '/^(5(0|[6-9])|63|67(?!59|6770|6774))\d*$/',
148+
'MD' => '/^(6759(?!24|38|40|6[3-9]|70|76)|676770|676774)\d*$/',
147149
];
148150

149151
$ccNumAndTypeMatches = isset(
@@ -213,6 +215,8 @@ public function getVerificationRegEx()
213215
'SO' => '/^[0-9]{3,4}$/',
214216
'OT' => '/^[0-9]{3,4}$/',
215217
'JCB' => '/^[0-9]{3,4}$/',
218+
'MI' => '/^[0-9]{3}$/',
219+
'MD' => '/^[0-9]{3}$/',
216220
];
217221
return $verificationExpList;
218222
}

‎app/code/Magento/Paypal/Model/Report/Settlement.php

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
namespace Magento\Paypal\Model\Report;
1010

11+
use DateTime;
1112
use Magento\Framework\Filesystem;
1213
use Magento\Framework\Filesystem\DirectoryList;
1314

@@ -162,6 +163,13 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
162163
*/
163164
protected $_scopeConfig;
164165

166+
/**
167+
* Columns with DateTime data type
168+
*
169+
* @var array
170+
*/
171+
private $dateTimeColumns = ['transaction_initiation_date', 'transaction_completion_date'];
172+
165173
/**
166174
* @param \Magento\Framework\Model\Context $context
167175
* @param \Magento\Framework\Registry $registry
@@ -249,7 +257,8 @@ public function fetchAndSave(\Magento\Framework\Filesystem\Io\Sftp $connection)
249257

250258
// Set last modified date, this value will be overwritten during parsing
251259
if (isset($attributes['mtime'])) {
252-
$lastModified = new \DateTime($attributes['mtime']);
260+
$date = new \DateTime();
261+
$lastModified = $date->setTimestamp($attributes['mtime']);
253262
$this->setReportLastModified(
254263
$lastModified->format('Y-m-d H:i:s')
255264
);
@@ -324,7 +333,7 @@ public function parseCsv($localCsv, $format = 'new')
324333
$rowMap = $this->_csvColumns[$format]['rowmap'];
325334

326335
$flippedSectionColumns = array_flip($sectionColumns);
327-
$stream = $this->_tmpDirectory->openFile($localCsv);
336+
$stream = $this->_tmpDirectory->openFile($localCsv, 'r');
328337
while ($line = $stream->readCsv()) {
329338
if (empty($line)) {
330339
// The line was empty, so skip it.
@@ -360,11 +369,7 @@ public function parseCsv($localCsv, $format = 'new')
360369
break;
361370
case 'SB':
362371
// Section body.
363-
$bodyItem = [];
364-
for ($i = 1; $i < count($line); $i++) {
365-
$bodyItem[$rowMap[$flippedSectionColumns[$i]]] = $line[$i];
366-
}
367-
$this->_rows[] = $bodyItem;
372+
$this->_rows[] = $this->getBodyItems($line, $flippedSectionColumns, $rowMap);
368373
break;
369374
case 'SC':
370375
// Section records count.
@@ -385,6 +390,41 @@ public function parseCsv($localCsv, $format = 'new')
385390
return $this;
386391
}
387392

393+
/**
394+
* Parse columns from line of csv file
395+
*
396+
* @param array $line
397+
* @param array $sectionColumns
398+
* @param array $rowMap
399+
* @return array
400+
*/
401+
private function getBodyItems(array $line, array $sectionColumns, array $rowMap)
402+
{
403+
$bodyItem = [];
404+
for ($i = 1, $count = count($line); $i < $count; $i++) {
405+
if(isset($rowMap[$sectionColumns[$i]])) {
406+
if (in_array($rowMap[$sectionColumns[$i]], $this->dateTimeColumns)) {
407+
$line[$i] = $this->formatDateTimeColumns($line[$i]);
408+
}
409+
$bodyItem[$rowMap[$sectionColumns[$i]]] = $line[$i];
410+
}
411+
}
412+
return $bodyItem;
413+
}
414+
415+
/**
416+
* Format date columns in UTC
417+
*
418+
* @param string $lineItem
419+
* @return string
420+
*/
421+
private function formatDateTimeColumns($lineItem)
422+
{
423+
/** @var DateTime $date */
424+
$date = new DateTime($lineItem, new \DateTimeZone('UTC'));
425+
return $date->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
426+
}
427+
388428
/**
389429
* Load report by unique key (accoutn + report date)
390430
*

‎app/code/Magento/Search/Adapter/Mysql/Query/Preprocessor/Synonyms.php renamed to ‎app/code/Magento/Search/Adapter/Query/Preprocessor/Synonyms.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2016 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Search\Adapter\Mysql\Query\Preprocessor;
6+
namespace Magento\Search\Adapter\Query\Preprocessor;
77

88
use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
99
use Magento\Search\Api\SynonymAnalyzerInterface;

‎app/code/Magento/Search/Api/SynonymGroupRepositoryInterface.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ interface SynonymGroupRepositoryInterface
1414
* Save synonym group data
1515
*
1616
* @param \Magento\Search\Api\Data\SynonymGroupInterface $synonymGroup
17+
* @param bool $errorOnMergeConflict
1718
* @return \Magento\Search\Api\Data\SynonymGroupInterface saved attribute set
1819
*/
19-
public function save(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGroup);
20+
public function save(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGroup, $errorOnMergeConflict = false);
2021

2122
/**
2223
* Remove given synonym group data
@@ -25,4 +26,12 @@ public function save(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGrou
2526
* @return bool
2627
*/
2728
public function delete(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGroup);
29+
30+
/**
31+
* Return a paritcular synonym group interface instance based on passed in synonym group id
32+
*
33+
* @param int $synonymGroupId
34+
* @return \Magento\Search\Api\Data\SynonymGroupInterface
35+
*/
36+
public function get($synonymGroupId);
2837
}

‎app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,45 @@
66

77
namespace Magento\Search\Controller\Adminhtml\Synonyms;
88

9-
use Magento\Search\Controller\Adminhtml\Synonyms;
10-
119
/**
1210
* Delete Controller
1311
*/
14-
class Delete extends Synonyms
12+
class Delete extends \Magento\Backend\App\Action
1513
{
14+
/**
15+
* Authorization level of a basic admin session
16+
*
17+
* @see _isAllowed()
18+
*/
19+
const ADMIN_RESOURCE = 'Magento_Search::synonyms';
20+
21+
/**
22+
* @var \Psr\Log\LoggerInterface $logger
23+
*/
24+
private $logger;
25+
26+
/**
27+
* @var \Magento\Search\Api\SynonymGroupRepositoryInterface $synGroupRepository
28+
*/
29+
private $synGroupRepository;
30+
31+
/**
32+
* Constructor
33+
*
34+
* @param \Magento\Backend\App\Action\Context $context
35+
* @param \Magento\Search\Api\SynonymGroupRepositoryInterface $synGroupRepository
36+
* @param \Psr\Log\LoggerInterface $logger
37+
*/
38+
public function __construct(
39+
\Magento\Backend\App\Action\Context $context,
40+
\Magento\Search\Api\SynonymGroupRepositoryInterface $synGroupRepository,
41+
\Psr\Log\LoggerInterface $logger
42+
) {
43+
$this->synGroupRepository = $synGroupRepository;
44+
$this->logger = $logger;
45+
parent::__construct($context);
46+
}
47+
1648
/**
1749
* Delete action
1850
*
@@ -25,13 +57,16 @@ public function execute()
2557
$resultRedirect = $this->resultRedirectFactory->create();
2658
if ($id) {
2759
try {
28-
$model = $this->_objectManager->create('Magento\Search\Model\SynonymGroup');
29-
$model->load($id);
30-
$repository = $this->_objectManager->create('Magento\Search\Api\SynonymGroupRepositoryInterface');
31-
$repository->delete($model);
60+
/** @var \Magento\Search\Model\SynonymGroup $synGroupModel */
61+
$synGroupModel = $this->synGroupRepository->get($id);
62+
$this->synGroupRepository->delete($synGroupModel);
3263
$this->messageManager->addSuccess(__('The synonym group has been deleted.'));
33-
} catch (\Exception $e) {
64+
} catch (\Magento\Framework\Exception\LocalizedException $e) {
3465
$this->messageManager->addError($e->getMessage());
66+
$this->logger->error($e);
67+
} catch (\Exception $e) {
68+
$this->messageManager->addError(__('An error was encountered while performing delete operation.'));
69+
$this->logger->error($e);
3570
}
3671
} else {
3772
$this->messageManager->addError(__('We can\'t find a synonym group to delete.'));

0 commit comments

Comments
 (0)