Bluejalappeno_Orderexport - Version 2.8.5

Version Notes

Updated payment information exported

Download this release

Release Info

Developer Genevieve Eddison
Extension Bluejalappeno_Orderexport
Version 2.8.5
Comparing to
See all releases


Code changes from version 2.8.4 to 2.8.5

Files changed (2) hide show
  1. app/code/community/Bluejalappeno/Orderexport/Model/Export/Sage.php +6 -2
  2. package.xml +9 -9
app/code/community/Bluejalappeno/Orderexport/Model/Export/Sage.php CHANGED
@@ -159,10 +159,8 @@ class Bluejalappeno_Orderexport_Model_Export_Sage extends Bluejalappeno_Orderexp
159
  $nominalCodePayments = Mage::getStoreConfig('order_export/sage/sage_pay_nominal');
160
 
161
  $csvData = array('SI',$accountCodeSales,$nominalCodeSales, '0',$orderdate,$orderId,$fullName,$grandTotal,$taxcode,$taxAmount,'1',$paymentMethod,'import');
162
- $payCsvData = array('SA' ,$accountCodePayments, $nominalCodePayments, '0', $orderdate,$orderId,$fullName,$grandTotal,$taxcode,$taxAmount,'1',$paymentMethod,'import');
163
 
164
  fputcsv($fp, $csvData, self::DELIMITER, self::ENCLOSURE);
165
- fputcsv($fp, $payCsvData, self::DELIMITER, self::ENCLOSURE);
166
  if ($order->getShippingAmount()!= NULL && $order->getShippingAmount() != 0) {
167
  $shippingAmount = $order->getData('shipping_amount');
168
  $shipTaxAmount = $order->getData('shipping_tax_amount');
@@ -175,6 +173,12 @@ class Bluejalappeno_Orderexport_Model_Export_Sage extends Bluejalappeno_Orderexp
175
  $refundcsvData = array('SC',$accountCodeSales,$nominalCodeSales, '0',$orderdate,$orderId,$fullName,$refundedAmount,$taxcode,$refundedTaxAmount,'1',$paymentMethod,'import');
176
  fputcsv($fp, $refundcsvData, self::DELIMITER, self::ENCLOSURE);
177
  }
 
 
 
 
 
 
178
 
179
 
180
  }
159
  $nominalCodePayments = Mage::getStoreConfig('order_export/sage/sage_pay_nominal');
160
 
161
  $csvData = array('SI',$accountCodeSales,$nominalCodeSales, '0',$orderdate,$orderId,$fullName,$grandTotal,$taxcode,$taxAmount,'1',$paymentMethod,'import');
 
162
 
163
  fputcsv($fp, $csvData, self::DELIMITER, self::ENCLOSURE);
 
164
  if ($order->getShippingAmount()!= NULL && $order->getShippingAmount() != 0) {
165
  $shippingAmount = $order->getData('shipping_amount');
166
  $shipTaxAmount = $order->getData('shipping_tax_amount');
173
  $refundcsvData = array('SC',$accountCodeSales,$nominalCodeSales, '0',$orderdate,$orderId,$fullName,$refundedAmount,$taxcode,$refundedTaxAmount,'1',$paymentMethod,'import');
174
  fputcsv($fp, $refundcsvData, self::DELIMITER, self::ENCLOSURE);
175
  }
176
+ foreach ($order->getPaymentsCollection() as $payment) {
177
+ $paymentAmount = $payment->getData('amount_paid');
178
+ $orderTax = $order->getData('tax_amount');
179
+ $payCsvData = array('SA' ,$accountCodePayments, $nominalCodePayments, '0', $orderdate,$orderId,$fullName,$paymentAmount,$taxcode,$orderTax,'1',$payment->getMethod(),'import');
180
+ fputcsv($fp, $payCsvData, self::DELIMITER, self::ENCLOSURE);
181
+ }
182
 
183
 
184
  }
package.xml CHANGED
@@ -1,23 +1,23 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Bluejalappeno_Orderexport</name>
4
- <version>2.8.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>Export your Magento orders in three versatile formats, including exports for CSV, Sage 50 and Highrise</summary>
10
  <description>Order Export includes:&#xD;
11
  &#xD;
12
  -export of full order details including customer details, payment, tax, shipping method&#xD;
13
  - standard csv format also includes item details and custom options with one line item per row&#xD;
14
  -Sage export is pre-formatted for upload to Sage accounting systems&#xD;
