Version Notes
Download this release
Release Info
| Developer | Codisto |
| Extension | codistoconnect |
| Version | 1.90.10 |
| Comparing to | |
| See all releases | |
Code changes from version 1.90.9 to 1.90.10
- app/code/community/Codisto/Sync/controllers/IndexController.php +4 -1
- app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.9.php → data-install-1.90.10.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.9.php → mysql4-install-1.90.10.php} +0 -0
- package.xml +1 -1
app/code/community/Codisto/Sync/controllers/IndexController.php
CHANGED
|
@@ -552,6 +552,8 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
|
|
| 552 |
if(!$ebaysalesrecordnumber)
|
| 553 |
$ebaysalesrecordnumber = '';
|
| 554 |
|
|
|
|
|
|
|
| 555 |
$ebayusername = (string)$ordercontent->ebayusername;
|
| 556 |
if(!$ebayusername)
|
| 557 |
$ebayusername = '';
|
|
@@ -566,10 +568,11 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
|
|
| 566 |
$order->setCustomer($quote->getCustomer());
|
| 567 |
$order->setCodistoOrderid($ordercontent->orderid);
|
| 568 |
|
| 569 |
-
if(preg_match('/\{ordernumber\}|\{ebaysalesrecordnumber\}/', $ordernumberformat))
|
| 570 |
{
|
| 571 |
$incrementId = preg_replace('/\{ordernumber\}/', (string)$order->getIncrementId(), $ordernumberformat);
|
| 572 |
$incrementId = preg_replace('/\{ebaysalesrecordnumber\}/', $ebaysalesrecordnumber, $incrementId);
|
|
|
|
| 573 |
$order->setIncrementId($incrementId);
|
| 574 |
}
|
| 575 |
else
|
| 552 |
if(!$ebaysalesrecordnumber)
|
| 553 |
$ebaysalesrecordnumber = '';
|
| 554 |
|
| 555 |
+
$ebaytransactionid = (string)$ordercontent->ebaytransactionid;
|
| 556 |
+
|
| 557 |
$ebayusername = (string)$ordercontent->ebayusername;
|
| 558 |
if(!$ebayusername)
|
| 559 |
$ebayusername = '';
|
| 568 |
$order->setCustomer($quote->getCustomer());
|
| 569 |
$order->setCodistoOrderid($ordercontent->orderid);
|
| 570 |
|
| 571 |
+
if(preg_match('/\{ordernumber\}|\{ebaysalesrecordnumber\}|\{ebaytransactionid\}/', $ordernumberformat))
|
| 572 |
{
|
| 573 |
$incrementId = preg_replace('/\{ordernumber\}/', (string)$order->getIncrementId(), $ordernumberformat);
|
| 574 |
$incrementId = preg_replace('/\{ebaysalesrecordnumber\}/', $ebaysalesrecordnumber, $incrementId);
|
| 575 |
+
$incrementId = preg_replace('/\{ebaytransactionid\}/', $ebaytransactionid, $incrementId);
|
| 576 |
$order->setIncrementId($incrementId);
|
| 577 |
}
|
| 578 |
else
|
app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.9.php → data-install-1.90.10.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.10</version>
|
| 27 |
<depends>
|
| 28 |
<Mage_Payment/>
|
| 29 |
</depends>
|
app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.9.php → mysql4-install-1.90.10.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.10</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-08-17</date><time>23:16:08</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="e5db211cdecaace51453f276e3e27268"/><file name="Signal.php" hash="b624f962056ceffae9c3160ed3e5655e"/></dir><dir name="controllers"><file name="CodistoController.php" hash="eccbf167582d60ae559b7455b9b8e7ea"/><file name="IndexController.php" hash="3926b34de61b45b2351b8b0d166ec6e1"/><file name="SyncController.php" hash="337315134c4a86f1aa6b1882e9b64937"/></dir><dir name="Controller"><file name="Router.php" hash="6e5ab9b0012590acf986459b5acec54c"/></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.10.php" hash="6d07d4e22ae5d907df1f4389c3a829d4"/></dir></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.90.10.php" hash="a42cf5f15b68ac92d4c207bed8472c7d"/></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="c5cdb49f8522fc213c8a65630ffb0cb4"/><file name="config.xml" hash="9cdd38b9425be8a38bb570f03c6ff9e6"/></dir><dir name="Model"><file name="Observer.php" hash="8b309ae85f2bf696e97ff6777c1d64f2"/><file name="Sync.php" hash="07662f6eb15475f27edea545a69f72e7"/><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>
|
