codistoconnect - Version 1.90.4

Version Notes

Download this release

Release Info

Developer Codisto
Extension codistoconnect
Version 1.90.4
Comparing to
See all releases


Code changes from version 1.90.3 to 1.90.4

Files changed (6) hide show
  1. app/code/community/Codisto/Sync/Model/Observer.php +2 -0
  2. app/code/community/Codisto/Sync/controllers/IndexController.php +22 -31
  3. app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.3.php → data-install-1.90.4.php} +0 -0
  4. app/code/community/Codisto/Sync/etc/config.xml +1 -1
  5. app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.3.php → mysql4-install-1.90.4.php} +0 -0
  6. package.xml +1 -1
app/code/community/Codisto/Sync/Model/Observer.php CHANGED
@@ -743,6 +743,8 @@ class Codisto_Sync_Model_Observer
743
  }
744
 
745
  $MerchantID = Zend_Json::decode(Mage::getStoreConfig('codisto/merchantid', 0));
 
 
746
  $HostKey = Mage::getStoreConfig('codisto/hostkey', 0);
747
  if(!in_array($MerchantID, $visited, true))
748
  $merchants[] = array( 'merchantid' => $MerchantID, 'hostkey' => $HostKey, 'storeid' => 0);
743
  }
744
 
745
  $MerchantID = Zend_Json::decode(Mage::getStoreConfig('codisto/merchantid', 0));
746
+ if(is_array($MerchantID))
747
+ $MerchantID = $MerchantID[0];
748
  $HostKey = Mage::getStoreConfig('codisto/hostkey', 0);
749
  if(!in_array($MerchantID, $visited, true))
750
  $merchants[] = array( 'merchantid' => $MerchantID, 'hostkey' => $HostKey, 'storeid' => 0);
app/code/community/Codisto/Sync/controllers/IndexController.php CHANGED
@@ -1415,45 +1415,36 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
1415
  }
1416
  }
1417
 
1418
- if($ordercontent->paymentstatus == 'complete')
 
 
1419
  {
1420
- $order->setBaseTotalPaid($ordertotal);
1421
- $order->setTotalPaid($ordertotal);
1422
- $order->setBaseTotalDue(0.0);
1423
- $order->setTotalDue(0.0);
1424
- $order->setDue(0.0);
 
 
1425
 
1426
- $payment = $order->getPayment();
1427
 
1428
- if($paypaltransactionid)
1429
- {
1430
- $transaction = $payment->getTransaction(0);
1431
- if($transaction)
1432
  {
1433
- $transaction->setTxnId($paypaltransactionid);
1434
- $payment->setLastTransId($paypaltransactionid);
 
 
 
 
1435
  }
1436
- }
1437
 
1438
- $payment->setMethod('ebay');
1439
- $payment->setParentTransactionId(null)
1440
- ->setIsTransactionClosed(1);
1441
 
1442
- $payment->save();
1443
- }
1444
- else
1445
- {
1446
- $payment = $order->getPayment();
1447
- $payment->setMethod('ebay');
1448
- $payment->save();
1449
- }
1450
-
1451
- $order->save();
1452
 
1453
- if(!$order->hasInvoices())
1454
- {
1455
- if($ordercontent->paymentstatus == 'complete' && $order->canInvoice())
1456
- {
1457
  $invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice();
1458
 
1459
  if($invoice->getTotalQty())
1415
  }
1416
  }
1417
 
1418
+ $order->save();
1419
+
1420
+ if(!$order->hasInvoices())
1421
  {
1422
+ if($ordercontent->paymentstatus == 'complete' && $order->canInvoice())
1423
+ {
1424
+ $order->setBaseTotalPaid($ordertotal);
1425
+ $order->setTotalPaid($ordertotal);
1426
+ $order->setBaseTotalDue(0.0);
1427
+ $order->setTotalDue(0.0);
1428
+ $order->setDue(0.0);
1429
 
1430
+ $payment = $order->getPayment();
1431
 
1432
+ if($paypaltransactionid)
 
 
 
1433
  {
1434
+ $transaction = $payment->getTransaction(0);
1435
+ if($transaction)
1436
+ {
1437
+ $transaction->setTxnId($paypaltransactionid);
1438
+ $payment->setLastTransId($paypaltransactionid);
1439
+ }
1440
  }
 
1441
 
1442
+ $payment->setMethod('ebay');
1443
+ $payment->setParentTransactionId(null)
1444
+ ->setIsTransactionClosed(1);
1445
 
1446
+ $payment->save();
 
 
 
 
 
 
 
 
 
1447
 
 
 
 
 
1448
  $invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice();
1449
 
1450
  if($invoice->getTotalQty())
app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.3.php → data-install-1.90.4.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.3</version>
27
  <depends>
28
  <Mage_Payment/>
29
  </depends>
23
  <config>
24
  <modules>
25
  <Codisto_Sync>
26
+ <version>1.90.4</version>
27
  <depends>
28
  <Mage_Payment/>
29
  </depends>
app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.3.php → mysql4-install-1.90.4.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.3</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-06-15</date><time>18:26:18</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="331f0298b2c5701e2e7ef4d52b11c5e6"/><file name="Signal.php" hash="b624f962056ceffae9c3160ed3e5655e"/></dir><dir name="controllers"><file name="CodistoController.php" hash="4992c5f9d6d2f7422f409f0321b0e455"/><file name="IndexController.php" hash="3519c07183177e17e75cb84e7a30a934"/><file name="SyncController.php" hash="dffd761724da815f9e29620b475e2c08"/></dir><dir name="Controller"><file name="Router.php" hash="0ae958be465fbbe216afe18d4a715c5d"/></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.3.php" hash="6d07d4e22ae5d907df1f4389c3a829d4"/></dir></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.90.3.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="4ef592c4047f610b6943758fa4fd43a6"/><file name="config.xml" hash="2387f3f61abd1272c313a8ecfba55cef"/></dir><dir name="Model"><file name="Observer.php" hash="b0b1e5c7ac62875fd77a74c49c48d5e9"/><file name="Sync.php" hash="1dd1ae1ef128a7ea51625ac2238e83ba"/><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>
1
  <?xml version="1.0"?>
2
+ <package><name>codistoconnect</name><version>1.90.4</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-06-29</date><time>19:08:19</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="331f0298b2c5701e2e7ef4d52b11c5e6"/><file name="Signal.php" hash="b624f962056ceffae9c3160ed3e5655e"/></dir><dir name="controllers"><file name="CodistoController.php" hash="4992c5f9d6d2f7422f409f0321b0e455"/><file name="IndexController.php" hash="8f4607d274bf4ca479bd0e3670be9839"/><file name="SyncController.php" hash="dffd761724da815f9e29620b475e2c08"/></dir><dir name="Controller"><file name="Router.php" hash="0ae958be465fbbe216afe18d4a715c5d"/></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.4.php" hash="6d07d4e22ae5d907df1f4389c3a829d4"/></dir></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.90.4.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="4ef592c4047f610b6943758fa4fd43a6"/><file name="config.xml" hash="3926beeb88969b7a8bb8fc9e6cbed7fd"/></dir><dir name="Model"><file name="Observer.php" hash="8b309ae85f2bf696e97ff6777c1d64f2"/><file name="Sync.php" hash="1dd1ae1ef128a7ea51625ac2238e83ba"/><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>