codistoconnect - Version 1.91.9

Version Notes

Release 1.91.9

Download this release

Release Info

Developer Codisto
Extension codistoconnect
Version 1.91.9
Comparing to
See all releases


Code changes from version 1.91.8 to 1.91.9

app/code/community/Codisto/Sync/controllers/IndexController.php CHANGED
@@ -584,6 +584,10 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
584
if(!$ebaysalesrecordnumber)
585
$ebaysalesrecordnumber = '';
586
587
$ebaytransactionid = (string)$ordercontent->ebaytransactionid;
588
589
$ebayusername = (string)$ordercontent->ebayusername;
@@ -601,11 +605,12 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
601
$order->setCodistoOrderid((string)$ordercontent->orderid);
602
$order->setCodistoMerchantid((string)$ordercontent->merchantid);
603
604
- if(preg_match('/\{ordernumber\}|\{ebaysalesrecordnumber\}|\{ebaytransactionid\}/', $ordernumberformat))
605
{
606
$incrementId = preg_replace('/\{ordernumber\}/', (string)$order->getIncrementId(), $ordernumberformat);
607
$incrementId = preg_replace('/\{ebaysalesrecordnumber\}/', $ebaysalesrecordnumber, $incrementId);
608
$incrementId = preg_replace('/\{ebaytransactionid\}/', $ebaytransactionid, $incrementId);
609
$order->setIncrementId($incrementId);
610
}
611
else
584
if(!$ebaysalesrecordnumber)
585
$ebaysalesrecordnumber = '';
586
587
+ $amazonorderid = (string)$ordercontent->amazonorderid;
588
+ if(!$amazonorderid)
589
+ $amazonorderid = '';
590
+
591
$ebaytransactionid = (string)$ordercontent->ebaytransactionid;
592
593
$ebayusername = (string)$ordercontent->ebayusername;
605
$order->setCodistoOrderid((string)$ordercontent->orderid);
606
$order->setCodistoMerchantid((string)$ordercontent->merchantid);
607
608
+ if(preg_match('/\{ordernumber\}|\{ebaysalesrecordnumber\}|\{ebaytransactionid\}|\{amazonorderid\}/', $ordernumberformat))
609
{
610
$incrementId = preg_replace('/\{ordernumber\}/', (string)$order->getIncrementId(), $ordernumberformat);
611
$incrementId = preg_replace('/\{ebaysalesrecordnumber\}/', $ebaysalesrecordnumber, $incrementId);
612
$incrementId = preg_replace('/\{ebaytransactionid\}/', $ebaytransactionid, $incrementId);
613
+ $incrementId = preg_replace('/\{amazonorderid\}/', $amazonorderid, $incrementId);
614
$order->setIncrementId($incrementId);
615
}
616
else
app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.91.8.php → data-install-1.91.9.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.91.8</version>
27
<depends>
28
<Mage_Payment/>
29
</depends>
23
<config>
24
<modules>
25
<Codisto_Sync>
26
+ <version>1.91.9</version>
27
<depends>
28
<Mage_Payment/>
29
</depends>
app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.91.8.php → mysql4-install-1.91.9.php} RENAMED
File without changes
package.xml CHANGED
@@ -1,7 +1,7 @@
1
<?xml version="1.0"?>
2
<package>
3
<name>codistoconnect</name>
4
- <version>1.91.8</version>
5
<stability>stable</stability>
6
<license uri="http://opensource.org/licenses/Apache-2.0">Apache 2</license>
7
<channel>community</channel>
@@ -16,11 +16,11 @@ Only simple products are supported.&#xD;
16
You will be required to authorise us to make listings on your behalf. This is easy to do and can be done in 3 steps.&#xD;
17
&#xD;
18
</description>
19
- <notes>Release 1.91.8</notes>
20
<authors><author><name>Codisto</name><user>codistodev</user><email>ebay@codisto.com</email></author></authors>
21
- <date>2017-07-23</date>
22
- <time>04:48:07</time>
23
- <contents><target name="magecommunity"><dir name="Codisto"><dir name="Sync"><dir name="Block"><file name="PaymentInfo.php" hash="7aa15fed37766d20d9d5a7d707aff80d"/></dir><dir name="Controller"><file name="Router.php" hash="9dbb9e0e72e5eb0eda425f450542e4db"/></dir><dir name="Ebaypayment"><dir name="Model"><file name="Paymentmethod.php" hash="480787461a5b952a739f20a752bffb5d"/></dir></dir><dir name="Helper"><file name="CmsContent.php" hash="f00b4523d681c60c660089d0de0f2e03"/><file name="Data.php" hash="8a0721d8d2d882c4ba64e9dab9de4fe9"/><file name="Signal.php" hash="998380ec7df67fe41a27475fc7fe7ed2"/></dir><dir name="Model"><dir name="Indexer"><file name="Ebay.php" hash="556b1aabc7c3202f31a2e6c250e7d590"/></dir><file name="Observer.php" hash="c94c6b2e7ba44e5adf77726a1dcb0f73"/><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="6a6664ea18d93bcdd0f45530caa56244"/></dir></dir><file name="Sync.php" hash="7e12ef2933ad4311f0a7d0b60c23f50d"/></dir><dir name="Test"><dir name="Config"><file name="AdminHtml.php" hash="6ee6404e52ed6376ad41b7556f265c32"/><dir name="Config"><dir name="expectations"><file name="testCodistoCoreConfig.yaml" hash="4a4e07f62981139ff6eb8a63420cbf0d"/></dir></dir><file name="Config.php" hash="2e9023fcbab484d03936394934f44f13"/></dir><dir name="Controller"><file name="Router.php" hash="8afc0dca269dd0977ff6b3ac6802d0ee"/></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="Model"><file name="Paymentmethod.php" hash="862365909073ffbba057f6f152933826"/><file name="Sync.php" hash="10a38bbb62260208a8b1529e762b7b75"/></dir><file name="README" hash="8299e52f9198536ff5fd3fb42f4a29d8"/></dir><dir name="controllers"><file name="CodistoController.php" hash="eccbf167582d60ae559b7455b9b8e7ea"/><file name="IndexController.php" hash="9cb9fce3d862c67be27f0e5c19a4630b"/><file name="IndexController.php.save" hash="24cc504720034f8c02ad9b889676abd0"/><file name="SyncController.php" hash="34561518a75844c480722129c780dfdf"/></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.91.8.php" hash="29334830432cf1a02e4a992b9a42d6c5"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="a1225ee5783c6cd41408e9c26091d1a2"/><file name="config.xml" hash="0e2ee60551b61b5c1a3907c54bdf50e5"/></dir><dir name="sql"><dir name="codisto_setup"><file name="mysql4-install-1.91.8.php" hash="f5e7410bdb70ae4c021e3d257ccbf9a9"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Codisto_Sync.xml" hash="a791bc2a9302d085eb29edf77421f525"/></dir></target></contents>
24
<compatible/>
25
<dependencies><required><php><min>5.2.0</min><max>8.0.0</max></php></required></dependencies>
26
</package>
1
<?xml version="1.0"?>
2
<package>
3
<name>codistoconnect</name>
4
+ <version>1.91.9</version>
5
<stability>stable</stability>
6
<license uri="http://opensource.org/licenses/Apache-2.0">Apache 2</license>
7
<channel>community</channel>
16
You will be required to authorise us to make listings on your behalf. This is easy to do and can be done in 3 steps.&#xD;
17
&#xD;
18
</description>
19
+ <notes>Release 1.91.9</notes>
20
<authors><author><name>Codisto</name><user>codistodev</user><email>ebay@codisto.com</email></author></authors>
21
+ <date>2017-08-09</date>
22
+ <time>07:49:12</time>
23
+ <contents><target name="magecommunity"><dir name="Codisto"><dir name="Sync"><dir name="Block"><file name="PaymentInfo.php" hash="7aa15fed37766d20d9d5a7d707aff80d"/></dir><dir name="Controller"><file name="Router.php" hash="9dbb9e0e72e5eb0eda425f450542e4db"/></dir><dir name="Ebaypayment"><dir name="Model"><file name="Paymentmethod.php" hash="480787461a5b952a739f20a752bffb5d"/></dir></dir><dir name="Helper"><file name="CmsContent.php" hash="f00b4523d681c60c660089d0de0f2e03"/><file name="Data.php" hash="8a0721d8d2d882c4ba64e9dab9de4fe9"/><file name="Signal.php" hash="998380ec7df67fe41a27475fc7fe7ed2"/></dir><dir name="Model"><dir name="Indexer"><file name="Ebay.php" hash="556b1aabc7c3202f31a2e6c250e7d590"/></dir><file name="Observer.php" hash="c94c6b2e7ba44e5adf77726a1dcb0f73"/><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="6a6664ea18d93bcdd0f45530caa56244"/></dir></dir><file name="Sync.php" hash="7e12ef2933ad4311f0a7d0b60c23f50d"/></dir><dir name="Test"><dir name="Config"><file name="AdminHtml.php" hash="6ee6404e52ed6376ad41b7556f265c32"/><dir name="Config"><dir name="expectations"><file name="testCodistoCoreConfig.yaml" hash="4a4e07f62981139ff6eb8a63420cbf0d"/></dir></dir><file name="Config.php" hash="2e9023fcbab484d03936394934f44f13"/></dir><dir name="Controller"><file name="Router.php" hash="8afc0dca269dd0977ff6b3ac6802d0ee"/></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="Model"><file name="Paymentmethod.php" hash="862365909073ffbba057f6f152933826"/><file name="Sync.php" hash="10a38bbb62260208a8b1529e762b7b75"/></dir><file name="README" hash="8299e52f9198536ff5fd3fb42f4a29d8"/></dir><dir name="controllers"><file name="CodistoController.php" hash="eccbf167582d60ae559b7455b9b8e7ea"/><file name="IndexController.php" hash="856decd3979f727e9674fe61576cca54"/><file name="IndexController.php.save" hash="24cc504720034f8c02ad9b889676abd0"/><file name="SyncController.php" hash="34561518a75844c480722129c780dfdf"/></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.91.9.php" hash="29334830432cf1a02e4a992b9a42d6c5"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="a1225ee5783c6cd41408e9c26091d1a2"/><file name="config.xml" hash="1c27489694580ac2457b3b24293c48f0"/></dir><dir name="sql"><dir name="codisto_setup"><file name="mysql4-install-1.91.9.php" hash="f5e7410bdb70ae4c021e3d257ccbf9a9"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Codisto_Sync.xml" hash="a791bc2a9302d085eb29edf77421f525"/></dir></target></contents>
24
<compatible/>
25
<dependencies><required><php><min>5.2.0</min><max>8.0.0</max></php></required></dependencies>
26
</package>