0.1.2

Magestore · Oct 30, 2015 · 8080d27 · 8080d27
1 parent cf36f86
commit 8080d27
Show file tree

Hide file tree

Showing 49 changed files with 397 additions and 474 deletions.
diff --git a/app/code/Magestore/Bannerslider/Block/Adminhtml/Banner/Edit/Tab/Banner.php b/app/code/Magestore/Bannerslider/Block/Adminhtml/Banner/Edit/Tab/Banner.php
@@ -31,26 +31,13 @@
  * @module   Bannerslider
  * @author   Magestore Developer
  */
-class Banner extends \Magento\Backend\Block\Widget\Form\Generic 
-    implements \Magento\Backend\Block\Widget\Tab\TabInterface
+class Banner extends \Magento\Backend\Block\Widget\Form\Generic implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
      * @var \Magento\Framework\ObjectFactory
      */
     protected $_objectFactory;
 
-    /**
-     * @var \Magento\Store\Model\System\Store
-     */
-    protected $_systemStore;
-
-    /**
-     * helper.
-     *
-     * @var \Magestore\Bannerslider\Helper\Data
-     */
-    protected $_bannersliderHelper;
-
     /**
      * value collection factory.
      *
@@ -74,10 +61,8 @@ class Banner extends \Magento\Backend\Block\Widget\Form\Generic
      * constructor.
      *
      * @param \Magento\Backend\Block\Template\Context                        $context
-     * @param \Magestore\Bannerslider\Helper\Data                            $bannersliderHelper
      * @param \Magento\Framework\Registry                                    $registry
      * @param \Magento\Framework\Data\FormFactory                            $formFactory
-     * @param \Magento\Store\Model\System\Store                              $systemStore
      * @param \Magento\Framework\ObjectFactory                               $objectFactory
      * @param \Magestore\Bannerslider\Model\Banner                           $banner
      * @param \Magestore\Bannerslider\Model\Resource\Value\CollectionFactory $valueCollectionFactory
@@ -86,19 +71,14 @@ class Banner extends \Magento\Backend\Block\Widget\Form\Generic
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
-        \Magestore\Bannerslider\Helper\Data $bannersliderHelper,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\Store\Model\System\Store $systemStore,
         \Magento\Framework\ObjectFactory $objectFactory,
         \Magestore\Bannerslider\Model\Banner $banner,
         \Magestore\Bannerslider\Model\Resource\Value\CollectionFactory $valueCollectionFactory,
         \Magestore\Bannerslider\Model\SliderFactory $sliderFactory,
         array $data = []
     ) {
-        $this->_localeDate = $context->getLocaleDate();
-        $this->_systemStore = $systemStore;
-        $this->_bannersliderHelper = $bannersliderHelper;
         $this->_objectFactory = $objectFactory;
         $this->_banner = $banner;
         $this->_valueCollectionFactory = $valueCollectionFactory;

diff --git a/app/code/Magestore/Bannerslider/Block/Adminhtml/Banner/Grid.php b/app/code/Magestore/Bannerslider/Block/Adminhtml/Banner/Grid.php
@@ -41,30 +41,30 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     protected $_bannerCollectionFactory;
 
     /**
-     * Registry object.
+     * slider collection factory.
      *
-     * @var \Magento\Framework\Registry
+     * @var \Magestore\Bannerslider\Model\Resource\Slider\CollectionFactory
      */
-    protected $_coreRegistry;
+    protected $_sliderCollectionFactory;
 
     /**
      * construct.
      *
      * @param \Magento\Backend\Block\Template\Context                         $context
      * @param \Magento\Backend\Helper\Data                                    $backendHelper
      * @param \Magestore\Bannerslider\Model\Resource\Banner\CollectionFactory $bannerCollectionFactory
-     * @param \Magento\Framework\Registry                                     $coreRegistry
      * @param array                                                           $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magestore\Bannerslider\Model\Resource\Banner\CollectionFactory $bannerCollectionFactory,
-        \Magento\Framework\Registry $coreRegistry,
+        \Magestore\Bannerslider\Model\Resource\Slider\CollectionFactory $sliderCollectionFactory,
         array $data = []
     ) {
         $this->_bannerCollectionFactory = $bannerCollectionFactory;
-        $this->_coreRegistry = $coreRegistry;
+        $this->_sliderCollectionFactory = $sliderCollectionFactory;
+
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -81,13 +81,9 @@ protected function _construct()
     protected function _prepareCollection()
     {
         $storeViewId = $this->getRequest()->getParam('store');
-        $collection = $this->_bannerCollectionFactory->create()->setStoreViewId($storeViewId);
 
-        $collection->getSelect()->joinLeft(
-            ['sliderTable' => $collection->getTable('magestore_bannerslider_slider')],
-            'main_table.slider_id = sliderTable.slider_id',
-            ['title' => 'sliderTable.title']
-        );
+        /** @var \Magestore\Bannerslider\Model\Resource\Banner\Collection $collection */
+        $collection = $this->_bannerCollectionFactory->create()->setStoreViewId($storeViewId);
 
         $this->setCollection($collection);
 
