LinnLiveConnect - Version 1.1.52

Version Notes

mapping fix

Download this release

Release Info

Developer Albert Andrejev
Extension LinnLiveConnect
Version 1.1.52
Comparing to
See all releases


Code changes from version 1.1.51 to 1.1.52

Files changed (4) hide show
  1. app/code/local/LinnSystems/LinnLiveConnect/Model/Api/V2.php +12 -15
  2. app/code/local/LinnSystems/LinnLiveConnect/etc/api.xml +1 -1
  3. app/code/local/LinnSystems/LinnLiveConnect/etc/config.xml +1 -1
  4. package.xml +5 -5
app/code/local/LinnSystems/LinnLiveConnect/Model/Api/V2.php CHANGED
@@ -49,7 +49,7 @@ class Mage_Catalog_Model_Product_Api_V2_LL extends Mage_Catalog_Model_Product_Ap
49
  $retry = true;
50
  sleep(1);
51
  }else{
52
- throw $e->getMessage();
53
  }
54
  $tries++;
55
  }
@@ -998,12 +998,7 @@ class LinnLiveMain extends Mage_Core_Model_Abstract {
998
  list($assignedProductsArray, $attributesSetArray) = $this->_prepareConfigurableData($productsSet, $attributesSet, true);
999
  return $this->_updateConfigurable($store, $productId, $assignedProductsArray, $attributesSetArray, $identifierType, true, $reindex);
1000
  }
