ptkdiscount - Version 1.2.1

Version Notes

Solution to bug the administrator, integrates the ACL

Download this release

Release Info

Developer PtkDeveloper
Extension ptkdiscount
Version 1.2.1
Comparing to
See all releases


Code changes from version 1.2.0 to 1.2.1

Files changed (5) hide show
  1. app/code/community/PTK/Discount/controllers/Adminhtml/DiscountController.php +6 -0
  2. app/code/community/PTK/Discount/controllers/Adminhtml/DiscountbackendController.php +6 -0
  3. app/code/community/PTK/Discount/etc/config.xml +4 -4
  4. app/design/adminhtml/default/default/layout/discount.xml +32 -0
  5. package.xml +6 -6
app/code/community/PTK/Discount/controllers/Adminhtml/DiscountController.php CHANGED
@@ -301,4 +301,10 @@ class PTK_Discount_Adminhtml_DiscountController extends Mage_Adminhtml_Controlle
301
 
302
  }
303
 
 
 
 
 
 
 
304
  }
301
 
302
  }
303
 
304
+
305
+
306
+ protected function _isAllowed(){
307
+ return Mage::getSingleton('admin/session')->isAllowed('discount/discount');
308
+ }
309
+
310
  }
app/code/community/PTK/Discount/controllers/Adminhtml/DiscountbackendController.php CHANGED
@@ -7,4 +7,10 @@ class PTK_Discount_Adminhtml_DiscountbackendController extends Mage_Adminhtml_Co
7
  $this->_title($this->__("Import"));
8
  $this->renderLayout();
9
  }
 
 
 
 
 
 
10
  }
7
  $this->_title($this->__("Import"));
8
  $this->renderLayout();
9
  }
10
+
11
+ protected function _isAllowed(){
12
+ return Mage::getSingleton('admin/session')->isAllowed('discount/discountbackend');
13
+ }
14
+
15
+
16
  }
app/code/community/PTK/Discount/etc/config.xml CHANGED
@@ -82,7 +82,7 @@
82
  <adminhtml>
83
  <menu>
84
  <discount module="discount">
85
- <title>Discounts</title>
86
  <sort_order>100</sort_order>
87
  <children>
88
  <discountbackend module="discount">
@@ -91,7 +91,7 @@
91
  <action>admin_discount/adminhtml_discountbackend</action>
92
  </discountbackend>
93
  <discount module="discount">
94
- <title>Manage Discount</title>
95
  <sort_order>0</sort_order>
96
  <action>admin_discount/adminhtml_discount</action>
97
  </discount>
@@ -106,14 +106,14 @@
106
  <admin>
107
  <children>
108
  <discount translate="title" module="discount">
109
- <title>Discounts</title>
110
  <sort_order>1000</sort_order>
111
  <children>
112
  <discountbackend translate="title">
113
  <title>Import</title>
114
  </discountbackend>
115
  <discount translate="title">
116
- <title>Manage Discount</title>
117
  <sort_order>0</sort_order>
118
  </discount>
119
  </children>
82
  <adminhtml>
83
  <menu>
84
  <discount module="discount">
85
+ <title>Discount Manager</title>
86
  <sort_order>100</sort_order>
87
  <children>
88
  <discountbackend module="discount">
91
  <action>admin_discount/adminhtml_discountbackend</action>
92
  </discountbackend>
93
  <discount module="discount">
94
+ <title>Discounts</title>
95
  <sort_order>0</sort_order>
96
  <action>admin_discount/adminhtml_discount</action>
97
  </discount>
106
  <admin>
107
  <children>
108
  <discount translate="title" module="discount">
109
+ <title>Discount Manager</title>
110
  <sort_order>1000</sort_order>
111
  <children>
112
  <discountbackend translate="title">
113
  <title>Import</title>
114
  </discountbackend>
115
  <discount translate="title">
116
+ <title>Discounts</title>
117
  <sort_order>0</sort_order>
118
  </discount>
119
  </children>
