Skip to content

FR#7689_22 quote_address_id not copied when converting quote address to order address #11613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mrodespin wants to merge 8 commits into from
Closed

FR#7689_22 quote_address_id not copied when converting quote address to order address #11613

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc57c70
FR#7689_22 quote_address_id not copied when converting quote address …
Oct 21, 2017
a95bf98
Fix codacy errors
Oct 23, 2017
475ab04
Fix travis errors
Oct 23, 2017
0fc206c
Fix travis errors
Oct 24, 2017
9c50eec
mierdas
Oct 25, 2017
bb493f0
FR#7689_22 quote_address_id not copied when converting quote address …
Nov 4, 2017
da61c6e
FR#7689_22 quote_address_id not copied when converting quote address …
Nov 4, 2017
249db10
FR#7689_22 quote_address_id not copied when converting quote address …
Nov 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/code/Magento/Quote/Model/QuoteManagement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,8 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
$quote->getShippingAddress(),
[
'address_type' => 'shipping',
'email' => $quote->getCustomerEmail()
'email' => $quote->getCustomerEmail(),
'quote_address_id' => $quote->getShippingAddress()->getId()
]
);
$addresses[] = $shippingAddress;
Expand All @@ -474,7 +475,8 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
$quote->getBillingAddress(),
[
'address_type' => 'billing',
'email' => $quote->getCustomerEmail()
'email' => $quote->getCustomerEmail(),
'quote_address_id' => $quote->getBillingAddress()->getId()
]
);
$addresses[] = $billingAddress;
Expand Down
12 changes: 8 additions & 4 deletions app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,8 @@ public function testSubmit()
$shippingAddress,
[
'address_type' => 'shipping',
'email' => '[email protected]'
'email' => '[email protected]',
'quote_address_id' => null
]
)
->willReturn($convertedShippingAddress);
Expand All @@ -571,7 +572,8 @@ public function testSubmit()
$billingAddress,
[
'address_type' => 'billing',
'email' => '[email protected]'
'email' => '[email protected]',
'quote_address_id' => null
]
)
->willReturn($convertedBillingAddress);
Expand Down Expand Up @@ -1013,7 +1015,8 @@ public function testSubmitForCustomer()
$shippingAddress,
[
'address_type' => 'shipping',
'email' => '[email protected]'
'email' => '[email protected]',
'quote_address_id' => null
]
)
->willReturn($convertedShippingAddress);
Expand All @@ -1023,7 +1026,8 @@ public function testSubmitForCustomer()
$billingAddress,
[
'address_type' => 'billing',
'email' => '[email protected]'
'email' => '[email protected]',
'quote_address_id' => null
]
)
->willReturn($convertedBillingAddress);
Expand Down
20 changes: 20 additions & 0 deletions app/code/Magento/Sales/Api/Data/OrderAddressInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ interface OrderAddressInterface extends \Magento\Framework\Api\ExtensibleDataInt
*/
const CUSTOMER_ADDRESS_ID = 'customer_address_id';

/**
* Quote address ID.
*/
const QUOTE_ADDRESS_ID = 'quote_address_id';

/**
* Region ID.
*/
Expand Down Expand Up @@ -181,6 +186,13 @@ public function getCountryId();
*/
public function getCustomerAddressId();

/**
* Gets the quote address ID for the order address.
*
* @return int|null Quote address ID.
*/
public function getQuoteAddressId();
Copy link
Contributor

@dmanners dmanners Oct 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately you cannot add these new methods to an interface without breaking BC http://devdocs.magento.com/guides/v2.2/contributor-guide/backward-compatible-development/index.html#introduction-of-a-method-to-a-class-or-interface in this case I would recommend adding a new interface to handle these new methods.

Copy link
Contributor Author

@mrodespin mrodespin Oct 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okey, i didnt know that policy, i will implement your solution and update the PR as soon as i a can. Thanks!! @dmanners


/**
* Gets the customer ID for the order address.
*
Expand Down Expand Up @@ -352,6 +364,14 @@ public function setParentId($id);
*/
public function setCustomerAddressId($id);

/**
* Sets the quote address ID for the order address.
*
* @param int $addressId
* @return $this
*/
public function setQuoteAddressId($addressId);

/**
* Sets the region ID for the order address.
*
Expand Down
18 changes: 18 additions & 0 deletions app/code/Magento/Sales/Model/Order/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,16 @@ public function getCustomerAddressId()
return $this->getData(OrderAddressInterface::CUSTOMER_ADDRESS_ID);
}

/**
* Returns quote_address_id
*
* @return int
*/
public function getQuoteAddressId()
{
return $this->getData(OrderAddressInterface::QUOTE_ADDRESS_ID);
}

/**
* Returns customer_id
*
Expand Down Expand Up @@ -523,6 +533,14 @@ public function setCustomerAddressId($id)
return $this->setData(OrderAddressInterface::CUSTOMER_ADDRESS_ID, $id);
}

/**
* {@inheritdoc}
*/
public function setQuoteAddressId($addressId)
{
return $this->setData(OrderAddressInterface::QUOTE_ADDRESS_ID, $addressId);
}

/**
* {@inheritdoc}
*/
Expand Down