codistoconnect - Version 1.90.5

Version Notes

Download this release

Release Info

Developer Codisto
Extension codistoconnect
Version 1.90.5
Comparing to
See all releases


Code changes from version 1.90.4 to 1.90.5

Files changed (5) hide show
  1. app/code/community/Codisto/Sync/Model/Sync.php +71 -59
  2. app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.4.php → data-install-1.90.5.php} +0 -0
  3. app/code/community/Codisto/Sync/etc/config.xml +1 -1
  4. app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.4.php → mysql4-install-1.90.5.php} +0 -0
  5. package.xml +1 -1
app/code/community/Codisto/Sync/Model/Sync.php CHANGED
@@ -885,89 +885,101 @@ class Codisto_Sync_Model_Sync
885
  {
886
  $attributeID = $attribute->getId();
887
  $attributeCode = $attribute->getAttributeCode();
888
- $attributeLabel = $attribute->getStoreLabel();
889
  $attributeTable = $backend->getTable();
890
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
891
  $attributeCodeIDMap[$attributeID] = $attributeCode;
892
 
893
  $attributeTypes[$attributeTable][$attributeID] = $attributeCode;
894
 
895
- if($attributeLabel)
896
- {
897
- $attributeGroupID = $attribute->getAttributeGroupId();
898
- $attributeGroupName = '';
899
 
900
- if($attributeGroupID)
 
 
901
  {
902
- if(isset($this->groupCache[$attributeGroupID]))
903
- {
904
- $attributeGroupName = $this->groupCache[$attributeGroupID];
905
- }
906
- else
907
- {
908
- $attributeGroup = Mage::getModel('catalog/product_attribute_group')->load($attributeGroupID);
909
 
910
- $attributeGroupName = html_entity_decode($attributeGroup->getAttributeGroupName());
911
 
912
- $this->groupCache[$attributeGroupID] = $attributeGroupName;
913
- }
914
  }
 
915
 
916
- $attributeFrontEnd = $attribute->getFrontend();
917
-
918
- $attributeData = array(
919
- 'id' => $attributeID,
920
- 'code' => $attributeCode,
921
- 'name' => $attribute->getName(),
922
- 'label' => $attributeLabel,
923
- 'backend_type' => $attribute->getBackendType(),
924
- 'frontend_type' => $attributeFrontEnd->getInputType(),
925
- 'groupid' => $attributeGroupID,
926
- 'groupname' => $attributeGroupName,
927
- 'html' => ($attribute->getIsHtmlAllowedOnFront() && $attribute->getIsWysiwygEnabled()) ? true : false,
928
- 'source_model' => $attribute->getSourceModel()
929
- );
930
-
931
- if(!isset($attributeData['frontend_type']) || is_null($attributeData['frontend_type']))
 
 
 
 
 
 
 
932
  {
933
- $attributeData['frontend_type'] = '';
934
  }
935
-
936
- if($attributeData['source_model'])
937
  {
938
- if(isset($this->optionCache[$store->getId().'-'.$attribute->getId()]))
939
- {
940
- $attributeData['source'] = $this->optionCache[$store->getId().'-'.$attribute->getId()];
941
- }
942
- else
943
  {
944
- try
945
- {
946
- $attributeData['source'] = Mage::getModel( $attributeData['source_model'] );
947
-
948
- if($attributeData['source'])
949
- {
950
- $attributeData['source']->setAttribute($attribute);
951
 
952
- $this->optionCache[$store->getId().'-'.$attribute->getId()] = $attributeData['source'];
953
- }
954
- }
955
- catch(Exception $e)
956
  {
 
957
 
 
958
  }
959
  }
960
- }
961
- else
962
- {
963
- $attributeData['source'] = $attribute->getSource();
964
- }
965
 
966
- $attributeSet[] = $attributeData;
967
- $attributeCodes[] = $attributeCode;
 
 
 
 
968
  }
969
- }
970
 
 
 
 
971
  }
972
 
973
  $adapter = Mage::getModel('core/resource')->getConnection(Mage_Core_Model_Resource::DEFAULT_READ_RESOURCE);
