Version Notes
Works with the latest version of Freestyle
Download this release
Release Info
Developer | John Canare |
Extension | FreestyleMagento |
Version | 1.4.2 |
Comparing to | |
See all releases |
Code changes from version 1.4.1 to 1.4.2
app/code/community/Freestyle/Advancedexport/Model/Exportmodels/Product.php
CHANGED
@@ -241,32 +241,6 @@ extends Mage_Catalog_Model_Product_Api
|
|
241 |
{
|
242 |
return (bool) count(array_filter(array_keys($array), 'is_string'));
|
243 |
}
|
244 |
-
private function serializeArray($attributeCode, $attributeData) {
|
245 |
-
if ($attributeCode == 'group_price' || $attributeCode == 'tier_price') {
|
246 |
-
return $attributeData;
|
247 |
-
}
|
248 |
-
if (is_array($attributeData) && !$this->is_assoc($attributeData)) {
|
249 |
-
//return json_encode($attributeData,JSON_FORCE_OBJECT); //serialize the data
|
250 |
-
$returnJson = '';
|
251 |
-
try {
|
252 |
-
$returnJson = json_encode($attributeData, JSON_FORCE_OBJECT); //serialize the data
|
253 |
-
} catch (Exception $ex) {
|
254 |
-
Mage::log('[EXCEPTION] - Error Serializing: ' . serialize($attributeCode) . "; " . serialize($attributeData) . "; Product Id: " . (string) $this->productId, 1, 'freestyle.log');
|
255 |
-
if (version_compare(phpversion(), '5.3.0', '>='))
|
256 |
-
Mage::log('JSON ERROR = ' . json_last_error(), 1, 'freestyle.log');
|
257 |
-
Mage::log('Message: ' . $ex->getMessage() . ' In: ' . $ex->getFile() . '::' . $ex->getLine());
|
258 |
-
$returnJson = serialize($attributeData);
|
259 |
-
}
|
260 |
-
return $returnJson;
|
261 |
-
}
|
262 |
-
else {
|
263 |
-
return $attributeData;
|
264 |
-
}
|
265 |
-
}
|
266 |
-
|
267 |
-
private function is_assoc($array) {
|
268 |
-
return (bool) count(array_filter(array_keys($array), 'is_string'));
|
269 |
-
}
|
270 |
|
271 |
private function jsonizeOption($option)
|
272 |
{
|
241 |
{
|
242 |
return (bool) count(array_filter(array_keys($array), 'is_string'));
|
243 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
244 |
|
245 |
private function jsonizeOption($option)
|
246 |
{
|
app/code/community/Freestyle/Advancedexport/etc/config.xml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
<config>
|
14 |
<modules>
|
15 |
<Freestyle_Advancedexport>
|
16 |
-
<version>1.4.
|
17 |
</Freestyle_Advancedexport>
|
18 |
</modules>
|
19 |
<adminhtml>
|
13 |
<config>
|
14 |
<modules>
|
15 |
<Freestyle_Advancedexport>
|
16 |
+
<version>1.4.2</version>
|
17 |
</Freestyle_Advancedexport>
|
18 |
</modules>
|
19 |
<adminhtml>
|
app/code/community/Freestyle/Advancedexport/sql/advancedexport_setup/mysql4-upgrade-1.4.1-1.4.2.php
ADDED
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
// app/code/community/Freestyle/AdvancedExport/
|
4 |
+
// sql/advancedexport_setup/mysql4-1.4.1-1.4.2.php
|
5 |
+
|
6 |
+
/* @var $installer Mage_Core_Model_Resource_Setup */
|
7 |
+
|
8 |
+
$installer = $this;
|
9 |
+
$installer->startSetup();
|
10 |
+
// get the version of magento!
|
11 |
+
$mageVersion = Mage::getVersion();
|
12 |
+
//$mageEdition = strtoupper(Mage::getEdition());
|
13 |
+
$enterpriseFolder = Mage::getBaseDir('code') . DS . 'core' . DS . 'Enterprise';
|
14 |
+
$mageEdition = is_dir($enterpriseFolder) ? "ENTERPRISE" : "COMMUNITY";
|
15 |
+
|
16 |
+
if ($mageEdition == 'ENTERPRISE') {
|
17 |
+
$runPureSQL = version_compare($mageVersion, '1.12.0.0') <= 0;
|
18 |
+
} else {
|
19 |
+
//we are assuming if you are not enterprise, you are community
|
20 |
+
$runPureSQL = version_compare($mageVersion, '1.7.0.0') <= 0;
|
21 |
+
}
|
22 |
+
|
23 |
+
if ($runPureSQL) {
|
24 |
+
//$installer->run("");
|
25 |
+
} else {
|
26 |
+
//
|
27 |
+
}
|
28 |
+
|
29 |
+
$installer->endSetup();
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>FreestyleMagento</name>
|
4 |
-
<version>1.4.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.freestylesolutions.com/freestyle-commerce-subscription-agreement/">Custom License</license>
|
7 |
<channel>community</channel>
|
@@ -10,9 +10,9 @@
|
|
10 |
<description>This extension provides Magento admin console users with an "Export" option. This "Export" provides functionality to export magento data for use with Freestyle. The Freestyle Advancedexport is a free must have extension for anyone working with Magento and Freestyle.</description>
|
11 |
<notes>Works with the latest version of Freestyle</notes>
|
12 |
<authors><author><name>John Canare</name><user>dydacompdev</user><email>developer@freestylesolutions.com</email></author></authors>
|
13 |
-
<date>2015-04-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="Freestyle"><dir name="Advancedexport"><dir name="Block"><dir name="Adminhtml"><file name="Builddate.php" hash="08fe361315b777171321e494df803646"/><dir name="Form"><dir name="Edit"><file name="Form.php" hash="9cc7a746c077d5a88ac42eceebd197fd"/><dir name="Tab"><file name="ErrorsRender.php" hash="9aca6f070a45568a44e202ca619e0545"/><file name="FilesPassiveRender.php" hash="0e1e4de430f10d39d9dd8b9a49f5d230"/><file name="FilesRender.php" hash="e20979544a71a470e56968aa1170e731"/><file name="General.php" hash="a22d667813b2f5b91e958d5c2691aed3"/><file name="History.php" hash="c79666fb367cc6dce2fcf5acbafdaf07"/><file name="Passive.php" hash="a5f43e27f524e0cb0d0e5d5046916785"/><file name="Queue.php" hash="3279d2091fe5789ec5fafb56636cec0d"/><file name="UpdatetimeRender.php" hash="1db35a2341ec67b25ef46a44c107a976"/></dir><file name="Tabs.php" hash="56c664cae93e4dd71d9088eeb8cef45a"/></dir><file name="Edit.php" hash="01cc3dbcd81be4e8deb9e6127e853352"/></dir><file name="Notes.php" hash="d31a63fa2f1b513cc1c980eec056eea7"/><dir name="System"><dir name="Config"><file name="Date.php" hash="5a7b7ff9c41823f29caf0498c17ebaab"/><dir name="Form"><file name="Button.php" hash="a5c5a0dde09fdfafcb063ba6fd13da0e"/></dir></dir></dir><file name="Version.php" hash="bb077e744dee4bd6aaeea8e92784b972"/></dir></dir><dir name="Helper"><file name="Curl.php" hash="bad253fc991a51f61a17c11399eb3132"/><file name="Data.php" hash="c97f0a8842dc12c7f9bd7ee69d0f37e7"/><file name="Debug.php" hash="5852c513eef856241cabbc7d0a8f433c"/><file name="NotificationSender.php" hash="d3eb0df7b68f3c56f5a4d768d8d5faac"/><file name="Queue.php" hash="5ce841c8a59a74131c61d5d259f6a6d0"/><file name="Website.php" hash="1b2705c545143bcdd2742dfcab96d78f"/></dir><dir name="Model"><file name="Api.php" hash="7ffcba98b3947af9efe8d611996495a3"/><file name="Configuration.php" hash="e26bd7668dfc8dca06e41ead6477d7eb"/><file name="Cronjob.php" hash="dade2f3c1bb0bc4da8f5621fadb07f5e"/><dir name="Exportmodels"><file name="Abstract.php" hash="79088c0d0bdf3b6abd51a56bc9c6f1a4"/><file name="Category.php" hash="9380a71a03d697d6d16536040b274c98"/><file name="Customer.php" hash="3cb09a4a3792b4e1e8d2bdd92927101d"/><file name="Customergroup.php" hash="e428d491f5c5a7ebc5bd76f4765808d7"/><file name="Order.php" hash="78766d828920e24c65d4614be1c12857"/><file name="Product.php" hash="
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>FreestyleMagento</name>
|
4 |
+
<version>1.4.2</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.freestylesolutions.com/freestyle-commerce-subscription-agreement/">Custom License</license>
|
7 |
<channel>community</channel>
|
10 |
<description>This extension provides Magento admin console users with an "Export" option. This "Export" provides functionality to export magento data for use with Freestyle. The Freestyle Advancedexport is a free must have extension for anyone working with Magento and Freestyle.</description>
|
11 |
<notes>Works with the latest version of Freestyle</notes>
|
12 |
<authors><author><name>John Canare</name><user>dydacompdev</user><email>developer@freestylesolutions.com</email></author></authors>
|
13 |
+
<date>2015-04-09</date>
|
14 |
+
<time>22:22:13</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="Freestyle"><dir name="Advancedexport"><dir name="Block"><dir name="Adminhtml"><file name="Builddate.php" hash="08fe361315b777171321e494df803646"/><dir name="Form"><dir name="Edit"><file name="Form.php" hash="9cc7a746c077d5a88ac42eceebd197fd"/><dir name="Tab"><file name="ErrorsRender.php" hash="9aca6f070a45568a44e202ca619e0545"/><file name="FilesPassiveRender.php" hash="0e1e4de430f10d39d9dd8b9a49f5d230"/><file name="FilesRender.php" hash="e20979544a71a470e56968aa1170e731"/><file name="General.php" hash="a22d667813b2f5b91e958d5c2691aed3"/><file name="History.php" hash="c79666fb367cc6dce2fcf5acbafdaf07"/><file name="Passive.php" hash="a5f43e27f524e0cb0d0e5d5046916785"/><file name="Queue.php" hash="3279d2091fe5789ec5fafb56636cec0d"/><file name="UpdatetimeRender.php" hash="1db35a2341ec67b25ef46a44c107a976"/></dir><file name="Tabs.php" hash="56c664cae93e4dd71d9088eeb8cef45a"/></dir><file name="Edit.php" hash="01cc3dbcd81be4e8deb9e6127e853352"/></dir><file name="Notes.php" hash="d31a63fa2f1b513cc1c980eec056eea7"/><dir name="System"><dir name="Config"><file name="Date.php" hash="5a7b7ff9c41823f29caf0498c17ebaab"/><dir name="Form"><file name="Button.php" hash="a5c5a0dde09fdfafcb063ba6fd13da0e"/></dir></dir></dir><file name="Version.php" hash="bb077e744dee4bd6aaeea8e92784b972"/></dir></dir><dir name="Helper"><file name="Curl.php" hash="bad253fc991a51f61a17c11399eb3132"/><file name="Data.php" hash="c97f0a8842dc12c7f9bd7ee69d0f37e7"/><file name="Debug.php" hash="5852c513eef856241cabbc7d0a8f433c"/><file name="NotificationSender.php" hash="d3eb0df7b68f3c56f5a4d768d8d5faac"/><file name="Queue.php" hash="5ce841c8a59a74131c61d5d259f6a6d0"/><file name="Website.php" hash="1b2705c545143bcdd2742dfcab96d78f"/></dir><dir name="Model"><file name="Api.php" hash="7ffcba98b3947af9efe8d611996495a3"/><file name="Configuration.php" hash="e26bd7668dfc8dca06e41ead6477d7eb"/><file name="Cronjob.php" hash="dade2f3c1bb0bc4da8f5621fadb07f5e"/><dir name="Exportmodels"><file name="Abstract.php" hash="79088c0d0bdf3b6abd51a56bc9c6f1a4"/><file name="Category.php" hash="9380a71a03d697d6d16536040b274c98"/><file name="Customer.php" hash="3cb09a4a3792b4e1e8d2bdd92927101d"/><file name="Customergroup.php" hash="e428d491f5c5a7ebc5bd76f4765808d7"/><file name="Order.php" hash="78766d828920e24c65d4614be1c12857"/><file name="Product.php" hash="e4fede5607086920544fba4b1f5bdcdf"/><file name="SimpleXMLExtended.php" hash="638de7e3a590ebfce74c5dcbe965639b"/></dir><file name="History.php" hash="00bfb42bc1d8c86a73ec41a10191458a"/><dir name="Import"><dir name="Entity"><file name="Customer.php" hash="b2f1fecfbd39b2634cc389368ef66b44"/><file name="Product.php" hash="1b31624ba81415bd880bf6c3c84fc7a6"/></dir></dir><dir name="Invoice"><file name="Api.php" hash="e04e5f27e56d5297d0c29fed09f3a5e4"/></dir><dir name="Mysql4"><dir name="Configuration"><file name="Collection.php" hash="0d739ad41a263ae1e67d49f943e87b57"/></dir><file name="Configuration.php" hash="92123cbd5a308880bd8c4a6c50f4bc00"/><dir name="History"><file name="Collection.php" hash="4f6217bc233b24e981384e63971a7471"/></dir><file name="History.php" hash="d425f9f5629b6623a0c10bcde035b545"/><dir name="Passivemode"><file name="Collection.php" hash="aa1d0eb67df09498591dc94b9dd68f30"/></dir><file name="Passivemode.php" hash="8c25108d17cc79da64569065302d0201"/><dir name="Queue"><file name="Collection.php" hash="51324737e38ba8dd1b50df1b8b772efe"/></dir><file name="Queue.php" hash="0981b1549e662074af9f59e28b33ffbe"/></dir><file name="Observer.php" hash="11eb8fa7c2966cdd952d5613586e8b29"/><dir name="Order"><file name="Api.php" hash="b34edbf48ccd5e8daf3ea869fc5faa3e"/><file name="V2.php" hash="49ab537bb4ed23835be8e020842a6426"/></dir><file name="Order.php" hash="5459ba64c8b5852070b68fdfe6e57fff"/><file name="Passivemode.php" hash="393e60259d17746db9ceff819612a811"/><file name="Queue.php" hash="70e21b92dba661bf8769abf7a8e4335a"/><file name="Queuebatchsize.php" hash="2abd75111acb1de73b31aa8104f7ad45"/><file name="Resend.php" hash="4b0f8bfa0acda09a622a950340d94cc2"/><file name="Website.php" hash="b6bcad455b9ba66cb7cee7916e4c1b07"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="AdvancedexportController.php" hash="c78091ed1445cc483d867b9d14d6c84d"/></dir><file name="FrontprocessController.php" hash="b96fbb3430862dc189ad5652e3e64d41"/><file name="IndexController.php" hash="8a7dc0ba6b221b0d5bcc3bcf95faa6ea"/><file name="StatusController.php" hash="bda8819211353a91c201bdc5d697cd55"/><file name="WebsiteController.php" hash="a6ee710cd5183bd78af2cacaa73a571f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="51c36f27b0e2e269f2e5223858fd7bb9"/><file name="api.xml" hash="4a7d00fd45d48d13e95ceea0a4b1924c"/><file name="config.xml" hash="381f241ea206daab7608fa51a0c1a410"/><file name="system.xml" hash="58f32bd2c92efcdefa65dfe1f9b92aaf"/></dir><dir name="sql"><dir name="advancedexport_setup"><file name="mysql4-install-0.0.1.php" hash="c1096957085f9930a793b700077f5afd"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="64cf0247c1eab29330a2642b723ecac3"/><file name="mysql4-upgrade-1.2.1-1.2.2.php" hash="e9d7fc462268d3796e50296198fbda41"/><file name="mysql4-upgrade-1.2.11-1.3.0.php" hash="c48139c0b5c16cf89be3bdcea0868aa7"/><file name="mysql4-upgrade-1.2.2-1.2.3.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.2.3-1.2.4.php" hash="64861d8d3d5779c37efe582f4a8cb485"/><file name="mysql4-upgrade-1.2.4-1.2.6.php" hash="90b7737761f22bdf18b827e36a260206"/><file name="mysql4-upgrade-1.2.6-1.2.8.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.2.8-1.2.11.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.2.8-1.2.9.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.2.9-1.2.10.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.3.1-1.3.2.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.3.2-1.3.3.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.3.3-1.3.4.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.3.4-1.3.5.php" hash="2eb5732ba62e8a1bab990dd318e01a1b"/><file name="mysql4-upgrade-1.3.5-1.3.6.php" hash="2550819bb0fccb5e52f05e36f05ede3e"/><file name="mysql4-upgrade-1.3.6-1.3.7.php" hash="421e56d80e408afe96a04fef8705630f"/><file name="mysql4-upgrade-1.3.7-1.3.8.php" hash="8bdda723e5c1bbefafa4babcfdf98415"/><file name="mysql4-upgrade-1.3.8-1.4.0.php" hash="8bdda723e5c1bbefafa4babcfdf98415"/><file name="mysql4-upgrade-1.4.0-1.4.1.php" hash="8bdda723e5c1bbefafa4babcfdf98415"/><file name="mysql4-upgrade-1.4.1-1.4.2.php" hash="93593330c335ce8e0536aa6cd83a01ed"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Freestyle_Advancedexport.xml" hash="3b06a6c188d7f6f8e3f1a799fb85362d"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="advancedexport.xml" hash="06f702733cff6435493c2e72b10c517f"/></dir><dir name="template"><dir name="advancedexport"><file name="export_tab_content.phtml" hash="b244978529353044a292ecbe0a3db7d7"/><dir name="system"><dir name="config"><file name="button.phtml" hash="611fa4beb8d0986f28e0b72247bf36a0"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="advancedexport"><file name="wait.gif" hash="d7f40e28681760feec4d3be76cb29aa3"/></dir></dir><dir name="enterprise"><dir name="advancedexport"><file name="wait.gif" hash="d7f40e28681760feec4d3be76cb29aa3"/></dir></dir></dir></dir></target><target name="mage"><dir name="freestyleexport"><file name="delete.me" hash="d41d8cd98f00b204e9800998ecf8427e"/><dir name="tempFiles"><file name="delete.me" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><file name=".htaccess" hash="1b3ffe987853dfbcb25ae5220d37945b"/></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|