Skip to content
Snippets Groups Projects
Commit b9385569 authored by Merlin Axel Rutz's avatar Merlin Axel Rutz Committed by Jonathan Sacksick
Browse files

Issue #3354205 by geek-merlin, jsacksick, lisastreeter: Prevent WSOD when...

Issue #3354205 by geek-merlin, jsacksick, lisastreeter: Prevent WSOD when loading a store-orphaned order.
parent 012cd031
No related branches found
No related tags found
1 merge request!235Issue #3115150 by mbovan: Submitting add to cart form with empty quantity...
Pipeline #69891 canceled
......@@ -665,7 +665,7 @@ class Order extends CommerceContentEntityBase implements OrderInterface {
* {@inheritdoc}
*/
public function getCalculationDate() {
$timezone = $this->getStore()->getTimezone();
$timezone = $this->getStore()?->getTimezone();
$timestamp = $this->getPlacedTime() ?: \Drupal::time()->getRequestTime();
$date = DrupalDateTime::createFromTimestamp($timestamp, $timezone);
......
......@@ -149,6 +149,10 @@ class OrderRefresh implements OrderRefreshInterface {
* {@inheritdoc}
*/
public function refresh(OrderInterface $order) {
// It's no use refreshing a store-orphaned order.
if (!$order->getStore()) {
return;
}
// First invoke order preprocessors if any.
foreach ($this->preprocessors as $processor) {
$processor->preprocess($order);
......
......@@ -689,6 +689,7 @@ class OrderTest extends OrderKernelTestBase {
'type' => 'default',
'uid' => $this->user->id(),
'state' => 'draft',
'store_id' => $this->store->id(),
]);
$order->setRefreshState(OrderInterface::REFRESH_ON_LOAD);
$order->save();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment