Version Notes
No comments
Download this release
Release Info
Developer | Remarkety |
Extension | Remarkety_Mgconnector |
Version | 1.4.10.2 |
Comparing to | |
See all releases |
Code changes from version 1.4.9.5 to 1.4.10.2
CHANGELOG.txt
CHANGED
@@ -1,3 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
1.4.9.5
|
2 |
-------
|
3 |
Get only visible items for orders
|
1 |
+
1.4.10.2
|
2 |
+
-------
|
3 |
+
Products should not be taken from flat catalog table if enabled
|
4 |
+
|
5 |
+
1.4.10.1
|
6 |
+
--------
|
7 |
+
Bugfix - Return proper cart URL on multistore websites
|
8 |
+
|
9 |
1.4.9.5
|
10 |
-------
|
11 |
Get only visible items for orders
|
app/code/community/Remarkety/Mgconnector/Model/Core.php
CHANGED
@@ -636,7 +636,7 @@ class Remarkety_Mgconnector_Model_Core extends Mage_Core_Model_Abstract
|
|
636 |
// $itemsCollection->join(
|
637 |
//
|
638 |
// );
|
639 |
-
|
640 |
|
641 |
foreach ($itemsCollection as $item) {
|
642 |
$product = null;
|
@@ -790,7 +790,7 @@ class Remarkety_Mgconnector_Model_Core extends Mage_Core_Model_Abstract
|
|
790 |
$currency = $quoteData['quote_currency_code'];
|
791 |
$quoteData['currency'] = $this->_currencyInfo($currency);
|
792 |
|
793 |
-
$quoteData['checkout_url'] = $this->getCartRecoveryURL($quoteData['entity_id']);
|
794 |
|
795 |
foreach ($quote->getItemsCollection() as $item) {
|
796 |
$quoteItem = array();
|
@@ -854,7 +854,11 @@ class Remarkety_Mgconnector_Model_Core extends Mage_Core_Model_Abstract
|
|
854 |
try {
|
855 |
try {
|
856 |
$store = Mage::app()->getStore($mage_store_id);
|
857 |
-
|
|
|
|
|
|
|
|
|
858 |
} catch (Exception $ex) {
|
859 |
$this->_debug(__FUNCTION__, REMARKETY_MGCONNECTOR_ERROR, "Cannot set active store", $myArgs);
|
860 |
}
|
@@ -1335,11 +1339,16 @@ class Remarkety_Mgconnector_Model_Core extends Mage_Core_Model_Abstract
|
|
1335 |
|
1336 |
}
|
1337 |
|
1338 |
-
public function getCartRecoveryURL($cart_id)
|
1339 |
{
|
1340 |
$recovery = Mage::getModel('mgconnector/recovery');
|
1341 |
$id = $recovery->encodeQuoteId($cart_id);
|
1342 |
-
$
|
|
|
|
|
|
|
|
|
|
|
1343 |
return $url;
|
1344 |
}
|
1345 |
|
636 |
// $itemsCollection->join(
|
637 |
//
|
638 |
// );
|
639 |
+
$itemsCollection = $order->getAllVisibleItems();
|
640 |
|
641 |
foreach ($itemsCollection as $item) {
|
642 |
$product = null;
|
790 |
$currency = $quoteData['quote_currency_code'];
|
791 |
$quoteData['currency'] = $this->_currencyInfo($currency);
|
792 |
|
793 |
+
$quoteData['checkout_url'] = $this->getCartRecoveryURL($quoteData['entity_id'], $mage_store_view_id);
|
794 |
|
795 |
foreach ($quote->getItemsCollection() as $item) {
|
796 |
$quoteItem = array();
|
854 |
try {
|
855 |
try {
|
856 |
$store = Mage::app()->getStore($mage_store_id);
|
857 |
+
if($store) {
|
858 |
+
//make sure current store not using flat catalog in this request (otherwise, disabled products wont be included)
|
859 |
+
$store->setConfig('catalog/frontend/flat_catalog_product', 0);
|
860 |
+
Mage::app()->setCurrentStore($store);
|
861 |
+
}
|
862 |
} catch (Exception $ex) {
|
863 |
$this->_debug(__FUNCTION__, REMARKETY_MGCONNECTOR_ERROR, "Cannot set active store", $myArgs);
|
864 |
}
|
1339 |
|
1340 |
}
|
1341 |
|
1342 |
+
public function getCartRecoveryURL($cart_id, $storeId = null)
|
1343 |
{
|
1344 |
$recovery = Mage::getModel('mgconnector/recovery');
|
1345 |
$id = $recovery->encodeQuoteId($cart_id);
|
1346 |
+
if($storeId != null) {
|
1347 |
+
$url = (string)Mage::app()->getStore($storeId)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK) . 'remarkety/recovery/cart/quote_id/' . $id;
|
1348 |
+
} else {
|
1349 |
+
$url = (string)Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK) . 'remarkety/recovery/cart/quote_id/' . $id;
|
1350 |
+
}
|
1351 |
+
|
1352 |
return $url;
|
1353 |
}
|
1354 |
|
app/code/community/Remarkety/Mgconnector/Model/Observer.php
CHANGED
@@ -13,7 +13,7 @@ if (!defined("REMARKETY_LOG"))
|
|
13 |
|
14 |
class Remarkety_Mgconnector_Model_Observer
|
15 |
{
|
16 |
-
const REMARKETY_EVENTS_ENDPOINT = '
|
17 |
const REMARKETY_METHOD = 'POST';
|
18 |
const REMARKETY_TIMEOUT = 2;
|
19 |
const REMARKETY_VERSION = 0.9;
|
13 |
|
14 |
class Remarkety_Mgconnector_Model_Observer
|
15 |
{
|
16 |
+
const REMARKETY_EVENTS_ENDPOINT = 'http://remarkety-trunk.local/events';
|
17 |
const REMARKETY_METHOD = 'POST';
|
18 |
const REMARKETY_TIMEOUT = 2;
|
19 |
const REMARKETY_VERSION = 0.9;
|
app/code/community/Remarkety/Mgconnector/Model/Request.php
CHANGED
@@ -9,8 +9,8 @@
|
|
9 |
*/
|
10 |
class Remarkety_Mgconnector_Model_Request
|
11 |
{
|
12 |
-
const REMARKETY_URI = '
|
13 |
-
const REMARKETY_STOREID_URI = '
|
14 |
const REMARKETY_METHOD = 'POST';
|
15 |
const REMARKETY_TIMEOUT = 30;
|
16 |
const REMARKETY_VERSION = 0.9;
|
9 |
*/
|
10 |
class Remarkety_Mgconnector_Model_Request
|
11 |
{
|
12 |
+
const REMARKETY_URI = 'http://remarkety-trunk.local/public/install/notify';
|
13 |
+
const REMARKETY_STOREID_URI = 'http://remarkety-trunk.local/public/install/get-store-id';
|
14 |
const REMARKETY_METHOD = 'POST';
|
15 |
const REMARKETY_TIMEOUT = 30;
|
16 |
const REMARKETY_VERSION = 0.9;
|
app/code/community/Remarkety/Mgconnector/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Remarkety_Mgconnector>
|
5 |
-
<version>1.4.
|
6 |
</Remarkety_Mgconnector>
|
7 |
</modules>
|
8 |
<global>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Remarkety_Mgconnector>
|
5 |
+
<version>1.4.10.2</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.
|
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>2017-01-
|
13 |
-
<time>9-
|
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="e6dc10d742071fe8d041801d4ae605ff"/></dir><file name="Complete.php" hash="d816f575e8ef99c8dbb4440666963bd0"/><dir name="Configuration"><file name="Form.php" hash="861b674ee5ac1e384fd68e29bd59bb02"/></dir><file name="Configuration.php" hash="8f8c4988205d9d1e2c7cd23c27a9483f"/><dir name="Install"><file name="Form.php" hash="cede3e19bde805c40342ea26e1deeda5"/></dir><file name="Install.php" hash="9c093e25a8cc9a1fe16c87cfea2e3819"/><dir name="Upgrade"><file name="Form.php" hash="9af9dbeae95cbcdae2ec32632447f9c6"/></dir><file name="Upgrade.php" hash="93222bbdfff6b417b4b6ecbfc7c3d764"/></dir><file name="Configuration.php" hash="4df74b83acfbbe6e6fdaa708f0d9ba7e"/><dir name="Extension"><file name="RewardPoints.php" hash="82e320930f59dfd45e5aa73005118833"/></dir><dir name="Install"><dir name="Complete"><file name="Form.php" hash="fd219a65921dba3099ba77166f59e8da"/></dir><file name="Complete.php" hash="c20351873d05cde757620ae6458c1ec4"/><dir name="Install"><dir name="Create"><file name="Form.php" hash="af271c9df233ac8164dfa73216a524fc"/></dir><file name="Create.php" hash="bcd942c4fd64543c1b65001ec84d0d71"/><dir name="Login"><file name="Form.php" hash="bb431cadabe945c82df6cb921c5e2c30"/></dir><file name="Login.php" hash="6f7e30f2c36e56925be25496fde1e29a"/></dir><dir name="Upgrade"><file name="Form.php" hash="490a20b1e39d153af18e90844593c772"/></dir><file name="Upgrade.php" hash="5e30edfcc5954ccf65dcd36192356bed"/><dir name="Welcome"><file name="Form.php" hash="b4f135c3c0106a8391931d6d5865d599"/><file name="Store.php" hash="c4be91045c5ce42128f3c22350ac589b"/></dir><file name="Welcome.php" hash="de47e1c94e4073e2d2af94a0b5455250"/></dir><dir name="Queue"><dir name="Configure"><file name="Form.php" hash="4668539bf05e44ec9cdfcf2388277e9a"/></dir><file name="Configure.php" hash="87841e46d93c568bdd09304d016de589"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="EventType.php" hash="13fd2faaa07dc11d6052ab9e0c6a4261"/><file name="Status.php" hash="7f087c6d8e55b67d5a7781a31d1ed924"/></dir></dir></dir><file name="Grid.php" hash="f822b539114f10256a69333c8bf4a2e6"/></dir><file name="Queue.php" hash="b778ce9202431147083365b8021103d0"/></dir><dir name="Tracking"><file name="Base.php" hash="f80c74e11c575b27110505d51cb4d6fc"/><file name="General.php" hash="2fbff52cfe2924412376bbb4328068be"/><file name="Product.php" hash="11fd52b220b73fb5f2dc87a4684b056a"/></dir></dir><dir name="Helper"><file name="Configuration.php" hash="45084eee5817158fbf19959217797c6e"/><file name="Data.php" hash="e07e033f6594609aa78c82a45708dd85"/><file name="Extension.php" hash="5788a232ffaa32674b4bfc1e12e4ea98"/><file name="Links.php" hash="9f154ee8056f27f8b42f1a42880bb90a"/><file name="Urls.php" hash="2d431aa22e9cd1595c421502ecda62b8"/></dir><dir name="Model"><dir name="Core"><file name="Api.php" hash="fc55e8b87e999498bb14340db7e9cde4"/></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.10.2</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>2017-01-17</date>
|
13 |
+
<time>9-05-17</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="e6dc10d742071fe8d041801d4ae605ff"/></dir><file name="Complete.php" hash="d816f575e8ef99c8dbb4440666963bd0"/><dir name="Configuration"><file name="Form.php" hash="861b674ee5ac1e384fd68e29bd59bb02"/></dir><file name="Configuration.php" hash="8f8c4988205d9d1e2c7cd23c27a9483f"/><dir name="Install"><file name="Form.php" hash="cede3e19bde805c40342ea26e1deeda5"/></dir><file name="Install.php" hash="9c093e25a8cc9a1fe16c87cfea2e3819"/><dir name="Upgrade"><file name="Form.php" hash="9af9dbeae95cbcdae2ec32632447f9c6"/></dir><file name="Upgrade.php" hash="93222bbdfff6b417b4b6ecbfc7c3d764"/></dir><file name="Configuration.php" hash="4df74b83acfbbe6e6fdaa708f0d9ba7e"/><dir name="Extension"><file name="RewardPoints.php" hash="82e320930f59dfd45e5aa73005118833"/></dir><dir name="Install"><dir name="Complete"><file name="Form.php" hash="fd219a65921dba3099ba77166f59e8da"/></dir><file name="Complete.php" hash="c20351873d05cde757620ae6458c1ec4"/><dir name="Install"><dir name="Create"><file name="Form.php" hash="af271c9df233ac8164dfa73216a524fc"/></dir><file name="Create.php" hash="bcd942c4fd64543c1b65001ec84d0d71"/><dir name="Login"><file name="Form.php" hash="bb431cadabe945c82df6cb921c5e2c30"/></dir><file name="Login.php" hash="6f7e30f2c36e56925be25496fde1e29a"/></dir><dir name="Upgrade"><file name="Form.php" hash="490a20b1e39d153af18e90844593c772"/></dir><file name="Upgrade.php" hash="5e30edfcc5954ccf65dcd36192356bed"/><dir name="Welcome"><file name="Form.php" hash="b4f135c3c0106a8391931d6d5865d599"/><file name="Store.php" hash="c4be91045c5ce42128f3c22350ac589b"/></dir><file name="Welcome.php" hash="de47e1c94e4073e2d2af94a0b5455250"/></dir><dir name="Queue"><dir name="Configure"><file name="Form.php" hash="4668539bf05e44ec9cdfcf2388277e9a"/></dir><file name="Configure.php" hash="87841e46d93c568bdd09304d016de589"/><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="EventType.php" hash="13fd2faaa07dc11d6052ab9e0c6a4261"/><file name="Status.php" hash="7f087c6d8e55b67d5a7781a31d1ed924"/></dir></dir></dir><file name="Grid.php" hash="f822b539114f10256a69333c8bf4a2e6"/></dir><file name="Queue.php" hash="b778ce9202431147083365b8021103d0"/></dir><dir name="Tracking"><file name="Base.php" hash="f80c74e11c575b27110505d51cb4d6fc"/><file name="General.php" hash="2fbff52cfe2924412376bbb4328068be"/><file name="Product.php" hash="11fd52b220b73fb5f2dc87a4684b056a"/></dir></dir><dir name="Helper"><file name="Configuration.php" hash="45084eee5817158fbf19959217797c6e"/><file name="Data.php" hash="e07e033f6594609aa78c82a45708dd85"/><file name="Extension.php" hash="5788a232ffaa32674b4bfc1e12e4ea98"/><file name="Links.php" hash="9f154ee8056f27f8b42f1a42880bb90a"/><file name="Urls.php" hash="2d431aa22e9cd1595c421502ecda62b8"/></dir><dir name="Model"><dir name="Core"><file name="Api.php" hash="fc55e8b87e999498bb14340db7e9cde4"/></dir><file name="Core.php" hash="eef9cd853e31fe9c2be18f559f29c732"/><dir name="Extension"><dir name="RewardPoints"><file name="AbstractIntegration.php" hash="4ac34942072ce49d2971065a82d1068c"/><file name="IntegrationInterface.php" hash="f95f9f1e243c9fd920d27b9299b90f72"/><file name="MagestoreRewardPoints.php" hash="70c4c74fedd4bfb717132d6d825e438d"/><dir name="Observer"><file name="AbstractObserver.php" hash="eb710b7582050de644de2a8402d759ec"/><file name="MagestoreRewardPoints.php" hash="bac2ae11f94aa923accb0437027b4bec"/></dir></dir></dir><file name="Install.php" hash="902f33bd045e653e9c4fed2ce632b26e"/><file name="Observer.php" hash="8a903089df312f9e111f405dd2e6add9"/><file name="Queue.php" hash="afda656a56b9d44d2ce18a60fdce0912"/><file name="Recovery.php" hash="69bd78f2a3d92db91601cf2afa9c131c"/><file name="Request.php" hash="7b405a7e28d8c00c562e73e9343b0b62"/><dir name="Resource"><file name="Coupon.php" hash="6079c05e422e9c1ad5327fc881cee7e3"/><dir name="Queue"><file name="Collection.php" hash="61b5b2fb72b1cbc9465b8efa6f161e46"/></dir><file name="Queue.php" hash="fd9ce12e48148c2eb88db7336b43e5ac"/><dir name="Rule"><file name="Collection.php" hash="d38eed437f15d67b21c3be935053fea5"/></dir><file name="Setup.php" hash="5387a1470bf28911ba531ed88e156569"/></dir><file name="Webtracking.php" hash="e5b5f1d1bcd50d83e56ce8e3ba910de7"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ConfigureController.php" hash="0b7a6beed2fc4eed01ad7c3363a73dbb"/><dir name="Extension"><file name="AbstractController.php" hash="fa816f490f29820c3b3faa17a3fc00e5"/><file name="RewardPointsController.php" hash="3e94e5ae4d467abf03f41e260b0421f9"/></dir><file name="InstallController.php" hash="be36853b940c958f29fe00535eea1df1"/><file name="MgconnectorController.php" hash="8eecb0d7625336661d2b541d64999f8a"/><file name="QueueController.php" hash="b8c8a0ab8c4efde1fdc9283a37f93b4e"/></dir><file name="RecoveryController.php" hash="a2493669b27287ceb4ada2f9128f5c08"/><file name="WebtrackingController.php" hash="03835c6f4760d203ed81dcea6b591de5"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a417737a2225ef9f70b47eef77d75b7c"/><file name="api.xml" hash="9f6d5fd3330bb0640f97efc3f819e684"/><file name="config.xml" hash="62d01945c7fbaaf19d2d45d48bfcd896"/></dir><dir name="sql"><dir name="mgconnector_setup"><file name="mysql4-install-1.0.0.13.php" hash="6d0bc421987b0238e350003629e8c464"/><file name="mysql4-upgrade-1.0.0.13-1.0.0.14.php" hash="2c28f665f2a8f78cdfc0b121703734af"/><file name="mysql4-upgrade-1.0.0.14-1.0.0.15.php" hash="284433b68df4ce4e83389db33f4a197c"/><file name="mysql4-upgrade-1.0.0.14-1.1.0.0.php" hash="2042704f23d7337ba3d0901f662096a8"/><file name="mysql4-upgrade-1.1.0.5-1.1.0.6.php" hash="2cc5dc8b986cd4ea1a70519ca59a7be9"/><file name="mysql4-upgrade-1.1.2.8-1.1.2.9.php" hash="ef7be7f476ed01e81fe8f9a62b63d008"/><file name="mysql4-upgrade-1.1.2.8-1.3.0.0.php" hash="fef6b0ee2a43cd42036ca12915885794"/><file name="mysql4-upgrade-1.1.2.9-1.1.3.0.php" hash="4871718266ef707c3b136e6d5591ed25"/><file name="mysql4-upgrade-1.4.7.2-1.4.8.0.php" hash="d2b686bdedc6645a5c4f9609c6cea434"/></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">
|