Version Notes
Mise à jour du module vers la version 0.2.5.
Pour plus d'informations, se référer à la documentation.
Download this release
Release Info
Developer | Magento Core Team |
Extension | Speedinfo_Opensi |
Version | 0.2.5 |
Comparing to | |
See all releases |
Code changes from version 0.2.4 to 0.2.5
- app/code/community/Speedinfo/Opensi/Block/Adminhtml/Edit/Tab/Webservices.php +6 -1
- app/code/community/Speedinfo/Opensi/controllers/IndexController.php +7 -3
- app/code/community/Speedinfo/Opensi/etc/config.xml +1 -1
- app/code/community/Speedinfo/Opensi/sql/opensi_setup/mysql4-upgrade-0.2.4-0.2.5.php +21 -0
- app/design/adminhtml/default/default/template/opensi/tab/webservices.phtml +23 -1
- package.xml +5 -5
app/code/community/Speedinfo/Opensi/Block/Adminhtml/Edit/Tab/Webservices.php
CHANGED
@@ -23,7 +23,12 @@ class Speedinfo_Opensi_Block_Adminhtml_Edit_Tab_Webservices extends Mage_Adminht
|
|
23 |
$client = Mage::getModel("opensi/client")->loadByStore($this->getStore());
|
24 |
return !empty($client) ? Mage::getModel("opensi/webservice")->loadByNameClient($name,$client->id) : '';
|
25 |
}
|
26 |
-
|
|
|
|
|
|
|
|
|
|
|
27 |
public function getStore()
|
28 |
{
|
29 |
if(Mage::registry('store_id') != ""){
|
23 |
$client = Mage::getModel("opensi/client")->loadByStore($this->getStore());
|
24 |
return !empty($client) ? Mage::getModel("opensi/webservice")->loadByNameClient($name,$client->id) : '';
|
25 |
}
|
26 |
+
|
27 |
+
public function getClient(){
|
28 |
+
$client = Mage::getModel("opensi/client")->loadByStore($this->getStore());
|
29 |
+
return !empty($client) ? $client : false;
|
30 |
+
}
|
31 |
+
|
32 |
public function getStore()
|
33 |
{
|
34 |
if(Mage::registry('store_id') != ""){
|
app/code/community/Speedinfo/Opensi/controllers/IndexController.php
CHANGED
@@ -46,7 +46,7 @@ class Speedinfo_Opensi_IndexController extends Mage_Adminhtml_Controller_Action
|
|
46 |
$famille2 = $params['familles'][1];
|
47 |
$famille3 = $params['familles'][2];
|
48 |
|
49 |
-
//Gestion
|
50 |
$attr1 = $params['attribut'][0];
|
51 |
$attr2 = $params['attribut'][1];
|
52 |
$attr3 = $params['attribut'][2];
|
@@ -58,6 +58,9 @@ class Speedinfo_Opensi_IndexController extends Mage_Adminhtml_Controller_Action
|
|
58 |
$hauteur = $params['hauteur'];
|
59 |
$longueur = $params['longueur'];
|
60 |
$largeur = $params['largeur'];
|
|
|
|
|
|
|
61 |
|
62 |
// préparer les attributs
|
63 |
$clientData = array(
|
@@ -81,6 +84,7 @@ class Speedinfo_Opensi_IndexController extends Mage_Adminhtml_Controller_Action
|
|
81 |
'hauteur' => $hauteur,
|
82 |
'longueur' => $longueur,
|
83 |
'largeur' => $largeur,
|
|
|
84 |
);
|
85 |
$client->setData($clientData);
|
86 |
$params['id'] != 0 ? $client->setId($params['id']) : '';
|
@@ -107,12 +111,12 @@ class Speedinfo_Opensi_IndexController extends Mage_Adminhtml_Controller_Action
|
|
107 |
}
|
108 |
$idWebservice = $ws->getId();
|
109 |
}
|
|
|
110 |
$wsData = array(
|
111 |
'name' => $name,
|
112 |
'client_id' => $idClient,
|
113 |
'active' => isset($params[$name]['active']) ? 1 : 0,
|
114 |
-
|
115 |
-
// 'frequency' => $params[$name]['frequency'],
|
116 |
);
|
117 |
$ws->setData($wsData);
|
118 |
isset($idWebservice) ? $ws->setId($idWebservice) : '';
|
46 |
$famille2 = $params['familles'][1];
|
47 |
$famille3 = $params['familles'][2];
|
48 |
|
49 |
+
//Gestion des attributs
|
50 |
$attr1 = $params['attribut'][0];
|
51 |
$attr2 = $params['attribut'][1];
|
52 |
$attr3 = $params['attribut'][2];
|
58 |
$hauteur = $params['hauteur'];
|
59 |
$longueur = $params['longueur'];
|
60 |
$largeur = $params['largeur'];
|
61 |
+
|
62 |
+
//Mode Test
|
63 |
+
$testMode = $params['test_mode'];
|
64 |
|
65 |
// préparer les attributs
|
66 |
$clientData = array(
|
84 |
'hauteur' => $hauteur,
|
85 |
'longueur' => $longueur,
|
86 |
'largeur' => $largeur,
|
87 |
+
'test_mode' => $testMode,
|
88 |
);
|
89 |
$client->setData($clientData);
|
90 |
$params['id'] != 0 ? $client->setId($params['id']) : '';
|
111 |
}
|
112 |
$idWebservice = $ws->getId();
|
113 |
}
|
114 |
+
$frequency = $params[$name]['frequency'] < $value['frequency'] ? $value['frequency'] : $params[$name]['frequency'];
|
115 |
$wsData = array(
|
116 |
'name' => $name,
|
117 |
'client_id' => $idClient,
|
118 |
'active' => isset($params[$name]['active']) ? 1 : 0,
|
119 |
+
'frequency' => $testMode ? 1 : $frequency,
|
|
|
120 |
);
|
121 |
$ws->setData($wsData);
|
122 |
isset($idWebservice) ? $ws->setId($idWebservice) : '';
|
app/code/community/Speedinfo/Opensi/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Speedinfo_Opensi>
|
5 |
-
<version>0.2.
|
6 |
</Speedinfo_Opensi>
|
7 |
</modules>
|
8 |
<global>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Speedinfo_Opensi>
|
5 |
+
<version>0.2.5</version>
|
6 |
</Speedinfo_Opensi>
|
7 |
</modules>
|
8 |
<global>
|
app/code/community/Speedinfo/Opensi/sql/opensi_setup/mysql4-upgrade-0.2.4-0.2.5.php
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Update des tables
|
4 |
+
*
|
5 |
+
* @Author Speedinfo
|
6 |
+
* http://wwww.speedinfo.fr | http://www.opensi.fr
|
7 |
+
*/
|
8 |
+
|
9 |
+
$installer = $this;
|
10 |
+
|
11 |
+
$installer->startSetup();
|
12 |
+
|
13 |
+
$db = $installer->getConnection();
|
14 |
+
if(!$db->tableColumnExists($this->getTable('opensi_client'), 'test_mode')) {
|
15 |
+
$installer->run("
|
16 |
+
ALTER TABLE {$this->getTable('opensi_client')} ADD test_mode tinyint(1) NOT NULL default '0';
|
17 |
+
");
|
18 |
+
}
|
19 |
+
|
20 |
+
//end
|
21 |
+
$installer->endSetup();
|
app/design/adminhtml/default/default/template/opensi/tab/webservices.phtml
CHANGED
@@ -1,4 +1,26 @@
|
|
1 |
-
<div class="entry-edit">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
<?php foreach(Mage::Helper('opensi')->getWebservicesName() as $title=>$ws):?>
|
3 |
<div class="entry-edit-head">
|
4 |
<h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__($title); ?></h4>
|
1 |
+
<div class="entry-edit">
|
2 |
+
<div class="entry-edit-head">
|
3 |
+
<h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__("Paramétrage d'exécution des webservices"); ?></h4>
|
4 |
+
</div>
|
5 |
+
<div id="base_fieldset" class="fieldset ">
|
6 |
+
<div class="hor-scroll">
|
7 |
+
<table cellspacing="0" class="form-list">
|
8 |
+
<tbody>
|
9 |
+
<tr>
|
10 |
+
<td class="label" style="width:200px;">
|
11 |
+
<label style="width:300px;"><?php echo $this->__('Passer en mode de test :'); ?></label>
|
12 |
+
</td>
|
13 |
+
<td class="value">
|
14 |
+
<select name="opensi[test_mode]" style="width: 50px;" id="test_mode">
|
15 |
+
<option <?php echo $this->getClient()->test_mode == 1 ? 'selected="selected"' : '' ?> value="1"><?php echo $this->__('Oui'); ?></option>
|
16 |
+
<option <?php echo $this->getClient()->test_mode == 0 ? 'selected="selected"' : '' ?> value="0"><?php echo $this->__('Non'); ?></option>
|
17 |
+
</select>
|
18 |
+
</td>
|
19 |
+
</tr>
|
20 |
+
</tbody>
|
21 |
+
</table>
|
22 |
+
</div>
|
23 |
+
</div>
|
24 |
<?php foreach(Mage::Helper('opensi')->getWebservicesName() as $title=>$ws):?>
|
25 |
<div class="entry-edit-head">
|
26 |
<h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__($title); ?></h4>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Speedinfo_Opensi</name>
|
4 |
-
<version>0.2.
|
5 |
<stability>stable</stability>
|
6 |
<license>GPL</license>
|
7 |
<channel>community</channel>
|
@@ -10,12 +10,12 @@
|
|
10 |
<description>Le module OpenSi Connect vous permet de coupler Magento au logiciel de gestion commerciale et de comptabilité OpenSi E-Commerce.
|
11 |
Speedinfo a conçu un connecteur pour OpenSi E-Commerce et Magento sous la forme du module OpenSi Connect
|
12 |
OpenSi E-Commerce, est un logiciel de gestion commerciale et de comptabilité dédié à l'e-commerce.</description>
|
13 |
-
<notes>Mise à jour du module vers la version 0.2.
|
14 |
Pour plus d'informations, se référer à la documentation.</notes>
|
15 |
<authors><author><name>Dray</name><user>auto-converted</user><email>rony.dray@speedinfo.fr</email></author></authors>
|
16 |
-
<date>2011-01-
|
17 |
-
<time>
|
18 |
-
<contents><target name="mage"><dir name="app"><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="opensi"><dir name="tab"><file name="webservices.phtml" hash="
|
19 |
<compatible/>
|
20 |
<dependencies/>
|
21 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Speedinfo_Opensi</name>
|
4 |
+
<version>0.2.5</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>GPL</license>
|
7 |
<channel>community</channel>
|
10 |
<description>Le module OpenSi Connect vous permet de coupler Magento au logiciel de gestion commerciale et de comptabilité OpenSi E-Commerce.
|
11 |
Speedinfo a conçu un connecteur pour OpenSi E-Commerce et Magento sous la forme du module OpenSi Connect
|
12 |
OpenSi E-Commerce, est un logiciel de gestion commerciale et de comptabilité dédié à l'e-commerce.</description>
|
13 |
+
<notes>Mise à jour du module vers la version 0.2.5.
|
14 |
Pour plus d'informations, se référer à la documentation.</notes>
|
15 |
<authors><author><name>Dray</name><user>auto-converted</user><email>rony.dray@speedinfo.fr</email></author></authors>
|
16 |
+
<date>2011-01-14</date>
|
17 |
+
<time>15:35:14</time>
|
18 |
+
<contents><target name="mage"><dir name="app"><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="opensi"><dir name="tab"><file name="webservices.phtml" hash="1cf90d1681d8ffd73d759cf9bb949531"/></dir></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Speedinfo_Opensi.xml" hash="16cc3fbf8e32ce7b8add016bfbc89c5f"/></dir></dir><dir name="locale"><dir name="fr_FR"><file name="Speedinfo_OpenSi.csv" hash="51f46b50056059d178766fa9111fe072"/></dir></dir></dir></target><target name="magecommunity"><dir name="Speedinfo"><dir name="Opensi"><dir name="Block"><dir name="Adminhtml"><dir name="Edit"><dir name="Tab"><file name="Attributs.php" hash="562e895af0d5f2a1cffa1be63d0b5fa4"/><file name="Familles.php" hash="317e2361f1dcb6c494ca9ab6bf0d5cae"/><file name="General.php" hash="485e888e215dde1762a42d147cced3e1"/><file name="Webservices.php" hash="5b36d060b95c963526e5e14d9ec4b847"/></dir><file name="Form.php" hash="3ce2dc7af0ec4c5a44178ac46d6178a8"/></dir><file name="Edit.php" hash="b91602dd06e9432d879db352fa2aaeaa"/><file name="Grid.php" hash="6ace416ae5264fed2bbc57aa5d152e6e"/><file name="Tabs.php" hash="4383dd11c3e1fffe43868e489f6b977f"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="9754ad25b294a0306d4e28090bf9e4cb"/></dir><dir name="etc"><file name="config.xml" hash="5dcc954d2520f503fd00afbcb6de5407"/></dir><dir name="Helper"><file name="Data.php" hash="b5798cdae9319b34ada4c3de5964c0b4"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Errorlog"><file name="Collection.php" hash="ad19bb95ad5e56f0dcaeff4db10cf52f"/></dir><dir name="Webservice"><file name="Collection.php" hash="3a5e5d973ffb834d4eadec4f9335b36e"/></dir><file name="Client.php" hash="0b47754c6aace0dc54340dfd807eb17a"/><file name="Errorlog.php" hash="9a8c882377bbdeada65c7c5d8346af35"/><file name="Webservice.php" hash="781eb93e76ba8bffe881f091904d0f98"/></dir><file name="Client.php" hash="f89aeb3dda8d8a27bf6a05e5082a945e"/><file name="Cron.php" hash="94436f6e624d9f665bc27cb92cadb001"/><file name="Errorlog.php" hash="d269ec20ae481684a1daa2c515848252"/><file name="Webservice.php" hash="c77708c3507d79a83e64a1801ea255c2"/><file name="Webservices.php" hash="136456ed98a080680fd353d176fffdc9"/></dir><dir name="sql"><dir name="opensi_setup"><file name="mysql4-install-0.1.0.php" hash="ce8cef17aac76ccfadf09d7d84d23841"/><file name="mysql4-upgrade-0.2.0-0.2.1.php" hash="f207b0704a6cad542dced6b40ac25341"/><file name="mysql4-upgrade-0.2.4-0.2.5.php" hash="99fcd03734f514441005dd8af5c22809"/></dir></dir></dir></dir></target></contents>
|
19 |
<compatible/>
|
20 |
<dependencies/>
|
21 |
</package>
|