app/design/adminhtml/default/default/layout/discount.xml ADDED
@@ -0,0 +1,32 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <layout version="0.1.0">
3
+
4
+ <discount_adminhtml_discount_new>
5
+ <reference name="head">
6
+ <action method="addItem"><type>js</type><name>discount/jquery-1.8.3.min.js</name></action>
7
+ <action method="addItem"><type>js</type><name>discount/ptkFunction.js</name></action>
8
+ <action method="addItem"><type>skin_css</type><name>discount/discount.css</name></action>
9
+ </reference>
10
+
11
+ </discount_adminhtml_discount_new>
12
+
13
+ <discount_adminhtml_discount_edit>
14
+ <reference name="head">
15
+ <action method="addItem"><type>js</type><name>discount/jquery-1.8.3.min.js</name></action>
16
+ <action method="addItem"><type>js</type><name>discount/ptkFunction.js</name></action>
17
+ <action method="addItem"><type>skin_css</type><name>discount/discount.css</name></action>
18
+ </reference>
19
+
20
+ </discount_adminhtml_discount_edit>
21
+
22
+ <discount_adminhtml_discountbackend_index>
23
+ <reference name="content">
24
+ <block type="discount/adminhtml_discountbackend" name="discountbackend" template="discount/discountbackend.phtml"/>
25
+ </reference>
26
+ </discount_adminhtml_discountbackend_index>
27
+ <discount_adminhtml_discount_index>
28
+ <reference name="content">
29
+ <block type="discount/adminhtml_discount" name="discount" />
30
+ </reference>
31
+ </discount_adminhtml_discount_index>
32
+ </layout>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ptkdiscount</name>
4
- <version>1.2.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.ptk.com.co">commercial</license>
7
  <channel>community</channel>
@@ -23,11 +23,11 @@ Members &#x201C;VIP&#x201D; group: we will give a discount of &#xD;
23
  - 30% from 16th February to 10th March, &#xD;
24
  - 50% from 11th March to 20th March.&#xD;
25
  &#x201C;General&#x201D; group would receive a discount of 10% from 1st January to 10th February 2016.</description>
26
- <notes>Solution bug in the upload form</notes>
27
  <authors><author><name>PtkDeveloper</name><user>MAG002965829</user><email>caguilar@ptk.com.co</email></author></authors>
28
- <date>2016-02-15</date>
29
- <time>15:50:43</time>
30
- <contents><target name="magecommunity"><dir name="PTK"><dir name="Discount"><dir name="Block"><dir name="Adminhtml"><dir name="Discount"><dir name="Edit"><file name="Form.php" hash="c4baf52fac8668929dd7b7298766779b"/><dir name="Tab"><file name="Form.php" hash="6d4de01e920f0ccec2c415c8017f37bc"/></dir><file name="Tabs.php" hash="7a85daf47d0ec2db0c88472e8b00abbb"/></dir><file name="Edit.php" hash="d266a254b4189cbe6d64095904f0c25d"/><file name="Grid.php" hash="b05554ea23734fa9ae5060fcaefb271a"/></dir><file name="Discount.php" hash="1b0effb2d1aa7afe12929609e5014e0e"/><file name="Discountbackend.php" hash="91fffa4f942cb1bd6107fde8467175bd"/></dir></dir><dir name="Helper"><file name="Data.php" hash="982540fcf600d0dd90533b6e0c834641"/></dir><dir name="Model"><dir name="Catalog"><file name="Product.php" hash="90b837bd43565095d4b78d22f8c38bf3"/></dir><file name="Cron.php" hash="4dd23ef17da8faae38d75adb6437e9e3"/><file name="Discount.php" hash="b5492952d99a36743729413af2f40eed"/><dir name="Mysql4"><dir name="Discount"><file name="Collection.php" hash="b3aad55070df0aa361269e7d853ce5ab"/></dir><file name="Discount.php" hash="b718f05969955072a3b3e93a632a682b"/></dir><file name="Observer.php" hash="bd8e7eca7f852cee67eec603d6395c8a"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="DiscountController.php" hash="601ed43889d2fbbbcc84f50a7007a4d2"/><file name="DiscountbackendController.php" hash="7d20346fedad0afb4f211e9467e6ab7b"/></dir></dir><dir name="etc"><file name="config.xml" hash="7e7a2b47e216fe49fc2d4c17ec269cf3"/><file name="system.xml" hash="ccde483303b3c0c10ff8fe204eaebcfe"/></dir><dir name="sql"><dir name="discount_setup"><file name="mysql4-install-0.1.0.php" hash="ebdf91cba1ded22c482727ef35ff69ee"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="discount"><file name="discount.css" hash="15e0b14cab38eaafe6c5bb69f0e3e85f"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="discount"><file name="jquery-1.8.3.min.js" hash="56bbd985660f218e7769084ce8434e07"/><file name="ptkFunction.js" hash="999721c44e355646ade0674e9ba192cc"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="discount"><file name="discountbackend.phtml" hash="7e65f9db1e1fca46490aa6bcfc1b4144"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="es_ES"><file name="PTK_Discount.csv" hash="7149341d0cacd4d29b55c6244eda40c1"/></dir></target><target name="magemedia"><dir name="media"><dir name="example"><file name="imports" hash=""/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="PTK_Discount.xml" hash="561a01ac6d19058f3473c2f004aceb7b"/></dir></target></contents>
31
  <compatible/>
