Dev 1.x

Block/Slider.php

@@ -19,8 +19,6 @@
 
 namespace Mageplaza\BetterSlider\Block;
 
-use Magento\Framework\View\Element\Template;
-use Magento\Framework\ObjectManagerInterface;
 use \Magento\Framework\View\Element\Template\Context;
 use Mageplaza\BetterSlider\Model\SliderFactory as SliderModelFactory;
 use Mageplaza\BetterSlider\Model\BannerFactory as BannerModelFactory;

Model/Banner.php

@@ -74,14 +74,19 @@ class Banner extends \Magento\Framework\Model\AbstractModel
      */
 
     protected $imageModel;
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    private $urlBuilder;
 
 
     /**
      * constructor
-     * 
+     *
      * @param \Mageplaza\BetterSlider\Model\ResourceModel\Slider\CollectionFactory $sliderCollectionFactory
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -90,15 +95,15 @@ public function __construct(
         \Mageplaza\BetterSlider\Model\ResourceModel\Slider\CollectionFactory $sliderCollectionFactory,
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
+        \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-
-
         array $data = []
     )
     {
         $this->sliderCollectionFactory = $sliderCollectionFactory;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
+        $this->urlBuilder = $urlBuilder;
     }
 
 
@@ -174,10 +179,6 @@ public function getSelectedSlidersCollection()
      */
     public function getBannerUrl()
     {
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $storeManager = $objectManager->get('\Magento\Store\Model\StoreManagerInterface');
-        $baseUrl = $storeManager->getStore()->getBaseUrl();
-        return $baseUrl . 'pub/media/mageplaza/betterslider/banner/image' . $this->getUploadFile();
-
+        return $this->urlBuilder->getBaseUrl(['_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA]).'mageplaza/betterslider/banner/image' . $this->getUploadFile();
     }
 }

Model/ResourceModel/Banner/Grid/Collection.php

@@ -49,7 +49,7 @@ public function __construct(
         $eventObject,
         $resourceModel,
         $model = 'Magento\Framework\View\Element\UiComponent\DataProvider\Document',
-        $connection = null,
+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
     )
     {

Model/ResourceModel/Slider/Grid/Collection.php

@@ -15,6 +15,7 @@
  */
 namespace Mageplaza\BetterSlider\Model\ResourceModel\Slider\Grid;
 
+
 class Collection extends \Mageplaza\BetterSlider\Model\ResourceModel\Slider\Collection implements \Magento\Framework\Api\Search\SearchResultInterface
 {
     /**
@@ -26,7 +27,7 @@ class Collection extends \Mageplaza\BetterSlider\Model\ResourceModel\Slider\Coll
 
     /**
      * constructor
-     * 
+     *
      * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
@@ -35,9 +36,9 @@ class Collection extends \Mageplaza\BetterSlider\Model\ResourceModel\Slider\Coll
      * @param $eventPrefix
      * @param $eventObject
      * @param $resourceModel
-     * @param $model
-     * @param $connection
-     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     * @param string $model
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
+     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb|null $resource
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
@@ -49,7 +50,7 @@ public function __construct(
         $eventObject,
         $resourceModel,
         $model = 'Magento\Framework\View\Element\UiComponent\DataProvider\Document',
-        $connection = null,
+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
     )
     {
@@ -76,6 +77,7 @@ public function getAggregations()
     public function setAggregations($aggregations)
     {
         $this->aggregations = $aggregations;
+        return $this;
     }
 
 

Model/Upload.php

@@ -60,7 +60,7 @@ public function uploadFileAndGetName($input, $destinationFolder, $data)
             }
         } catch (\Exception $e) {
             if ($e->getCode() != \Magento\Framework\File\Uploader::TMP_NAME_EMPTY) {
-                throw new \Magento\Framework\Exception\LocalizedException($e->getMessage());
+                throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()));
             } else {
                 if (isset($data[$input]['value'])) {
                     return $data[$input]['value'];

composer.json

@@ -5,7 +5,7 @@
     "mageplaza/module-core": "*"
   },
   "type": "magento2-module",
-  "version": "1.2.1",
+  "version": "1.2.4",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

etc/adminhtml/system.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <tab id="mageplaza" translate="label" sortOrder="1">
+        <tab id="mageplaza" translate="label">
             <label>mageplaza</label>
         </tab>
         <section id="betterslider" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="1"

etc/module.xml

@@ -20,6 +20,7 @@
         <sequence>
             <module name="Magento_Backend"/>
             <module name="Mageplaza_Core"/>
+            <module name="Mageplaza_Productslider"/>
         </sequence>
     </module>
 </config>

view/frontend/layout/default.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <head>
-        <link src="Mageplaza_BetterSlider::js/owl.carousel.min.js"/>
-        <css src="Mageplaza_BetterSlider::css/owl.carousel.min.css"/>
         <css src="Mageplaza_BetterSlider::css/owl.theme.default.min.css"/>
     </head>
     <body>

view/frontend/templates/slider.phtml

@@ -1,14 +1,11 @@
-<!--<link rel="stylesheet" type="text/css" href="--><?php //echo $block->getViewFileUrl('Mageplaza_BetterSlider::css/owl.carousel.min.css')?><!--">-->
-<!--<link rel="stylesheet" type="text/css" href="--><?php //echo $block->getViewFileUrl('Mageplaza_BetterSlider::css/owl.theme.default.min.css')?><!--">-->
 <?php
+/** @var \Mageplaza\BetterSlider\Block\Slider $block */
 $items      = ($block->getItems() AND $block->getItems() > 1) ? $block->getItems() : 1;
 $nav        = $block->getShowNav() ? 'true' : 'false';
 $loop       = $block->getLoop() ? 'true' : 'false';
 $autoHeight = $block->getAutoHeight() ? 'true' : 'false';
 ?>
 
-
-
 <?php if ($block->getSliders()) :?>
 <div>
 	<div class="mp-owl-carousel owl-carousel">
@@ -21,13 +18,15 @@ $autoHeight = $block->getAutoHeight() ? 'true' : 'false';
 <script>// <![CDATA[
 	require([
 		'jquery',
+        'Mageplaza_Productslider/js/owl.carousel.min'
 	], function ($) {
 		$(document).ready(function () {
 			$(".mp-owl-carousel").owlCarousel({
-				navigation: <?php echo $nav;?>,
+				nav: <?php echo $nav;?>,
 				items: <?php echo $items;?>,
-				loop: <?php echo $loop;?>,
+				loop: 1,
 				autoHeight: <?php echo $autoHeight;?>,
+                autoplay: 1
 			});
 		});
 	});