Merge pull request #8 from landofcoder/feature2-1

landofcoder · web-flow · commit e05df0633cdd · 2019-08-31T10:48:41.000+07:00
Feature2 1
diff --git a/Controller/Adminhtml/Tag/Index.php b/Controller/Adminhtml/Tag/Index.php
@@ -26,7 +26,7 @@
 class Index extends \Magento\Backend\App\Action
 {
 
-    protected $resultPageFactory;
+    protected $resultPageFactory = false;
 
     /**
      * Constructor
@@ -50,7 +50,7 @@ public function __construct(
     public function execute()
     {
         $resultPage = $this->resultPageFactory->create();
-            $resultPage->getConfig()->getTitle()->prepend(__("Tag"));
+            $resultPage->getConfig()->getTitle()->prepend(__("Tags"));
             return $resultPage;
     }
 }
diff --git a/Controller/Adminhtml/Tags/Index.php b/Controller/Adminhtml/Tags/Index.php
@@ -20,14 +20,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-
 namespace Lof\ProductTags\Controller\Adminhtml\Tags;
-
 class Index extends \Magento\Backend\App\Action
 {
-
     protected $resultPageFactory;
-
     /**
      * Constructor
      *
@@ -41,7 +37,6 @@ public function __construct(
         $this->resultPageFactory = $resultPageFactory;
         parent::__construct($context);
     }
-
     /**
      * Execute view action
      *
@@ -51,4 +46,4 @@ public function execute()
     {
         return $this->resultPageFactory->create();
     }
-}
+}
diff --git a/Controller/Router.php b/Controller/Router.php
@@ -37,4 +37,4 @@ public function match(\Magento\Framework\App\RequestInterface $request)
            ['request' => $request]
        );
    }
-}
+} 
diff --git a/Controller/Tag/Index.php b/Controller/Tag/Index.php
diff --git a/etc/adminhtml/menu.xml b/etc/adminhtml/menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
 	<menu>
-		<add id="Lof_ProductTags::producttags" module="Lof_ProductTags" parent="Magento_Catalog::inventory" resource="Lof_ProductTags::lofproducttags" action="lofproducttags/tag/index" sortOrder="9999" title="Product Tags"/>
+		<add id="Lof_ProductTags::producttags" module="Lof_ProductTags" parent="Magento_Catalog::inventory" resource="Magento_Backend::content" action="lof_producttags/tag/index" sortOrder="9999" title="Product Tags"/>
 	</menu>
 </config>
diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
@@ -4,5 +4,8 @@
 		<route frontName="lofproducttags" id="lofproducttags">
 			<module before="Magento_Backend" name="Lof_ProductTags"/>
 		</route>
+		<route frontName="lof_producttags" id="lof_producttags">
+			<module before="Magento_Backend" name="Lof_ProductTags"/>
+		</route>
 	</router>
-</config>
+</config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -18,29 +18,29 @@
                     <label>Route</label>
                     <comment>This text will change your url.</comment>
                     <depends>
-                        <field id ="enabled">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                 </field>
                 <field id="enable_tag_on_product" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable tags block</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>show/hide product tags on product detail page.</comment>
                     <depends>
-                        <field id ="enabled">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                 </field>
                 <field id="product_tag_title" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Product Tags Block Title</label>
                     <depends>
-                        <field id ="enabled">1</field>
-                        <field id ="enable_tag_on_product">1</field>
+                        <field id="enabled">1</field>
+                        <field id="enable_tag_on_product">1</field>
                     </depends>
                 </field>
                 <field id="number_tags" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Limit tags to show</label>
                     <depends>
-                        <field id ="enabled">1</field>
-                        <field id ="enable_tag_on_product">1</field>
+                        <field id="enabled">1</field>
+                        <field id="enable_tag_on_product">1</field>
                     </depends>
                 </field>
 
@@ -49,25 +49,24 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>show/hide product tags on sidebar position.</comment>
                     <depends>
-                        <field id ="enabled">1</field>
+                        <field id="enabled">1</field>
                     </depends>
                 </field>
                 <field id="tag_sidebar_title" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Sidebar Tags Block Title</label>
                     <depends>
-                        <field id ="enabled">1</field>
-                        <field id ="enable_tag_sidebar">1</field>
+                        <field id="enabled">1</field>
+                        <field id="enable_tag_sidebar">1</field>
                     </depends>
                 </field>
                 <field id="number_tags_sidebar" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Limit tags to show on sidebar</label>
                     <depends>
-                        <field id ="enabled">1</field>
-                        <field id ="enable_tag_sidebar">1</field>
+                        <field id="enabled">1</field>
+                        <field id="enable_tag_sidebar">1</field>
                     </depends>
                 </field>
 			</group>
-            <!-- <resource>Lof_ProductTags::lof_producttags</resource> -->
 		</section>
 	</system>
 </config>
diff --git a/view/adminhtml/layout/lof_producttags_tag_index.xml b/view/adminhtml/layout/lof_producttags_tag_index.xml
@@ -6,4 +6,4 @@
 			<uiComponent name="lof_producttags_tag_listing"/>
 		</referenceContainer>
 	</body>
-</page>
+</page>
diff --git a/view/adminhtml/layout/lofproducttags_tags_index.xml b/view/adminhtml/layout/lofproducttags_tags_index.xml
@@ -5,4 +5,4 @@
 			<block class="Lof\ProductTags\Block\Adminhtml\Tags\Index" name="tags.index" template="Lof_ProductTags::tags/index.phtml"/>
 		</referenceContainer>
 	</body>
-</page>
+</page>
diff --git a/view/adminhtml/templates/tags/index.phtml b/view/adminhtml/templates/tags/index.phtml
@@ -1 +1 @@
-Hello tags/index.phtml
+hello Chinh'
diff --git a/view/adminhtml/ui_component/lof_producttags_tag_listing.xml b/view/adminhtml/ui_component/lof_producttags_tag_listing.xml
@@ -4,6 +4,14 @@
 		<item name="js_config" xsi:type="array">
 			<item name="provider" xsi:type="string">lof_producttags_tag_listing.lof_producttags_tag_listing_data_source</item>
 		</item>
+		<item name="buttons" xsi:type="array">
+            <item name="add" xsi:type="array">
+                <item name="name" xsi:type="string">add</item>
+                <item name="label" xsi:type="string" translate="true">Add New Tag</item>
+                <item name="class" xsi:type="string">primary</item>
+                <item name="url" xsi:type="string">lof_producttags/tags/index</item>
+            </item>
+        </item>
 	</argument>
 	<settings>
 		<spinner>lof_producttags_tag_columns</spinner>
@@ -31,6 +39,7 @@
 		<columnsControls name="columns_controls"/>
 		<filters name="listing_filters"/>
 		<paging name="listing_paging"/>
+		<filterSearch name="fulltext"/>
 	</listingToolbar>
 	<columns name="lof_producttags_tag_columns">
 		<selectionsColumn name="ids">
@@ -42,13 +51,31 @@
 			<settings>
 				<filter>text</filter>
 				<sorting>asc</sorting>
-				<label translate="true">ID</label>
+				<label translate="true">Tag ID</label>
 			</settings>
 		</column>
-		<column name="tag_name">
+		<column name="status">
 			<settings>
 				<filter>text</filter>
-				<label translate="true">tag_name</label>
+				<label translate="true">Status</label>
+			</settings>
+		</column>
+		<column name="tag_title">
+			<settings>
+				<filter>text</filter>
+				<label translate="true">Title</label>
+			</settings>
+		</column>
+		<column name="number_products">
+			<settings>
+				<filter>text</filter>
+				<label translate="true">number of products</label>
+			</settings>
+		</column>
+		<column name="created_at">
+			<settings>
+				<filter>text</filter>
+				<label translate="true">Created At</label>
 			</settings>
 		</column>
 	</columns>

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`class Index extends \Magento\Backend\App\Action`
`27`	`27`	`{`
`28`	`28`
`29`		`- protected $resultPageFactory;`
	`29`	`+ protected $resultPageFactory = false;`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* Constructor`
`@@ -50,7 +50,7 @@ public function __construct(`
`50`	`50`	`public function execute()`
`51`	`51`	`{`
`52`	`52`	`$resultPage = $this->resultPageFactory->create();`
`53`		`- $resultPage->getConfig()->getTitle()->prepend(__("Tag"));`
	`53`	`+ $resultPage->getConfig()->getTitle()->prepend(__("Tags"));`
`54`	`54`	`return $resultPage;`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,10 @@`
`20`	`20`	`* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE`
`21`	`21`	`* SOFTWARE.`
`22`	`22`	`*/`
`23`		`-`
`24`	`23`	`namespace Lof\ProductTags\Controller\Adminhtml\Tags;`
`25`		`-`
`26`	`24`	`class Index extends \Magento\Backend\App\Action`
`27`	`25`	`{`
`28`		`-`
`29`	`26`	`protected $resultPageFactory;`
`30`		`-`
`31`	`27`	`/**`
`32`	`28`	`* Constructor`
`33`	`29`	`*`
`@@ -41,7 +37,6 @@ public function __construct(`
`41`	`37`	`$this->resultPageFactory = $resultPageFactory;`
`42`	`38`	`parent::__construct($context);`
`43`	`39`	`}`
`44`		`-`
`45`	`40`	`/**`
`46`	`41`	`* Execute view action`
`47`	`42`	`*`
`@@ -51,4 +46,4 @@ public function execute()`
`51`	`46`	`{`
`52`	`47`	`return $this->resultPageFactory->create();`
`53`	`48`	`}`
`54`		`-}`
	`49`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,4 @@ public function match(\Magento\Framework\App\RequestInterface $request)`
`37`	`37`	`['request' => $request]`
`38`	`38`	`);`
`39`	`39`	`}`
`40`		`-}`
	`40`	`+}`