885
  {
886
  $attributeID = $attribute->getId();
887
  $attributeCode = $attribute->getAttributeCode();
 
888
  $attributeTable = $backend->getTable();
889
 
890
+ $attributeLabel = $attribute->getStoreLabel($store->getId());
891
+ if(!isset($attributeLabel) || is_null($attributeLabel) || !$attributeLabel)
892
+ {
893
+ if($store->getId() != Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID)
894
+ $attributeLabel = $attribute->getStoreLabel(Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID);
895
+ if(!isset($attributeLabel) || is_null($attributeLabel) || !$attributeLabel)
896
+ {
897
+ $attributeLabel = $attribute->getFrontendLabel();
898
+ if(!isset($attributeLabel) || is_null($attributeLabel) || !$attributeLabel)
899
+ {
900
+ $attributeLabel = $attribute->getName();
901
+ if(!isset($attributeLabel) || is_null($attributeLabel) || !$attributeLabel)
902
+ $attributeLabel = '';
903
+ }
904
+ }
905
+ }
906
+
907
  $attributeCodeIDMap[$attributeID] = $attributeCode;
908
 
909
  $attributeTypes[$attributeTable][$attributeID] = $attributeCode;
910
 
911
+ $attributeGroupID = $attribute->getAttributeGroupId();
912
+ $attributeGroupName = '';
 
 
913
 
914
+ if($attributeGroupID)
915
+ {
916
+ if(isset($this->groupCache[$attributeGroupID]))
917
  {
918
+ $attributeGroupName = $this->groupCache[$attributeGroupID];
919
+ }
920
+ else
921
+ {
922
+ $attributeGroup = Mage::getModel('catalog/product_attribute_group')->load($attributeGroupID);
 
 
923
 
924
+ $attributeGroupName = html_entity_decode($attributeGroup->getAttributeGroupName());
925
 
926
+ $this->groupCache[$attributeGroupID] = $attributeGroupName;
 
927
  }
928
+ }
929
 
930
+ $attributeFrontEnd = $attribute->getFrontend();
931
+
932
+ $attributeData = array(
933
+ 'id' => $attributeID,
934
+ 'code' => $attributeCode,
935
+ 'name' => $attribute->getName(),
936
+ 'label' => $attributeLabel,
937
+ 'backend_type' => $attribute->getBackendType(),
938
+ 'frontend_type' => $attributeFrontEnd->getInputType(),
939
+ 'groupid' => $attributeGroupID,
940
+ 'groupname' => $attributeGroupName,
941
+ 'html' => ($attribute->getIsHtmlAllowedOnFront() && $attribute->getIsWysiwygEnabled()) ? true : false,
942
+ 'source_model' => $attribute->getSourceModel()
943
+ );
944
+
945
+ if(!isset($attributeData['frontend_type']) || is_null($attributeData['frontend_type']))
946
+ {
947
+ $attributeData['frontend_type'] = '';
948
+ }
949
+
950
+ if($attributeData['source_model'])
951
+ {
952
+ if(isset($this->optionCache[$store->getId().'-'.$attribute->getId()]))
953
  {
954
+ $attributeData['source'] = $this->optionCache[$store->getId().'-'.$attribute->getId()];
955
  }
956
+ else
 
957
  {
958
+ try
 
 
 
 
959
  {
960
+ $attributeData['source'] = Mage::getModel( $attributeData['source_model'] );
 
 
 
 
 
 
961
 
962
+ if($attributeData['source'])
 
 
 
963
  {
964
+ $attributeData['source']->setAttribute($attribute);
965
 
966
+ $this->optionCache[$store->getId().'-'.$attribute->getId()] = $attributeData['source'];
967
  }
968
  }
969
+ catch(Exception $e)
970
+ {
 
 
 
971
 
972
+ }
973
+ }
974
+ }
975
+ else
976
+ {
977
+ $attributeData['source'] = $attribute->getSource();
978
  }
 
979
 
980
+ $attributeSet[] = $attributeData;
981
+ $attributeCodes[] = $attributeCode;
982
+ }
983
  }
984
 
985
  $adapter = Mage::getModel('core/resource')->getConnection(Mage_Core_Model_Resource::DEFAULT_READ_RESOURCE);
