Fruugo_Integration - Version 1.1.3

Version Notes

- fixed: non-fruugo orders can not be saved issue when create shipments

Download this release

Release Info

Developer inoutput.io
Extension Fruugo_Integration
Version 1.1.3
Comparing to
See all releases


Code changes from version 1.1.2 to 1.1.3

Files changed (3) hide show
  1. app/code/community/Fruugo/Integration/Model/Observer.php +8 -12
  2. app/code/community/Fruugo/Integration/etc/config.xml +1 -1
  3. package.xml +5 -5
app/code/community/Fruugo/Integration/Model/Observer.php CHANGED
@@ -42,19 +42,15 @@ class Fruugo_Integration_Model_Observer
42
  $order = $event->getOrder();
43
  $fruugoId = $order->getFruugoOrderId();
44
 
45
- if (empty($fruugoId) && $fruugoId === null) {
46
- $message = "Cannot process order, no fruugoId found for order: " . $order->getId();
47
- $this->_writeLog($message, self::$ERROR);
48
- throw new Exception($message);
49
- }
50
-
51
- if ($order->getStatus() == 'canceled') {
52
- $this->beforeCancelOrder($order, $fruugoId);
53
- }
54
 
55
- // When creating credit memo, order status changes to "processing"
56
- if ($order->getStatus() == 'processing') {
57
- $this->beforeSaveRefund($order, $fruugoId);
 
58
  }