1001
-
1002
- /*
1003
- * Checks if this Magento server has valid Extension installed
1004
- */
1005
-
1006
- //http://magento18.ixander.eu/api/v2_soap
1007
  public function getGeneralInfo(){
1008
  $config = Mage::getStoreConfig("api/config");
1009
  $verInfo = Mage::getVersionInfo();
@@ -1017,8 +1012,7 @@ class LinnLiveMain extends Mage_Core_Model_Abstract {
1017
 
1018
  return $result;
1019
  }
1020
-
1021
-
1022
  public function storesList()
1023
  {
1024
  return ($this->_getCurrentVersion() >= 160);
@@ -1072,7 +1066,6 @@ class LinnLiveMain extends Mage_Core_Model_Abstract {
1072
  return true;
1073
  }
1074
 
1075
-
1076
  public function assignImages($productImages)
1077
  {
1078
  $store = $this->_currentStoreCode(null);
@@ -1133,8 +1126,6 @@ class LinnLiveMain extends Mage_Core_Model_Abstract {
1133
  }
1134
 
1135
 
1136
-
1137
-
1138
  /*
1139
  * Implementation of catalogProductList because of bug in associativeArray.
1140
  * Extended to filter by category id too.
@@ -1175,8 +1166,14 @@ class LinnLiveMain extends Mage_Core_Model_Abstract {
1175
 
1176
  //add prepared filters to collection
1177
  try {
1178
- foreach ($preparedFilters as $field => $value) {
1179
- $collection->addFieldToFilter($field, $value);
 
 
 
 
 
 
1180
  }
1181
  }
1182
  catch (Mage_Core_Exception $e) {
@@ -1202,7 +1199,7 @@ class LinnLiveMain extends Mage_Core_Model_Abstract {
1202
 
1203
  $_assignedIds = array();
1204
  $_fetchedIds = array();
1205
-
1206
  $i = 0;
1207
  foreach ($collection as $_product) {
1208
 
49
  $retry = true;
50
  sleep(1);
51
  }else{
52
+ throw $e;
53
  }
54
  $tries++;
55
  }
998
  list($assignedProductsArray, $attributesSetArray) = $this->_prepareConfigurableData($productsSet, $attributesSet, true);
999
  return $this->_updateConfigurable($store, $productId, $assignedProductsArray, $attributesSetArray, $identifierType, true, $reindex);
1000
  }
1001
+
 
 
 
 
 
1002
  public function getGeneralInfo(){
1003
  $config = Mage::getStoreConfig("api/config");
1004
  $verInfo = Mage::getVersionInfo();
1012
 
1013
  return $result;
1014
  }
1015
+
 
1016
  public function storesList()
1017
  {
1018
  return ($this->_getCurrentVersion() >= 160);
1066
  return true;
1067
  }
1068
 
 
1069
  public function assignImages($productImages)
1070
  {
1071
  $store = $this->_currentStoreCode(null);
1126
  }
1127
 
1128
 
 
 
1129
  /*
1130
  * Implementation of catalogProductList because of bug in associativeArray.
1131
  * Extended to filter by category id too.
1166
 
1167
  //add prepared filters to collection
1168
  try {
1169
+ foreach ($preparedFilters as $field => $data) {
1170
+ if(is_array($data)){
1171
+ foreach ($data as $key => $value){
1172
+ $collection->addFieldToFilter($field, array($key=>$value));
1173
+ }
1174
+ }else{
1175
+ $collection->addFieldToFilter($field, $data);
1176
+ }
1177
  }
1178
  }
1179
  catch (Mage_Core_Exception $e) {
1199
 
1200
  $_assignedIds = array();
1201
  $_fetchedIds = array();
1202
+
1203
  $i = 0;
1204
  foreach ($collection as $_product) {
1205
 
app/code/local/LinnSystems/LinnLiveConnect/etc/api.xml CHANGED
@@ -77,7 +77,7 @@
77
  </product_attribute_set_not_exists>
78
  <product_attribute_set_not_valid>
79
  <code>103</code>
80
- <message>roduct attribute set was not added to catalogue.</message>
81
  </product_attribute_set_not_valid>
82
  <products_not_suitable>
83
  <code>104</code>
77
  </product_attribute_set_not_exists>
78
  <product_attribute_set_not_valid>
79
  <code>103</code>
80
+ <message>Product attribute set was not added to catalogue.</message>
81
  </product_attribute_set_not_valid>
82
  <products_not_suitable>
83
  <code>104</code>
app/code/local/LinnSystems/LinnLiveConnect/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <LinnSystems_LinnLiveConnect>
5
- <version>1.1.51</version>
6
  </LinnSystems_LinnLiveConnect>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <LinnSystems_LinnLiveConnect>
5
+ <version>1.1.52</version>
6
  </LinnSystems_LinnLiveConnect>
7
  </modules>
8
  <global>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>LinnLiveConnect</name>
4
- <version>1.1.51</version>
5
  <stability>stable</stability>
6
  <license>GPL v2</license>
7
  <channel>community</channel>
@@ -9,11 +9,11 @@
9
  <summary>Extended SOAP WS-I compliant API to support integration with LinnLive2.</summary>
10
  <description>Extended SOAP WS-I compliant API to support integration with LinnLive2 (http://www.linnlive.com).&#xD;
11
  Contains some workarounds to avoid bugs in original Magento modules and additional functionality to operate Magento store remotely.</description>
12
- <notes>Version 1.1.51</notes>
13
  <authors><author><name>Albert Andrejev</name><user>albert_andrejev</user><email>albert@linnsystems.com</email></author><author><name>Pavel Nikolajev</name><user>Pavel_LL2</user><email>pavel.nokolajev@linnsystems.com</email></author><author><name>Aleksandr Kornev</name><user>alex_LL2</user><email>alex.kornevs@linnsystems.com</email></author></authors>
14
- <date>2014-08-11</date>
15
- <time>08:58:39</time>
16
- <contents><target name="magelocal"><dir name="LinnSystems"><dir name="LinnLiveConnect"><dir name="Helper"><file name="Data.php" hash="5fe5216de67d4e69a0f418b0cd7780ee"/></dir><dir name="Model"><dir name="Api"><file name="V2.php" hash="e979ff29f3f34ae4cc32d9a0f9a4b93c"/></dir></dir><dir name="etc"><file name="api.xml" hash="76538ff23e66eee306d79aab6c59cdf3"/><file name="config.xml" hash="8bb065b37523b8adb48705e0511bd7d1"/><file name="wsdl.xml" hash="2b450fd6a6332d20583aaa4fc52012b6"/><file name="wsi.xml" hash="67b9b8ae64b953805556a5d243e148bc"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="LinnSystems_LinnLiveConnect.xml" hash="19c48712cd0516815d6784592ada0881"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>LinnLiveConnect</name>
4
+ <version>1.1.52</version>
5
  <stability>stable</stability>
6
  <license>GPL v2</license>
7
  <channel>community</channel>
9
  <summary>Extended SOAP WS-I compliant API to support integration with LinnLive2.</summary>
10
  <description>Extended SOAP WS-I compliant API to support integration with LinnLive2 (http://www.linnlive.com).&#xD;
11
  Contains some workarounds to avoid bugs in original Magento modules and additional functionality to operate Magento store remotely.</description>
12
+ <notes>mapping fix</notes>
13
  <authors><author><name>Albert Andrejev</name><user>albert_andrejev</user><email>albert@linnsystems.com</email></author><author><name>Pavel Nikolajev</name><user>Pavel_LL2</user><email>pavel.nokolajev@linnsystems.com</email></author><author><name>Aleksandr Kornev</name><user>alex_LL2</user><email>alex.kornevs@linnsystems.com</email></author></authors>
14
+ <date>2014-08-25</date>
15
+ <time>07:38:35</time>
16
+ <contents><target name="magelocal"><dir name="LinnSystems"><dir name="LinnLiveConnect"><dir name="Helper"><file name="Data.php" hash="5fe5216de67d4e69a0f418b0cd7780ee"/></dir><dir name="Model"><dir name="Api"><file name="V2.php" hash="d1d407d83c02ba7fe85a1de1386ee463"/></dir></dir><dir name="etc"><file name="api.xml" hash="f24d33b8241c0b29c58c4cffb93162e6"/><file name="config.xml" hash="fa5ee3ecddfbc3605d33524f7cc57f71"/><file name="wsdl.xml" hash="2b450fd6a6332d20583aaa4fc52012b6"/><file name="wsi.xml" hash="67b9b8ae64b953805556a5d243e148bc"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="LinnSystems_LinnLiveConnect.xml" hash="19c48712cd0516815d6784592ada0881"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>