@@ -137,15 +133,19 @@ protected function _prepareColumns()
                 'width' => '50px',
             ]
         );
+
         $this->addColumn(
             'title',
             [
                 'header' => __('Slider'),
-                'index' => 'title',
+                'index'   => 'slider_id',
+                'type'    => 'options',
+                'options' => $this->getSliderAvailableOption(),
                 'class' => 'xxx',
                 'width' => '50px',
             ]
         );
+
         $this->addColumn(
             'start_time',
             [
@@ -173,10 +173,10 @@ protected function _prepareColumns()
                 'header' => __('Status'),
                 'index' => 'status',
                 'type' => 'options',
-                'filter_index' => 'main_table.status',
                 'options' => Status::getAvailableStatuses(),
             ]
         );
+
         $this->addColumn(
             'edit',
             [
@@ -204,6 +204,23 @@ protected function _prepareColumns()
         return parent::_prepareColumns();
     }
 
+    /**
+     * get slider vailable option
+     *
+     * @return array
+     */
+    public function getSliderAvailableOption()
+    {
+        $option = [];
+        $sliderCollection = $this->_sliderCollectionFactory->create()->addFieldToSelect(['title']);
+
+        foreach ($sliderCollection as $slider) {
+            $option[$slider->getId()] = $slider->getTitle();
+        }
+
+        return $option;
+    }
+
     /**
      * @return $this
      */

diff --git a/app/code/Magestore/Bannerslider/Block/Adminhtml/Banner/Helper/Renderer/Image.php b/app/code/Magestore/Bannerslider/Block/Adminhtml/Banner/Helper/Renderer/Image.php
@@ -45,33 +45,23 @@ class Image extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
      */
     protected $_bannerFactory;
 
-    /**
-     * Registry object.
-     *
-     * @var \Magento\Framework\Registry
-     */
-    protected $_coreRegistry;
-
     /**
      * [__construct description].
      *
      * @param \Magento\Backend\Block\Context              $context
      * @param \Magento\Store\Model\StoreManagerInterface  $storeManager
      * @param \Magestore\Bannerslider\Model\BannerFactory $bannerFactory
-     * @param \Magento\Framework\Registry                 $coreRegistry
      * @param array                                       $data
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magestore\Bannerslider\Model\BannerFactory $bannerFactory,
-        \Magento\Framework\Registry $coreRegistry,
         array $data = []
     ) {
         parent::__construct($context, $data);
         $this->_storeManager = $storeManager;
         $this->_bannerFactory = $bannerFactory;
-        $this->_coreRegistry = $coreRegistry;
     }
 
     /**
@@ -85,8 +75,9 @@ public function render(\Magento\Framework\Object $row)
     {
         $storeViewId = $this->getRequest()->getParam('store');
         $banner = $this->_bannerFactory->create()->setStoreViewId($storeViewId)->load($row->getId());
-        $srcImage = $this->_storeManager->getStore()
-            ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA).$banner->getImage();
+        $srcImage = $this->_storeManager->getStore()->getBaseUrl(
+                \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+            ) . $banner->getImage();
 
         return '<image width="150" height="50" src ="'.$srcImage.'" alt="'.$banner->getImage().'" >';
     }

diff --git a/app/code/Magestore/Bannerslider/Block/Adminhtml/CoreSlider/Grid.php b/app/code/Magestore/Bannerslider/Block/Adminhtml/CoreSlider/Grid.php
@@ -36,60 +36,30 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      */
     protected $_collectionFactory;
 
-    /**
-     * slider factory.
-     *
-     * @var \Magestore\Bannerslider\Model\SliderFactory
-     */
-    protected $_sliderFactory;
-
-    /**
-     * report factory.
-     *
-     * @var \Magestore\Bannerslider\Model\ReportFactory
-     */
-    protected $_reportFactory;
-
     /**
      * helper.
      *
      * @var \Magestore\Bannerslider\Helper\Data
      */
     protected $_bannersliderHelper;
 
-    /**
-     * Registry object.
-     *
-     * @var \Magento\Framework\Registry
-     */
-    protected $_coreRegistry;
-
     /**
      * [__construct description].
      *
      * @param \Magento\Backend\Block\Template\Context     $context            [description]
      * @param \Magento\Backend\Helper\Data                $backendHelper      [description]
-     * @param \Magestore\Bannerslider\Model\SliderFactory $sliderFactory      [description]
-     * @param \Magestore\Bannerslider\Model\ReportFactory $reportFactory      [description]
      * @param \Magento\Framework\Data\Collection          $dataCollection     [description]
-     * @param \Magento\Framework\Registry                 $coreRegistry       [description]
      * @param \Magestore\Bannerslider\Helper\Data         $bannersliderHelper [description]
      * @param array                                       $data               [description]
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
-        \Magestore\Bannerslider\Model\SliderFactory $sliderFactory,
-        \Magestore\Bannerslider\Model\ReportFactory $reportFactory,
         \Magento\Framework\Data\CollectionFactory $collectionFactory,
         \Magento\Framework\ObjectFactory $objectFactory,
-        \Magento\Framework\Registry $coreRegistry,
         \Magestore\Bannerslider\Helper\Data $bannersliderHelper,
         array $data = []
     ) {
-        $this->_sliderFactory = $sliderFactory;
-        $this->_reportFactory = $reportFactory;
-        $this->_coreRegistry = $coreRegistry;
         $this->_bannersliderHelper = $bannersliderHelper;
         $this->_collectionFactory = $collectionFactory;
         $this->_objectFactory = $objectFactory;

diff --git a/app/code/Magestore/Bannerslider/Block/Adminhtml/CoreSlider/Helper/Renderer/Action.php b/app/code/Magestore/Bannerslider/Block/Adminhtml/CoreSlider/Helper/Renderer/Action.php
@@ -45,33 +45,23 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      */
     protected $_bannerFactory;
 
-    /**
-     * Registry object.
-     *
-     * @var \Magento\Framework\Registry
-     */
-    protected $_coreRegistry;
-
     /**
      * [__construct description].
      *
      * @param \Magento\Backend\Block\Context              $context       [description]
      * @param \Magento\Store\Model\StoreManagerInterface  $storeManager  [description]
      * @param \Magestore\Bannerslider\Model\BannerFactory $bannerFactory [description]
-     * @param \Magento\Framework\Registry                 $coreRegistry  [description]
      * @param array                                       $data          [description]
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magestore\Bannerslider\Model\BannerFactory $bannerFactory,
-        \Magento\Framework\Registry $coreRegistry,
         array $data = []
     ) {
         parent::__construct($context, $data);
         $this->_storeManager = $storeManager;
         $this->_bannerFactory = $bannerFactory;
-        $this->_coreRegistry = $coreRegistry;
     }
 
     /**
@@ -85,7 +75,6 @@ public function render(\Magento\Framework\Object $row)
     {
         $url = $this->getUrl('*/slider/preview', array('sliderpreview_id' => $row->getId()));
 
-        return '<a onclick="window.open(\''.$url.'\', \'_blank\',\'width=1000,height=700,resizable=1,scrollbars=1\'); '
-            . 'return false;">Preview</a>';
+        return '<a onclick="window.open(\'' . $url . '\', \'_blank\',\'width=1000,height=700,resizable=1,scrollbars=1\'); return false;">Preview</a>';
     }
 }
diff --git a/app/code/Magestore/Bannerslider/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magestore/Bannerslider/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -59,8 +59,7 @@ public function getElementStoreViewId()
      */
     public function canDisplayUseDefault()
     {
-        return ($this->getRequest()->getParam('store') && $this->getElement()->getDateFormat() == null 
-            && $this->getElementName() != 'slider_id') ? true : false;
+        return ($this->getRequest()->getParam('store') && $this->getElement()->getDateFormat() == NULL && $this->getElementName() != 'slider_id') ? TRUE : FALSE;
     }
 
     /**
@@ -80,8 +79,7 @@ public function usedDefault()
      */
     public function checkFieldDisable()
     {
-        if (!$this->getElementStoreViewId() && $this->getElementName() != 'banner_id' && $this->canDisplayUseDefault() 
-            && $this->usedDefault()) {
+        if (!$this->getElementStoreViewId() && $this->getElementName() != 'banner_id' && $this->canDisplayUseDefault() && $this->usedDefault()) {
             $this->getElement()->setDisabled(true);
         }