Llian_FreeAdminShipping - Version 0.1.2

Version Notes

Release Notes
Llian Free Admin Shipping 0.1.2 (2017-01-26)
* added composer file
* added NL translation
* minor refactoring

Llian Free Admin Shipping 0.1.1 (2014-04-17)
* tested with Magento 1.6.2, 1.7.0, 1.8.0, 1.8.1 and now considered stable

Llian Free Admin Shipping 0.1.0 beta (2013-03-28)
* initial public release

Download this release

Release Info

Developer Llian
Extension Llian_FreeAdminShipping
Version 0.1.2
Comparing to
See all releases


Code changes from version 0.1.1 to 0.1.2

Files changed (6) hide show
  1. app/code/community/Llian/FreeAdminShipping/Helper/Data.php +12 -6
  2. app/code/community/Llian/FreeAdminShipping/Model/Carrier/Freeadminshipping.php +5 -8
  3. app/code/community/Llian/FreeAdminShipping/etc/config.xml +1 -1
  4. app/etc/modules/Llian_FreeAdminShipping.xml +1 -0
  5. app/locale/nl_NL/Llian_FreeAdminShipping.csv +1 -0
  6. package.xml +8 -4
app/code/community/Llian/FreeAdminShipping/Helper/Data.php CHANGED
@@ -4,15 +4,15 @@
4
  *
5
  * Copyright (C) 2013 Llian
6
  *
7
- * This program is free software: you can redistribute it and/or modify it under the terms of the
8
- * GNU General Public License as published by the Free Software Foundation, either version 3 of the
9
  * License, or (at your option) any later version.
10
  *
11
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
12
  * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
  * GNU General Public License for more details.
14
  *
15
- * You should have received a copy of the GNU General Public License along with this program. If not,
16
  * see <http://www.gnu.org/licenses/gpl.html>.
17
  *
18
  * @category Llian
@@ -22,8 +22,14 @@
22
  * @license http://www.gnu.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
23
  */
24
 
 
 
 
 
 
 
 
25
  class Llian_FreeAdminShipping_Helper_Data extends Mage_Core_Helper_Abstract
26
  {
27
 
28
- }
29
- ?>
4
  *
5
  * Copyright (C) 2013 Llian
6
  *
7
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
8
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
9
  * License, or (at your option) any later version.
10
  *
11
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
12
  * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
  * GNU General Public License for more details.
14
  *
15
+ * You should have received a copy of the GNU General Public License along with this program. If not,
16
  * see <http://www.gnu.org/licenses/gpl.html>.
17
  *
18
  * @category Llian
22
  * @license http://www.gnu.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
23
  */
24
 
25
+ /**
26
+ * Helper
27
+ *
28
+ * @category Llian
29
+ * @package Llian_FreeAdminShipping
30
+ * @author Llian <info@llian.de>
31
+ */
32
  class Llian_FreeAdminShipping_Helper_Data extends Mage_Core_Helper_Abstract
33
  {
34
 
35
+ }
 
app/code/community/Llian/FreeAdminShipping/Model/Carrier/Freeadminshipping.php CHANGED
@@ -45,10 +45,10 @@ implements Mage_Shipping_Model_Carrier_Interface
45
  protected function isAdmin()
46
  {
47
  /* set admin session */
48
- Mage::getSingleton('core/session', array('name' => 'adminhtml'))->start();
49
- $isLoggedIn = Mage::getSingleton('admin/session', array('name' => 'adminhtml'))->isLoggedIn();
50
  /* set original session */
51
- Mage::getSingleton('core/session', array('name' => $this->_sessionNamespace))->start();
52
  return $isLoggedIn;
53
  }
54
 
@@ -79,11 +79,8 @@ implements Mage_Shipping_Model_Carrier_Interface
79
 
80
  public function getAllowedMethods()
81
  {
82
- return array('freeadminshipping'=>$this->getConfigData('name'));
83
  }
84
 
85
 
86
- }
87
-
88
-
89
- ?>
45
  protected function isAdmin()
46
  {
47
  /* set admin session */
48
+ Mage::getSingleton('core/session', ['name' => 'adminhtml'])->start();
49
+ $isLoggedIn = Mage::getSingleton('admin/session', ['name' => 'adminhtml'])->isLoggedIn();
50
  /* set original session */
51
+ Mage::getSingleton('core/session', ['name' => $this->_sessionNamespace])->start();
52
  return $isLoggedIn;
53
  }
54
 
79
 
80
  public function getAllowedMethods()
81
  {
82
+ return ['freeadminshipping'=>$this->getConfigData('name')];
83
  }
84
 
85
 
86
+ }
 
 
 
app/code/community/Llian/FreeAdminShipping/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Llian_FreeAdminShipping>
5
- <version>0.1.0</version>
6
  </Llian_FreeAdminShipping>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Llian_FreeAdminShipping>
5
+ <version>0.1.2</version>
6
  </Llian_FreeAdminShipping>
7
  </modules>
8
  <global>
app/etc/modules/Llian_FreeAdminShipping.xml CHANGED
@@ -6,6 +6,7 @@
6
  <codePool>community</codePool>