32
- <dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
33
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ptkdiscount</name>
4
+ <version>1.2.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.ptk.com.co">commercial</license>
7
  <channel>community</channel>
23
  - 30% from 16th February to 10th March, &#xD;
24
  - 50% from 11th March to 20th March.&#xD;
25
  &#x201C;General&#x201D; group would receive a discount of 10% from 1st January to 10th February 2016.</description>
26
+ <notes>Solution to bug the administrator, integrates the ACL</notes>
27
  <authors><author><name>PtkDeveloper</name><user>MAG002965829</user><email>caguilar@ptk.com.co</email></author></authors>
28
+ <date>2016-03-09</date>
29
+ <time>14:51:38</time>
30
+ <contents><target name="magecommunity"><dir name="PTK"><dir name="Discount"><dir name="Block"><dir name="Adminhtml"><dir name="Discount"><dir name="Edit"><file name="Form.php" hash="c4baf52fac8668929dd7b7298766779b"/><dir name="Tab"><file name="Form.php" hash="6d4de01e920f0ccec2c415c8017f37bc"/></dir><file name="Tabs.php" hash="7a85daf47d0ec2db0c88472e8b00abbb"/></dir><file name="Edit.php" hash="d266a254b4189cbe6d64095904f0c25d"/><file name="Grid.php" hash="b05554ea23734fa9ae5060fcaefb271a"/></dir><file name="Discount.php" hash="1b0effb2d1aa7afe12929609e5014e0e"/><file name="Discountbackend.php" hash="91fffa4f942cb1bd6107fde8467175bd"/></dir></dir><dir name="Helper"><file name="Data.php" hash="982540fcf600d0dd90533b6e0c834641"/></dir><dir name="Model"><dir name="Catalog"><file name="Product.php" hash="90b837bd43565095d4b78d22f8c38bf3"/></dir><file name="Cron.php" hash="4dd23ef17da8faae38d75adb6437e9e3"/><file name="Discount.php" hash="b5492952d99a36743729413af2f40eed"/><dir name="Mysql4"><dir name="Discount"><file name="Collection.php" hash="b3aad55070df0aa361269e7d853ce5ab"/></dir><file name="Discount.php" hash="b718f05969955072a3b3e93a632a682b"/></dir><file name="Observer.php" hash="bd8e7eca7f852cee67eec603d6395c8a"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="DiscountController.php" hash="ca49eeea5ebf931299309b2b0738a858"/><file name="DiscountbackendController.php" hash="c72b4608d8fa7d9c8e4318de2d13c940"/></dir></dir><dir name="etc"><file name="config.xml" hash="d33fd420292349ab10ddd585c100948e"/><file name="system.xml" hash="ccde483303b3c0c10ff8fe204eaebcfe"/></dir><dir name="sql"><dir name="discount_setup"><file name="mysql4-install-0.1.0.php" hash="ebdf91cba1ded22c482727ef35ff69ee"/></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="discount"><file name="discount.css" hash="15e0b14cab38eaafe6c5bb69f0e3e85f"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="discount"><file name="jquery-1.8.3.min.js" hash="56bbd985660f218e7769084ce8434e07"/><file name="ptkFunction.js" hash="999721c44e355646ade0674e9ba192cc"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="discount"><file name="discountbackend.phtml" hash="7e65f9db1e1fca46490aa6bcfc1b4144"/></dir></dir><dir name="layout"><file name="discount.xml" hash="aae400cb407965a9c880199f24bd25fe"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="es_ES"><file name="PTK_Discount.csv" hash="7149341d0cacd4d29b55c6244eda40c1"/></dir></target><target name="magemedia"><dir name="media"><dir name="example"><file name="imports" hash=""/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="PTK_Discount.xml" hash="561a01ac6d19058f3473c2f004aceb7b"/></dir></target></contents>
31
  <compatible/>
32
+ <dependencies><required><php><min>5.3.0</min><max>5.6.0</max></php></required></dependencies>
33
  </package>