Speedinfo_Opensi - Version 0.3.6

Version Notes

Mise à jour du module vers la version 0.3.6
Pour plus d'informations, se référer à la documentation.

Download this release

Release Info

Developer Magento Core Team
Extension Speedinfo_Opensi
Version 0.3.6
Comparing to
See all releases


Code changes from version 0.3.5 to 0.3.6

Files changed (3) hide show
  1. app/code/community/Speedinfo/Opensi/Model/Webservices.php +10 -4
  2. app/code/community/Speedinfo/Opensi/etc/config.xml +1 -1
  3. package.xml +5 -5
app/code/community/Speedinfo/Opensi/Model/Webservices.php CHANGED
@@ -126,10 +126,13 @@ class Speedinfo_Opensi_Model_Webservices extends Mage_Core_Model_Abstract {
126
  // Informations de commande
127
  $commandeWeb->setAttribute('Num_Com_Web', $order->getIncrementId());
128
  $commandeWeb->setAttribute('Code_Site_Web', $client->web_site_code);
 
129
  if($customer->getId()){
130
  $commandeWeb->setAttribute('Login', $customer->getId());
 
131
  }else{
132
  $commandeWeb->setAttribute('Login', "Invité");
 
133
  }
134
  $commandeWeb->setAttribute('Date_Commande', $orderDate->format('d-m-Y H:i:s'));
135
  $shippingDesc = strip_tags($order->getShippingDescription());
@@ -188,7 +191,7 @@ class Speedinfo_Opensi_Model_Webservices extends Mage_Core_Model_Abstract {
188
  $billingFax = $order->getBillingAddress()->getFax();
189
  if (!empty($billingFax))
190
  $commandeWeb->setAttribute('Fax_Fact', $billingFax);
191
- $commandeWeb->setAttribute('Email_Fact', $customer->getEmail());
192
 
193
  //Informations de livraison
194
  $commandeWeb->setAttribute('Civ_Liv', 0);
@@ -213,7 +216,7 @@ class Speedinfo_Opensi_Model_Webservices extends Mage_Core_Model_Abstract {
213
  $shippingFax = $order->getShippingAddress()->getFax();
214
  if (!empty($shippingFax))
215
  $commandeWeb->setAttribute('Fax_Liv', $shippingFax);
216
- $commandeWeb->setAttribute('Email_Liv', $customer->getEmail());
217
 
218
  $request->appendChild($commandeWeb);
219
  // Informations du contenu de la commande
@@ -240,6 +243,8 @@ class Speedinfo_Opensi_Model_Webservices extends Mage_Core_Model_Abstract {
240
  if (!empty($discountAmount) && $itemTotal != 0) {
241
  $discount = (1 - (($itemTotal - $item->getDiscountAmount()) / $itemTotal)) * 100;
242
  $discount = round($discount, 2);
 
 
243
  }
244
 
245
  // $discountPourcent = $item->getDiscountPercent();
@@ -844,7 +849,8 @@ class Speedinfo_Opensi_Model_Webservices extends Mage_Core_Model_Abstract {
844
  public function setPubwebArticle($startedAt, $client, $storeId) {
845
  $productCollection = Mage::getModel('catalog/product')->getCollection()->addFieldToFilter('updated_at', array('gteq' => $startedAt->format('Y-m-d H:i:s')))
846
  ->addStoreFilter($storeId)
847
- ->addAttributeToSelect(array('sku', 'status'));
 
848
  ini_set('max_execution_time', 50 );
849
  foreach ($productCollection as $product) {
850
  if(!$this->verfiSku($product)){
@@ -955,4 +961,4 @@ class Speedinfo_Opensi_Model_Webservices extends Mage_Core_Model_Abstract {
955
  return true;
956
  }
957
 
958
- }
126
  // Informations de commande
127
  $commandeWeb->setAttribute('Num_Com_Web', $order->getIncrementId());
128
  $commandeWeb->setAttribute('Code_Site_Web', $client->web_site_code);
129
+ $email = "";
130
  if($customer->getId()){
131
  $commandeWeb->setAttribute('Login', $customer->getId());
132
+ $email = $customer->getEmail();
133
  }else{
134
  $commandeWeb->setAttribute('Login', "Invité");
135
+ $email = $order->getCustomerEmail();
136
  }
137
  $commandeWeb->setAttribute('Date_Commande', $orderDate->format('d-m-Y H:i:s'));
138
  $shippingDesc = strip_tags($order->getShippingDescription());
191
  $billingFax = $order->getBillingAddress()->getFax();
192
  if (!empty($billingFax))
193
  $commandeWeb->setAttribute('Fax_Fact', $billingFax);
194
+ $commandeWeb->setAttribute('Email_Fact', $email);
195
 
196
  //Informations de livraison
197
  $commandeWeb->setAttribute('Civ_Liv', 0);
216
  $shippingFax = $order->getShippingAddress()->getFax();
217
  if (!empty($shippingFax))
218
  $commandeWeb->setAttribute('Fax_Liv', $shippingFax);
219
+ $commandeWeb->setAttribute('Email_Liv', $email);
220
 
221
  $request->appendChild($commandeWeb);
222
  // Informations du contenu de la commande
243
  if (!empty($discountAmount) && $itemTotal != 0) {
244
  $discount = (1 - (($itemTotal - $item->getDiscountAmount()) / $itemTotal)) * 100;
245
  $discount = round($discount, 2);
246
+ }else{
247
+ $ligneCommandeClient->setAttribute('Remise_Pourc', 0);
248
  }
249
 
250
  // $discountPourcent = $item->getDiscountPercent();
849
  public function setPubwebArticle($startedAt, $client, $storeId) {
850
  $productCollection = Mage::getModel('catalog/product')->getCollection()->addFieldToFilter('updated_at', array('gteq' => $startedAt->format('Y-m-d H:i:s')))
851
  ->addStoreFilter($storeId)
852
+ ->addAttributeToSelect(array('sku', 'status'))
853
+ ->addFieldToFilter('type_id', array('nin' => array('configurable', 'grouped')));
854
  ini_set('max_execution_time', 50 );
855
  foreach ($productCollection as $product) {
856
  if(!$this->verfiSku($product)){
961
  return true;
962
  }
963
 
964
+ }
app/code/community/Speedinfo/Opensi/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Speedinfo_Opensi>
5
- <version>0.3.5</version>
6
  </Speedinfo_Opensi>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Speedinfo_Opensi>
5
+ <version>0.3.6</version>
6
  </Speedinfo_Opensi>
7
  </modules>
8
  <global>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Speedinfo_Opensi</name>
4
- <version>0.3.5</version>
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&#xE9; OpenSi E-Commerce.
11
  Speedinfo a con&#xE7;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&#xE9; d&#xE9;di&#xE9; &#xE0; l'e-commerce.</description>
13
- <notes>Mise &#xE0; jour du module vers la version 0.3.5
14
  Pour plus d'informations, se r&#xE9;f&#xE9;rer &#xE0; la documentation.</notes>
15
  <authors><author><name>Dray</name><user>auto-converted</user><email>rony.dray@speedinfo.fr</email></author></authors>
16
- <date>2011-05-30</date>
17
- <time>11:01:51</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="44197706123f54d5c2e17475cd64b9f1"/></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="09ccc564f6ba4e7cbb58e0357c43e035"/></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="67924c0d50793cbd461d700326a365b0"/></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="c2dccdfb120a3d8639ff88523c1e655e"/><file name="Errorlog.php" hash="d269ec20ae481684a1daa2c515848252"/><file name="Webservice.php" hash="c77708c3507d79a83e64a1801ea255c2"/><file name="Webservices.php" hash="0f6f5fe5c2685b987da56b7303a65552"/></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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Speedinfo_Opensi</name>
4
+ <version>0.3.6</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&#xE9; OpenSi E-Commerce.
11
  Speedinfo a con&#xE7;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&#xE9; d&#xE9;di&#xE9; &#xE0; l'e-commerce.</description>
13
+ <notes>Mise &#xE0; jour du module vers la version 0.3.6
14
  Pour plus d'informations, se r&#xE9;f&#xE9;rer &#xE0; la documentation.</notes>
15
  <authors><author><name>Dray</name><user>auto-converted</user><email>rony.dray@speedinfo.fr</email></author></authors>
16
+ <date>2011-06-27</date>
17
+ <time>12:10:46</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="44197706123f54d5c2e17475cd64b9f1"/></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="09ccc564f6ba4e7cbb58e0357c43e035"/></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="78f35d2e594177dc5720b1855a3912c0"/></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="c2dccdfb120a3d8639ff88523c1e655e"/><file name="Errorlog.php" hash="d269ec20ae481684a1daa2c515848252"/><file name="Webservice.php" hash="c77708c3507d79a83e64a1801ea255c2"/><file name="Webservices.php" hash="36f006b2f84107f8f90246ca8bff95ea"/></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>