Version Notes
Minor bugs fixed
Download this release
Release Info
Developer | Oct8ne |
Extension | LetsSyncroLLC_Oct8ne |
Version | 2.0.3 |
Comparing to | |
See all releases |
Code changes from version 2.0.2 to 2.0.3
- app/code/community/LetsSyncroLLC/Oct8ne/Helper/Data.php +1 -1
- app/code/community/LetsSyncroLLC/Oct8ne/Model/Mage/Package.php +0 -83
- app/code/community/LetsSyncroLLC/Oct8ne/controllers/FrameController.php +25 -6
- app/code/community/LetsSyncroLLC/Oct8ne/etc/config.xml +2 -3
- app/etc/modules/LetsSyncroLLC_Oct8ne.xml +1 -1
- package.xml +4 -4
app/code/community/LetsSyncroLLC/Oct8ne/Helper/Data.php
CHANGED
@@ -159,7 +159,7 @@ class LetsSyncroLLC_Oct8ne_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
159 |
// return as total the number of related products in the first page
|
160 |
$productsCount = sizeof($relatedProductIds);
|
161 |
|
162 |
-
$result
|
163 |
'total' => $productsCount,
|
164 |
'results' => self::getProductsInfoByIds($relatedProductIds)
|
165 |
);
|
159 |
// return as total the number of related products in the first page
|
160 |
$productsCount = sizeof($relatedProductIds);
|
161 |
|
162 |
+
$result = array(
|
163 |
'total' => $productsCount,
|
164 |
'results' => self::getProductsInfoByIds($relatedProductIds)
|
165 |
);
|
app/code/community/LetsSyncroLLC/Oct8ne/Model/Mage/Package.php
DELETED
@@ -1,83 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* Magento
|
4 |
-
*
|
5 |
-
* NOTICE OF LICENSE
|
6 |
-
*
|
7 |
-
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
-
* that is bundled with this package in the file LICENSE.txt.
|
9 |
-
* It is also available through the world-wide-web at this URL:
|
10 |
-
* http://opensource.org/licenses/osl-3.0.php
|
11 |
-
* If you did not receive a copy of the license and are unable to
|
12 |
-
* obtain it through the world-wide-web, please send an email
|
13 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
-
*
|
15 |
-
* DISCLAIMER
|
16 |
-
*
|
17 |
-
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
-
* versions in the future. If you wish to customize Magento for your
|
19 |
-
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
-
*
|
21 |
-
* @category Mage
|
22 |
-
* @package Mage_Core
|
23 |
-
* @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
|
24 |
-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
-
*/
|
26 |
-
|
27 |
-
|
28 |
-
class LetsSyncroLLC_Oct8ne_Model_Mage_Package extends Mage_Core_Model_Design_Package
|
29 |
-
{
|
30 |
-
/**
|
31 |
-
* Declare design package theme params
|
32 |
-
* Polymorph method:
|
33 |
-
* 1) if 1 parameter specified, sets everything to this value
|
34 |
-
* 2) if 2 parameters, treats 1st as key and 2nd as value
|
35 |
-
*
|
36 |
-
* @return Mage_Core_Model_Design_Package
|
37 |
-
*/
|
38 |
-
public function setTheme()
|
39 |
-
{
|
40 |
-
if(Mage::registry('oct8ne') === 1)
|
41 |
-
return $this;
|
42 |
-
|
43 |
-
switch (func_num_args()) {
|
44 |
-
case 1:
|
45 |
-
foreach (array('layout', 'template', 'skin', 'locale') as $type) {
|
46 |
-
$this->_theme[$type] = func_get_arg(0);
|
47 |
-
}
|
48 |
-
break;
|
49 |
-
|
50 |
-
case 2:
|
51 |
-
$this->_theme[func_get_arg(0)] = func_get_arg(1);
|
52 |
-
break;
|
53 |
-
|
54 |
-
default:
|
55 |
-
throw Mage::exception(Mage::helper('core')->__('Wrong number of arguments for %s', __METHOD__));
|
56 |
-
}
|
57 |
-
return $this;
|
58 |
-
}
|
59 |
-
|
60 |
-
/**
|
61 |
-
* Set package name
|
62 |
-
* In case of any problem, the default will be set.
|
63 |
-
*
|
64 |
-
* @param string $name
|
65 |
-
* @return Mage_Core_Model_Design_Package
|
66 |
-
*/
|
67 |
-
public function setPackageName($name = '')
|
68 |
-
{
|
69 |
-
if(Mage::registry('oct8ne') === 1)
|
70 |
-
return $this;
|
71 |
-
|
72 |
-
return parent::setPackageName($name);
|
73 |
-
}
|
74 |
-
|
75 |
-
|
76 |
-
public function getFallbackTheme()
|
77 |
-
{
|
78 |
-
if(Mage::registry('oct8ne') === 1 && Mage::registry('oct8ne_defaultpackage') !== 1)
|
79 |
-
return '';
|
80 |
-
|
81 |
-
return parent::getFallbackTheme();
|
82 |
-
}
|
83 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/LetsSyncroLLC/Oct8ne/controllers/FrameController.php
CHANGED
@@ -83,12 +83,13 @@ class LetsSyncroLLC_Oct8ne_FrameController extends Mage_Core_Controller_Front_Ac
|
|
83 |
}
|
84 |
|
85 |
$currentCurrency = Mage::app()->getStore()->getCurrentCurrencyCode();
|
86 |
-
if (!is_null($currency))
|
87 |
Mage::app()->getStore()->setCurrentCurrencyCode($currency);
|
|
|
88 |
|
89 |
-
$
|
90 |
-
$this->getRequest()->setParam('q', $
|
91 |
-
if (
|
92 |
Mage::app()->getStore()->setCurrentCurrencyCode($currentCurrency);
|
93 |
$results = array(
|
94 |
'total' => 0,
|
@@ -274,7 +275,12 @@ class LetsSyncroLLC_Oct8ne_FrameController extends Mage_Core_Controller_Front_Ac
|
|
274 |
$orderValid = 0;
|
275 |
}
|
276 |
$values += array(
|
277 |
-
'internalId' => $item['orderproducts_id']
|
|
|
|
|
|
|
|
|
|
|
278 |
);
|
279 |
}
|
280 |
$v[] = $values;
|
@@ -473,4 +479,17 @@ class LetsSyncroLLC_Oct8ne_FrameController extends Mage_Core_Controller_Front_Ac
|
|
473 |
return $result_collection;
|
474 |
}
|
475 |
|
476 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
83 |
}
|
84 |
|
85 |
$currentCurrency = Mage::app()->getStore()->getCurrentCurrencyCode();
|
86 |
+
if (!is_null($currency)) {
|
87 |
Mage::app()->getStore()->setCurrentCurrencyCode($currency);
|
88 |
+
}
|
89 |
|
90 |
+
$searchTerm = $this->getRequest()->getParam('search', null);
|
91 |
+
$this->getRequest()->setParam('q', $searchTerm);
|
92 |
+
if (! $this->isValidSearchCriteria($searchTerm)) {
|
93 |
Mage::app()->getStore()->setCurrentCurrencyCode($currentCurrency);
|
94 |
$results = array(
|
95 |
'total' => 0,
|
275 |
$orderValid = 0;
|
276 |
}
|
277 |
$values += array(
|
278 |
+
'internalId' => $item['orderproducts_id'],
|
279 |
+
'orderId' => $item['order_id'],
|
280 |
+
'orderValid' => $orderValid,
|
281 |
+
'incrementId' => $incrementId,
|
282 |
+
'orderPrice' => $item[$report . '_price'],
|
283 |
+
'status' => $status
|
284 |
);
|
285 |
}
|
286 |
$v[] = $values;
|
479 |
return $result_collection;
|
480 |
}
|
481 |
|
482 |
+
private function isValidSearchCriteria($searchTerm) {
|
483 |
+
if (is_null($searchTerm) || strlen($searchTerm) == 0) {
|
484 |
+
return false;
|
485 |
+
}
|
486 |
+
|
487 |
+
$helper = Mage::helper("catalogsearch"); /* @var $helper Mage_CatalogSearch_Helper_Data */
|
488 |
+
$len = strlen($searchTerm);
|
489 |
+
if ($len < $helper->getMinQueryLength() || $len > $helper->getMaxQueryLength()) {
|
490 |
+
return false;
|
491 |
+
}
|
492 |
+
|
493 |
+
return true;
|
494 |
+
}
|
495 |
+
}
|
app/code/community/LetsSyncroLLC/Oct8ne/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<LetsSyncroLLC_Oct8ne>
|
5 |
-
<version>2.0.
|
6 |
</LetsSyncroLLC_Oct8ne>
|
7 |
</modules>
|
8 |
|
@@ -35,8 +35,7 @@
|
|
35 |
<rewrite>
|
36 |
<url>LetsSyncroLLC_Oct8ne_Model_Mage_Url</url>
|
37 |
<url_rewrite>LetsSyncroLLC_Oct8ne_Model_Mage_Rewrite</url_rewrite>
|
38 |
-
<url_rewrite_request>LetsSyncroLLC_Oct8ne_Model_Mage_Request</url_rewrite_request>
|
39 |
-
<design_package>LetsSyncroLLC_Oct8ne_Model_Mage_Package</design_package>
|
40 |
</rewrite>
|
41 |
</core>
|
42 |
|
2 |
<config>
|
3 |
<modules>
|
4 |
<LetsSyncroLLC_Oct8ne>
|
5 |
+
<version>2.0.3</version>
|
6 |
</LetsSyncroLLC_Oct8ne>
|
7 |
</modules>
|
8 |
|
35 |
<rewrite>
|
36 |
<url>LetsSyncroLLC_Oct8ne_Model_Mage_Url</url>
|
37 |
<url_rewrite>LetsSyncroLLC_Oct8ne_Model_Mage_Rewrite</url_rewrite>
|
38 |
+
<url_rewrite_request>LetsSyncroLLC_Oct8ne_Model_Mage_Request</url_rewrite_request>
|
|
|
39 |
</rewrite>
|
40 |
</core>
|
41 |
|
app/etc/modules/LetsSyncroLLC_Oct8ne.xml
CHANGED
@@ -4,7 +4,7 @@
|
|
4 |
<LetsSyncroLLC_Oct8ne>
|
5 |
<active>true</active>
|
6 |
<codePool>community</codePool>
|
7 |
-
<version>2.0.
|
8 |
<depends>
|
9 |
<Mage_Eav/>
|
10 |
<Mage_Dataflow/>
|
4 |
<LetsSyncroLLC_Oct8ne>
|
5 |
<active>true</active>
|
6 |
<codePool>community</codePool>
|
7 |
+
<version>2.0.3</version>
|
8 |
<depends>
|
9 |
<Mage_Eav/>
|
10 |
<Mage_Dataflow/>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>LetsSyncroLLC_Oct8ne</name>
|
4 |
-
<version>2.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/gpl-license.php">GPL</license>
|
7 |
<channel>community</channel>
|
@@ -10,9 +10,9 @@
|
|
10 |
<description>Agent-assisted search, proprietary co-viewing technology, & live chat to engage in personal selling & service.</description>
|
11 |
<notes>Minor bugs fixed</notes>
|
12 |
<authors><author><name>Oct8ne</name><user>Oct8ne</user><email>xavier.gonzalez@oct8ne.com</email></author></authors>
|
13 |
-
<date>2015-05-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="LetsSyncroLLC"><dir name="Oct8ne"><dir name="Block"><file name="Accountconfig.php" hash="436dc6ed540632eb4b0f6917bbd62cbe"/><dir name="Customer"><file name="Notifier.php" hash="58785a446c6c6a69db0348b81852028b"/></dir><dir name="Html"><file name="Head.php" hash="7fec049acbd3391ce0176982eede105b"/></dir><file name="Index.php" hash="d4cc07e7e6412cb9f3cedf2508f56461"/><dir name="Mage"><dir name="Product"><file name="View.php" hash="ca15ba7c5cc756cc18af5c9c48fbe492"/></dir></dir></dir><dir name="Helper"><file name="CustomerData.php" hash="8a34a58756c97f3dd043abc8e8bc6a2c"/><file name="Data.php" hash="
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>LetsSyncroLLC_Oct8ne</name>
|
4 |
+
<version>2.0.3</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.opensource.org/licenses/gpl-license.php">GPL</license>
|
7 |
<channel>community</channel>
|
10 |
<description>Agent-assisted search, proprietary co-viewing technology, & live chat to engage in personal selling & service.</description>
|
11 |
<notes>Minor bugs fixed</notes>
|
12 |
<authors><author><name>Oct8ne</name><user>Oct8ne</user><email>xavier.gonzalez@oct8ne.com</email></author></authors>
|
13 |
+
<date>2015-05-13</date>
|
14 |
+
<time>14:16:04</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="LetsSyncroLLC"><dir name="Oct8ne"><dir name="Block"><file name="Accountconfig.php" hash="436dc6ed540632eb4b0f6917bbd62cbe"/><dir name="Customer"><file name="Notifier.php" hash="58785a446c6c6a69db0348b81852028b"/></dir><dir name="Html"><file name="Head.php" hash="7fec049acbd3391ce0176982eede105b"/></dir><file name="Index.php" hash="d4cc07e7e6412cb9f3cedf2508f56461"/><dir name="Mage"><dir name="Product"><file name="View.php" hash="ca15ba7c5cc756cc18af5c9c48fbe492"/></dir></dir></dir><dir name="Helper"><file name="CustomerData.php" hash="8a34a58756c97f3dd043abc8e8bc6a2c"/><file name="Data.php" hash="78689487b28dae699d3d0cc1ab783649"/><file name="Image.php" hash="a03be23a4397774c69557f2bcc44e863"/><file name="Search.php" hash="4a7207bbff2db493d3a6c0526fb53eb7"/><file name="Url.php" hash="c1ea68e020ccf7c3622028a3ca6fb4c7"/><file name="Version.php" hash="09b28379399279f137a16ffcc0fb5ce6"/><file name="Wishlist.php" hash="527bb806bf2c6ecea035a1bcdbe78270"/></dir><dir name="Model"><file name="Cron.php" hash="11fbdce80ef509a89cbc055960c627dd"/><file name="Letssyncro.php" hash="a7755ee759fa31f004207823314a907d"/><dir name="Mage"><file name="Onepage.php" hash="400ea1de621a7d2e6b0e04db55b60027"/><file name="Request.php" hash="feee181c817bc4a1ed8d662104ddb1af"/><file name="Rewrite.php" hash="5699a8b1707724c4ad01fd6998cf12d6"/><file name="Url.php" hash="82a05832eaea74fedfd2c5b081dc5cc6"/></dir><dir name="Mysql4"><dir name="LetsSyncro"><file name="Collection.php" hash="1820b31106065627aa81007f966de6b7"/></dir><file name="Letssyncro.php" hash="81b49a4f7770d408eacd230a41434cbf"/><dir name="Orderproducts"><file name="Collection.php" hash="06e0828b6dbb87a110fcda58ce04e90c"/></dir><file name="Orderproducts.php" hash="96bf9e4f859a44d7ecb44e6319a16e62"/><dir name="Quoteproducts"><file name="Collection.php" hash="1b3154c09f9b8b3f525937e18d63c5b5"/></dir><file name="Quoteproducts.php" hash="32e565482455445dbc9d0e5f9a4dfdad"/></dir><file name="Observer.php" hash="3b297d91a8f6509fa08031b348ead85c"/><file name="Orderproducts.php" hash="9edf0ab5159b046d0d33c2766087183f"/><file name="Quoteproducts.php" hash="3b6baf23d5ab4136c52fe24d470a3fd0"/></dir><dir name="controllers"><file name="AccountController.php" hash="c900a756947b61498e5edd2e39b1d0bf"/><file name="AdminController.php" hash="c5206f6bbbdc7d98d93e99d948aa241d"/><file name="FrameController.php" hash="930e002722e93e599076e570379acf96"/><file name="IndexController.php" hash="5a63469c2dead9b78a262fd580a3e43b"/></dir><dir name="etc"><file name="config.xml" hash="400dd4961ff84402f473390278130953"/><file name="system.xml" hash="8421c301f81fe34f9abea301dce209fb"/></dir><dir name="sql"><dir name="oct8ne_setup"><file name="mysql4-install-2.0.0.php" hash="7cd9ed6b373a104ec7a27b1b2f26b570"/><file name="mysql4-upgrade-1.0.0-1.1.0.php" hash="0944f9c420562fa8071b04eff2abdb15"/><file name="mysql4-upgrade-1.1.6-1.1.7.php" hash="bfdad124cbf44578af8b3aff95bb78bf"/><file name="mysql4-upgrade-2.0.0.php" hash="c54894921ab155a55058b4f94070e051"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="oct8ne"><dir name="layout"><file name="oct8ne.xml" hash="664f6b6c51799aba0fa905cbc80eb703"/></dir><dir name="template"><dir name="page"><file name="1column.phtml" hash="3fbf17f71254a75cbf3261eab5a727ab"/><file name="2columns-left.phtml" hash="3fbf17f71254a75cbf3261eab5a727ab"/><file name="2columns-right.phtml" hash="3fbf17f71254a75cbf3261eab5a727ab"/><file name="3columns.phtml" hash="3fbf17f71254a75cbf3261eab5a727ab"/></dir></dir></dir></dir><dir name="base"><dir name="default"><dir name="layout"><file name="oct8ne.xml" hash="4b6f167fdbaf25f864934c0e8ecdda51"/></dir><dir name="template"><dir name="oct8ne"><dir name="frame"><file name="clean-page.phtml" hash="86c6580270709b8adb8a624130704cb5"/><dir name="productview"><file name="additional.phtml" hash="d0f80a4f31b31154af12197301cbc524"/><file name="addto.phtml" hash="358f19e35ff76f853cfad50ad35329fc"/><file name="addtocart.phtml" hash="06ac8be9a7197e87e8c5972c27804cc9"/><file name="attributes.phtml" hash="def5531385ad60aac88274bd91f76f52"/><file name="description.phtml" hash="09674e0a56d36f27c93d3a52c3a880c4"/><file name="media.phtml" hash="b23c4e9ef29e00d2f592d822fec8e52c"/><file name="media.phtml.ORIGINAL" hash="071f4d92269b2cbfa1a14271afbf0dbe"/><dir name="options"><file name="js.phtml" hash="7d9917d908ca99033c3473ecc10d895d"/><dir name="type"><file name="date.phtml" hash="41a612891cda695e3023d15a460c4325"/><file name="default.phtml" hash="b6f6d8e715f2a1d59913f313654fc38a"/><file name="file.phtml" hash="5e336ccdfa66b78264e5a0e859600d74"/><file name="select.phtml" hash="162f029fc825b78676cce70633805e62"/><file name="text.phtml" hash="c2c2940fb278d952e0e0d5d232ba5ed9"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="182b49972e67cc834b8e1094a3984f5b"/></dir><file name="wrapper.phtml" hash="b635f6abf10b920afb6000b462134db6"/></dir><file name="options.phtml" hash="60d92d70da66f28300788027aa6f3056"/><file name="price.phtml" hash="06e90ec3368d07d62c3895f706069f96"/><file name="price_clone.phtml" hash="fb1ca9b19f97b0498f529b96c5c0e372"/><file name="tierprices.phtml" hash="4ac50d3c9f54d11fa5041a361485da74"/><dir name="type"><file name="configurable.phtml" hash="b9a427816f9c8a3d0d7179e8d5382683"/><file name="default.phtml" hash="e7f000d4b7fbc62f4e155e429f976126"/><file name="grouped.phtml" hash="9ce42ac44794853963bf68e9f2e911b0"/><dir name="options"><file name="configurable.phtml" hash="2636b369c1ceacd1b131f77ade2c996f"/></dir><file name="simple.phtml" hash="b9a427816f9c8a3d0d7179e8d5382683"/><file name="virtual.phtml" hash="b9a427816f9c8a3d0d7179e8d5382683"/></dir></dir><file name="productview.phtml" hash="da287c78285ecb003bbee37491d3a2f2"/></dir><file name="letssyncro.phtml" hash="d5e92999805e58e11abf1b3b6d29d341"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="LetsSyncroLLC_Oct8ne.xml" hash="82fbed9c7a4de60cffb3aa6d9fd37374"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="LetsSyncroLLC_Oct8ne.csv" hash="686df4107da7e35e243b629c5ee57963"/></dir><dir name="es_ES"><file name="LetsSyncroLLC_Oct8ne.csv" hash="eb0b3ddaae1e2e52005e9ab23cb37163"/></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><file name="oct8ne.css" hash="4255fddac8c054bbe32621cdccf844b8"/></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="LetsSyncro_Logo.png" hash="2104af20cc380d0c745531e1dca2f97c"/></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|