app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.4.php → data-install-1.90.5.php} RENAMED
File without changes
app/code/community/Codisto/Sync/etc/config.xml CHANGED
@@ -23,7 +23,7 @@
23
  <config>
24
  <modules>
25
  <Codisto_Sync>
26
- <version>1.90.4</version>
27
  <depends>
28
  <Mage_Payment/>
29
  </depends>
23
  <config>
24
  <modules>
25
  <Codisto_Sync>
26
+ <version>1.90.5</version>
27
  <depends>
28
  <Mage_Payment/>
29
  </depends>
app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.4.php → mysql4-install-1.90.5.php} RENAMED
File without changes
package.xml CHANGED
@@ -1,2 +1,2 @@
1
  <?xml version="1.0"?>
2
- <package><name>codistoconnect</name><version>1.90.4</version><stability>stable</stability><license>OSL-3.0</license><channel>community</channel><extends></extends><summary>Fastest, Easiest eBay listing</summary><description>CodistoConnect enables you to list on eBay in the simplest way possible with maximum performance</description><notes></notes><authors><author><name>Codisto</name><user>Codisto</user><email>hello@codisto.com</email></author></authors><date>2016-06-29</date><time>19:08:19</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="design"><dir name="ebay"><file name="README" hash="8a3f3351f68ccde9f161cdbe3960392f"/></dir></dir><dir name="code"><dir name="community"><dir name="Codisto"><dir name="Sync"><dir name="Helper"><file name="CmsContent.php" hash="f00b4523d681c60c660089d0de0f2e03"/><file name="Data.php" hash="331f0298b2c5701e2e7ef4d52b11c5e6"/><file name="Signal.php" hash="b624f962056ceffae9c3160ed3e5655e"/></dir><dir name="controllers"><file name="CodistoController.php" hash="4992c5f9d6d2f7422f409f0321b0e455"/><file name="IndexController.php" hash="8f4607d274bf4ca479bd0e3670be9839"/><file name="SyncController.php" hash="dffd761724da815f9e29620b475e2c08"/></dir><dir name="Controller"><file name="Router.php" hash="0ae958be465fbbe216afe18d4a715c5d"/></dir><dir name="Test"><file name="README" hash="8299e52f9198536ff5fd3fb42f4a29d8"/><dir name="Config"><file name="AdminHtml.php" hash="6ee6404e52ed6376ad41b7556f265c32"/><file name="Config.php" hash="2e9023fcbab484d03936394934f44f13"/><dir name="Config"><dir name="expectations"><file name="testCodistoCoreConfig.yaml" hash="4a4e07f62981139ff6eb8a63420cbf0d"/></dir></dir></dir><dir name="Controllers"><file name="CodistoController.php" hash="a2be4faeac73ff1847c0d7dc4fbdc0e0"/><file name="IndexController.php" hash="f7252fae8d2f7b67397ae56524db49d1"/><file name="SyncController.php" hash="33436e4935631488073765d723a82ff7"/></dir><dir name="Controller"><file name="Router.php" hash="8afc0dca269dd0977ff6b3ac6802d0ee"/></dir><dir name="Model"><file name="Paymentmethod.php" hash="862365909073ffbba057f6f152933826"/><file name="Sync.php" hash="10a38bbb62260208a8b1529e762b7b75"/></dir></dir><dir name="sql"><dir name="codisto_setup"><file name="mysql4-install-1.90.4.php" hash="6d07d4e22ae5d907df1f4389c3a829d4"/></dir></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.90.4.php" hash="a42cf5f15b68ac92d4c207bed8472c7d"/></dir></dir><dir name="Block"><file name="PaymentInfo.php" hash="7aa15fed37766d20d9d5a7d707aff80d"/></dir><dir name="Ebaypayment"><dir name="Model"><file name="Paymentmethod.php" hash="480787461a5b952a739f20a752bffb5d"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="4ef592c4047f610b6943758fa4fd43a6"/><file name="config.xml" hash="3926beeb88969b7a8bb8fc9e6cbed7fd"/></dir><dir name="Model"><file name="Observer.php" hash="8b309ae85f2bf696e97ff6777c1d64f2"/><file name="Sync.php" hash="1dd1ae1ef128a7ea51625ac2238e83ba"/><dir name="Indexer"><file name="Ebay.php" hash="556b1aabc7c3202f31a2e6c250e7d590"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="6a6664ea18d93bcdd0f45530caa56244"/></dir></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Codisto_Sync.xml" hash="a791bc2a9302d085eb29edf77421f525"/></dir></dir></dir></target></contents></package>
1
  <?xml version="1.0"?>
