Eadesigndev_Awb - Version 1.0.8

Version Notes

Update for Magento 1.9.2.2 and security patch SUPEE-6788.

Download this release

Release Info

Developer EaDesign
Extension Eadesigndev_Awb
Version 1.0.8
Comparing to
See all releases


Code changes from version 1.0.7 to 1.0.8

Files changed (6) hide show
  1. app/code/local/Eadesigndev/Awb/Block/Adminhtml/Block/System/Update.php +1 -1
  2. app/code/local/Eadesigndev/Awb/Model/Observer.php +8 -1
  3. app/code/local/Eadesigndev/Awb/controllers/Adminhtml/{IndexController.php → AwbController.php} +3 -3
  4. app/code/local/Eadesigndev/Awb/etc/adminhtml.xml +4 -4
  5. app/code/local/Eadesigndev/Awb/etc/config.xml +18 -6
  6. package.xml +5 -5
app/code/local/Eadesigndev/Awb/Block/Adminhtml/Block/System/Update.php CHANGED
@@ -12,7 +12,7 @@ class Eadesigndev_Awb_Block_Adminhtml_Block_System_Update extends Mage_Adminhtml
12
  }
13
 
14
  $this->setElement($element);
15
- $url = Mage::helper('adminhtml')->getUrl('awbadmin/adminhtml_index/update');
16
 
17
  $html = $this->getLayout()->createBlock('adminhtml/widget_button')
18
  ->setType('button')
12
  }
13
 
14
  $this->setElement($element);
15
+ $url = Mage::helper('adminhtml')->getUrl('adminhtml/awb/update');
16
 
17
  $html = $this->getLayout()->createBlock('adminhtml/widget_button')
18
  ->setType('button')
app/code/local/Eadesigndev/Awb/Model/Observer.php CHANGED
@@ -11,6 +11,13 @@ class Eadesigndev_Awb_Model_Observer
11
  public function addButtonShip($observer)
