1.1.2: #4

mage2pro · Oct 11, 2018 · e3555b3 · e3555b3
1 parent f26366e
commit e3555b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Observer/DisplayOptionsForming.php b/Observer/DisplayOptionsForming.php
@@ -20,8 +20,15 @@ final class DisplayOptionsForming implements ObserverInterface {
 	 * @param O $o
 	 */
 	function execute(O $o) {
-		$op = $o['currency_options']; /** @var DataObject $op */
-		if ($s = Settings::s()->get($o['base_code'])) { /** @var \Dfe\CurrencyFormat\O $s */
+		/**
+		 * 2018-10-11
+		 * "A conflict with Webkul Marketplace:
+		 * «Invalid method: Df\Config\A::options» on the backend customer screen":
+		 * https://github.com/mage2pro/currency-format/issues/4
+		 * Webkul Marketplace works incorrectly: `$o['base_code']` is null.
+		 */
+		if (($c = $o['base_code']) && ($s = Settings::s()->get($c))) { /** @var \Dfe\CurrencyFormat\O $s */
+			$op = $o['currency_options']; /** @var DataObject $op */
 			$op->setData($s->options() + $op->getData());
 		}
 	}

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "mage2pro/currency-format"
-	,"version": "1.1.1"
+	,"version": "1.1.2"
 	,"description": "The «Price Format» extension for Magento 2"
 	,"type": "magento2-module"
 	,"homepage": "https://mage2.pro/c/price-format"