Merge pull request #1449 from mailchimp/issue1448-2.3

Rewrite "This MailChimp account is not connected to Magento" label to make it more clear 2.3 #1448
mailchimp · Jul 2, 2022 · 3d1f862 · 3d1f862
2 parents 9ab6d82 + 3b4688b
commit 3d1f862
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Controller/Adminhtml/Ecommerce/Getaccountdetails.php b/Controller/Adminhtml/Ecommerce/Getaccountdetails.php
@@ -81,9 +81,9 @@ public function execute()
                     $options['total_orders'] = ['label' => __('Total orders:'), 'value' => $totalOrders['total_items']];
                     $totalCarts = $api->ecommerce->carts->getAll($store, 'total_items');
                     $options['total_carts'] = ['label' => __('Total Carts:'), 'value' => $totalCarts['total_items']];
-                    $options['notsaved'] = ['label' => __('This MailChimp account is not connected to Magento.'), 'value' => ''];
+                    $options['notsaved'] = ['label' => __('Ecommerce disabled, save configuration to enable.'), 'value' => ''];
                 } else {
-                    $options['nostore'] = ['label' => __('This MailChimp account is not connected to Magento.'), 'value' => ''];
+                    $options['nostore'] = ['label' => __('Ecommerce disabled, only subscribers will be synchronized (your orders, products,etc will be not synchronized).'), 'value' => ''];
                 }
             }
         } catch (\Mailchimp_Error $e) {

diff --git a/Model/Config/Source/Details.php b/Model/Config/Source/Details.php
@@ -126,9 +126,9 @@ public function toOptionArray()
                         [['label' => 'Total List Subscribers', 'value' => $this->_options['list_subscribers']]]
                     );
                 }
-                $ret = array_merge($ret, [['label' => 'Ecommerce Data uploaded to MailChimp', 'value' => '']]);
                 if (isset($this->_options['store_exists']) && $this->_options['store_exists']) {
                     $ret = array_merge($ret, [
+                        ['label' => 'Ecommerce Data uploaded to MailChimp', 'value' => ''],
                         ['label' => '  Total Customers', 'value' => $this->_options['total_customers']],
                         ['label' => '  Total Products', 'value' => $this->_options['total_products']],
                         ['label' => '  Total Orders', 'value' => $this->_options['total_orders']],
@@ -145,7 +145,7 @@ public function toOptionArray()
                     }
                 } else {
                     $ret = array_merge($ret, [
-                        ['label'=>'This MailChimp account is not connected to Magento.','value'=>'']
+                        ['label'=>'Ecommerce disabled, only subscribers will be synchronized (your orders, products,etc will be not synchronized).','value'=>'']
                     ]);
                 }
             }