From 4df5b10de7dec0d475019d6c1dfe80c1660031d8 Mon Sep 17 00:00:00 2001
From: Lucas van Staden <lucas@dhemdia.com.au>
Date: Thu, 6 Mar 2014 15:28:53 +0800
Subject: [PATCH] Add epracel code fields to core shipping methods freeshipping
 and flatrate

---
 .../Shipping/Carrier/Eparcel/Export/Csv.php   |  7 ++++++
 .../community/Fontis/Australia/etc/system.xml | 24 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/app/code/community/Fontis/Australia/Model/Shipping/Carrier/Eparcel/Export/Csv.php b/src/app/code/community/Fontis/Australia/Model/Shipping/Carrier/Eparcel/Export/Csv.php
index e97dcb9..64345e8 100755
--- a/src/app/code/community/Fontis/Australia/Model/Shipping/Carrier/Eparcel/Export/Csv.php
+++ b/src/app/code/community/Fontis/Australia/Model/Shipping/Carrier/Eparcel/Export/Csv.php
@@ -262,6 +262,13 @@ protected function getConsignementRecord(Mage_Sales_Model_Order $order, Dhmedia_
     
     protected function _getChargeCode(Mage_Sales_Model_Order $order)
     {
+        
+        if($shippingCarrier = $order->getShippingCarrier()) {
+           if($shippingCarrier->getConfigData('eparcel_code')) {
+               return $shippingCarrier->getConfigData('eparcel_code');
+           }
+        }
+        
         list ($carrierCode, $chargeCode) = explode('_', $order->getData('shipping_method'));
         
         if ($this->_isValidChargeCode($chargeCode)) {
diff --git a/src/app/code/community/Fontis/Australia/etc/system.xml b/src/app/code/community/Fontis/Australia/etc/system.xml
index a212f8c..3b46a14 100644
--- a/src/app/code/community/Fontis/Australia/etc/system.xml
+++ b/src/app/code/community/Fontis/Australia/etc/system.xml
@@ -30,6 +30,30 @@
     <sections>
         <carriers>
             <groups>
+                <flatrate translate="label">
+                    <fields>
+                        <eparcel_code translate="label">
+                            <label>Eparcel Code</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>5000</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </eparcel_code>
+                    </fields>
+                </flatrate>
+                <freeshipping translate="label">
+                    <fields>
+                        <eparcel_code translate="label">
+                            <label>Eparcel Code</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>5000</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </eparcel_code>
+                    </fields>
+                </freeshipping>
                 <australiapost translate="label" module="australia">
                     <label>Australia Post</label>
                     <frontend_type>text</frontend_type>