Merged in develop (pull request #8)

Change structure module

Approved-by: Khoa Truong Dinh <[email protected]>

app/code/Boolfly/Megamenu/Block/Adminhtml/Edit/BackButton.php → Block/Adminhtml/Edit/Button/Back.php

@@ -5,19 +5,19 @@
  *  * See COPYING.txt for license details.
  *  *
  *  * @author    [email protected]
- * *  @project   Megamenu
+ * *  @project   Core
  */
-namespace Boolfly\Megamenu\Block\Adminhtml\Edit;
+namespace Boolfly\Base\Block\Adminhtml\Edit\Button;
 
 use Magento\Backend\Block\Template;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
- * Class BackButton
+ * Class Back
  *
- * @package Boolfly\Megamenu\Block\Adminhtml\Edit
+ * @package Boolfly\Base\Block\Adminhtml\Edit\Button
  */
-class BackButton extends Template implements ButtonProviderInterface
+class Back extends Template implements ButtonProviderInterface
 {
     /**
      * Save button

app/code/Boolfly/Megamenu/Block/Adminhtml/Edit/DeleteButton.php → Block/Adminhtml/Edit/Button/Delete.php

@@ -5,19 +5,19 @@
  *  * See COPYING.txt for license details.
  *  *
  *  * @author    [email protected]
- * *  @project   Megamenu
+ * *  @project   Core
  */
-namespace Boolfly\Megamenu\Block\Adminhtml\Edit;
+namespace Boolfly\Base\Block\Adminhtml\Edit\Button;
 
 use Magento\Backend\Block\Template;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
- * Class DeleteButton
+ * Class Delete
  *
- * @package Boolfly\Megamenu\Block\Adminhtml\Edit
+ * @package Boolfly\Base\Block\Adminhtml\Edit\Button
  */
-class DeleteButton extends Template implements ButtonProviderInterface
+class Delete extends Template implements ButtonProviderInterface
 {
     /**
      * Delete button

app/code/Boolfly/Megamenu/Block/Adminhtml/Edit/SaveButton.php → Block/Adminhtml/Edit/Button/Save.php

@@ -5,19 +5,19 @@
  *  * See COPYING.txt for license details.
  *  *
  *  * @author    [email protected]
- * *  @project   Megamenu
+ * *  @project   Core
  */
-namespace Boolfly\Megamenu\Block\Adminhtml\Edit;
+namespace Boolfly\Base\Block\Adminhtml\Edit\Button;
 
 use Magento\Backend\Block\Template;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
- * Class SaveButton
+ * Class Save
  *
- * @package Boolfly\Megamenu\Block\Adminhtml\Edit
+ * @package Boolfly\Base\Block\Adminhtml\Edit\Button
  */
-class SaveButton extends Template implements ButtonProviderInterface
+class Save extends Template implements ButtonProviderInterface
 {
     /**
      * Save button

app/code/Boolfly/Megamenu/Block/Adminhtml/Edit/SaveAndContinueButton.php → Block/Adminhtml/Edit/Button/SaveAndContinue.php

@@ -5,22 +5,23 @@
  *  * See COPYING.txt for license details.
  *  *
  *  * @author    [email protected]
- * *  @project   Megamenu
+ * *  @project   Core
  */
-namespace Boolfly\Megamenu\Block\Adminhtml\Edit;
+namespace Boolfly\Base\Block\Adminhtml\Edit\Button;
 
 use Magento\Backend\Block\Template;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
- * Class SaveAndContinueButton
+ * Class Delete
  *
- * @package Boolfly\Megamenu\Block\Adminhtml\Edit
+ * @package Boolfly\Base\Block\Adminhtml\Edit\Button
  */
-class SaveAndContinueButton extends Template implements ButtonProviderInterface
+class SaveAndContinue extends Template implements ButtonProviderInterface
 {
+
     /**
-     * Save button
+     * Save and continue button
      *
      * @return array
      */

app/code/Boolfly/BannerSlider/Controller/Adminhtml/Image/Upload.php → Controller/Adminhtml/Image/AbstractUpload.php

@@ -1,56 +1,51 @@
 <?php
 /************************************************************
  * *
- *  * Copyright © 2019 Forix. All rights reserved.
+ *  * Copyright © Boolfly. All rights reserved.
  *  * See COPYING.txt for license details.
  *  *
- *  * @author    thao@forixwebdesign.com
- * *  @project   Weiman Product
+ *  * @author    info@boolfly.com
+ * *  @project   Core
  */
-namespace Boolfly\BannerSlider\Controller\Adminhtml\Image;
+namespace Boolfly\Base\Controller\Adminhtml\Image;
 
-use Boolfly\BannerSlider\Model\ImageUploader;
+use Boolfly\Base\Model\ImageUploader;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action as BackendAction;
 use Magento\Backend\App\Action\Context;
 
 /**
- * Class Upload
+ * Class AbstractUpload
  *
- * @package Boolfly\BannerSlider\Controller\Adminhtml\Image
+ * @package Boolfly\Base\Controller\Adminhtml\Image
  */
-class Upload extends BackendAction
+abstract class AbstractUpload extends BackendAction
 {
-
     /**
-     *  Check admin permissions for this controller
+     * Check admin permissions for this controller
+     * Note: Override when extends this class
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Boolfly_BannerSlider::banner';
+    const ADMIN_RESOURCE = 'Boolfly_Base::menu';
 
     /**
      * @var ImageUploader
      */
     protected $imageUploader;
 
-    /**
-     * @var string
-     */
-    protected $fileId;
-
     /**
      * Upload constructor.
      *
      * @param Context       $context
-     * @param ImageUploader $documentUploader
+     * @param ImageUploader $imageUploader
      */
     public function __construct(
         Context $context,
-        ImageUploader $documentUploader
+        ImageUploader $imageUploader
     ) {
         parent::__construct($context);
-        $this->imageUploader = $documentUploader;
+        $this->imageUploader = $imageUploader;
     }
 
     /**

app/code/Boolfly/BannerSlider/Model/ImageUploader.php → Model/ImageUploader.php

@@ -1,13 +1,13 @@
 <?php
 /************************************************************
  * *
- *  * Copyright © 2019 Boolfly. All rights reserved.
+ *  * Copyright © Boolfly. All rights reserved.
  *  * See COPYING.txt for license details.
  *  *
  *  * @author    [email protected]
- * *  @project   Banner Slider
+ * *  @project   Core
  */
-namespace Boolfly\BannerSlider\Model;
+namespace Boolfly\Base\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
@@ -28,13 +28,6 @@
 class ImageUploader
 {
 
-    /**@#%
-     * Cache Image Directory
-     *
-     * @const
-     */
-    const BANNER_CACHE_IMAGE_DIRECTORY = 'bannerslider/banner/cache/';
-
     /**
      * Core file storage database
      *
@@ -115,8 +108,8 @@ public function __construct(
         StoreManagerInterface $storeManager,
         LoggerInterface $logger,
         Repository $assetRepository,
-        $baseTmpPath = 'tmp/boolfly/banner',
-        $basePath = 'boolfly/banner',
+        $baseTmpPath = 'tmp/boolfly/',
+        $basePath = 'boolfly/',
         $allowedExtensions = [
             'jpg',
             'jpeg',
@@ -241,6 +234,7 @@ public function moveFileFromTmp($imageName)
                 $baseImagePath
             );
         } catch (\Exception $e) {
+            $this->logger->critical($e->getMessage());
             throw new LocalizedException(
                 __('Something went wrong while saving the file(s).')
             );

app/code/Boolfly/Megamenu/Model/Source/Status.php → Model/Source/Config/Status.php

@@ -5,24 +5,24 @@
  *  * See COPYING.txt for license details.
  *  *
  *  * @author    [email protected]
- * *  @project   Megamenu
+ * *  @project   Core
  */
-namespace Boolfly\Megamenu\Model\Source;
+namespace Boolfly\Base\Model\Source;
 
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 use Magento\Eav\Model\Entity\Attribute\Source\SourceInterface;
 use Magento\Framework\Data\OptionSourceInterface;
 
 /**
- * Banner status functionality model
+ * Status functionality model
  *
  * @api
  * @since 100.0.2
  */
 class Status extends AbstractSource implements SourceInterface, OptionSourceInterface
 {
     /**#@+
-     * Banner Status values
+     * Status values
      */
     const STATUS_ENABLED = 1;
 

app/code/Boolfly/Megamenu/Ui/Component/Listing/Columns/EditActions.php → Ui/Component/Listing/Columns/EditActions.php

@@ -5,9 +5,9 @@
  *  * See COPYING.txt for license details.
  *  *
  *  * @author    [email protected]
- * *  @project   Megamenu
+ * *  @project   Core
  */
-namespace Boolfly\Megamenu\Ui\Component\Listing\Columns;
+namespace Boolfly\Base\Ui\Component\Listing\Columns;
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
@@ -17,7 +17,7 @@
 /**
  * Class EditActions
  *
- * @package Boolfly\Megamenu\Ui\Component\Listing\Columns
+ * @package Boolfly\Base\Ui\Component\Listing\Columns
  */
 class EditActions extends Column
 {