59
  } catch (Exception $ex) {
60
  Mage::logException($ex);
42
  $order = $event->getOrder();
43
  $fruugoId = $order->getFruugoOrderId();
44
 
45
+ if (!empty($fruugoId) && $fruugoId !== null) {
46
+ if ($order->getStatus() == 'canceled') {
47
+ $this->beforeCancelOrder($order, $fruugoId);
48
+ }
 
 
 
 
 
49
 
50
+ // When creating credit memo, order status changes to "processing"
51
+ if ($order->getStatus() == 'processing') {
52
+ $this->beforeSaveRefund($order, $fruugoId);
53
+ }
54
  }
55
  } catch (Exception $ex) {
56
  Mage::logException($ex);
app/code/community/Fruugo/Integration/etc/config.xml CHANGED
@@ -24,7 +24,7 @@
24
  <config>
25
  <modules>
26
  <Fruugo_Integration>
27
- <version>1.1.2</version> <!-- Version number of your module -->
28
  </Fruugo_Integration>
29
  </modules>
30
  <global>
24
  <config>
25
  <modules>
26
  <Fruugo_Integration>
27
+ <version>1.1.3</version> <!-- Version number of your module -->
28
  </Fruugo_Integration>
29
  </modules>
30
  <global>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Fruugo_Integration</name>
4
- <version>1.1.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/">GNU</license>
7
  <channel>community</channel>
@@ -14,11 +14,11 @@ This plugin mainly performs two tasks:&#xD;
14
  - Generate products xml feed from Magento periodically on a specified frequency.&#xD;
15
  &#xD;
16
  - Read from Fruugo Rrders API periodically on a specified frequency, and notifies Magento order events to Fruugo Orders API.</description>
17
- <notes>- Fixed: use parent product's attributes when skus' are empty, including: Brand, Manufacturer, Description and Short Description</notes>
18
  <authors><author><name>inoutput.io</name><user>inoutput</user><email>support@inoutput.io</email></author><author><name>fruugo.com</name><user>Fruugo</user><email>support@fruugo.com</email></author></authors>
19
- <date>2016-05-13</date>
20
- <time>01:13:06</time>
21
- <contents><target name="magecommunity"><dir name="Fruugo"><dir name="Integration"><dir name="Block"><file name="AttributeMapping.php" hash="404e26cc04af15812e4658b890cf8a3b"/><file name="AttributeMappingFiltered.php" hash="f1ab925472234af316bb905c3956037b"/><file name="AttributesDropdown.php" hash="4ba397594b404eda631b44088e38c914"/><file name="AttributesDropdownFiltered.php" hash="efd6945b9917cdeab93b97329875f4a9"/><dir name="Catalog"><dir name="Product"><file name="Tab.php" hash="412d5a38c07f78fd56e3509809038008"/></dir></dir><file name="Languagestoremapping.php" hash="7852846c2428b4fc15434a1e78a37de7"/><file name="Refreshcountriesbutton.php" hash="5a7e3af708dd470725981ec187b2c07d"/><dir name="Sales"><dir name="Order"><dir name="View"><file name="Tabs.php" hash="d98faeeede3c06d5f28f8f9731438314"/></dir></dir></dir></dir><dir name="Helper"><file name="ConfigLoader.php" hash="f930d687b44fe0a3a9e70383e0500a7c"/><file name="Data.php" hash="866fe8e1ea50749218d6efcab8454f28"/><file name="Defines.php" hash="a97616fe105332db06292c68eabecdf1"/><file name="FruugoCountriesSeeder.php" hash="68949469a1b1ce6a605fccd132e9e3c0"/><file name="Logger.php" hash="a83fdd017e59261e059a8d18d223dd59"/><file name="OrdersFeedProcessor.php" hash="13ad2489306efa271b2a3c9cdf8df56c"/><file name="ProductsFeedGenerator.php" hash="c107ad9c705842f71b41ab25afa36c1b"/><file name="ProductsFeedGeneratorProfiler.php" hash="78519bf2785bc19f6debfbe433297f84"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><file name="OrderCron.php" hash="8187697b999171b8940be7e5306a3bc7"/><file name="ProductCron.php" hash="a8bdd62ad14cdb85d9ef0ae2b85cecad"/></dir><dir name="Source"><file name="Attributes.php" hash="efefa53fce3319717eeb5afd00444189"/><file name="AttributesFiltered.php" hash="3ab28b20474b54ae82b7b4cd54c8dbb8"/><file name="ExportPageSize.php" hash="a322cb1b507d33444078ba6494b461fd"/><file name="Hour.php" hash="fab1337425532af32cf8642b8b244930"/><file name="MaxErrors.php" hash="03213889323c47349b5aaa7d7b6752f5"/><file name="MaxResourcesLoad.php" hash="8b941802b5a45f2744abe83b117dceba"/><file name="NumberOfPerformanceReports.php" hash="17973e45d1bcb123359e29b1396a882d"/><file name="ProductDescriptionType.php" hash="4a2810baeabe1a74b1b06b92cc2e4481"/><file name="SleepTimeSec.php" hash="9c9790275cf3ec3347746bee53cb50ae"/></dir></dir></dir></dir><file name="AttributeMapping.php" hash="202770a2c3a8e37c34a029f29c0cf4e1"/><file name="Countries.php" hash="a23378525c616fd87c5589933aec48c6"/><file name="CronJobObserver.php" hash="303c9619a9abb2489365b08c94507b31"/><file name="Observer.php" hash="cfe67be1c9720875300293267a984766"/><file name="Payment.php" hash="4e7d2d72e7662ea71c178d85c9b9bd6c"/><dir name="Resource"><dir name="Countries"><file name="Collection.php" hash="618a95f1535d4c63724a2f7eaebf6c2b"/></dir><file name="Countries.php" hash="dc3da7aec3c3472a4ccd73e2b2f255f0"/><dir name="Shipment"><file name="Collection.php" hash="66d038f890e36403f9ffb2e283e88daf"/></dir><file name="Shipment.php" hash="d8c13444ba5089cf606241f2c7c9a87d"/></dir><file name="Shipment.php" hash="23b1c0b4bc4e29cb137c9b3819723a63"/></dir><dir name="controllers"><file name="OrdersController.php" hash="a2d9d2f4c916c376f146cfccecb4110d"/><file name="PackinglistController.php" hash="d76ac40e81f51635a073fb20492883f8"/><file name="ProductsController.php" hash="9dc5bf284d9813cb0c59bd8c11b7af7d"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/><file name=".gitignore" hash="a1d994a3c45d2cb16e44c5a311159532"/></dir><dir name="data"><dir name="fruugo_attributes_setup"><file name="data-install-0.1.1.php" hash="bd62b8624704473d9621dc3cf279e09a"/></dir><file name=".DS_Store" hash="d3071693cbf676ab90bb393a4d874cfc"/></dir><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="integration.xml" hash="3f173b27f9f483c00b33b713c0bad737"/></dir><dir name="template"><dir name="integration"><dir name="catalog"><dir name="product"><file name="fruugo-allowed-countries.phtml" hash="066098b4583e6bd3882c01645bd9ed1d"/></dir></dir><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="packinglist.phtml" hash="9ec64369d5c23043976b08573f3435dd"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="a3488e14d6b0099a753997fa1a5b95a5"/><file name="system.xml" hash="9a636de3f2feaf4e57e9fc4c754059d3"/></dir><dir name="sql"><dir name="fruugo_attributes_setup"><file name="install-0.1.1.php" hash="326629d7305e3c3b20aaf8d97de1f17b"/></dir></dir><file name=".DS_Store" hash="f1c8a7553e431a94f2a6a04691414584"/><file name=".gitignore" hash="f0cb20b35e2469e9e9617f658ed452a5"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="integration.xml" hash="3f173b27f9f483c00b33b713c0bad737"/></dir><dir name="template"><dir name="integration"><dir name="catalog"><dir name="product"><file name="fruugo-allowed-countries.phtml" hash="066098b4583e6bd3882c01645bd9ed1d"/></dir></dir><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="packinglist.phtml" hash="9ec64369d5c23043976b08573f3435dd"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Fruugo_Integration.xml" hash="d04b1a6c988bc77c1ef229967e3095c4"/></dir></target></contents>
22
  <compatible/>
23
  <dependencies><required><php><min>5.4.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7</min><max/></package></required></dependencies>
24
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Fruugo_Integration</name>
4
+ <version>1.1.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.gnu.org/licenses/">GNU</license>
7
  <channel>community</channel>
14
  - Generate products xml feed from Magento periodically on a specified frequency.&#xD;
15
  &#xD;
16
  - Read from Fruugo Rrders API periodically on a specified frequency, and notifies Magento order events to Fruugo Orders API.</description>
17
+ <notes>- fixed: non-fruugo orders can not be saved issue when create shipments</notes>
18
  <authors><author><name>inoutput.io</name><user>inoutput</user><email>support@inoutput.io</email></author><author><name>fruugo.com</name><user>Fruugo</user><email>support@fruugo.com</email></author></authors>
19
+ <date>2016-05-17</date>
20
+ <time>08:38:51</time>
21
+ <contents><target name="magecommunity"><dir name="Fruugo"><dir name="Integration"><dir name="Block"><file name="AttributeMapping.php" hash="404e26cc04af15812e4658b890cf8a3b"/><file name="AttributeMappingFiltered.php" hash="f1ab925472234af316bb905c3956037b"/><file name="AttributesDropdown.php" hash="4ba397594b404eda631b44088e38c914"/><file name="AttributesDropdownFiltered.php" hash="efd6945b9917cdeab93b97329875f4a9"/><dir name="Catalog"><dir name="Product"><file name="Tab.php" hash="412d5a38c07f78fd56e3509809038008"/></dir></dir><file name="Languagestoremapping.php" hash="7852846c2428b4fc15434a1e78a37de7"/><file name="Refreshcountriesbutton.php" hash="5a7e3af708dd470725981ec187b2c07d"/><dir name="Sales"><dir name="Order"><dir name="View"><file name="Tabs.php" hash="d98faeeede3c06d5f28f8f9731438314"/></dir></dir></dir></dir><dir name="Helper"><file name="ConfigLoader.php" hash="f930d687b44fe0a3a9e70383e0500a7c"/><file name="Data.php" hash="866fe8e1ea50749218d6efcab8454f28"/><file name="Defines.php" hash="a97616fe105332db06292c68eabecdf1"/><file name="FruugoCountriesSeeder.php" hash="68949469a1b1ce6a605fccd132e9e3c0"/><file name="Logger.php" hash="a83fdd017e59261e059a8d18d223dd59"/><file name="OrdersFeedProcessor.php" hash="13ad2489306efa271b2a3c9cdf8df56c"/><file name="ProductsFeedGenerator.php" hash="c107ad9c705842f71b41ab25afa36c1b"/><file name="ProductsFeedGeneratorProfiler.php" hash="78519bf2785bc19f6debfbe433297f84"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><file name="OrderCron.php" hash="8187697b999171b8940be7e5306a3bc7"/><file name="ProductCron.php" hash="a8bdd62ad14cdb85d9ef0ae2b85cecad"/></dir><dir name="Source"><file name="Attributes.php" hash="efefa53fce3319717eeb5afd00444189"/><file name="AttributesFiltered.php" hash="3ab28b20474b54ae82b7b4cd54c8dbb8"/><file name="ExportPageSize.php" hash="a322cb1b507d33444078ba6494b461fd"/><file name="Hour.php" hash="fab1337425532af32cf8642b8b244930"/><file name="MaxErrors.php" hash="03213889323c47349b5aaa7d7b6752f5"/><file name="MaxResourcesLoad.php" hash="8b941802b5a45f2744abe83b117dceba"/><file name="NumberOfPerformanceReports.php" hash="17973e45d1bcb123359e29b1396a882d"/><file name="ProductDescriptionType.php" hash="4a2810baeabe1a74b1b06b92cc2e4481"/><file name="SleepTimeSec.php" hash="9c9790275cf3ec3347746bee53cb50ae"/></dir></dir></dir></dir><file name="AttributeMapping.php" hash="202770a2c3a8e37c34a029f29c0cf4e1"/><file name="Countries.php" hash="a23378525c616fd87c5589933aec48c6"/><file name="CronJobObserver.php" hash="303c9619a9abb2489365b08c94507b31"/><file name="Observer.php" hash="edd3fff810f024cf9b02f8466c02f1fd"/><file name="Payment.php" hash="4e7d2d72e7662ea71c178d85c9b9bd6c"/><dir name="Resource"><dir name="Countries"><file name="Collection.php" hash="618a95f1535d4c63724a2f7eaebf6c2b"/></dir><file name="Countries.php" hash="dc3da7aec3c3472a4ccd73e2b2f255f0"/><dir name="Shipment"><file name="Collection.php" hash="66d038f890e36403f9ffb2e283e88daf"/></dir><file name="Shipment.php" hash="d8c13444ba5089cf606241f2c7c9a87d"/></dir><file name="Shipment.php" hash="23b1c0b4bc4e29cb137c9b3819723a63"/></dir><dir name="controllers"><file name="OrdersController.php" hash="a2d9d2f4c916c376f146cfccecb4110d"/><file name="PackinglistController.php" hash="d76ac40e81f51635a073fb20492883f8"/><file name="ProductsController.php" hash="9dc5bf284d9813cb0c59bd8c11b7af7d"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/><file name=".gitignore" hash="a1d994a3c45d2cb16e44c5a311159532"/></dir><dir name="data"><dir name="fruugo_attributes_setup"><file name="data-install-0.1.1.php" hash="bd62b8624704473d9621dc3cf279e09a"/></dir><file name=".DS_Store" hash="d3071693cbf676ab90bb393a4d874cfc"/></dir><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="integration.xml" hash="3f173b27f9f483c00b33b713c0bad737"/></dir><dir name="template"><dir name="integration"><dir name="catalog"><dir name="product"><file name="fruugo-allowed-countries.phtml" hash="066098b4583e6bd3882c01645bd9ed1d"/></dir></dir><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="packinglist.phtml" hash="9ec64369d5c23043976b08573f3435dd"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="f3e0316b37de31e41d9f70fae738b6f2"/><file name="system.xml" hash="9a636de3f2feaf4e57e9fc4c754059d3"/></dir><dir name="sql"><dir name="fruugo_attributes_setup"><file name="install-0.1.1.php" hash="326629d7305e3c3b20aaf8d97de1f17b"/></dir></dir><file name=".DS_Store" hash="f1c8a7553e431a94f2a6a04691414584"/><file name=".gitignore" hash="f0cb20b35e2469e9e9617f658ed452a5"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="integration.xml" hash="3f173b27f9f483c00b33b713c0bad737"/></dir><dir name="template"><dir name="integration"><dir name="catalog"><dir name="product"><file name="fruugo-allowed-countries.phtml" hash="066098b4583e6bd3882c01645bd9ed1d"/></dir></dir><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="packinglist.phtml" hash="9ec64369d5c23043976b08573f3435dd"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Fruugo_Integration.xml" hash="d04b1a6c988bc77c1ef229967e3095c4"/></dir></target></contents>
22
  <compatible/>
23
  <dependencies><required><php><min>5.4.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.7</min><max/></package></required></dependencies>
24
  </package>