Merge branch 'master' into 7.x

keithbrink · keithbrink · commit 0973ee7e0aa3 · 2020-05-07T18:19:16.000+03:00
diff --git a/src/AmazonOrderList.php b/src/AmazonOrderList.php
@@ -78,6 +78,7 @@ public function setConfig($config)
         parent::setConfig($config);
 
         $this->options['MarketplaceId.Id.1'] = $config['marketplaceId'];
+        unset($this->options['marketplaceId']);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ public function setConfig($config)`
`78`	`78`	`parent::setConfig($config);`
`79`	`79`
`80`	`80`	`$this->options['MarketplaceId.Id.1'] = $config['marketplaceId'];`
	`81`	`+ unset($this->options['marketplaceId']);`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`/**`