Skip to content

Commit 86ccd2d

Browse files
MC-35123: An invoiced order of a product with a Customizable Option (file) can not be reordered
1 parent de1cd39 commit 86ccd2d

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

app/code/Magento/Catalog/Model/Product/Option/Type/File.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ protected function _getProcessingParams()
182182

183183
/**
184184
* Returns file info array if we need to get file from already existing file.
185+
*
185186
* Or returns null, if we need to get file from uploaded array.
186187
*
187188
* @return null|array
@@ -528,6 +529,8 @@ protected function _getOptionDownloadUrl($route, $params)
528529
}
529530

530531
/**
532+
* Prepare size
533+
*
531534
* @param array $value
532535
* @return string
533536
*/

app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ public function isSalable($product)
358358

359359
/**
360360
* Prepare product and its configuration to be added to some products list.
361+
*
361362
* Perform standard preparation process and then prepare options belonging to specific product type.
362363
*
363364
* @param \Magento\Framework\DataObject $buyRequest
@@ -443,6 +444,7 @@ public function processConfiguration(
443444

444445
/**
445446
* Initialize product(s) for add to cart process.
447+
*
446448
* Advanced version of func to prepare product for cart - processMode can be specified there.
447449
*
448450
* @param \Magento\Framework\DataObject $buyRequest
@@ -538,6 +540,7 @@ public function processFileQueue()
538540

539541
/**
540542
* Add file to File Queue
543+
*
541544
* @param array $queueOptions Array of File Queue
542545
* (eg. ['operation'=>'move',
543546
* 'src_name'=>'filename',

app/code/Magento/Sales/Model/AdminOrder/Create.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,6 @@ protected function _setQuoteAddress(\Magento\Quote\Model\Quote\Address $address,
13771377
$data = isset($data['region']) && is_array($data['region']) ? array_merge($data, $data['region']) : $data;
13781378

13791379
$addressForm = $this->_metadataFormFactory->create(
1380-
13811380
AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
13821381
'adminhtml_customer_address',
13831382
$data,

0 commit comments

Comments
 (0)