7
  <depends>
8
  <Mage_Core />
 
9
  </depends>
10
  </Llian_FreeAdminShipping>
11
  </modules>
6
  <codePool>community</codePool>
7
  <depends>
8
  <Mage_Core />
9
+ <Mage_Adminhtml />
10
  </depends>
11
  </Llian_FreeAdminShipping>
12
  </modules>
app/locale/nl_NL/Llian_FreeAdminShipping.csv ADDED
@@ -0,0 +1 @@
 
1
+ "Free Admin Shipping","Gratis verzenden voor Admin"
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Llian_FreeAdminShipping</name>
4
- <version>0.1.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/gpl.html">GNU General Public License (GPL)</license>
7
  <channel>community</channel>
@@ -13,6 +13,10 @@ Features:&#xD;
13
  * Allows admin users to offer free shipping while frontend users don't have this option&#xD;
14
  * Custom labels for this shipping option</description>
15
  <notes>Release Notes&#xD;
 
 
 
 
16
  &#xD;
17
  Llian Free Admin Shipping 0.1.1 (2014-04-17)&#xD;
18
  * tested with Magento 1.6.2, 1.7.0, 1.8.0, 1.8.1 and now considered stable&#xD;
@@ -20,9 +24,9 @@ Llian Free Admin Shipping 0.1.1 (2014-04-17)&#xD;
20
  Llian Free Admin Shipping 0.1.0 beta (2013-03-28)&#xD;
21
  * initial public release</notes>
22
  <authors><author><name>Llian</name><user>Llian</user><email>info@llian.de</email></author></authors>
23
- <date>2014-04-16</date>
24
- <time>22:05:24</time>
25
- <contents><target name="magecommunity"><dir name="Llian"><dir name="FreeAdminShipping"><dir name="Helper"><file name="Data.php" hash="df588165030b3465e257342a40ca5695"/></dir><dir name="Model"><dir name="Carrier"><file name="Freeadminshipping.php" hash="fc5ee18c4de97724a2695eda969da35e"/></dir></dir><dir name="etc"><file name="config.xml" hash="ab47ebe6fe0b4ff39a2c4e3eb09524b7"/><file name="system.xml" hash="58fea674746913414f8160fecfb1aae2"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Llian_FreeAdminShipping.xml" hash="6aeee5c01c7fabcb55e7b8b286ef87dd"/></dir></target><target name="magelocale"><dir><dir name="de_DE"><file name="Llian_FreeAdminShipping.csv" hash="d42fbb4f9f697b44e02413df12f985d8"/></dir></dir></target></contents>
26
  <compatible/>
27
  <dependencies><required><php><min>5.2.13</min><max>6.0.0</max></php></required></dependencies>
28
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Llian_FreeAdminShipping</name>
4
+ <version>0.1.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/gpl.html">GNU General Public License (GPL)</license>
7
  <channel>community</channel>
13
  * Allows admin users to offer free shipping while frontend users don't have this option&#xD;
14
  * Custom labels for this shipping option</description>
15
  <notes>Release Notes&#xD;
16
+ Llian Free Admin Shipping 0.1.2 (2017-01-26)&#xD;
17
+ * added composer file&#xD;
18
+ * added NL translation&#xD;
19
+ * minor refactoring&#xD;
20
  &#xD;
21
  Llian Free Admin Shipping 0.1.1 (2014-04-17)&#xD;
22
  * tested with Magento 1.6.2, 1.7.0, 1.8.0, 1.8.1 and now considered stable&#xD;
24
  Llian Free Admin Shipping 0.1.0 beta (2013-03-28)&#xD;
25
  * initial public release</notes>
26
  <authors><author><name>Llian</name><user>Llian</user><email>info@llian.de</email></author></authors>
27
+ <date>2017-02-02</date>
28
+ <time>21:05:11</time>
29
+ <contents><target name="magecommunity"><dir name="Llian"><dir name="FreeAdminShipping"><dir name="Helper"><file name="Data.php" hash="0dec9be3422091c308f8df9e9d7203c7"/></dir><dir name="Model"><dir name="Carrier"><file name="Freeadminshipping.php" hash="8158be8848f2e4a9c38d4f7997fe5154"/></dir></dir><dir name="etc"><file name="config.xml" hash="bc4b68e0ddaebfab5e429fcf13933423"/><file name="system.xml" hash="58fea674746913414f8160fecfb1aae2"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Llian_FreeAdminShipping.xml" hash="ad3c41373886dc138006b9e87080c3f6"/></dir></target><target name="magelocale"><dir><dir name="de_DE"><file name="Llian_FreeAdminShipping.csv" hash="d42fbb4f9f697b44e02413df12f985d8"/></dir><dir name="nl_NL"><file name="Llian_FreeAdminShipping.csv" hash="e925c9b9a6586ad423ea63e60554452a"/></dir></dir></target></contents>
30
  <compatible/>
31
  <dependencies><required><php><min>5.2.13</min><max>6.0.0</max></php></required></dependencies>
32
  </package>