Contiamo_Connector - Version 1.3.0

Version Notes

Minor:
- Fix net_total and gross_total values on order items wrt tax.
- Return product cost row total (cost * qty) on order items if the cost is available

Download this release

Release Info

Developer Chris Baynes
Extension Contiamo_Connector
Version 1.3.0
Comparing to
See all releases


Code changes from version 1.2.1 to 1.3.0

Files changed (4) hide show
  1. app/code/community/Contiamo/Connector/Model/Export/OrderItem.php +5 -1
  2. app/code/community/Contiamo/Connector/Model/Export/OrderItems.php +4 -3
  3. app/code/community/Contiamo/Connector/etc/config.xml +1 -1
  4. package.xml +7 -5
app/code/community/Contiamo/Connector/Model/Export/OrderItem.php CHANGED
@@ -31,6 +31,10 @@ class Contiamo_Connector_Model_Export_OrderItem
31
  $category = $this->getCategory(1);
32
  return $category ? $category->getName() : '';
33
 
 
 
 
 
34
  default:
35
  return $this->orderItem->getData($field);
36
  }
@@ -65,4 +69,4 @@ class Contiamo_Connector_Model_Export_OrderItem
65
  return $val;
66
  }
67
  }
68
- }
31
  $category = $this->getCategory(1);
32
  return $category ? $category->getName() : '';
33
 
34
+ case 'product_cost':
35
+ $cost = $this->product->getCost();
36
+ return $cost ? $cost * $this->orderItem->getQtyOrdered() : '';
37
+
38
  default:
39
  return $this->orderItem->getData($field);
40
  }
69
  return $val;
70
  }
71
  }
72
+ }
app/code/community/Contiamo/Connector/Model/Export/OrderItems.php CHANGED
@@ -18,10 +18,11 @@ class Contiamo_Connector_Model_Export_OrderItems extends Contiamo_Connector_Mode
18
  'qty' => 'qty_ordered',
19
 
20
  // metrics
21
- 'gross_total' => 'row_total',
22
  'tax_total' => 'tax_amount',
23
- 'net_total' => 'subtotal',
24
- 'discount_total' => 'discount_amount'
 
25
  );
26
 
27
  public static function customAttributes()
18
  'qty' => 'qty_ordered',
19
 
20
  // metrics
21
+ 'gross_total' => 'row_total_incl_tax',
22
  'tax_total' => 'tax_amount',
23
+ 'net_total' => 'row_total',
24
+ 'discount_total' => 'discount_amount',
25
+ 'product_cost' => 'product_cost'
26
  );
27
 
28
  public static function customAttributes()
app/code/community/Contiamo/Connector/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Contiamo_Connector>
5
- <version>1.2.1</version>
6
  </Contiamo_Connector>
7
  </modules>
8
 
2
  <config>
3
  <modules>
4
  <Contiamo_Connector>
5
+ <version>1.3.0</version>
6
  </Contiamo_Connector>
7
  </modules>
8
 
package.xml CHANGED
@@ -1,18 +1,20 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Contiamo_Connector</name>
4
- <version>1.2.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Use Contiamo to analyze your sale trends and customer base.</summary>
10
  <description>Use Contiamo to analyze your sale trends and customer base.</description>
11
- <notes>fix magento version compatibility</notes>
 
 
12
  <authors><author><name>Chris Baynes</name><user>contiamo</user><email>info@contiamo.com</email></author></authors>
