Version Notes
Ajout de la méthode _isAllowed dans les controllers du module afin de permettre aux utilisateurs à accès restreint d'utiliser le module s'ils ont les permissions nécéssaires
Download this release
Release Info
| Developer | Berlioz |
| Extension | ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo |
| Version | 1.0.7 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.6 to 1.0.7
- app/code/community/LaPoste/ExpeditorINet/controllers/ExportController.php +10 -0
- app/code/community/LaPoste/ExpeditorINet/controllers/ImportController.php +10 -0
- app/code/community/LaPoste/ExpeditorINet/etc/adminhtml.xml +72 -0
- app/code/community/LaPoste/ExpeditorINet/etc/config.xml +10 -60
- app/code/community/LaPoste/ExpeditorINet/etc/system.xml +1 -1
- package.xml +5 -6
app/code/community/LaPoste/ExpeditorINet/controllers/ExportController.php
CHANGED
|
@@ -20,6 +20,16 @@ class LaPoste_ExpeditorINet_ExportController extends Mage_Adminhtml_Controller_A
|
|
| 20 |
$this->setUsedModuleName('LaPoste_ExpeditorINet');
|
| 21 |
}
|
| 22 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
/**
|
| 24 |
* Main action : show orders list
|
| 25 |
*
|
| 20 |
$this->setUsedModuleName('LaPoste_ExpeditorINet');
|
| 21 |
}
|
| 22 |
|
| 23 |
+
/**
|
| 24 |
+
* Check whether the admin user has access to this controller.
|
| 25 |
+
*
|
| 26 |
+
* @return bool
|
| 27 |
+
*/
|
| 28 |
+
protected function _isAllowed()
|
| 29 |
+
{
|
| 30 |
+
return Mage::getSingleton('admin/session')->isAllowed('sales/expeditorinet/export');
|
| 31 |
+
}
|
| 32 |
+
|
| 33 |
/**
|
| 34 |
* Main action : show orders list
|
| 35 |
*
|
app/code/community/LaPoste/ExpeditorINet/controllers/ImportController.php
CHANGED
|
@@ -20,6 +20,16 @@ class LaPoste_ExpeditorINet_ImportController extends Mage_Adminhtml_Controller_A
|
|
| 20 |
$this->setUsedModuleName('LaPoste_ExpeditorINet');
|
| 21 |
}
|
| 22 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
/**
|
| 24 |
* Main action : show import form
|
| 25 |
*
|
| 20 |
$this->setUsedModuleName('LaPoste_ExpeditorINet');
|
| 21 |
}
|
| 22 |
|
| 23 |
+
/**
|
| 24 |
+
* Check whether the admin user has access to this controller.
|
| 25 |
+
*
|
| 26 |
+
* @return bool
|
| 27 |
+
*/
|
| 28 |
+
protected function _isAllowed()
|
| 29 |
+
{
|
| 30 |
+
return Mage::getSingleton('admin/session')->isAllowed('sales/expeditorinet/import');
|
| 31 |
+
}
|
| 32 |
+
|
| 33 |
/**
|
| 34 |
* Main action : show import form
|
| 35 |
*
|
app/code/community/LaPoste/ExpeditorINet/etc/adminhtml.xml
ADDED
|
@@ -0,0 +1,72 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<!--
|
| 3 |
+
/**
|
| 4 |
+
* LaPoste_ExpeditorINet
|
| 5 |
+
*
|
| 6 |
+
* @category LaPoste
|
| 7 |
+
* @package LaPoste_ExpeditorINet
|
| 8 |
+
* @copyright Copyright (c) 2010 La Poste
|
| 9 |
+
* @author Smile (http://www.smile.fr) & Jibé
|
| 10 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 11 |
+
*/
|
| 12 |
+
-->
|
| 13 |
+
<config>
|
| 14 |
+
<menu>
|
| 15 |
+
<sales>
|
| 16 |
+
<children>
|
| 17 |
+
<expeditorinet translate="title"> <!-- TODO faire marcher : module="expeditor_inet" (aussi dans les children) -->
|
| 18 |
+
<title>La Poste Expeditor INet</title>
|
| 19 |
+
<sort_order>15</sort_order>
|
| 20 |
+
<children>
|
| 21 |
+
<export translate="title">
|
| 22 |
+
<title>Export orders</title>
|
| 23 |
+
<action>expeditorinet/export</action>
|
| 24 |
+
<sort_order>10</sort_order>
|
| 25 |
+
</export>
|
| 26 |
+
<import translate="title">
|
| 27 |
+
<title>Import shipping</title>
|
| 28 |
+
<action>expeditorinet/import</action>
|
| 29 |
+
<sort_order>20</sort_order>
|
| 30 |
+
</import>
|
| 31 |
+
</children>
|
| 32 |
+
</expeditorinet>
|
| 33 |
+
</children>
|
| 34 |
+
</sales>
|
| 35 |
+
</menu>
|
| 36 |
+
<acl>
|
| 37 |
+
<resources>
|
| 38 |
+
<admin>
|
| 39 |
+
<children>
|
| 40 |
+
<sales>
|
| 41 |
+
<children>
|
| 42 |
+
<expeditorinet translate="title">
|
| 43 |
+
<title>La Poste Expeditor INet</title>
|
| 44 |
+
<children>
|
| 45 |
+
<export translate="title">
|
| 46 |
+
<title>Export orders</title>
|
| 47 |
+
</export>
|
| 48 |
+
<import translate="title">
|
| 49 |
+
<title>Import shipping</title>
|
| 50 |
+
</import>
|
| 51 |
+
</children>
|
| 52 |
+
<sort_order>15</sort_order>
|
| 53 |
+
</expeditorinet>
|
| 54 |
+
</children>
|
| 55 |
+
</sales>
|
| 56 |
+
<system>
|
| 57 |
+
<children>
|
| 58 |
+
<config>
|
| 59 |
+
<children>
|
| 60 |
+
<expeditorinet>
|
| 61 |
+
<title>La Poste Expeditor INet</title>
|
| 62 |
+
<sort_order>100</sort_order>
|
| 63 |
+
</expeditorinet>
|
| 64 |
+
</children>
|
| 65 |
+
</config>
|
| 66 |
+
</children>
|
| 67 |
+
</system>
|
| 68 |
+
</children>
|
| 69 |
+
</admin>
|
| 70 |
+
</resources>
|
| 71 |
+
</acl>
|
| 72 |
+
</config>
|
app/code/community/LaPoste/ExpeditorINet/etc/config.xml
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
<?xml version="1.0"
|
| 2 |
<!--
|
| 3 |
/**
|
| 4 |
* LaPoste_ExpeditorINet
|
|
@@ -13,30 +13,34 @@
|
|
| 13 |
<config>
|
| 14 |
<modules>
|
| 15 |
<LaPoste_ExpeditorINet>
|
| 16 |
-
<version>1.0.
|
| 17 |
<depends>
|
| 18 |
<Mage_Sales />
|
| 19 |
<Mage_Adminhtml />
|
| 20 |
</depends>
|
| 21 |
</LaPoste_ExpeditorINet>
|
| 22 |
</modules>
|
|
|
|
| 23 |
<global>
|
| 24 |
<models>
|
| 25 |
<expeditorinet>
|
| 26 |
<class>LaPoste_ExpeditorINet_Model</class>
|
| 27 |
</expeditorinet>
|
| 28 |
</models>
|
|
|
|
| 29 |
<blocks>
|
| 30 |
<expeditorinet>
|
| 31 |
<class>LaPoste_ExpeditorINet_Block</class>
|
| 32 |
</expeditorinet>
|
| 33 |
</blocks>
|
|
|
|
| 34 |
<helpers>
|
| 35 |
<expeditorinet>
|
| 36 |
<class>LaPoste_ExpeditorINet_Helper</class>
|
| 37 |
</expeditorinet>
|
| 38 |
</helpers>
|
| 39 |
</global>
|
|
|
|
| 40 |
<admin>
|
| 41 |
<routers>
|
| 42 |
<expeditorinet>
|
|
@@ -48,65 +52,8 @@
|
|
| 48 |
</expeditorinet>
|
| 49 |
</routers>
|
| 50 |
</admin>
|
|
|
|
| 51 |
<adminhtml>
|
| 52 |
-
<menu>
|
| 53 |
-
<sales>
|
| 54 |
-
<children>
|
| 55 |
-
<expeditorinet translate="title"> <!-- TODO faire marcher : module="expeditor_inet" (aussi dans les children) -->
|
| 56 |
-
<title>La Poste Expeditor INet</title>
|
| 57 |
-
<sort_order>15</sort_order>
|
| 58 |
-
<children>
|
| 59 |
-
<export translate="title">
|
| 60 |
-
<title>Export orders</title>
|
| 61 |
-
<action>expeditorinet/export</action>
|
| 62 |
-
<sort_order>10</sort_order>
|
| 63 |
-
</export>
|
| 64 |
-
<import translate="title">
|
| 65 |
-
<title>Import shipping</title>
|
| 66 |
-
<action>expeditorinet/import</action>
|
| 67 |
-
<sort_order>20</sort_order>
|
| 68 |
-
</import>
|
| 69 |
-
</children>
|
| 70 |
-
</expeditorinet>
|
| 71 |
-
</children>
|
| 72 |
-
</sales>
|
| 73 |
-
</menu>
|
| 74 |
-
<acl>
|
| 75 |
-
<resources>
|
| 76 |
-
<admin>
|
| 77 |
-
<children>
|
| 78 |
-
<sales>
|
| 79 |
-
<children>
|
| 80 |
-
<expeditorinet translate="title">
|
| 81 |
-
<title>La Poste Expeditor INet</title>
|
| 82 |
-
<children>
|
| 83 |
-
<export translate="title">
|
| 84 |
-
<title>Export orders</title>
|
| 85 |
-
</export>
|
| 86 |
-
<import translate="title">
|
| 87 |
-
<title>Import shipping</title>
|
| 88 |
-
</import>
|
| 89 |
-
</children>
|
| 90 |
-
<sort_order>15</sort_order>
|
| 91 |
-
</expeditorinet>
|
| 92 |
-
</children>
|
| 93 |
-
</sales>
|
| 94 |
-
<system>
|
| 95 |
-
<children>
|
| 96 |
-
<config>
|
| 97 |
-
<children>
|
| 98 |
-
<expeditorinet>
|
| 99 |
-
<title>La Poste Expeditor INet</title>
|
| 100 |
-
<sort_order>100</sort_order>
|
| 101 |
-
</expeditorinet>
|
| 102 |
-
</children>
|
| 103 |
-
</config>
|
| 104 |
-
</children>
|
| 105 |
-
</system>
|
| 106 |
-
</children>
|
| 107 |
-
</admin>
|
| 108 |
-
</resources>
|
| 109 |
-
</acl>
|
| 110 |
<translate>
|
| 111 |
<modules>
|
| 112 |
<expeditorinet>
|
|
@@ -117,6 +64,7 @@
|
|
| 117 |
</modules>
|
| 118 |
</translate>
|
| 119 |
</adminhtml>
|
|
|
|
| 120 |
<default>
|
| 121 |
<expeditorinet>
|
| 122 |
<export>
|
|
@@ -126,6 +74,7 @@
|
|
| 126 |
<field_delimiter>double_quotes</field_delimiter>
|
| 127 |
<field_separator>;</field_separator>
|
| 128 |
</export>
|
|
|
|
| 129 |
<import>
|
| 130 |
<default_tracking_title>So Colissimo</default_tracking_title>
|
| 131 |
<send_email>1</send_email>
|
|
@@ -133,6 +82,7 @@
|
|
| 133 |
<include_comment>0</include_comment>
|
| 134 |
<carrier_code>socolissimosimplicite_socolissimosimplicite</carrier_code>
|
| 135 |
</import>
|
|
|
|
| 136 |
<pickup_point_codes>
|
| 137 |
<A2P />
|
| 138 |
<ACP />
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
<!--
|
| 3 |
/**
|
| 4 |
* LaPoste_ExpeditorINet
|
| 13 |
<config>
|
| 14 |
<modules>
|
| 15 |
<LaPoste_ExpeditorINet>
|
| 16 |
+
<version>1.0.7</version>
|
| 17 |
<depends>
|
| 18 |
<Mage_Sales />
|
| 19 |
<Mage_Adminhtml />
|
| 20 |
</depends>
|
| 21 |
</LaPoste_ExpeditorINet>
|
| 22 |
</modules>
|
| 23 |
+
|
| 24 |
<global>
|
| 25 |
<models>
|
| 26 |
<expeditorinet>
|
| 27 |
<class>LaPoste_ExpeditorINet_Model</class>
|
| 28 |
</expeditorinet>
|
| 29 |
</models>
|
| 30 |
+
|
| 31 |
<blocks>
|
| 32 |
<expeditorinet>
|
| 33 |
<class>LaPoste_ExpeditorINet_Block</class>
|
| 34 |
</expeditorinet>
|
| 35 |
</blocks>
|
| 36 |
+
|
| 37 |
<helpers>
|
| 38 |
<expeditorinet>
|
| 39 |
<class>LaPoste_ExpeditorINet_Helper</class>
|
| 40 |
</expeditorinet>
|
| 41 |
</helpers>
|
| 42 |
</global>
|
| 43 |
+
|
| 44 |
<admin>
|
| 45 |
<routers>
|
| 46 |
<expeditorinet>
|
| 52 |
</expeditorinet>
|
| 53 |
</routers>
|
| 54 |
</admin>
|
| 55 |
+
|
| 56 |
<adminhtml>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 57 |
<translate>
|
| 58 |
<modules>
|
| 59 |
<expeditorinet>
|
| 64 |
</modules>
|
| 65 |
</translate>
|
| 66 |
</adminhtml>
|
| 67 |
+
|
| 68 |
<default>
|
| 69 |
<expeditorinet>
|
| 70 |
<export>
|
| 74 |
<field_delimiter>double_quotes</field_delimiter>
|
| 75 |
<field_separator>;</field_separator>
|
| 76 |
</export>
|
| 77 |
+
|
| 78 |
<import>
|
| 79 |
<default_tracking_title>So Colissimo</default_tracking_title>
|
| 80 |
<send_email>1</send_email>
|
| 82 |
<include_comment>0</include_comment>
|
| 83 |
<carrier_code>socolissimosimplicite_socolissimosimplicite</carrier_code>
|
| 84 |
</import>
|
| 85 |
+
|
| 86 |
<pickup_point_codes>
|
| 87 |
<A2P />
|
| 88 |
<ACP />
|
app/code/community/LaPoste/ExpeditorINet/etc/system.xml
CHANGED
|
@@ -6,7 +6,7 @@
|
|
| 6 |
* @category LaPoste
|
| 7 |
* @package LaPoste_ExpeditorINet
|
| 8 |
* @copyright Copyright (c) 2010 La Poste
|
| 9 |
-
* @author
|
| 10 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 11 |
*/
|
| 12 |
-->
|
| 6 |
* @category LaPoste
|
| 7 |
* @package LaPoste_ExpeditorINet
|
| 8 |
* @copyright Copyright (c) 2010 La Poste
|
| 9 |
+
* @author Smile (http://www.smile.fr) & Jibé
|
| 10 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 11 |
*/
|
| 12 |
-->
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo</name>
|
| 4 |
-
<version>1.0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -13,15 +13,14 @@ Ce module est compatible avec les commandes utilisant le mode de livraison So Co
|
|
| 13 |

|
| 14 |
Testé et validé sur Magento :
|
| 15 |
- Community : 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9
|
| 16 |
-
- Professional : 1.8
|
| 17 |
- Enterprise : 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14
|
| 18 |

|
| 19 |
Réalisé par Smile sur la base du module créé par Jibé.</description>
|
| 20 |
-
<notes>
|
| 21 |
<authors><author><name>Berlioz</name><user>Aline</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
|
| 22 |
-
<date>2015-
|
| 23 |
-
<time>
|
| 24 |
-
<contents><target name="mageetc"><dir name="modules"><file name="LaPoste_ExpeditorINet.xml" hash="f2198321021ba493d81d064eb99e6aec"/></dir></target><target name="magecommunity"><dir name="LaPoste"><dir name="ExpeditorINet"><dir name="Block"><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="768bc842442e022eb3b39706d0606279"/></dir><file name="Orders.php" hash="eddae8e734c4b12a36343ef330cdcb32"/></dir><dir name="Import"><file name="Form.php" hash="375c120395760e50ce8eb6e6edf2cdca"/></dir></dir><dir name="Helper"><file name="Data.php" hash="026ea878ecf24e84711b27ad8b10edaf"/></dir><dir name="Model"><dir name="Config"><dir name="Source"><file name="EndOfLineCharacter.php" hash="b8c600ab0371995b790bbb9f9ce43185"/><file name="FieldDelimiter.php" hash="d82eacb4771e2db3168bc360dbd9586b"/><file name="FieldSeparator.php" hash="30c60175102f0c138798d6ce095e1439"/><file name="FileCharset.php" hash="67ae7384d6c71a535e1d93fd683a4d80"/><file name="FileExtension.php" hash="b5d4b7b193e63270f30c5624ff7e9921"/></dir></dir></dir><dir name="controllers"><file name="ExportController.php" hash="
|
| 25 |
<compatible/>
|
| 26 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 27 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>ColiPoste_La_Poste_Expeditor_Inet_So_Colissimo</name>
|
| 4 |
+
<version>1.0.7</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 13 |

|
| 14 |
Testé et validé sur Magento :
|
| 15 |
- Community : 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9
|
|
|
|
| 16 |
- Enterprise : 1.8, 1.9, 1.10, 1.11, 1.12, 1.13, 1.14
|
| 17 |

|
| 18 |
Réalisé par Smile sur la base du module créé par Jibé.</description>
|
| 19 |
+
<notes>Ajout de la méthode _isAllowed dans les controllers du module afin de permettre aux utilisateurs à accès restreint d'utiliser le module s'ils ont les permissions nécéssaires</notes>
|
| 20 |
<authors><author><name>Berlioz</name><user>Aline</user><email>Aline.BERLIOZ@laposte.fr</email></author></authors>
|
| 21 |
+
<date>2015-07-20</date>
|
| 22 |
+
<time>07:47:19</time>
|
| 23 |
+
<contents><target name="mageetc"><dir name="modules"><file name="LaPoste_ExpeditorINet.xml" hash="f2198321021ba493d81d064eb99e6aec"/></dir></target><target name="magecommunity"><dir name="LaPoste"><dir name="ExpeditorINet"><dir name="Block"><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="768bc842442e022eb3b39706d0606279"/></dir><file name="Orders.php" hash="eddae8e734c4b12a36343ef330cdcb32"/></dir><dir name="Import"><file name="Form.php" hash="375c120395760e50ce8eb6e6edf2cdca"/></dir></dir><dir name="Helper"><file name="Data.php" hash="026ea878ecf24e84711b27ad8b10edaf"/></dir><dir name="Model"><dir name="Config"><dir name="Source"><file name="EndOfLineCharacter.php" hash="b8c600ab0371995b790bbb9f9ce43185"/><file name="FieldDelimiter.php" hash="d82eacb4771e2db3168bc360dbd9586b"/><file name="FieldSeparator.php" hash="30c60175102f0c138798d6ce095e1439"/><file name="FileCharset.php" hash="67ae7384d6c71a535e1d93fd683a4d80"/><file name="FileExtension.php" hash="b5d4b7b193e63270f30c5624ff7e9921"/></dir></dir></dir><dir name="controllers"><file name="ExportController.php" hash="f8dc785c98d13affc034cf786f135024"/><file name="ImportController.php" hash="15793cd2633cf6de8ab33a87a5e170c4"/></dir><dir name="etc"><file name="adminhtml.xml" hash="6e5e8d4fec8dc97e6900af8084c4a0b5"/><file name="config.xml" hash="ba34cb70d6da1ec33e0de80a58a8ee07"/><file name="system.xml" hash="7c7a4a4c1e4e5db4ac1d020de0d16bca"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="expeditorinet"><dir name="import"><file name="form.phtml" hash="0afef5bb21747ce26466f7367b3f6d19"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="fr_FR"><file name="LaPoste_ExpeditorINet.csv" hash="b519614a28683786e3d60293bdc551f6"/></dir></dir></target></contents>
|
| 24 |
<compatible/>
|
| 25 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 26 |
</package>
|