2
+ <package><name>codistoconnect</name><version>1.90.5</version><stability>stable</stability><license>OSL-3.0</license><channel>community</channel><extends></extends><summary>Fastest, Easiest eBay listing</summary><description>CodistoConnect enables you to list on eBay in the simplest way possible with maximum performance</description><notes></notes><authors><author><name>Codisto</name><user>Codisto</user><email>hello@codisto.com</email></author></authors><date>2016-06-30</date><time>16:50:16</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="design"><dir name="ebay"><file name="README" hash="8a3f3351f68ccde9f161cdbe3960392f"/></dir></dir><dir name="code"><dir name="community"><dir name="Codisto"><dir name="Sync"><dir name="Helper"><file name="CmsContent.php" hash="f00b4523d681c60c660089d0de0f2e03"/><file name="Data.php" hash="331f0298b2c5701e2e7ef4d52b11c5e6"/><file name="Signal.php" hash="b624f962056ceffae9c3160ed3e5655e"/></dir><dir name="controllers"><file name="CodistoController.php" hash="4992c5f9d6d2f7422f409f0321b0e455"/><file name="IndexController.php" hash="8f4607d274bf4ca479bd0e3670be9839"/><file name="SyncController.php" hash="dffd761724da815f9e29620b475e2c08"/></dir><dir name="Controller"><file name="Router.php" hash="0ae958be465fbbe216afe18d4a715c5d"/></dir><dir name="Test"><file name="README" hash="8299e52f9198536ff5fd3fb42f4a29d8"/><dir name="Config"><file name="AdminHtml.php" hash="6ee6404e52ed6376ad41b7556f265c32"/><file name="Config.php" hash="2e9023fcbab484d03936394934f44f13"/><dir name="Config"><dir name="expectations"><file name="testCodistoCoreConfig.yaml" hash="4a4e07f62981139ff6eb8a63420cbf0d"/></dir></dir></dir><dir name="Controllers"><file name="CodistoController.php" hash="a2be4faeac73ff1847c0d7dc4fbdc0e0"/><file name="IndexController.php" hash="f7252fae8d2f7b67397ae56524db49d1"/><file name="SyncController.php" hash="33436e4935631488073765d723a82ff7"/></dir><dir name="Controller"><file name="Router.php" hash="8afc0dca269dd0977ff6b3ac6802d0ee"/></dir><dir name="Model"><file name="Paymentmethod.php" hash="862365909073ffbba057f6f152933826"/><file name="Sync.php" hash="10a38bbb62260208a8b1529e762b7b75"/></dir></dir><dir name="sql"><dir name="codisto_setup"><file name="mysql4-install-1.90.5.php" hash="6d07d4e22ae5d907df1f4389c3a829d4"/></dir></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.90.5.php" hash="a42cf5f15b68ac92d4c207bed8472c7d"/></dir></dir><dir name="Block"><file name="PaymentInfo.php" hash="7aa15fed37766d20d9d5a7d707aff80d"/></dir><dir name="Ebaypayment"><dir name="Model"><file name="Paymentmethod.php" hash="480787461a5b952a739f20a752bffb5d"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="4ef592c4047f610b6943758fa4fd43a6"/><file name="config.xml" hash="21762856ee3cb080d3185d21393815bb"/></dir><dir name="Model"><file name="Observer.php" hash="8b309ae85f2bf696e97ff6777c1d64f2"/><file name="Sync.php" hash="3aae1f063d1c8be658a798828b8d20bc"/><dir name="Indexer"><file name="Ebay.php" hash="556b1aabc7c3202f31a2e6c250e7d590"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="6a6664ea18d93bcdd0f45530caa56244"/></dir></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Codisto_Sync.xml" hash="a791bc2a9302d085eb29edf77421f525"/></dir></dir></dir></target></contents></package>