13
- <date>2015-08-14</date>
14
- <time>09:23:28</time>
15
- <contents><target name="magecommunity"><dir name="Contiamo"><dir name="Connector"><dir name="Helper"><file name="Data.php" hash="0b7005dfbd871a92c54f5a66201cde27"/></dir><dir name="Model"><dir name="Admin"><file name="AbstractSource.php" hash="649e273afe1ed9833eaa93c3c9dd9ce0"/><file name="CustomerSource.php" hash="832645ffd3dfc57e0d98ad83325ece02"/><file name="SaleItemSource.php" hash="3d24b9f71dee66d0b3f91c25deec6dc4"/><file name="SaleSource.php" hash="e6a42a4efe291823d2b3cd5cb38c7518"/></dir><file name="Contiamo.php" hash="7ed0a780d45c090cdd5af6738830ac62"/><dir name="Export"><file name="Collection.php" hash="2ca6280af2cdd7412e9f9bbdc04be6b1"/><file name="CustomAttributes.php" hash="3d798281b48857947316642e86fdd584"/><file name="Customer.php" hash="2b31447c49506f07b42d968619cab062"/><file name="Customers.php" hash="105a08c13f7034f0d8bb6f8212fcdda3"/><file name="Order.php" hash="7f2ac7f23d4f24ee9eac52312dbd7731"/><file name="OrderItem.php" hash="56249ebb4dce0f77da92a14268128ee0"/><file name="OrderItems.php" hash="1be1dbbd461d0b5604abce6b283c14f2"/><file name="OrderUpdates.php" hash="0bba8474dfa37f09a8f55216e1985cd4"/><file name="Orders.php" hash="e2284d473557226c1409b1f04d0fd980"/><file name="Status.php" hash="eb211ba504b76deba4375eefb2f90c37"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="3d4b6ecfc461825f115eb6dc8ba3677f"/></dir></dir></dir><dir name="controllers"><file name="ExportController.php" hash="2a6fe5fece69bfbf9395b61e1b91a4bb"/></dir><dir name="etc"><file name="adminhtml.xml" hash="70f5bf8121d1a276e649b9b5fb4ac9cc"/><file name="config.xml" hash="474351f6497567710e6e6ab8c8153ab7"/><file name="system.xml" hash="c1aaa3061a5e8fc4ba3ac66a0f408c58"/></dir><dir name="sql"><dir name="contiamo_setup"><file name="mysql4-install-0.0.1.php" hash="8b799197fe5d2567f1510b0777b137b1"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Contiamo_Connector.xml" hash="54eb6cba356dc238f94212376cbd86c1"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Contiamo_Connector</name>
4
+ <version>1.3.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Use Contiamo to analyze your sale trends and customer base.</summary>
10
  <description>Use Contiamo to analyze your sale trends and customer base.</description>
11
+ <notes>Minor:&#xD;
12
+ - Fix net_total and gross_total values on order items wrt tax.&#xD;
13
+ - Return product cost row total (cost * qty) on order items if the cost is available</notes>
14
  <authors><author><name>Chris Baynes</name><user>contiamo</user><email>info@contiamo.com</email></author></authors>
15
+ <date>2015-08-27</date>
16
+ <time>08:49:42</time>
17
+ <contents><target name="magecommunity"><dir name="Contiamo"><dir name="Connector"><dir name="Helper"><file name="Data.php" hash="0b7005dfbd871a92c54f5a66201cde27"/></dir><dir name="Model"><dir name="Admin"><file name="AbstractSource.php" hash="649e273afe1ed9833eaa93c3c9dd9ce0"/><file name="CustomerSource.php" hash="832645ffd3dfc57e0d98ad83325ece02"/><file name="SaleItemSource.php" hash="3d24b9f71dee66d0b3f91c25deec6dc4"/><file name="SaleSource.php" hash="e6a42a4efe291823d2b3cd5cb38c7518"/></dir><file name="Contiamo.php" hash="7ed0a780d45c090cdd5af6738830ac62"/><dir name="Export"><file name="Collection.php" hash="2ca6280af2cdd7412e9f9bbdc04be6b1"/><file name="CustomAttributes.php" hash="3d798281b48857947316642e86fdd584"/><file name="Customer.php" hash="2b31447c49506f07b42d968619cab062"/><file name="Customers.php" hash="105a08c13f7034f0d8bb6f8212fcdda3"/><file name="Order.php" hash="7f2ac7f23d4f24ee9eac52312dbd7731"/><file name="OrderItem.php" hash="0c1a723f3f047d4938a2ff1eb61e314b"/><file name="OrderItems.php" hash="f2a522e9321bc5fb52ca1e76497d549a"/><file name="OrderUpdates.php" hash="0bba8474dfa37f09a8f55216e1985cd4"/><file name="Orders.php" hash="e2284d473557226c1409b1f04d0fd980"/><file name="Status.php" hash="eb211ba504b76deba4375eefb2f90c37"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="3d4b6ecfc461825f115eb6dc8ba3677f"/></dir></dir></dir><dir name="controllers"><file name="ExportController.php" hash="2a6fe5fece69bfbf9395b61e1b91a4bb"/></dir><dir name="etc"><file name="adminhtml.xml" hash="70f5bf8121d1a276e649b9b5fb4ac9cc"/><file name="config.xml" hash="7757312a11532079d4f6953d556cb58f"/><file name="system.xml" hash="c1aaa3061a5e8fc4ba3ac66a0f408c58"/></dir><dir name="sql"><dir name="contiamo_setup"><file name="mysql4-install-0.0.1.php" hash="8b799197fe5d2567f1510b0777b137b1"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Contiamo_Connector.xml" hash="54eb6cba356dc238f94212376cbd86c1"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>