12
  {
13
 
 
 
 
 
 
 
 
14
  $container = $observer->getBlock();
15
 
16
  if (null !== $container && $container->getType() == 'adminhtml/sales_order_shipment_view') {
@@ -18,7 +25,7 @@ class Eadesigndev_Awb_Model_Observer
18
  $dataUrgent = array(
19
  'label' => 'Genereaza awb Urgent',
20
  'class' => 'awb-button',
21
- 'onclick' => 'setLocation(\' ' . Mage::helper("adminhtml")->getUrl("awbadmin/adminhtml_index/generate",
22
  array(
23
  'shippment_id' => $container->getShipment()->getId(),
24
  'order_id' => $container->getShipment()->getOrderId(),
11
  public function addButtonShip($observer)
12
  {
13
 
14
+ $helper = Mage::helper('awb/urgent');
15
+ $isConnected = $helper->isConnected();
16
+
17
+ if (!$isConnected){
18
+ return $this;
19
+ }
20
+
21
  $container = $observer->getBlock();
22
 
23
  if (null !== $container && $container->getType() == 'adminhtml/sales_order_shipment_view') {
25
  $dataUrgent = array(
26
  'label' => 'Genereaza awb Urgent',
27
  'class' => 'awb-button',
28
+ 'onclick' => 'setLocation(\' ' . Mage::helper("adminhtml")->getUrl("adminhtml/awb/generate",
29
  array(
30
  'shippment_id' => $container->getShipment()->getId(),
31
  'order_id' => $container->getShipment()->getOrderId(),
app/code/local/Eadesigndev/Awb/controllers/Adminhtml/{IndexController.php → AwbController.php} RENAMED
@@ -4,7 +4,7 @@
4
  *
5
  * @author Ea Design
6
  */
7
- class Eadesigndev_Awb_Adminhtml_IndexController extends Mage_Adminhtml_Controller_Action
8
  {
9
  /**
10
  * The index action on main extension pannel
@@ -20,7 +20,7 @@ class Eadesigndev_Awb_Adminhtml_IndexController extends Mage_Adminhtml_Controll
20
  }
21
 
22
  $this->loadLayout();
23
- $this->_setActiveMenu('awbadmin/adminhtml_index');
24
  $this->_addBreadcrumb(Mage::helper('awb')->__('AWB Ne validate'), Mage::helper('awb')->__('AWB Ne validate'));
25
 
26
  $listBlock = $this->getLayout()->createBlock('awb/adminhtml_template_awb', 'awb-list');
@@ -44,7 +44,7 @@ class Eadesigndev_Awb_Adminhtml_IndexController extends Mage_Adminhtml_Controll
44
 
45
  $this->_initTemplate('id');
46
 
47
- $this->_setActiveMenu('awbadmin/adminhtml_index');
48
  $this->_title($this->__('AWB'))->_title($this->__('Edit AWB'));
49
 
50
  $this->_addBreadcrumb(Mage::helper('awb')
4
  *
5
  * @author Ea Design
6
  */
7
+ class Eadesigndev_Awb_Adminhtml_AwbController extends Mage_Adminhtml_Controller_Action
8
  {
9
  /**
10
  * The index action on main extension pannel
20
  }
21
 
22
  $this->loadLayout();
23
+ $this->_setActiveMenu('adminhtml/index');
24
  $this->_addBreadcrumb(Mage::helper('awb')->__('AWB Ne validate'), Mage::helper('awb')->__('AWB Ne validate'));
25
 
26
  $listBlock = $this->getLayout()->createBlock('awb/adminhtml_template_awb', 'awb-list');
44
 
45
  $this->_initTemplate('id');
46
 
47
+ $this->_setActiveMenu('adminhtml/awb');
48
  $this->_title($this->__('AWB'))->_title($this->__('Edit AWB'));
49
 
50
  $this->_addBreadcrumb(Mage::helper('awb')
app/code/local/Eadesigndev/Awb/etc/adminhtml.xml CHANGED
@@ -7,12 +7,12 @@
7
  <children>
8
  <first_page module="awb">
9
  <title>Lista AWB</title>
10
- <action>awbadmin/adminhtml_index</action>
11
  </first_page>
12
  <auc_preferinte module="awb">
13
  <title>Settings</title>
14
  <sort_order>10</sort_order>
15
- <action>awbadmin/adminhtml_index/settings</action>
16
  </auc_preferinte>
17
  </children>
18
  </awb_menu>
@@ -32,12 +32,12 @@
32
  <first_page module="awb">
33
  <title>Templates</title>
34
  <sort_order>10</sort_order>
35
- <action>awbadmin/adminhtml_index</action>
36
  </first_page>
37
  <auc_preferinte module="awb">
38
  <title>Settings</title>
39
  <sort_order>10</sort_order>
40
- <action>awbadmin/adminhtml_index/settings</action>
41
  </auc_preferinte>
42
  </children>
43
  </awb_menu>
7
  <children>
8
  <first_page module="awb">
9
  <title>Lista AWB</title>
10
+ <action>adminhtml/awb</action>
11
  </first_page>
12
  <auc_preferinte module="awb">
13
  <title>Settings</title>
14
  <sort_order>10</sort_order>
15
+ <action>adminhtml/awb/settings</action>
16
  </auc_preferinte>
17
  </children>
18
  </awb_menu>
32
  <first_page module="awb">
33
  <title>Templates</title>
34
  <sort_order>10</sort_order>
35
+ <action>adminhtml/awb</action>
36
  </first_page>
37
  <auc_preferinte module="awb">
38
  <title>Settings</title>
39
  <sort_order>10</sort_order>
40
+ <action>adminhtml/awb/settings</action>
41
  </auc_preferinte>
42
  </children>
43
  </awb_menu>
app/code/local/Eadesigndev/Awb/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Eadesigndev_Awb>
5
- <version>1.0.7</version>
6
  </Eadesigndev_Awb>
7
  </modules>
8
  <global>
@@ -105,15 +105,27 @@
105
  </resources>
106
  </acl>
107
  </adminhtml>
 
 
 
 
 
 
 
 
 
 
 
108
  <admin>
109
  <routers>
110
- <awbadmin>
111
- <use>admin</use>
112
  <args>
113
- <module>Eadesigndev_Awb</module>
114
- <frontName>awbadmin</frontName>
 
115
  </args>
116
- </awbadmin>
117
  </routers>
118
  </admin>
 
119
  </config>
2
  <config>
3
  <modules>
4
  <Eadesigndev_Awb>
5
+ <version>1.0.8</version>
6
  </Eadesigndev_Awb>
7
  </modules>
8
  <global>
105
  </resources>
106
  </acl>
107
  </adminhtml>
108
+ <!--<admin>-->
109
+ <!--<routers>-->
110
+ <!--<awbadmin>-->
111
+ <!--<use>admin</use>-->
112
+ <!--<args>-->
113
+ <!--<module>Eadesigndev_Awb</module>-->
114
+ <!--<frontName>awbadmin</frontName>-->
115
+ <!--</args>-->
116
+ <!--</awbadmin>-->
117
+ <!--</routers>-->
118
+ <!--</admin>-->
119
  <admin>
120
  <routers>
121
+ <adminhtml>
 
122
  <args>
123
+ <modules>
124
+ <Eadesigndev_Awb after="Mage_Adminhtml">Eadesigndev_Awb_Adminhtml</Eadesigndev_Awb>
125
+ </modules>
126
  </args>
127
+ </adminhtml>
128
  </routers>
129
  </admin>
130
+
131
  </config>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Eadesigndev_Awb</name>
4
- <version>1.0.7</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Extension license name (OSL v3.0)</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>The extension will generate the AWB for the Urgent Courier shipments.</summary>
10
  <description>The Urgent AWB extension will be available for all users which will generate directly the AWB and to set in Admin specific settings for this.</description>
11
- <notes>The first stable version for urgent cargus AWB.</notes>
12
  <authors><author><name>EaDesign</name><user>eadesign</user><email>office@eadesign.ro</email></author></authors>
13
- <date>2015-10-12</date>
14
- <time>10:13:28</time>
15
- <contents><target name="magelocal"><dir name="Eadesigndev"><dir name="Awb"><dir name="Block"><dir name="Adminhtml"><dir name="Block"><dir name="System"><file name="Update.php" hash="d03dacbcd98394e72adc262c2aff3d81"/></dir></dir><dir name="Template"><dir name="Awb"><dir name="Edit"><dir name="Tabs"><file name="Curier.php" hash="dfb2470e6ad6a267eed847b309ec77a9"/><file name="General.php" hash="b26924c9f5f594ce307c5375e20c68fd"/></dir><file name="Tabs.php" hash="c7b0691c71a8b40805304cc4fbbea61f"/></dir><file name="Edit.php" hash="78b15f0ea278865873bd3a535db44fb2"/><file name="Grid.php" hash="8bd24618c90afb869fa3be37398f072b"/></dir><file name="Awb.php" hash="6bfb2b2498abe6b88c85f4c713b1b03e"/></dir></dir></dir><dir name="Helper"><file name="City.php" hash="5a9264ab3a7446030e79096cd99d8785"/><file name="Data.php" hash="c187ac74d9f262e7d3e3b01987e103dd"/><file name="Update.php" hash="b86a8b75079889a3826814b568cc5eb0"/><file name="Urgent.php" hash="825758da1e3b9ea77260967f4d7bc8ee"/></dir><dir name="Model"><file name="Awb.php" hash="d06268c2dcc85b7cd8c16ec04261b772"/><file name="Awbcity.php" hash="bbd3ce7cc4de5509d9a96972ee5bc2a2"/><dir name="Eacore"><file name="Feed.php" hash="e3f5332c220a13c83824eeb4aba411fb"/><file name="Observer.php" hash="398d15e59b8606119fadecb459655d49"/></dir><dir name="Mysql4"><dir name="Awb"><file name="Collection.php" hash="072c42994025f03cf8e3c3a9780e90f8"/></dir><file name="Awb.php" hash="c22ec37725f7b0b54b55fdf6e0b9f3ce"/><dir name="Awbcity"><file name="Collection.php" hash="06d0fe46e5e5126bcb4a2bdc4289322b"/></dir><file name="Awbcity.php" hash="b815842f9a8d025c593e0a90daa04f3c"/></dir><file name="Observer.php" hash="5e6dbba3024fcee338a1267f1d9bd36a"/><dir name="System"><file name="Abstract.php" hash="0f70b432b52dd7ff411e1e5329e9f171"/><file name="Pachet.php" hash="3261d557f4e59e1b0475466b349373d7"/><file name="Plantarifar.php" hash="8aa64b5531bbcdbb806886f039bca18b"/><file name="Platatransport.php" hash="d7f33fa5d50ac58ce3a0ae905267ff38"/><file name="Punctridicare.php" hash="f509bfd5983308de2ef2e11a58debd28"/><file name="Tarifeafisate.php" hash="9f31170ff36ef1aac05f6f204488b753"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="IndexController.php" hash="1d81318e01b93c3655be53266927c6ac"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="d140eac67b1633c94d135d3a3f36f700"/><file name="config.xml" hash="a625762661152328330408aa87facdf2"/><file name="system.xml" hash="95c1bc79374621d985aaa6ea2217a210"/></dir><dir name="sql"><dir name="eadsign_awb_setup"><file name="mysql4-install-1.0.1.php" hash="054c77e1def92b2a4ed36d4e3b3e8698"/><file name="mysql4-upgrade-1.0.1-1.0.3.php" hash="00b9a49697badbef44dfba319db37d2e"/><file name="mysql4-upgrade-1.0.3-1.0.4.php" hash="9e1ca1cf86afa550047ed09123f292a5"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="71b3f046b07d8eaa55f52c8bb742e349"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="99ddb72c91ae1cc46f3a836467330411"/><file name="mysql4-upgrade-1.0.6-1.0.7.php" hash="04e131f04b2dcdf00ae96c26bfb590d4"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="eadesigndev"><dir name="awb"><dir name="edit"><file name="edit.phtml" hash="70aa8d99b26cd6f6a1aeefb1c8082b71"/></dir><file name="list.phtml" hash="f55378bb66a0f6091edaa3ff92785a64"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eadesigndev_Awb.xml" hash="5b7cea4f08a7a4f6d62b232c621ff3ea"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>5.6.3</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Eadesigndev_Awb</name>
4
+ <version>1.0.8</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Extension license name (OSL v3.0)</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>The extension will generate the AWB for the Urgent Courier shipments.</summary>
10
  <description>The Urgent AWB extension will be available for all users which will generate directly the AWB and to set in Admin specific settings for this.</description>
11
+ <notes>Update for Magento 1.9.2.2 and security patch SUPEE-6788.</notes>
12
  <authors><author><name>EaDesign</name><user>eadesign</user><email>office@eadesign.ro</email></author></authors>
13
+ <date>2015-10-26</date>
14
+ <time>13:11:34</time>
15
+ <contents><target name="magelocal"><dir name="Eadesigndev"><dir name="Awb"><dir name="Block"><dir name="Adminhtml"><dir name="Block"><dir name="System"><file name="Update.php" hash="225b2a2522589af103010ee45f4a66c5"/></dir></dir><dir name="Template"><dir name="Awb"><dir name="Edit"><dir name="Tabs"><file name="Curier.php" hash="dfb2470e6ad6a267eed847b309ec77a9"/><file name="General.php" hash="b26924c9f5f594ce307c5375e20c68fd"/></dir><file name="Tabs.php" hash="c7b0691c71a8b40805304cc4fbbea61f"/></dir><file name="Edit.php" hash="78b15f0ea278865873bd3a535db44fb2"/><file name="Grid.php" hash="8bd24618c90afb869fa3be37398f072b"/></dir><file name="Awb.php" hash="6bfb2b2498abe6b88c85f4c713b1b03e"/></dir></dir></dir><dir name="Helper"><file name="City.php" hash="5a9264ab3a7446030e79096cd99d8785"/><file name="Data.php" hash="c187ac74d9f262e7d3e3b01987e103dd"/><file name="Update.php" hash="b86a8b75079889a3826814b568cc5eb0"/><file name="Urgent.php" hash="825758da1e3b9ea77260967f4d7bc8ee"/></dir><dir name="Model"><file name="Awb.php" hash="d06268c2dcc85b7cd8c16ec04261b772"/><file name="Awbcity.php" hash="bbd3ce7cc4de5509d9a96972ee5bc2a2"/><dir name="Eacore"><file name="Feed.php" hash="e3f5332c220a13c83824eeb4aba411fb"/><file name="Observer.php" hash="398d15e59b8606119fadecb459655d49"/></dir><dir name="Mysql4"><dir name="Awb"><file name="Collection.php" hash="072c42994025f03cf8e3c3a9780e90f8"/></dir><file name="Awb.php" hash="c22ec37725f7b0b54b55fdf6e0b9f3ce"/><dir name="Awbcity"><file name="Collection.php" hash="06d0fe46e5e5126bcb4a2bdc4289322b"/></dir><file name="Awbcity.php" hash="b815842f9a8d025c593e0a90daa04f3c"/></dir><file name="Observer.php" hash="f8a6626341b10bd4d9c3fbbfdb188c72"/><dir name="System"><file name="Abstract.php" hash="0f70b432b52dd7ff411e1e5329e9f171"/><file name="Pachet.php" hash="3261d557f4e59e1b0475466b349373d7"/><file name="Plantarifar.php" hash="8aa64b5531bbcdbb806886f039bca18b"/><file name="Platatransport.php" hash="d7f33fa5d50ac58ce3a0ae905267ff38"/><file name="Punctridicare.php" hash="f509bfd5983308de2ef2e11a58debd28"/><file name="Tarifeafisate.php" hash="9f31170ff36ef1aac05f6f204488b753"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="AwbController.php" hash="49bb9329264986bd5700bd5ce2a88a6d"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="56906340547a5fdd76a21be1efe9c7fa"/><file name="config.xml" hash="65742b9ffae49597b1d98c50dd4c0f7d"/><file name="system.xml" hash="95c1bc79374621d985aaa6ea2217a210"/></dir><dir name="sql"><dir name="eadsign_awb_setup"><file name="mysql4-install-1.0.1.php" hash="054c77e1def92b2a4ed36d4e3b3e8698"/><file name="mysql4-upgrade-1.0.1-1.0.3.php" hash="00b9a49697badbef44dfba319db37d2e"/><file name="mysql4-upgrade-1.0.3-1.0.4.php" hash="9e1ca1cf86afa550047ed09123f292a5"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="71b3f046b07d8eaa55f52c8bb742e349"/><file name="mysql4-upgrade-1.0.5-1.0.6.php" hash="99ddb72c91ae1cc46f3a836467330411"/><file name="mysql4-upgrade-1.0.6-1.0.7.php" hash="04e131f04b2dcdf00ae96c26bfb590d4"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="eadesigndev"><dir name="awb"><dir name="edit"><file name="edit.phtml" hash="70aa8d99b26cd6f6a1aeefb1c8082b71"/></dir><file name="list.phtml" hash="f55378bb66a0f6091edaa3ff92785a64"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eadesigndev_Awb.xml" hash="5b7cea4f08a7a4f6d62b232c621ff3ea"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>5.6.3</max></php></required></dependencies>
18
  </package>