fix issue with #85

mailchimp · Sep 12, 2017 · 5c0506c · 5c0506c
1 parent 7a567b7
commit 5c0506c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
@@ -17,16 +17,22 @@
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Symfony\Component\Config\Definition\Exception\Exception;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\DeploymentConfig;
 
 class InstallSchema implements InstallSchemaInterface
 {
     /**
      * @var ResourceConnection
      */
     protected $_resource;
-    public function __construct(ResourceConnection $resource)
+    /**
+     * @var DeploymentConfig
+     */
+    protected $_deploymentConfig;
+    public function __construct(ResourceConnection $resource,DeploymentConfig $deploymentConfig)
     {
         $this->_resource = $resource;
+        $this->_deploymentConfig = $deploymentConfig;
     }
 
     /**
@@ -205,7 +211,9 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'comment' => 'Retrieved from Mailchimp'
             ]
         );
-        $connection = $this->_resource->getConnectionByName('checkout');
+        if ($this->_deploymentConfig->get(\Magento\Framework\Config\ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS . '/checkout')) {
+            $connection = $this->_resource->getConnectionByName('checkout');
+        }
         $connection->addColumn(
             $connection->getTableName('quote'),
             'mailchimp_abandonedcart_flag',

diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
@@ -16,16 +16,22 @@
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\DeploymentConfig;
 
 class UpgradeSchema implements UpgradeSchemaInterface
 {
     /**
      * @var ResourceConnection
      */
     protected $_resource;
-    public function __construct(ResourceConnection $resource)
+    /**
+     * @var DeploymentConfig
+     */
+    protected $_deploymentConfig;
+    public function __construct(ResourceConnection $resource,DeploymentConfig $deploymentConfig)
     {
         $this->_resource = $resource;
+        $this->_deploymentConfig = $deploymentConfig;
     }
 
     /**
@@ -34,7 +40,12 @@ public function __construct(ResourceConnection $resource)
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
         $connection = $this->_resource->getConnectionByName('default');
-        $checkoutConnection = $this->_resource->getConnectionByName('checkout');
+        if ($this->_deploymentConfig->get(\Magento\Framework\Config\ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS . '/checkout')) {
+            $checkoutConnection = $this->_resource->getConnectionByName('checkout');
+        }
+        else {
+            $checkoutConnection = $connection;
+        }
         if (version_compare($context->getVersion(), '1.0.5') < 0) {
             $table = $connection
                 ->newTable($connection->getTableName('mailchimp_stores'))