Version Notes
No comments
Download this release
Release Info
Developer | Remarkety |
Extension | Remarkety_Mgconnector |
Version | 1.4.8.7 |
Comparing to | |
See all releases |
Code changes from version 1.4.8.4 to 1.4.8.7
CHANGELOG.txt
CHANGED
@@ -1,3 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
1.4.8.4
|
2 |
-------
|
3 |
- Bugfix - Only get carts with email address
|
1 |
+
1.4.8.7
|
2 |
+
-------
|
3 |
+
- Bugfix - Support PHP version 5.3
|
4 |
+
|
5 |
+
1.4.8.6
|
6 |
+
-------
|
7 |
+
- Bugfix - Support PHP version 5.3
|
8 |
+
|
9 |
+
1.4.8.5
|
10 |
+
-------
|
11 |
+
- Bugfix - Error during cron product prices send has been fixed
|
12 |
+
|
13 |
1.4.8.4
|
14 |
-------
|
15 |
- Bugfix - Only get carts with email address
|
app/code/community/Remarkety/Mgconnector/Model/Core.php
CHANGED
@@ -745,7 +745,7 @@ class Remarkety_Mgconnector_Model_Core extends Mage_Core_Model_Abstract {
|
|
745 |
$quotesCollection->addFieldToFilter('items_count', array('neq' => '0'))
|
746 |
->addFieldToFilter('main_table.is_active', '1')
|
747 |
->addFieldToFilter('main_table.customer_email', array('notnull' => true))
|
748 |
-
->addSubtotal(
|
749 |
->setOrder('updated_at');
|
750 |
if (is_numeric($mage_store_view_id)) {
|
751 |
$quotesCollection->addFieldToFilter('store_id', array('eq' => $mage_store_view_id));
|
745 |
$quotesCollection->addFieldToFilter('items_count', array('neq' => '0'))
|
746 |
->addFieldToFilter('main_table.is_active', '1')
|
747 |
->addFieldToFilter('main_table.customer_email', array('notnull' => true))
|
748 |
+
->addSubtotal(array($mage_store_view_id), null)
|
749 |
->setOrder('updated_at');
|
750 |
if (is_numeric($mage_store_view_id)) {
|
751 |
$quotesCollection->addFieldToFilter('store_id', array('eq' => $mage_store_view_id));
|
app/code/community/Remarkety/Mgconnector/Model/Observer.php
CHANGED
@@ -187,7 +187,7 @@ class Remarkety_Mgconnector_Model_Observer
|
|
187 |
$this->rule = $observer->getEvent()->getRule();
|
188 |
$this->rule->setUpdatedAt(date("Y-m-d H:i:s"));
|
189 |
if($this->shouldUpdateRule($this->rule)) {
|
190 |
-
$this->_queueRequest('catalogruleupdated',
|
191 |
//$this->sendProductPrices($this->rule->getId());
|
192 |
}
|
193 |
}
|
@@ -716,11 +716,15 @@ class Remarkety_Mgconnector_Model_Observer
|
|
716 |
|
717 |
public function sendProductPrices($ruleId = null)
|
718 |
{
|
|
|
|
|
|
|
|
|
|
|
719 |
$yesterday_start = date('Y-m-d 00:00:00',strtotime("-1 days"));
|
720 |
$yesterday_end = date('Y-m-d 23:59:59',strtotime("-1 days"));
|
721 |
$today_start = date('Y-m-d 00:00:00');
|
722 |
$today_end = date('Y-m-d 23:59:59');
|
723 |
-
$data = [];
|
724 |
|
725 |
Mage::log('sendProductPrices started', null, 'remarkety-ext.log');
|
726 |
|
@@ -745,14 +749,14 @@ class Remarkety_Mgconnector_Model_Observer
|
|
745 |
$useQueue = !is_null($ruleId);
|
746 |
|
747 |
// $i = 0;
|
748 |
-
$ruleProducts =
|
749 |
foreach($collection->getData() as $c) {
|
750 |
if (!isset($ruleProducts[$c['rule_id']]))
|
751 |
-
$ruleProducts[$c['rule_id']] =
|
752 |
$ruleProducts[$c['rule_id']][] = $c['product_id'];
|
753 |
}
|
754 |
|
755 |
-
$storeUrls =
|
756 |
foreach($ruleProducts as $ruleId => $products) {
|
757 |
/**
|
758 |
* @var Mage_CatalogRule_Model_Rule
|
@@ -769,13 +773,13 @@ class Remarkety_Mgconnector_Model_Observer
|
|
769 |
$configInstalled = $store->getConfig(Remarkety_Mgconnector_Model_Install::XPATH_INSTALLED);
|
770 |
$isRemarketyInstalled = !empty($configInstalled);
|
771 |
if ($isRemarketyInstalled) {
|
772 |
-
$rows =
|
773 |
$i = 0;
|
774 |
foreach($products as $productId){
|
775 |
if($i >= 10){
|
776 |
$this->_productsUpdate($store->getStoreId(), $rows, $useQueue);
|
777 |
$i = 0;
|
778 |
-
$rows =
|
779 |
}
|
780 |
$product = Mage::getModel('catalog/product')->load($productId);
|
781 |
$pWebsites = $product->getWebsiteIds();
|
187 |
$this->rule = $observer->getEvent()->getRule();
|
188 |
$this->rule->setUpdatedAt(date("Y-m-d H:i:s"));
|
189 |
if($this->shouldUpdateRule($this->rule)) {
|
190 |
+
$this->_queueRequest('catalogruleupdated', array('ruleId' => $this->rule->getId()), 1, null);
|
191 |
//$this->sendProductPrices($this->rule->getId());
|
192 |
}
|
193 |
}
|
716 |
|
717 |
public function sendProductPrices($ruleId = null)
|
718 |
{
|
719 |
+
// Fix for scenario when method is called directly as cron.
|
720 |
+
if (is_object($ruleId)) {
|
721 |
+
$ruleId = null;
|
722 |
+
}
|
723 |
+
|
724 |
$yesterday_start = date('Y-m-d 00:00:00',strtotime("-1 days"));
|
725 |
$yesterday_end = date('Y-m-d 23:59:59',strtotime("-1 days"));
|
726 |
$today_start = date('Y-m-d 00:00:00');
|
727 |
$today_end = date('Y-m-d 23:59:59');
|
|
|
728 |
|
729 |
Mage::log('sendProductPrices started', null, 'remarkety-ext.log');
|
730 |
|
749 |
$useQueue = !is_null($ruleId);
|
750 |
|
751 |
// $i = 0;
|
752 |
+
$ruleProducts = array();
|
753 |
foreach($collection->getData() as $c) {
|
754 |
if (!isset($ruleProducts[$c['rule_id']]))
|
755 |
+
$ruleProducts[$c['rule_id']] = array();
|
756 |
$ruleProducts[$c['rule_id']][] = $c['product_id'];
|
757 |
}
|
758 |
|
759 |
+
$storeUrls = array();
|
760 |
foreach($ruleProducts as $ruleId => $products) {
|
761 |
/**
|
762 |
* @var Mage_CatalogRule_Model_Rule
|
773 |
$configInstalled = $store->getConfig(Remarkety_Mgconnector_Model_Install::XPATH_INSTALLED);
|
774 |
$isRemarketyInstalled = !empty($configInstalled);
|
775 |
if ($isRemarketyInstalled) {
|
776 |
+
$rows = array();
|
777 |
$i = 0;
|
778 |
foreach($products as $productId){
|
779 |
if($i >= 10){
|
780 |
$this->_productsUpdate($store->getStoreId(), $rows, $useQueue);
|
781 |
$i = 0;
|
782 |
+
$rows = array();
|
783 |
}
|
784 |
$product = Mage::getModel('catalog/product')->load($productId);
|
785 |
$pWebsites = $product->getWebsiteIds();
|
app/code/community/Remarkety/Mgconnector/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Remarkety_Mgconnector>
|
5 |
-
<version>1.4.8.
|
6 |
</Remarkety_Mgconnector>
|
7 |
</modules>
|
8 |
<global>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Remarkety_Mgconnector>
|
5 |
+
<version>1.4.8.7</version>
|
6 |
</Remarkety_Mgconnector>
|
7 |
</modules>
|
8 |
<global>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Remarkety_Mgconnector</name>
|
4 |
-
<version>1.4.8.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/licenses/gpl-3.0.html">GPL v3</license>
|
7 |
<channel>community</channel>
|
@@ -9,11 +9,11 @@
|
|
9 |
<summary>Remarkety Magento Connector</summary>
|
10 |
<description>Remarkety Magento Connector</description>
|
11 |
<notes>No comments</notes>
|
12 |
-
<date>2016-
|
13 |
-
<time>
|
14 |
<contents>
|
15 |
<target name="magecommunity">
|
16 |
-
<dir name="Remarkety"><dir name="Mgconnector"><dir name="Block"><dir name="Adminhtml"><dir name="Configuration"><dir name="Complete"><file name="Form.php" hash="dc799532128513364fc3afd17eabb78b"/></dir><file name="Complete.php" hash="b9f7b4ecbd2be587c0efbd16523b167e"/><dir name="Configuration"><file name="Form.php" hash="ffe6b6ce5b2906c916694007ca5a1b28"/></dir><file name="Configuration.php" hash="67b3b564c2c3123301f5f97b2b258a7a"/><dir name="Install"><file name="Form.php" hash="59541fe2ad9a49b9fb56a41f00e6a591"/></dir><file name="Install.php" hash="f631fcdfd86d2bc416eb1ad4422fc20c"/><dir name="Upgrade"><file name="Form.php" hash="598f83eca99d0153537e22f9ee6b1934"/></dir><file name="Upgrade.php" hash="c672741b0407f108d2266dd939590846"/></dir><file name="Configuration.php" hash="bf0c9aabe92f669694e0699c009b2a9c"/><dir name="Extension"><file name="RewardPoints.php" hash="82e320930f59dfd45e5aa73005118833"/></dir><dir name="Install"><dir name="Complete"><file name="Form.php" hash="5992149b9ff2d2a7c2b008d98098362d"/></dir><file name="Complete.php" hash="452944c613b88ede358ee4dacd562d05"/><dir name="Install"><dir name="Create"><file name="Form.php" hash="65d98f1449ce6af413a3185692e07533"/></dir><file name="Create.php" hash="0d3182923fd5542e3d0a757625a85ae4"/><dir name="Login"><file name="Form.php" hash="a58c19056e47c7851eb6a5f40517f757"/></dir><file name="Login.php" hash="3ee61a883f843c55b1b32a328af84322"/></dir><dir name="Upgrade"><file name="Form.php" hash="6f4e2ac19d30115de4e275fdb8dca5b6"/></dir><file name="Upgrade.php" hash="f16ba61a8c86007bbc0a980e8faeade1"/><dir name="Welcome"><file name="Form.php" hash="58cb26cc7555498bd0367c77a99c8d60"/><file name="Store.php" hash="a3b77928861fb2660dc069a821e67932"/></dir><file name="Welcome.php" hash="86589c79b5c38ea5f25d58ac932f33cb"/></dir><dir name="Queue"><dir name="Configure"><file name="Form.php" hash="8eb691898c79cd5aed15c7857cb84b4c"/></dir><file name="Configure.php" hash="03d5ebf7644462904c439d172cde3afc"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="EventType.php" hash="4ac5971c368b70efa96b4c8297c85c3c"/><file name="Status.php" hash="ec57ddafc2515b952958e6ace6de22ec"/></dir></dir></dir><file name="Grid.php" hash="74d5f3b18d76cdf8219e2d39a83a2f7c"/></dir><file name="Queue.php" hash="2c905cc54a6c08d4d73a392d5b95a25c"/></dir><dir name="Tracking"><file name="Base.php" hash="5e0f245ac5ee59d2f6c6f35087059b56"/><file name="General.php" hash="9ca2796c6f2bf9233553e6b782f3722b"/><file name="Product.php" hash="3a0c1b1a5fcbd23d1dcd04714742ebe9"/></dir></dir><dir name="Helper"><file name="Configuration.php" hash="5c20237a83db488fa1fae9345bacdb15"/><file name="Data.php" hash="b27f970b943e6e989e9061275cc25c7b"/><file name="Extension.php" hash="5788a232ffaa32674b4bfc1e12e4ea98"/><file name="Links.php" hash="8bb36c918e956663113646183bd33c4c"/><file name="Urls.php" hash="ce396940c96bf8139da8ec59bb498acf"/></dir><dir name="Model"><dir name="Core"><file name="Api.php" hash="948c7965f7fe9d044b532314aaa8e0f9"/></dir><file name="Core.php" hash="
|
17 |
<target name="mageetc">
|
18 |
<dir name="modules"><file name="Remarkety_Mgconnector.xml" hash="d584b234f653fbf34376e7dcb8caf117"/></dir></target>
|
19 |
<target name="magedesign">
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Remarkety_Mgconnector</name>
|
4 |
+
<version>1.4.8.7</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/licenses/gpl-3.0.html">GPL v3</license>
|
7 |
<channel>community</channel>
|
9 |
<summary>Remarkety Magento Connector</summary>
|
10 |
<description>Remarkety Magento Connector</description>
|
11 |
<notes>No comments</notes>
|
12 |
+
<date>2016-10-18</date>
|
13 |
+
<time>11-49-21</time>
|
14 |
<contents>
|
15 |
<target name="magecommunity">
|
16 |
+
<dir name="Remarkety"><dir name="Mgconnector"><dir name="Block"><dir name="Adminhtml"><dir name="Configuration"><dir name="Complete"><file name="Form.php" hash="dc799532128513364fc3afd17eabb78b"/></dir><file name="Complete.php" hash="b9f7b4ecbd2be587c0efbd16523b167e"/><dir name="Configuration"><file name="Form.php" hash="ffe6b6ce5b2906c916694007ca5a1b28"/></dir><file name="Configuration.php" hash="67b3b564c2c3123301f5f97b2b258a7a"/><dir name="Install"><file name="Form.php" hash="59541fe2ad9a49b9fb56a41f00e6a591"/></dir><file name="Install.php" hash="f631fcdfd86d2bc416eb1ad4422fc20c"/><dir name="Upgrade"><file name="Form.php" hash="598f83eca99d0153537e22f9ee6b1934"/></dir><file name="Upgrade.php" hash="c672741b0407f108d2266dd939590846"/></dir><file name="Configuration.php" hash="bf0c9aabe92f669694e0699c009b2a9c"/><dir name="Extension"><file name="RewardPoints.php" hash="82e320930f59dfd45e5aa73005118833"/></dir><dir name="Install"><dir name="Complete"><file name="Form.php" hash="5992149b9ff2d2a7c2b008d98098362d"/></dir><file name="Complete.php" hash="452944c613b88ede358ee4dacd562d05"/><dir name="Install"><dir name="Create"><file name="Form.php" hash="65d98f1449ce6af413a3185692e07533"/></dir><file name="Create.php" hash="0d3182923fd5542e3d0a757625a85ae4"/><dir name="Login"><file name="Form.php" hash="a58c19056e47c7851eb6a5f40517f757"/></dir><file name="Login.php" hash="3ee61a883f843c55b1b32a328af84322"/></dir><dir name="Upgrade"><file name="Form.php" hash="6f4e2ac19d30115de4e275fdb8dca5b6"/></dir><file name="Upgrade.php" hash="f16ba61a8c86007bbc0a980e8faeade1"/><dir name="Welcome"><file name="Form.php" hash="58cb26cc7555498bd0367c77a99c8d60"/><file name="Store.php" hash="a3b77928861fb2660dc069a821e67932"/></dir><file name="Welcome.php" hash="86589c79b5c38ea5f25d58ac932f33cb"/></dir><dir name="Queue"><dir name="Configure"><file name="Form.php" hash="8eb691898c79cd5aed15c7857cb84b4c"/></dir><file name="Configure.php" hash="03d5ebf7644462904c439d172cde3afc"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="EventType.php" hash="4ac5971c368b70efa96b4c8297c85c3c"/><file name="Status.php" hash="ec57ddafc2515b952958e6ace6de22ec"/></dir></dir></dir><file name="Grid.php" hash="74d5f3b18d76cdf8219e2d39a83a2f7c"/></dir><file name="Queue.php" hash="2c905cc54a6c08d4d73a392d5b95a25c"/></dir><dir name="Tracking"><file name="Base.php" hash="5e0f245ac5ee59d2f6c6f35087059b56"/><file name="General.php" hash="9ca2796c6f2bf9233553e6b782f3722b"/><file name="Product.php" hash="3a0c1b1a5fcbd23d1dcd04714742ebe9"/></dir></dir><dir name="Helper"><file name="Configuration.php" hash="5c20237a83db488fa1fae9345bacdb15"/><file name="Data.php" hash="b27f970b943e6e989e9061275cc25c7b"/><file name="Extension.php" hash="5788a232ffaa32674b4bfc1e12e4ea98"/><file name="Links.php" hash="8bb36c918e956663113646183bd33c4c"/><file name="Urls.php" hash="ce396940c96bf8139da8ec59bb498acf"/></dir><dir name="Model"><dir name="Core"><file name="Api.php" hash="948c7965f7fe9d044b532314aaa8e0f9"/></dir><file name="Core.php" hash="ee964a27d5700393a656d9d3c48118f0"/><dir name="Extension"><dir name="RewardPoints"><file name="AbstractIntegration.php" hash="4ac34942072ce49d2971065a82d1068c"/><file name="IntegrationInterface.php" hash="f95f9f1e243c9fd920d27b9299b90f72"/><file name="MagestoreRewardPoints.php" hash="28671b6f35cb829f2d11166f081ad816"/><dir name="Observer"><file name="AbstractObserver.php" hash="eb710b7582050de644de2a8402d759ec"/><file name="MagestoreRewardPoints.php" hash="bac2ae11f94aa923accb0437027b4bec"/></dir></dir></dir><file name="Install.php" hash="fc260ea02ba27273cd51e7051c953cce"/><file name="Observer.php" hash="f351de3b13d72aca1ccbdb5d5e897b30"/><file name="Queue.php" hash="3a0fda4b18ec947c20e6e81cc1e995de"/><file name="Recovery.php" hash="bd856fdd5788e00bcf29a67446ad8ef1"/><file name="Request.php" hash="47e81216d7bca3f0aba93bf816298221"/><dir name="Resource"><file name="Coupon.php" hash="6079c05e422e9c1ad5327fc881cee7e3"/><dir name="Queue"><file name="Collection.php" hash="ce59b04c8a8146f5094d6622134885d3"/></dir><file name="Queue.php" hash="971a539849d0cde2e413b0642403a6ca"/><dir name="Rule"><file name="Collection.php" hash="b7cd7bbc0c4100a1a320e0f551be067a"/></dir><file name="Setup.php" hash="13253a5b7a2749f4a3bc84e32e31e27c"/></dir><file name="Webtracking.php" hash="4b2d9d73dcc8d68b40f375f6c55c4999"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ConfigureController.php" hash="b4e51acf22ea798e2d2144a4672bc30f"/><dir name="Extension"><file name="AbstractController.php" hash="f5402dbc0e13412a52b70b5d36a14110"/><file name="RewardPointsController.php" hash="3e94e5ae4d467abf03f41e260b0421f9"/></dir><file name="InstallController.php" hash="cebbe5f80c59d6fbc18eecff20e7d432"/><file name="MgconnectorController.php" hash="a8e55464624c5fa9e9641cf97f963b3b"/><file name="QueueController.php" hash="1f2f85bd1ecf2242dd40fc64ec1aa3b0"/></dir><file name="RecoveryController.php" hash="0a53efaef9019c6b661fe494067473e3"/><file name="WebtrackingController.php" hash="fd2c5034d94161c0e6f7f4e6b5816a55"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a417737a2225ef9f70b47eef77d75b7c"/><file name="api.xml" hash="9f6d5fd3330bb0640f97efc3f819e684"/><file name="config.xml" hash="15dad4f0a8b35793f933a128750a32f9"/></dir><dir name="sql"><dir name="mgconnector_setup"><file name="mysql4-install-1.0.0.13.php" hash="d1033ffd3d6b13af28ad4082d5744c25"/><file name="mysql4-upgrade-1.0.0.13-1.0.0.14.php" hash="db871ba73f3dcc7abfb806991edc12f1"/><file name="mysql4-upgrade-1.0.0.14-1.0.0.15.php" hash="c9ced7a4a2e85c9d594e9f97320cab58"/><file name="mysql4-upgrade-1.0.0.14-1.1.0.0.php" hash="fd445e8c179cdb2718a85adec05c5343"/><file name="mysql4-upgrade-1.1.0.5-1.1.0.6.php" hash="e24831cfd077827ba545f7ea71669729"/><file name="mysql4-upgrade-1.1.2.8-1.3.0.0.php" hash="97bbb9e411bcd45f875f29fcc8c8b420"/><file name="mysql4-upgrade-1.4.7.2-1.4.8.0.php" hash="bb01ef486d9457fc7ef661a654fd1ec6"/></dir></dir></dir></dir></target>
|
17 |
<target name="mageetc">
|
18 |
<dir name="modules"><file name="Remarkety_Mgconnector.xml" hash="d584b234f653fbf34376e7dcb8caf117"/></dir></target>
|
19 |
<target name="magedesign">
|