15
- -Highrise export will connect with your Highrise CRM account and update your customer details, order history and background information.</description>
16
- <notes>Sage export includes configurable values for codes and account numbers</notes>
17
- <authors><author><name>Genevieve Eddison</name><user>auto-converted</user><email>sales@bluejalappeno.com</email></author></authors>
18
- <date>2012-11-05</date>
19
- <time>06:13:40</time>
20
- <contents><target name="magecommunity"><dir name="Bluejalappeno"><dir name="Orderexport"><dir name="Block"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="b9b3a0b810c7fd756d5dbd7ec99a83a5"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="54167d4d52bbe2a993031b12d29f0b89"/></dir><dir name="Model"><dir name="Export"><file name="Abstractcsv.php" hash="01607a1c81b14816fa8236a2f9eaf2bd"/><file name="Csv.php" hash="f00ae2076f43a7f73e30fd86ca940371"/><file name="Highrise.php" hash="846f2903af565ded408c8d68745545bb"/><file name="Sage.php" hash="be588e3698b0cc0ebd46e1f623181c57"/><file name="Status.php" hash="9864800aa692cfc3846a50cead36c4b1"/></dir><dir name="Options"><file name="Options.php" hash="21f4fdf0df408aad2a0898d1e1459cfd"/></dir><file name="Observer.php" hash="146ec38b9f087792217d3ba4f55bd25c"/></dir><dir name="controllers"><dir name="Sales"><dir name="Order"><file name="ExportController.php" hash="8343ada483bb5813eb7d04387267cef0"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="ea64eff226e20394b5514700b31a9b58"/><file name="system.xml" hash="b2d7e6ec001938c450e602b45eefcad1"/></dir><file name="changelog.txt" hash="0a771d5f5ac8433ae40f46d57103746b"/><file name="versions_supported.txt" hash="a3e69dd4d9f892aab0dcbf0a5dd246e2"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Bluejalappeno_Orderexport.xml" hash="2475d3204e4ed96a2969993d51eacfe2"/></dir></target></contents>
21
  <compatible/>
22
- <dependencies/>
23
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Bluejalappeno_Orderexport</name>
4
+ <version>2.8.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>Export your Magento orders in three versatile formats, including exports for CSV, Sage 50 and Highrise </summary>
10
  <description>Order Export includes:&#xD;
11
  &#xD;
12
  -export of full order details including customer details, payment, tax, shipping method&#xD;
13
  - standard csv format also includes item details and custom options with one line item per row&#xD;
14
  -Sage export is pre-formatted for upload to Sage accounting systems&#xD;
15
+ -Highrise export will connect with your Highrise CRM account and update your customer details, order history and background information. </description>
16
+ <notes>Updated payment information exported</notes>
17
+ <authors><author><name>Genevieve Eddison</name><user>japmaple</user><email>sales@bluejalappeno.com</email></author></authors>
18
+ <date>2013-03-11</date>
19
+ <time>02:42:41</time>
20
+ <contents><target name="magecommunity"><dir name="Bluejalappeno"><dir name="Orderexport"><dir name="Block"><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="b9b3a0b810c7fd756d5dbd7ec99a83a5"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="54167d4d52bbe2a993031b12d29f0b89"/></dir><dir name="Model"><dir name="Export"><file name="Abstractcsv.php" hash="01607a1c81b14816fa8236a2f9eaf2bd"/><file name="Csv.php" hash="f00ae2076f43a7f73e30fd86ca940371"/><file name="Highrise.php" hash="846f2903af565ded408c8d68745545bb"/><file name="Sage.php" hash="f6f72aeb6c5129503c58c078ff334882"/><file name="Status.php" hash="9864800aa692cfc3846a50cead36c4b1"/></dir><file name="Observer.php" hash="146ec38b9f087792217d3ba4f55bd25c"/><dir name="Options"><file name="Options.php" hash="21f4fdf0df408aad2a0898d1e1459cfd"/></dir></dir><file name="changelog.txt" hash="0a771d5f5ac8433ae40f46d57103746b"/><dir name="controllers"><dir name="Sales"><dir name="Order"><file name="ExportController.php" hash="8343ada483bb5813eb7d04387267cef0"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="ea64eff226e20394b5514700b31a9b58"/><file name="system.xml" hash="b2d7e6ec001938c450e602b45eefcad1"/></dir><file name="versions_supported.txt" hash="a3e69dd4d9f892aab0dcbf0a5dd246e2"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Bluejalappeno_Orderexport.xml" hash="2475d3204e4ed96a2969993d51eacfe2"/></dir></target></contents>
21
  <compatible/>
22
+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
23
  </package>