Merge pull request #287 from mageplaza/2.3-develop

Clean code
mageplaza · Nov 19, 2020 · 2d491de · 2d491de
2 parents 324dc20 + f8597ce
commit 2d491de
Show file tree

Hide file tree

Showing 57 changed files with 828 additions and 824 deletions.
diff --git a/Block/AbandonedCart.php b/Block/AbandonedCart.php
@@ -140,7 +140,7 @@ public function getSubtotal($inclTax = false)
     {
         $subtotal = 0;
         if ($quote = $this->getQuote()) {
-            $address = $quote->isVirtual() ? $quote->getBillingAddress() : $quote->getShippingAddress();
+            $address  = $quote->isVirtual() ? $quote->getBillingAddress() : $quote->getShippingAddress();
             $subtotal = $inclTax ? $address->getSubtotalInclTax() : $address->getSubtotal();
         }
 
@@ -175,7 +175,7 @@ public function getProductImage(Item $item)
             /** @var Product $product */
             $product = $this->_productRepository->getById($productId);
             /** @var Store $store */
-            $store = $this->_storeManager->getStore();
+            $store    = $this->_storeManager->getStore();
             $imageUrl = $store->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . 'catalog/product' . $product->getImage();
 
             return str_replace('\\', '/', $imageUrl);

diff --git a/Block/Adminhtml/AbandonedCart/Edit.php b/Block/Adminhtml/AbandonedCart/Edit.php
@@ -31,7 +31,7 @@ class Edit extends Container
 {
     protected function _construct()
     {
-        $this->_objectId = 'id';
+        $this->_objectId   = 'id';
         $this->_blockGroup = 'Mageplaza_Smtp';
         $this->_controller = 'adminhtml_AbandonedCart';
         parent::_construct();

diff --git a/Block/Adminhtml/AbandonedCart/Edit/Form.php b/Block/Adminhtml/AbandonedCart/Edit/Form.php
@@ -21,24 +21,26 @@
 namespace Mageplaza\Smtp\Block\Adminhtml\AbandonedCart\Edit;
 
 use Exception;
+use IntlDateFormatter;
 use Magento\Backend\Block\Template\Context;
 use Magento\Backend\Block\Widget\Form\Generic;
+use Magento\Catalog\Helper\Data as CatalogHelper;
+use Magento\Config\Model\Config\Source\Email\Identity;
+use Magento\Config\Model\Config\Source\Email\Template;
+use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Customer\Model\Address\Config as AddressConfig;
 use Magento\Framework\Data\FormFactory;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Registry;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Item;
-use Mageplaza\Smtp\Model\Source\AbandonedCartStatus;
-use Magento\Catalog\Helper\Data as CatalogHelper;
-use Magento\Config\Model\Config\Source\Email\Identity;
-use Magento\Config\Model\Config\Source\Email\Template;
 use Magento\Tax\Model\Config as TaxConfig;
-use Mageplaza\Smtp\Model\ResourceModel\Log\CollectionFactory as LogCollectionFactory;
 use Mageplaza\Smtp\Helper\EmailMarketing;
-use Magento\Customer\Api\GroupRepositoryInterface;
+use Mageplaza\Smtp\Model\ResourceModel\Log\CollectionFactory as LogCollectionFactory;
+use Mageplaza\Smtp\Model\Source\AbandonedCartStatus;
 
 /**
  * Class Form
@@ -222,10 +224,10 @@ public function getSentDateLogs($ids)
                 foreach ($collection as $log) {
                     $logDatesHtml .= $this->formatDate(
                         $log->getCreatedAt(),
-                        \IntlDateFormatter::MEDIUM,
+                        IntlDateFormatter::MEDIUM,
                         true
                     );
-                    $logDatesHtml.='</br>';
+                    $logDatesHtml .= '</br>';
                 }
             }
         }
@@ -354,7 +356,7 @@ public function isSingleStoreMode()
      * @param Quote $quote
      *
      * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function getStoreName(Quote $quote)
     {

diff --git a/Block/Adminhtml/Log/ClearButton.php b/Block/Adminhtml/Log/ClearButton.php
@@ -53,9 +53,9 @@ public function __construct(UrlInterface $urlBuilder)
     public function getButtonData()
     {
         return [
-            'label' => __('Clear All Logs'),
-            'class' => 'primary',
-            'on_click' => 'deleteConfirm(\'' . __(
+            'label'      => __('Clear All Logs'),
+            'class'      => 'primary',
+            'on_click'   => 'deleteConfirm(\'' . __(
                 'Are you sure you want to clear all email logs?'
             ) . '\', \'' . $this->_urlBuilder->getUrl('*/*/clear') . '\')',
             'sort_order' => 10,

diff --git a/Block/Adminhtml/System/Config/Button.php b/Block/Adminhtml/System/Config/Button.php
@@ -61,8 +61,8 @@ protected function _getElementHtml(AbstractElement $element)
         $originalData = $element->getOriginalData();
         $this->addData([
             'button_label' => $originalData['button_label'],
-            'button_url' => $this->getUrl($originalData['button_url'], ['_current' => true]),
-            'html_id' => $element->getHtmlId(),
+            'button_url'   => $this->getUrl($originalData['button_url'], ['_current' => true]),
+            'html_id'      => $element->getHtmlId(),
         ]);
 
         return $this->_toHtml();