codistoconnect - Version 1.90.18

Version Notes

Download this release

Release Info

Developer Codisto
Extension codistoconnect
Version 1.90.18
Comparing to
See all releases


Code changes from version 1.90.17 to 1.90.18

Files changed (6) hide show
  1. app/code/community/Codisto/Sync/controllers/IndexController.php +12 -4
  2. app/code/community/Codisto/Sync/controllers/SyncController.php +8 -3
  3. app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.17.php → data-install-1.90.18.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.17.php → mysql4-install-1.90.18.php} +0 -0
  6. package.xml +1 -1
app/code/community/Codisto/Sync/controllers/IndexController.php CHANGED
@@ -425,11 +425,18 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
425
 
426
  try
427
  {
 
428
  $order = Mage::getModel('sales/order')
429
- ->getCollection()
430
- ->addAttributeToFilter('codisto_orderid', $ordercontent->orderid)
431
- ->addAttributeToFilter('codisto_merchantid', array('in' => array($ordercontent->merchantid, '')))
432
- ->getFirstItem();
 
 
 
 
 
 
433
 
434
  if($order && $order->getId())
435
  {
@@ -445,6 +452,7 @@ class Codisto_Sync_IndexController extends Mage_Core_Controller_Front_Action
445
  }
446
  catch(Exception $e)
447
  {
 
448
  if($Retry < 5)
449
  {
450
  if($e->getCode() == 40001)
425
 
426
  try
427
  {
428
+
429
  $order = Mage::getModel('sales/order')
430
+ ->getCollection()
431
+ ->addFieldToFilter('codisto_orderid', $ordercontent->orderid)
432
+ ->addFieldToFilter(
433
+ array('codisto_merchantid', 'codisto_merchantid'),
434
+ array(
435
+ array('in'=> array($ordercontent->merchantid, '')),
436
+ array('null'=> true)
437
+ )
438
+ )
439
+ ->getFirstItem();
440
 
441
  if($order && $order->getId())
442
  {
452
  }
453
  catch(Exception $e)
454
  {
455
+
456
  if($Retry < 5)
457
  {
458
  if($e->getCode() == 40001)
app/code/community/Codisto/Sync/controllers/SyncController.php CHANGED
@@ -890,11 +890,16 @@ class Codisto_Sync_SyncController extends Mage_Core_Controller_Front_Action
890
  $description = $request->getPost('description');
891
  $url = $request->getPost('url');
892
  $severity = (int)$request->getPost('severity');
893
- Mage::log($severity, null, 'codisto.log');
894
  if(Mage::getResourceModel('adminnotification/inbox_collection')->addFieldToFilter('url', $url)->addFieldToFilter('is_remove', 0)->getSize() == 0)
 
895
  Mage::getModel('adminnotification/inbox')->add($severity, $title, $description, $url);
896
-
897
- $this->sendJsonResponse($response, 200, 'OK', array( 'ack' => 'ok' ) );
 
 
 
 
898
  $response->sendResponse();
899
  }
900
  else
890
  $description = $request->getPost('description');
891
  $url = $request->getPost('url');
892
  $severity = (int)$request->getPost('severity');
893
+
894
  if(Mage::getResourceModel('adminnotification/inbox_collection')->addFieldToFilter('url', $url)->addFieldToFilter('is_remove', 0)->getSize() == 0)
895
+ {
896
  Mage::getModel('adminnotification/inbox')->add($severity, $title, $description, $url);
897
+ $this->sendJsonResponse($response, 200, 'OK', array( 'ack' => 'ok' ) );
898
+ }
899
+ else
900
+ {
901
+ $this->sendJsonResponse($response, 200, 'OK', array( 'ack' => 'warning', 'message' => 'already present' ) );
902
+ }
903
  $response->sendResponse();
904
  }
905
  else
app/code/community/Codisto/Sync/data/codisto_setup/{data-install-1.90.17.php → data-install-1.90.18.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.17</version>
27
  <depends>
28
  <Mage_Payment/>
29
  </depends>
23
  <config>
24
  <modules>
25
  <Codisto_Sync>
26
+ <version>1.90.18</version>
27
  <depends>
28
  <Mage_Payment/>
29
  </depends>
app/code/community/Codisto/Sync/sql/codisto_setup/{mysql4-install-1.90.17.php → mysql4-install-1.90.18.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.17</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-28</date><time>22:43:11</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="8a0721d8d2d882c4ba64e9dab9de4fe9"/><file name="Signal.php" hash="998380ec7df67fe41a27475fc7fe7ed2"/></dir><dir name="controllers"><file name="CodistoController.php" hash="eccbf167582d60ae559b7455b9b8e7ea"/><file name="IndexController.php" hash="a54e7e55520e577831bd464db252a0d1"/><file name="SyncController.php" hash="e0024e99b72a45a0ceb5a5732c00e251"/></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.17.php" hash="f5e7410bdb70ae4c021e3d257ccbf9a9"/></dir></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.90.17.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="2715ea2efb150c8c16aef39a91215e9e"/></dir><dir name="Model"><file name="Observer.php" hash="81c22aef68f97ef2e89c32729e3b378b"/><file name="Sync.php" hash="380df62a188b83592db593efc18905c3"/><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.18</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-29</date><time>1:25:03</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="8a0721d8d2d882c4ba64e9dab9de4fe9"/><file name="Signal.php" hash="998380ec7df67fe41a27475fc7fe7ed2"/></dir><dir name="controllers"><file name="CodistoController.php" hash="eccbf167582d60ae559b7455b9b8e7ea"/><file name="IndexController.php" hash="92422630ae591242f302647889e82db9"/><file name="SyncController.php" hash="b23c4d2ace9fa98ae0ea744b972ef154"/></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.18.php" hash="f5e7410bdb70ae4c021e3d257ccbf9a9"/></dir></dir><dir name="data"><dir name="codisto_setup"><file name="data-install-1.90.18.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="cf58ae30e3ad89735cc9ca9a8a5fc2c4"/></dir><dir name="Model"><file name="Observer.php" hash="81c22aef68f97ef2e89c32729e3b378b"/><file name="Sync.php" hash="380df62a188b83592db593efc18905c3"/><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>