Bluejalappeno_Orderexport - Version 2.11.1

Version Notes

Added support for Enterprise

Download this release

Release Info

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


Code changes from version 2.9.0 to 2.11.1

Files changed (4) hide show
  1. app/code/community/Bluejalappeno/Orderexport/Model/Export/Sage.php +5 -5
  2. app/code/community/Bluejalappeno/Orderexport/Model/Observer.php +3 -3
  3. app/code/community/Bluejalappeno/Orderexport/changelog.txt +4 -0
  4. package.xml +5 -5
app/code/community/Bluejalappeno/Orderexport/Model/Export/Sage.php CHANGED
@@ -38,7 +38,7 @@ class Bluejalappeno_Orderexport_Model_Export_Sage extends Bluejalappeno_Orderexp
38
  $csv = '';
39
  foreach ($orders as $orderId) {
40
  $order = Mage::getModel('sales/order')->loadByAttribute('entity_id',$orderId);
41
- if ($order->getStatus() == Mage_Sales_Model_Order::STATE_COMPLETE || $order->getStatus() == Mage_Sales_Model_Order::STATE_CLOSED) {
42
  $this->writeOrder($order, $fp);
43
  }
44
  }
@@ -164,7 +164,7 @@ class Bluejalappeno_Orderexport_Model_Export_Sage extends Bluejalappeno_Orderexp
164
  if ($order->getShippingAmount()!= NULL && $order->getShippingAmount() != 0) {
165
  $shippingAmount = $order->getData('shipping_amount');
166
  $shipTaxAmount = $order->getData('shipping_tax_amount');
167
-
168
  $ship_csvData = array('SI',$accountCodeSales,$nominalCodeShip, '0',$orderdate,$orderId,$fullName,$shippingAmount,$taxcode,$shipTaxAmount,'1',$paymentMethod,'import');
169
  fputcsv($fp, $ship_csvData, self::DELIMITER, self::ENCLOSURE);
170
  }
@@ -178,8 +178,8 @@ class Bluejalappeno_Orderexport_Model_Export_Sage extends Bluejalappeno_Orderexp
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
  }
185
 
@@ -207,5 +207,5 @@ class Bluejalappeno_Orderexport_Model_Export_Sage extends Bluejalappeno_Orderexp
207
  );
208
  }
209
 
210
-
211
  }
38
  $csv = '';
39
  foreach ($orders as $orderId) {
40
  $order = Mage::getModel('sales/order')->loadByAttribute('entity_id',$orderId);
41
+ if ($order->getState() == Mage_Sales_Model_Order::STATE_COMPLETE || $order->getState() == Mage_Sales_Model_Order::STATE_CLOSED) {
42
  $this->writeOrder($order, $fp);
43
  }
44
  }
164
  if ($order->getShippingAmount()!= NULL && $order->getShippingAmount() != 0) {
165
  $shippingAmount = $order->getData('shipping_amount');
166
  $shipTaxAmount = $order->getData('shipping_tax_amount');
167
+
168
  $ship_csvData = array('SI',$accountCodeSales,$nominalCodeShip, '0',$orderdate,$orderId,$fullName,$shippingAmount,$taxcode,$shipTaxAmount,'1',$paymentMethod,'import');
169
  fputcsv($fp, $ship_csvData, self::DELIMITER, self::ENCLOSURE);
170
  }
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
  }
185
 
207
  );
208
  }
209
 
210
+
211
  }
app/code/community/Bluejalappeno/Orderexport/Model/Observer.php CHANGED
@@ -12,9 +12,9 @@ class Bluejalappeno_Orderexport_Model_Observer
12
  {
13
  public function addMassAction($observer) {
14
  $block = $observer->getEvent()->getBlock();
15
- if(get_class($block) =='Mage_Adminhtml_Block_Widget_Grid_Massaction'
16
- && strstr( $block->getRequest()->getControllerName(), 'sales_order') && Mage::getStoreConfig("order_export/export_orders/active"))
17
- {
18
  $block->addItem('orderexport', array(
19
  'label' => Mage::helper('sales')->__('Export Orders'),
20
  'url' => Mage::getModel('adminhtml/url')->getUrl('*/sales_order_export/csvexport'),
12
  {
13
  public function addMassAction($observer) {
14
  $block = $observer->getEvent()->getBlock();
15
+ if(($block instanceof Mage_Adminhtml_Block_Widget_Grid_Massaction || $block instanceof Enterprise_SalesArchive_Block_Adminhtml_Sales_Order_Grid_Massaction)
16
+ && strstr( $block->getRequest()->getControllerName(), 'sales_order') && Mage::getStoreConfig("order_export/export_orders/active"))
17
+ {
18
  $block->addItem('orderexport', array(
19
  'label' => Mage::helper('sales')->__('Export Orders'),
20
  'url' => Mage::getModel('adminhtml/url')->getUrl('*/sales_order_export/csvexport'),
app/code/community/Bluejalappeno/Orderexport/changelog.txt CHANGED
@@ -12,4 +12,8 @@ v2.8 - Rebranded to Blue Jalappeno, Resolved issue with compilation, Sage export
12
 
13
  v2.9 - Resovled issue with SSL
14
 
 
 
 
 
15
 
12
 
13
  v2.9 - Resovled issue with SSL
14
 
15
+ v2.10 - Altered test for block type in Observer
16
+
17
+ v2.11 - Added support for Enterprise
18
+
19
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Bluejalappeno_Orderexport</name>
4
- <version>2.9.0</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>
@@ -13,11 +13,11 @@
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>Resolved SSL issue</notes>
17
  <authors><author><name>Genevieve Eddison</name><user>japmaple</user><email>sales@bluejalappeno.com</email></author></authors>
18
- <date>2013-04-22</date>
19
- <time>03:48:09</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="0fb148f2cd7af56d02c5de9ce786fc1d"/><dir name="Options"><file name="Options.php" hash="21f4fdf0df408aad2a0898d1e1459cfd"/></dir></dir><file name="changelog.txt" hash="7689302fe53e3791a3441ea3892c1158"/><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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Bluejalappeno_Orderexport</name>
4
+ <version>2.11.1</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>
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>Added support for Enterprise</notes>
17
  <authors><author><name>Genevieve Eddison</name><user>japmaple</user><email>sales@bluejalappeno.com</email></author></authors>
18
+ <date>2013-11-16</date>
19
+ <time>01:40:04</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="c02b7792430a48f1cd497fd477c911fb"/><file name="Status.php" hash="9864800aa692cfc3846a50cead36c4b1"/></dir><file name="Observer.php" hash="23262c9e09abd58d14365b47ea7fbe00"/><dir name="Options"><file name="Options.php" hash="21f4fdf0df408aad2a0898d1e1459cfd"/></dir></dir><file name="changelog.txt" hash="4b92e0c0dbfbfbd0419e914494b7fe74"/><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>