Changes the order basket entities are loaded.

ChrisWillerton · Mar 29, 2018 · 9e01caa · 9e01caa
1 parent 0f842e1
commit 9e01caa
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/Basket/Basket.php b/src/Basket/Basket.php
@@ -408,6 +408,21 @@ protected function retrieveBasket()
 
 		if ($basket)
 		{
+			foreach ($basket['items'] as $hash => $item)
+			{
+				$classname = $item['classname'];
+				$loaded_item = $classname::loadInstance($item['id']);
+
+				if ($loaded_item)
+				{
+					$this->silentTry('addItem', [
+						$loaded_item,
+						$item['quantity'],
+						$item['created_at']
+					]);
+				}
+			}
+
 			if ($basket['delivery_option'])
 			{
 				$classname = $basket['delivery_option']['classname'];
@@ -429,21 +444,6 @@ protected function retrieveBasket()
 					$this->silentTry('setPromoCode', $loaded_code);
 				}
 			}
-
-			foreach ($basket['items'] as $hash => $item)
-			{
-				$classname = $item['classname'];
-				$loaded_item = $classname::loadInstance($item['id']);
-
-				if ($loaded_item)
-				{
-					$this->silentTry('addItem', [
-						$loaded_item,
-						$item['quantity'],
-						$item['created_at']
-					]);
-				}
-			}
 		}
 
 		event($this->event_namespace . '.retrieve', $this);