Fixed #598

craftcms · Dec 27, 2018 · 6d22621 · 6d22621
1 parent be23200
commit 6d22621
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG-v2.md b/CHANGELOG-v2.md
@@ -1,5 +1,10 @@
 # Release Notes for Craft Commerce 2.x
 
+## Unreleased
+
+### Fixed
+- Fixed a bug where the custom shipping method set on an order could not be retrieved with `Order::getShippingMethod()` 
+
 ## 2.0.0-beta.15 - 2018-12-27
 
 ### Changed

diff --git a/src/elements/Order.php b/src/elements/Order.php
@@ -1382,7 +1382,9 @@ public function getShippingMethodId()
      */
     public function getShippingMethod()
     {
-        return Plugin::getInstance()->getShippingMethods()->getShippingMethodByHandle((string)$this->shippingMethodHandle);
+        $shippingMethods = Plugin::getInstance()->getShippingMethods()->getAvailableShippingMethods($this);
+
+        return $shippingMethods[$this->shippingMethodHandle] ?? null;
     }
 
     /**