Version Notes
Download this release
Release Info
Developer | Codisto |
Extension | codistoconnect |
Version | 1.90.15 |
Comparing to | |
See all releases |
Code changes from version 1.90.14 to 1.90.15
- app/code/community/Codisto/Sync/Helper/Signal.php +2 -2
- app/code/community/Codisto/Sync/Model/Observer.php +2 -1
- app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.14.php → data-install-1.90.15.php} +0 -0
- app/code/community/Codisto/Sync/etc/config.xml +1 -1
- app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.14.php → mysql4-install-1.90.15.php} +0 -0
- package.xml +1 -1
app/code/community/Codisto/Sync/Helper/Signal.php
CHANGED
@@ -7,7 +7,7 @@ Mage::app();
|
|
7 |
$merchants = unserialize($argv[1]);
|
8 |
$msg = $argv[2];
|
9 |
|
10 |
-
$curlOptions = array( CURLOPT_TIMEOUT =>
|
11 |
|
12 |
if(isset($_ENV['CURL_CA_BUNDLE']) && $_ENV['CURL_CA_BUNDLE'])
|
13 |
{
|
@@ -33,7 +33,7 @@ foreach($merchants as $merchant)
|
|
33 |
{
|
34 |
if($Retry >= 3)
|
35 |
{
|
36 |
-
Mage::
|
37 |
break;
|
38 |
}
|
39 |
|
7 |
$merchants = unserialize($argv[1]);
|
8 |
$msg = $argv[2];
|
9 |
|
10 |
+
$curlOptions = array( CURLOPT_TIMEOUT => 20 );
|
11 |
|
12 |
if(isset($_ENV['CURL_CA_BUNDLE']) && $_ENV['CURL_CA_BUNDLE'])
|
13 |
{
|
33 |
{
|
34 |
if($Retry >= 3)
|
35 |
{
|
36 |
+
Mage::log($e->__toString(), null, 'codisto.log');
|
37 |
break;
|
38 |
}
|
39 |
|
app/code/community/Codisto/Sync/Model/Observer.php
CHANGED
@@ -330,7 +330,8 @@ class Codisto_Sync_Model_Observer
|
|
330 |
{
|
331 |
$transport = $observer->getEvent()->getTransport();
|
332 |
$payment = $observer->getEvent()->getPayment();
|
333 |
-
$
|
|
|
334 |
|
335 |
if($paymentmethod == 'ebay' && Mage::getDesign()->getArea() == 'adminhtml')
|
336 |
{
|
330 |
{
|
331 |
$transport = $observer->getEvent()->getTransport();
|
332 |
$payment = $observer->getEvent()->getPayment();
|
333 |
+
$paymentmethodinstance = is_object($payment) && $payment && method_exists($payment, 'getMethodInstance') ? $payment->getMethodInstance() : null;
|
334 |
+
$paymentmethod = is_object($paymentmethodinstance) && $paymentmethodinstance && method_exists($paymentmethodinstance, 'getCode') ? $paymentmethodinstance->getCode() : '';
|
335 |
|
336 |
if($paymentmethod == 'ebay' && Mage::getDesign()->getArea() == 'adminhtml')
|
337 |
{
|
app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.14.php → data-install-1.90.15.php}
RENAMED
File without changes
|
app/code/community/Codisto/Sync/etc/config.xml
CHANGED
@@ -23,7 +23,7 @@
|
|
23 |
<config>
|
24 |
<modules>
|
25 |
<Codisto_Sync>
|
26 |
-
<version>1.90.
|
27 |
<depends>
|
28 |
<Mage_Payment/>
|
29 |
</depends>
|
23 |
<config>
|
24 |
<modules>
|
25 |
<Codisto_Sync>
|
26 |
+
<version>1.90.15</version>
|
27 |
<depends>
|
28 |
<Mage_Payment/>
|
29 |
</depends>
|
app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.14.php → mysql4-install-1.90.15.php}
RENAMED
File without changes
|
package.xml
CHANGED
@@ -1,2 +1,2 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
-
<package><name>codistoconnect</name><version>1.90.
|
1 |
<?xml version="1.0"?>
|
2 |
+
<package><name>codistoconnect</name><version>1.90.15</version><stability>stable</stability><license>OSL-3.0</license><channel>community</channel><extends></extends><summary>Fastest, Easiest eBay listing</summary><description>CodistoConnect enables you to list on eBay in the simplest way possible with maximum performance</description><notes></notes><authors><author><name>Codisto</name><user>Codisto</user><email>hello@codisto.com</email></author></authors><date>2016-09-18</date><time>21:15:55</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="design"><dir name="ebay"><file name="README" hash="8a3f3351f68ccde9f161cdbe3960392f"/></dir></dir><dir name="code"><dir name="community"><dir name="Codisto"><dir name="Sync"><dir name="Helper"><file name="CmsContent.php" hash="f00b4523d681c60c660089d0de0f2e03"/><file name="Data.php" hash="47f7bc430c410c9989da367a8daff645"/><file name="Signal.php" hash="998380ec7df67fe41a27475fc7fe7ed2"/></dir><dir name="controllers"><file name="CodistoController.php" hash="eccbf167582d60ae559b7455b9b8e7ea"/><file name="IndexController.php" hash="62e550f21def246ae4a77b531213e988"/><file name="SyncController.php" hash="330295cefacba45b90b4f6e6fb68d72c"/></dir><dir name="Controller"><file name="Router.php" hash="66d43bfbe826fe525dc764d42146cd50"/></dir><dir name="Test"><file name="README" hash="8299e52f9198536ff5fd3fb42f4a29d8"/><dir name="Config"><file name="AdminHtml.php" hash="6ee6404e52ed6376ad41b7556f265c32"/><file name="Config.php" hash="2e9023fcbab484d03936394934f44f13"/><dir name="Config"><dir name="expectations"><file name="testCodistoCoreConfig.yaml" hash="4a4e07f62981139ff6eb8a63420cbf0d"/></dir></dir></dir><dir name="Controllers"><file name="CodistoController.php" hash="a2be4faeac73ff1847c0d7dc4fbdc0e0"/><file name="IndexController.php" hash="f7252fae8d2f7b67397ae56524db49d1"/><file name="SyncController.php" hash="33436e4935631488073765d723a82ff7"/></dir><dir name="Controller"><file name="Router.php" hash="8afc0dca269dd0977ff6b3ac6802d0ee"/></dir><dir name="Model"><file name="Paymentmethod.php" hash="862365909073ffbba057f6f152933826"/><file name="Sync.php" hash="10a38bbb62260208a8b1529e762b7b75"/></dir></dir><dir name="sql"><dir name="codisto_setup"><file name="mysql4-install-1.90.15.php" hash="6d07d4e22ae5d907df1f4389c3a829d4"/></dir></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.90.15.php" hash="29334830432cf1a02e4a992b9a42d6c5"/></dir></dir><dir name="Block"><file name="PaymentInfo.php" hash="7aa15fed37766d20d9d5a7d707aff80d"/></dir><dir name="Ebaypayment"><dir name="Model"><file name="Paymentmethod.php" hash="480787461a5b952a739f20a752bffb5d"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="9503ace98df8dfa2f2ec460b30e1053d"/><file name="config.xml" hash="7782661392d79ebd6ee252979aa80c88"/></dir><dir name="Model"><file name="Observer.php" hash="81c22aef68f97ef2e89c32729e3b378b"/><file name="Sync.php" hash="bb473d0e4d09e7c65e472c717b3e9b83"/><dir name="Indexer"><file name="Ebay.php" hash="556b1aabc7c3202f31a2e6c250e7d590"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="6a6664ea18d93bcdd0f45530caa56244"/></dir></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Codisto_Sync.xml" hash="a791bc2a9302d085eb29edf77421f525"/></dir></dir></dir></target></contents></package>
|