Version Notes
1.5.3.7
Install minigrid supports Magento super attributes for enhanced reporting formats such as Style/Colour/Size.
1.5.3.6
Remove slashes from api header for sites that have magic quotes enabled.
1.5.3.2
Not for general release - dbg authorisation issues
1.5.3.1
test_products:v1.0.2 - Fix for sites with large number of product records duplicate updated_at values.
test_products:v1.0.1 - return super attrs for config products.
1.5.2.9
customers:v1.0.0 - Add ship and bill address.
products:v1.0.0 - Add stock_backorders status
1.5.2.8
Non critical update to product support.
1.5.2.7
Gift card info for EE customers.
Additional stock info for products.
Slight speed improvement for all customers.
1.5.2.4
Non critical update to anytables added created query option.
1.5.2.4
Non critical update to anytables support.
1.5.2.2
Update to ordersAction - don't return shipping_label info as very large and not needed.
Also new Actions to support custom tables
1.5.2.0
Fix warning notice of Undefined variable: TEMANDO_FLAG. No change to functionality
1.5.1.9
Removed shipping label (data) from test_orders shippments.
1.5.1.8
test_orders promoted to live.
shipment and temando support now available
1.5.1.7
uncoverted_carts upgrade
test_orders shipment and temando support
1.5.1.6
Testing direct SQL test_unconvertedcarts for BNKR
1.5.1.5
Skipping carts with customer_id = 0 for BNKR
1.5.1.4
Fixed problem with empty unconvertedcarts
1.5.1.3
test_unconvertedcartsAction.
1.5.1.2
Avoid exception if unconvertedcarts product type
fails.
1.5.1.1
Check if Mage::getEdition(); exists before calling.
1.5.1.0
Updates to visits API
1.5.0.6
Updates to visits API
1.5.0.5
New
creditsAction
credit_idsAction
1.5.0.4
Added item id to wishlist items
1.5.0.3
Diagnostic routine for unconverted carts
1.5.0.2
Maintenance release.
1.5.0.0
OrdersNoPaymentAction for sites with non standard payment methods.
1.4.9
Exception handle for payment method.
Updated wishlistsAction
New product_IdsAction
New customer_IdsAction
New order_IdsAction
unconvertedcarts fix for Magento < 1.7
1.4.7
Support for multiple web sites on single Magento instance.
1.4.6
Test actions for multi web site catalog.
1.4.5
Diagnostic: gte - ordered by entity_id
1.4.4
Faster unconvertedcarts.
CustomerTaxClass added to orders and customer Actions
1.4.3
New attrInfoAction and entityTypeInfoAction added to tracked changes in Magento data.
1.4.2
Disconnect API version from module version for sites that cache module XML file
1.4.1
Improved order processing speed.
Multi store URL info.
Shipping address tracked.
gte option for orders,customers, products, carts and subscribers.
Status option for subscribersAction
Update carts action skip non identifed carts.
1.4.0
Split stats action into
stats and logstats
Updated customersAction to return custom attributes.
1.3.9
Added eavinfo_catalogAction
Products action now retuns full url of product images.
testing new testcustomerAction
1.3.8
Changed table exists function
mocoauto_api_error - API errors prefix
1.3.7
Added non sensitive payment info to orderAction
1.3.5
Faster uncovertedcarts
1.3.4
log_all_joined
1.3.3
Added rulesAction - for details on coupon and shopping carts rule.
1.3.2
Exception handles for uncoverted carts.
Changed catalogue tax rate processing.
1.3.1
Added graceful exception handling for installations that have misconfigured product attributes
1.3.0
Check direct SQL methods defined
exproducts
exstats
report version of php
1.2.9
Default tax rate fro products returned with producAction
1.2.8
storesAction now returns store config data
1.2.7
log stats function calculates using direct SQL
1.2.6
StatsAction now returns size of log files
1.2.5
Speed up stocklevelAction, now only returns non zero inventory
WishlistAction now includes wishListItemId
1.2.4
Added wishlistsAction
Added unconvertedcartsAction
Fix - log actions now check if table exists
1.2.3
Fix to Observer.php
1.2.2
Added subscribersAction
Added storesAction
1.2.1
ordersAction - now uses billing address as some products (Virtual) won't have a delivery address and checks that object exists
1.2.0
ordersAction - added shpping address
productsAction - added end of record marker
stocklevelsAction - New
Added log_ actions
1.1.7
Added malformed error
Returns API version number with failed calls
1.1.6
Changed API header name to work with sites that use additional authorisation now:
mocoapi: apikey= THE API KEY
1.1.5
Updated stats API now includes:
Version of magento
System date/time
added success true for succesful requests
changed product category to moco_category
Download this release
Release Info
| Developer | Rob Davies |
| Extension | MocoInsight_Mocoauto |
| Version | 1.5.3.7 |
| Comparing to | |
| See all releases | |
Code changes from version 1.5.3.0 to 1.5.3.7
app/code/community/MocoInsight/Mocoauto/controllers/ApiController.php
CHANGED
|
@@ -38,22 +38,18 @@
|
|
| 38 |
// list_modulesAction
|
| 39 |
// giftcardsAction
|
| 40 |
|
| 41 |
-
|
|
|
|
| 42 |
|
| 43 |
class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Action
|
| 44 |
{
|
| 45 |
|
| 46 |
public function _authorise()
|
| 47 |
{
|
| 48 |
-
$tokenString = $this->getRequest()->getHeader('mocoapi');
|
| 49 |
-
|
| 50 |
-
$token =
|
| 51 |
-
$
|
| 52 |
-
if(preg_match('/apikey="([a-z0-9]+)"/', $tokenString, $matches)) {
|
| 53 |
-
$token = $matches[1];
|
| 54 |
-
}
|
| 55 |
-
|
| 56 |
-
$apiToken = Mage::helper('mocoauto')->getApiToken(false);
|
| 57 |
|
| 58 |
// Check API enabled
|
| 59 |
|
|
@@ -68,11 +64,16 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 68 |
// Check the token passed in the header
|
| 69 |
if(!$token || $token != $apiToken) {
|
| 70 |
$this->getResponse()
|
| 71 |
-
->setBody(json_encode(array('success' => false,
|
|
|
|
|
|
|
|
|
|
|
|
|
| 72 |
->setHttpResponseCode(401)
|
| 73 |
->setHeader('Content-type', 'application/json', true);
|
| 74 |
return false;
|
| 75 |
}
|
|
|
|
| 76 |
|
| 77 |
|
| 78 |
// Check the URL doesnt have anything apended to it
|
|
@@ -88,6 +89,59 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 88 |
return true;
|
| 89 |
}
|
| 90 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 91 |
|
| 92 |
|
| 93 |
////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
@@ -707,7 +761,8 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 707 |
public function test_ordersAction()
|
| 708 |
{
|
| 709 |
//$MocoApiEpVer = '1.0.0'; // First version with version returned. limit to 512 bytes
|
| 710 |
-
|
|
|
|
| 711 |
if(!$this->_authorise()) {
|
| 712 |
return $this;
|
| 713 |
}
|
|
@@ -731,7 +786,7 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 731 |
$_orderCol->getSelect()->limit($page_size, ($offset * $page_size))->order('entity_id');
|
| 732 |
}
|
| 733 |
else{
|
| 734 |
-
$_orderCol->getSelect()->limit($page_size, ($offset * $page_size))->order('updated_at');
|
| 735 |
}
|
| 736 |
|
| 737 |
//Mage::log('SQL Query: '.$_orderCol->getSelect());
|
|
@@ -931,9 +986,11 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 931 |
return $this;
|
| 932 |
}
|
| 933 |
|
| 934 |
-
public function
|
| 935 |
{
|
| 936 |
-
|
|
|
|
|
|
|
| 937 |
|
| 938 |
if(!$this->_authorise()) {
|
| 939 |
return $this;
|
|
@@ -957,14 +1014,12 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 957 |
$_customerCol->getSelect()->limit($page_size, ($offset * $page_size))->order('entity_id');
|
| 958 |
}
|
| 959 |
else{
|
| 960 |
-
$_customerCol->getSelect()->limit($page_size, ($offset * $page_size))->order('updated_at');
|
| 961 |
}
|
| 962 |
|
| 963 |
$customers = array();
|
| 964 |
$customers[] = array('mocoauto_api_end_point_version' => $MocoApiEpVer);
|
| 965 |
|
| 966 |
-
|
| 967 |
-
|
| 968 |
foreach($_customerCol as $_customer) {
|
| 969 |
|
| 970 |
$attributes = $_customer->getAttributes();
|
|
@@ -998,7 +1053,7 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 998 |
$taxClassId = $_customer->getTaxClassId();
|
| 999 |
$taxClass = Mage::getModel('tax/class')->load($taxClassId);
|
| 1000 |
$customer['moco_customer_tax_class'] = $taxClass->getClassName();
|
| 1001 |
-
|
| 1002 |
if(is_object($_customer->getPrimaryBillingAddress())){
|
| 1003 |
$_billing_address = $_customer->getPrimaryBillingAddress();
|
| 1004 |
$billaddrdetails = array();
|
|
@@ -1023,9 +1078,10 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 1023 |
return $this;
|
| 1024 |
}
|
| 1025 |
|
| 1026 |
-
|
| 1027 |
-
public function ex_customersAction()
|
| 1028 |
{
|
|
|
|
|
|
|
| 1029 |
if(!$this->_authorise()) {
|
| 1030 |
return $this;
|
| 1031 |
}
|
|
@@ -1052,6 +1108,9 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 1052 |
}
|
| 1053 |
|
| 1054 |
$customers = array();
|
|
|
|
|
|
|
|
|
|
| 1055 |
|
| 1056 |
foreach($_customerCol as $_customer) {
|
| 1057 |
|
|
@@ -1083,12 +1142,25 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 1083 |
}
|
| 1084 |
}
|
| 1085 |
|
| 1086 |
-
|
| 1087 |
-
|
| 1088 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1089 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1090 |
|
| 1091 |
-
|
| 1092 |
}
|
| 1093 |
|
| 1094 |
$this->getResponse()
|
|
@@ -1098,6 +1170,7 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 1098 |
return $this;
|
| 1099 |
}
|
| 1100 |
|
|
|
|
| 1101 |
public function categoriesAction()
|
| 1102 |
{
|
| 1103 |
if(!$this->_authorise()) {
|
|
@@ -1156,7 +1229,7 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 1156 |
}
|
| 1157 |
|
| 1158 |
|
| 1159 |
-
public function
|
| 1160 |
{
|
| 1161 |
$MocoApiEpVer = '1.0.0'; // First version with version returned.
|
| 1162 |
|
|
@@ -1307,10 +1380,12 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 1307 |
return $this;
|
| 1308 |
}
|
| 1309 |
|
| 1310 |
-
public function
|
| 1311 |
{
|
| 1312 |
// $MocoApiEpVer = '1.0.0'; // First version with version returned.
|
| 1313 |
-
|
|
|
|
|
|
|
| 1314 |
|
| 1315 |
if(!$this->_authorise()) {
|
| 1316 |
return $this;
|
|
@@ -1337,12 +1412,12 @@ class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Acti
|
|
| 1337 |
$_productCol->getSelect()->limit($page_size, ($offset * $page_size))->order('entity_id');
|
| 1338 |
}
|
| 1339 |
else{
|
| 1340 |
-
$_productCol->getSelect()->limit($page_size, ($offset * $page_size))->order('updated_at');
|
| 1341 |
}
|
| 1342 |
|
| 1343 |
$products = array();
|
| 1344 |
|
| 1345 |
-
//Mage::log((string) $_productCol->getSelect());
|
| 1346 |
|
| 1347 |
foreach($_productCol as $_product){
|
| 1348 |
$product = array();
|
| 38 |
// list_modulesAction
|
| 39 |
// giftcardsAction
|
| 40 |
|
| 41 |
+
|
| 42 |
+
define("apiversion","1.5.3.7");
|
| 43 |
|
| 44 |
class MocoInsight_Mocoauto_ApiController extends Mage_Core_Controller_Front_Action
|
| 45 |
{
|
| 46 |
|
| 47 |
public function _authorise()
|
| 48 |
{
|
| 49 |
+
$tokenString = $this->getRequest()->getHeader('mocoapi'); // Get the api string from header
|
| 50 |
+
$noSlashTokenStr = stripslashes($tokenString); // Strip slashes in case of magic quotes
|
| 51 |
+
$token = substr($noSlashTokenStr,8,32); // Cut apikey from header string
|
| 52 |
+
$apiToken = Mage::helper('mocoauto')->getApiToken(false); // Get apikey value from plugin settings
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 53 |
|
| 54 |
// Check API enabled
|
| 55 |
|
| 64 |
// Check the token passed in the header
|
| 65 |
if(!$token || $token != $apiToken) {
|
| 66 |
$this->getResponse()
|
| 67 |
+
->setBody(json_encode(array('success' => false,
|
| 68 |
+
'message' => 'Not authorised',
|
| 69 |
+
'MocoAPI version' => apiversion,
|
| 70 |
+
'key string' => $tokenString,
|
| 71 |
+
'key extracted' => $token)))
|
| 72 |
->setHttpResponseCode(401)
|
| 73 |
->setHeader('Content-type', 'application/json', true);
|
| 74 |
return false;
|
| 75 |
}
|
| 76 |
+
|
| 77 |
|
| 78 |
|
| 79 |
// Check the URL doesnt have anything apended to it
|
| 89 |
return true;
|
| 90 |
}
|
| 91 |
|
| 92 |
+
public function mocodebugAction()
|
| 93 |
+
{
|
| 94 |
+
|
| 95 |
+
$time_start = microtime(true);
|
| 96 |
+
|
| 97 |
+
$MocoApiEpVer = '1.0.0'; // First version with version returned.
|
| 98 |
+
|
| 99 |
+
$currentSystemTime = date('Y-m-d H:i:s', time());
|
| 100 |
+
$sections = explode('/', trim($this->getRequest()->getPathInfo(), '/'));
|
| 101 |
+
$since = $this->getRequest()->getParam('since','ALL');
|
| 102 |
+
Mage::app()->setCurrentStore(Mage_Core_Model_App::ADMIN_STORE_ID); // set to admin view all sites and stores
|
| 103 |
+
$magentoVersion = Mage::getVersion();
|
| 104 |
+
$moduleversion = (String)Mage::getConfig()->getNode()->modules->MocoInsight_Mocoauto->version;
|
| 105 |
+
$phpversion = phpversion();
|
| 106 |
+
|
| 107 |
+
if(method_exists('Mage', 'getEdition')){
|
| 108 |
+
$magentoedition = (String)Mage::getEdition();
|
| 109 |
+
}
|
| 110 |
+
else{
|
| 111 |
+
$magentoedition = 'method Mage::getEdition() unavailable';
|
| 112 |
+
}
|
| 113 |
+
|
| 114 |
+
$paramsArray = $this->getRequest()->getParams();
|
| 115 |
+
$headersArray = getAllHeaders();
|
| 116 |
+
$keyByZend = $this->getRequest()->getHeader('mocoapi');
|
| 117 |
+
$keyByPhp = $_SERVER['HTTPS_MOCOAPI'];
|
| 118 |
+
if(!$keyByPhp){
|
| 119 |
+
$keyByPhp = $_SERVER['HTTP_MOCOAPI'];
|
| 120 |
+
}
|
| 121 |
+
|
| 122 |
+
$resultArray = array(
|
| 123 |
+
|
| 124 |
+
'mocoauto_api_end_point_version' => $MocoApiEpVer,
|
| 125 |
+
'System Date Time' => $currentSystemTime,
|
| 126 |
+
'Magento Version' => $magentoVersion,
|
| 127 |
+
'Magento Edition' => $magentoedition,
|
| 128 |
+
'MocoAPI Version' => apiversion,
|
| 129 |
+
'Module Version' => $moduleversion,
|
| 130 |
+
'PHP Version' => $phpversion,
|
| 131 |
+
'API processing time' => (microtime(true) - $time_start),
|
| 132 |
+
'key sent (Zend method)' => $keyByZend,
|
| 133 |
+
'key sent (PHP method)' => $keyByPhp
|
| 134 |
+
);
|
| 135 |
+
|
| 136 |
+
$resultArray['Request params'] = $paramsArray;
|
| 137 |
+
$resultArray['Request headers'] = $headersArray;
|
| 138 |
+
|
| 139 |
+
$this->getResponse()
|
| 140 |
+
->setBody(json_encode($resultArray))
|
| 141 |
+
->setHttpResponseCode(200)
|
| 142 |
+
->setHeader('Content-type', 'application/json', true);
|
| 143 |
+
return $this;
|
| 144 |
+
}
|
| 145 |
|
| 146 |
|
| 147 |
////////////////////////////////////////////////////////////////////////////////////////////////////////
|
| 761 |
public function test_ordersAction()
|
| 762 |
{
|
| 763 |
//$MocoApiEpVer = '1.0.0'; // First version with version returned. limit to 512 bytes
|
| 764 |
+
//$MocoApiEpVer = '1.0.1'; //Return product options.
|
| 765 |
+
$MocoApiEpVer = '1.0.2'; // order by entity_id and updated_at
|
| 766 |
if(!$this->_authorise()) {
|
| 767 |
return $this;
|
| 768 |
}
|
| 786 |
$_orderCol->getSelect()->limit($page_size, ($offset * $page_size))->order('entity_id');
|
| 787 |
}
|
| 788 |
else{
|
| 789 |
+
$_orderCol->getSelect()->limit($page_size, ($offset * $page_size))->order('updated_at')->order('entity_id');
|
| 790 |
}
|
| 791 |
|
| 792 |
//Mage::log('SQL Query: '.$_orderCol->getSelect());
|
| 986 |
return $this;
|
| 987 |
}
|
| 988 |
|
| 989 |
+
public function test_customersAction()
|
| 990 |
{
|
| 991 |
+
//$MocoApiEpVer = '1.0.0'; // Include customer default billing and delivery address.
|
| 992 |
+
$MocoApiEpVer = '1.0.1'; // Include customer default billing and delivery address.
|
| 993 |
+
|
| 994 |
|
| 995 |
if(!$this->_authorise()) {
|
| 996 |
return $this;
|
| 1014 |
$_customerCol->getSelect()->limit($page_size, ($offset * $page_size))->order('entity_id');
|
| 1015 |
}
|
| 1016 |
else{
|
| 1017 |
+
$_customerCol->getSelect()->limit($page_size, ($offset * $page_size))->order('updated_at')->order('entity_id');
|
| 1018 |
}
|
| 1019 |
|
| 1020 |
$customers = array();
|
| 1021 |
$customers[] = array('mocoauto_api_end_point_version' => $MocoApiEpVer);
|
| 1022 |
|
|
|
|
|
|
|
| 1023 |
foreach($_customerCol as $_customer) {
|
| 1024 |
|
| 1025 |
$attributes = $_customer->getAttributes();
|
| 1053 |
$taxClassId = $_customer->getTaxClassId();
|
| 1054 |
$taxClass = Mage::getModel('tax/class')->load($taxClassId);
|
| 1055 |
$customer['moco_customer_tax_class'] = $taxClass->getClassName();
|
| 1056 |
+
|
| 1057 |
if(is_object($_customer->getPrimaryBillingAddress())){
|
| 1058 |
$_billing_address = $_customer->getPrimaryBillingAddress();
|
| 1059 |
$billaddrdetails = array();
|
| 1078 |
return $this;
|
| 1079 |
}
|
| 1080 |
|
| 1081 |
+
public function customersAction()
|
|
|
|
| 1082 |
{
|
| 1083 |
+
$MocoApiEpVer = '1.0.0'; // Include customer default billing and delivery address.
|
| 1084 |
+
|
| 1085 |
if(!$this->_authorise()) {
|
| 1086 |
return $this;
|
| 1087 |
}
|
| 1108 |
}
|
| 1109 |
|
| 1110 |
$customers = array();
|
| 1111 |
+
$customers[] = array('mocoauto_api_end_point_version' => $MocoApiEpVer);
|
| 1112 |
+
|
| 1113 |
+
|
| 1114 |
|
| 1115 |
foreach($_customerCol as $_customer) {
|
| 1116 |
|
| 1142 |
}
|
| 1143 |
}
|
| 1144 |
|
| 1145 |
+
$taxClassId = $_customer->getTaxClassId();
|
| 1146 |
+
$taxClass = Mage::getModel('tax/class')->load($taxClassId);
|
| 1147 |
+
$customer['moco_customer_tax_class'] = $taxClass->getClassName();
|
| 1148 |
+
|
| 1149 |
+
if(is_object($_customer->getPrimaryBillingAddress())){
|
| 1150 |
+
$_billing_address = $_customer->getPrimaryBillingAddress();
|
| 1151 |
+
$billaddrdetails = array();
|
| 1152 |
+
$billaddrdetails[] = $_billing_address->toArray();
|
| 1153 |
+
$customer['moco_bill_address'] = $billaddrdetails;
|
| 1154 |
+
}
|
| 1155 |
|
| 1156 |
+
if(is_object($_customer->getPrimaryShippingAddress())){
|
| 1157 |
+
$_shipping_address = $_customer->getPrimaryShippingAddress();
|
| 1158 |
+
$shipaddrdetails = array();
|
| 1159 |
+
$shipaddrdetails[] = $_shipping_address->toArray();
|
| 1160 |
+
$customer['moco_ship_address'] = $shipaddrdetails;
|
| 1161 |
+
}
|
| 1162 |
|
| 1163 |
+
$customers[] = $customer;
|
| 1164 |
}
|
| 1165 |
|
| 1166 |
$this->getResponse()
|
| 1170 |
return $this;
|
| 1171 |
}
|
| 1172 |
|
| 1173 |
+
|
| 1174 |
public function categoriesAction()
|
| 1175 |
{
|
| 1176 |
if(!$this->_authorise()) {
|
| 1229 |
}
|
| 1230 |
|
| 1231 |
|
| 1232 |
+
public function ex_productsAction()
|
| 1233 |
{
|
| 1234 |
$MocoApiEpVer = '1.0.0'; // First version with version returned.
|
| 1235 |
|
| 1380 |
return $this;
|
| 1381 |
}
|
| 1382 |
|
| 1383 |
+
public function productsAction()
|
| 1384 |
{
|
| 1385 |
// $MocoApiEpVer = '1.0.0'; // First version with version returned.
|
| 1386 |
+
// $MocoApiEpVer = '1.0.1'; // Return super attributes for configurable products.
|
| 1387 |
+
$MocoApiEpVer = '1.0.2'; // Sort product collection on updated_at and entity_id.
|
| 1388 |
+
|
| 1389 |
|
| 1390 |
if(!$this->_authorise()) {
|
| 1391 |
return $this;
|
| 1412 |
$_productCol->getSelect()->limit($page_size, ($offset * $page_size))->order('entity_id');
|
| 1413 |
}
|
| 1414 |
else{
|
| 1415 |
+
$_productCol->getSelect()->limit($page_size, ($offset * $page_size))->order('updated_at')->order('entity_id');
|
| 1416 |
}
|
| 1417 |
|
| 1418 |
$products = array();
|
| 1419 |
|
| 1420 |
+
// Mage::log((string) $_productCol->getSelect()); //log query
|
| 1421 |
|
| 1422 |
foreach($_productCol as $_product){
|
| 1423 |
$product = array();
|
app/code/community/MocoInsight/Mocoauto/etc/config.xml
CHANGED
|
@@ -4,7 +4,7 @@
|
|
| 4 |
<config>
|
| 5 |
<modules>
|
| 6 |
<MocoInsight_Mocoauto>
|
| 7 |
-
<version>1.5.3.
|
| 8 |
</MocoInsight_Mocoauto>
|
| 9 |
</modules>
|
| 10 |
<global>
|
| 4 |
<config>
|
| 5 |
<modules>
|
| 6 |
<MocoInsight_Mocoauto>
|
| 7 |
+
<version>1.5.3.7</version>
|
| 8 |
</MocoInsight_Mocoauto>
|
| 9 |
</modules>
|
| 10 |
<global>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>MocoInsight_Mocoauto</name>
|
| 4 |
-
<version>1.5.3.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>OSL v1.0.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -11,7 +11,23 @@
|
|
| 11 |

|
| 12 |

|
| 13 |
</description>
|
| 14 |
-
<notes>1.5.3.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 15 |

|
| 16 |
test_products:v1.0.1 - return super attrs for config products.
|
| 17 |

|
|
@@ -289,9 +305,9 @@ System date/time
|
|
| 289 |
added success true for succesful requests
|
| 290 |
changed product category to moco_category</notes>
|
| 291 |
<authors><author><name>Rob Davies</name><user>mocoinsight</user><email>rob.davies@mocoinsight.com</email></author></authors>
|
| 292 |
-
<date>2016-
|
| 293 |
-
<time>
|
| 294 |
-
<contents><target name="magecommunity"><dir name="MocoInsight"><dir name="Mocoauto"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Buttons"><file name="Generate.php" hash="7690d026d99e31732279e6aa5b6b1def"/></dir></dir><file name="Menu.php" hash="1017af5f89545915f3f28be637e07a0c"/></dir></dir><dir name="Helper"><file name="Data.php" hash="4b53061397fec9446830ef218aba4055"/><file name="JWT.php" hash="6610b92191eccedb8edcf993730c3dc0"/></dir><dir name="Model"><file name="Observer.php" hash="c2cc2f396fedd682268457d17dd045b1"/><dir name="Source"><file name="Views.php" hash="c1ddaf4c7bb51c3907dd72b4e21b1897"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="MocoautoController.php" hash="6665fb22806ef20ee59e88a638ca6359"/></dir><file name="Api2OrdersController.php" hash="b9fa4922f70212b8b0fbf5ccc12a3e5b"/><file name="ApiController.php" hash="
|
| 295 |
<compatible/>
|
| 296 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 297 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>MocoInsight_Mocoauto</name>
|
| 4 |
+
<version>1.5.3.7</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>OSL v1.0.0</license>
|
| 7 |
<channel>community</channel>
|
| 11 |

|
| 12 |

|
| 13 |
</description>
|
| 14 |
+
<notes>1.5.3.7
|
| 15 |
+

|
| 16 |
+
Install minigrid supports Magento super attributes for enhanced reporting formats such as Style/Colour/Size.
|
| 17 |
+

|
| 18 |
+

|
| 19 |
+
1.5.3.6
|
| 20 |
+

|
| 21 |
+
Remove slashes from api header for sites that have magic quotes enabled.
|
| 22 |
+

|
| 23 |
+

|
| 24 |
+
1.5.3.2
|
| 25 |
+

|
| 26 |
+
Not for general release - dbg authorisation issues
|
| 27 |
+

|
| 28 |
+
1.5.3.1
|
| 29 |
+

|
| 30 |
+
test_products:v1.0.2 - Fix for sites with large number of product records duplicate updated_at values.
|
| 31 |

|
| 32 |
test_products:v1.0.1 - return super attrs for config products.
|
| 33 |

|
| 305 |
added success true for succesful requests
|
| 306 |
changed product category to moco_category</notes>
|
| 307 |
<authors><author><name>Rob Davies</name><user>mocoinsight</user><email>rob.davies@mocoinsight.com</email></author></authors>
|
| 308 |
+
<date>2016-06-17</date>
|
| 309 |
+
<time>01:11:20</time>
|
| 310 |
+
<contents><target name="magecommunity"><dir name="MocoInsight"><dir name="Mocoauto"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Buttons"><file name="Generate.php" hash="7690d026d99e31732279e6aa5b6b1def"/></dir></dir><file name="Menu.php" hash="1017af5f89545915f3f28be637e07a0c"/></dir></dir><dir name="Helper"><file name="Data.php" hash="4b53061397fec9446830ef218aba4055"/><file name="JWT.php" hash="6610b92191eccedb8edcf993730c3dc0"/></dir><dir name="Model"><file name="Observer.php" hash="c2cc2f396fedd682268457d17dd045b1"/><dir name="Source"><file name="Views.php" hash="c1ddaf4c7bb51c3907dd72b4e21b1897"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="MocoautoController.php" hash="6665fb22806ef20ee59e88a638ca6359"/></dir><file name="Api2OrdersController.php" hash="b9fa4922f70212b8b0fbf5ccc12a3e5b"/><file name="ApiController.php" hash="c7d9a8ac3cd36aebe86f1c072ab7c22b"/></dir><dir name="etc"><file name="config.xml" hash="abe370cab1c68d2d7518e54751d3c26b"/><file name="orig.config.xml" hash="863bd2bdfefde5ef9f6c9b30691f4bb4"/><file name="system.xml" hash="5d86b7d939b85826c7ac4d4496f80900"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="mocoauto.xml" hash="7dd142354c78e773490c552bbcc3b408"/></dir><dir name="template"><dir name="mocoauto"><dir name="config"><file name="button-generate.phtml" hash="d2ff89c8f1f78e748ac998bd13e61750"/><file name="link.phtml" hash="75c61cac6bdd33ed914f8618b5698598"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="mocoauto.xml" hash="a12a0e1dc675b9ac675181373299e36a"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="MocoInsight_Mocoauto.xml" hash="1ec387f21726f6c7ea3ea216c47340d9"/></dir></target><target name="magelocale"><dir name="en_US"><file name="MocoInsight_Mocoauto.csv" hash="9b508561f871f93fa3158014baebf02b"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="mocoauto"><file name="button.png" hash="58e62edb7f4be46e3b29c0bb774c7ad7"/><file name="icon.png" hash="b5bfce535c987d1e9e604823ac4b3943"/><file name="mocoauto.css" hash="3cd28072e5c2f2b656dd04c06288165b"/></dir></dir></dir></dir></target></contents>
|
| 311 |
<compatible/>
|
| 312 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 313 |
</package>
|
