Version Notes
Download this release
Release Info
Developer | Fontis |
Extension | Fontis_Australia |
Version | 2.2.5 |
Comparing to | |
See all releases |
Code changes from version 2.2.4 to 2.2.5
- app/code/community/Fontis/Australia/Model/Shipping/Carrier/Australiapost.php +108 -38
- app/code/community/Fontis/Australia/Model/Shipping/Carrier/Eparcel.php +25 -19
- app/code/community/Fontis/Australia/etc/config.xml +1 -4
- app/code/community/Fontis/Australia/etc/system.xml +18 -0
- app/code/community/Fontis/Australia/sql/australia_setup/mysql4-install-2.2.0.php +21 -14
- app/code/community/Fontis/Australia/sql/australia_setup/mysql4-install-2.2.2.php +3 -2
- app/design/frontend/base/default/layout/fontis_australia.xml +45 -0
- app/design/frontend/base/default/template/fontis/australia/payment/bpay/form.phtml +32 -0
- app/design/frontend/base/default/template/fontis/australia/payment/bpay/info.phtml +26 -0
- app/design/frontend/base/default/template/fontis/australia/payment/bpay/success.phtml +40 -0
- app/design/frontend/base/default/template/fontis/australia/payment/directdeposit/form.phtml +41 -0
- app/design/frontend/base/default/template/fontis/australia/payment/directdeposit/info.phtml +28 -0
- app/design/frontend/base/default/template/fontis/australia/payment/directdeposit/success.phtml +38 -0
- app/design/frontend/base/default/template/fontis/australia/postcode-checkout.phtml +84 -0
- app/design/frontend/base/default/template/fontis/australia/postcode.phtml +55 -0
- package.xml +7 -7
app/code/community/Fontis/Australia/Model/Shipping/Carrier/Australiapost.php
CHANGED
@@ -264,56 +264,126 @@ class Fontis_Australia_Model_Shipping_Carrier_Australiapost extends Mage_Shippin
|
|
264 |
}
|
265 |
|
266 |
protected function _drcRequest($service, $fromPostCode, $toPostCode, $destCountry, $weight, $length, $width, $height, $num_boxes)
|
267 |
-
|
268 |
-
|
269 |
-
|
270 |
-
|
271 |
-
|
272 |
-
|
273 |
-
|
274 |
-
|
275 |
-
|
276 |
-
|
277 |
-
|
278 |
-
|
279 |
-
|
280 |
-
|
281 |
-
|
282 |
-
|
283 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
284 |
try {
|
285 |
-
|
286 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
287 |
$drc_result = array();
|
288 |
$drc_result['err_msg'] = 'FAIL';
|
289 |
}
|
290 |
|
291 |
-
$drc_result = explode("\n"
|
292 |
-
|
293 |
//clean up array
|
294 |
-
|
295 |
-
|
296 |
-
|
|
|
|
|
|
|
|
|
|
|
297 |
}
|
|
|
|
|
298 |
}
|
299 |
-
else
|
|
|
|
|
300 |
$a = array();
|
301 |
$a['err_msg'] = 'FAIL';
|
302 |
return $a;
|
303 |
}
|
304 |
-
|
305 |
-
|
306 |
-
|
307 |
-
|
308 |
-
|
309 |
-
|
310 |
-
|
311 |
-
|
312 |
-
|
313 |
-
|
314 |
-
|
315 |
-
|
316 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
317 |
|
318 |
/**
|
319 |
* Get allowed shipping methods
|
264 |
}
|
265 |
|
266 |
protected function _drcRequest($service, $fromPostCode, $toPostCode, $destCountry, $weight, $length, $width, $height, $num_boxes)
|
267 |
+
{
|
268 |
+
// Construct the appropriate URL and send all the information
|
269 |
+
// to the Australia Post DRC.
|
270 |
+
|
271 |
+
// don't make a call if the postcodes are not populated.
|
272 |
+
if(is_null($fromPostCode) || is_null($toPostCode)) {
|
273 |
+
return array('err_msg' => 'One of To or From Postcodes are missing');
|
274 |
+
}
|
275 |
+
|
276 |
+
/**
|
277 |
+
* Lucas van Staden @ doghouse media (lucas@dhmedia.com.au)
|
278 |
+
* Add a drc call cache to session. (valid for 1 hour)
|
279 |
+
* The call to drc is made at least 3-4 times, using the same data (ugh)
|
280 |
+
* - Add to cart (sometimes * 2)
|
281 |
+
* - Checkout * 2
|
282 |
+
*
|
283 |
+
* Create a lookup cache based on FromPostcode->ToPostcode combination, and re-use cached data
|
284 |
+
* The end result will kill lookups in checkout process, as it was actually done at cart, which will speed checkout up.
|
285 |
+
*/
|
286 |
+
|
287 |
+
$drcCache = Mage::getSingleton('checkout/session')->getDrcCache();
|
288 |
+
if(!$drcCache) {
|
289 |
+
$drcCache = array();
|
290 |
+
} else {
|
291 |
+
// wrap it in a try block, s it is used durng checkout.
|
292 |
+
// prevents any mistake from stopping checkout as a new lookup will be done.
|
293 |
+
try {
|
294 |
+
$time = time();
|
295 |
+
if($this->getConfigFlag('cache')
|
296 |
+
&& array_key_exists($fromPostCode, $drcCache)
|
297 |
+
&& array_key_exists($toPostCode, $drcCache[$fromPostCode])
|
298 |
+
&& $time - $drcCache[$fromPostCode][$toPostCode]['timestamp'] < 3600) {
|
299 |
+
if ($this->getConfigFlag('debug')) {
|
300 |
+
Mage::log('Using cached drc lookup for ' . $fromPostCode . '/' . $toPostCode, null, 'fontis_australia.log');
|
301 |
+
}
|
302 |
+
return $drcCache[$fromPostCode][$toPostCode]['result'];
|
303 |
+
}
|
304 |
+
} catch (Exception $e) {
|
305 |
+
mage::logException($e);
|
306 |
+
}
|
307 |
+
}
|
308 |
+
|
309 |
+
$url = "http://drc.edeliver.com.au/ratecalc.asp?" .
|
310 |
+
"Pickup_Postcode=" . rawurlencode($fromPostCode) .
|
311 |
+
"&Destination_Postcode=" . rawurlencode($toPostCode) .
|
312 |
+
"&Country=" . rawurlencode($destCountry) .
|
313 |
+
"&Weight=" . rawurlencode($weight) .
|
314 |
+
"&Service_Type=" . rawurlencode($service) .
|
315 |
+
"&Height=" . rawurlencode($height) .
|
316 |
+
"&Width=" . rawurlencode($width) .
|
317 |
+
"&Length=" . rawurlencode($length) .
|
318 |
+
"&Quantity=" . rawurlencode($num_boxes);
|
319 |
+
|
320 |
+
if(extension_loaded('curl'))
|
321 |
+
{
|
322 |
+
|
323 |
+
if ($this->getConfigFlag('debug')) {
|
324 |
+
Mage::log('Using curl', null, 'fontis_australia.log');
|
325 |
+
}
|
326 |
try {
|
327 |
+
// use CURL rather than php fopen url wroppers.
|
328 |
+
// curl is faster.
|
329 |
+
// see http://stackoverflow.com/questions/555523/file-get-contents-vs-curl-what-has-better-performance
|
330 |
+
// and do it the 'magento way'
|
331 |
+
// @author Lucas van Staden from Doghouse Media (lucas@dhmedia.com.au)
|
332 |
+
$curl = new Varien_Http_Adapter_Curl();
|
333 |
+
$curl->setConfig(array(
|
334 |
+
'timeout' => 15 //Timeout in no of seconds
|
335 |
+
));
|
336 |
+
$curl->write(Zend_Http_Client::GET, $url);
|
337 |
+
$curlData = $curl->read();
|
338 |
+
$drc_result = Zend_Http_Response::extractBody($curlData);
|
339 |
+
$curl->close();
|
340 |
+
} catch(Exception $e) {
|
341 |
+
Mage::log($e);
|
342 |
$drc_result = array();
|
343 |
$drc_result['err_msg'] = 'FAIL';
|
344 |
}
|
345 |
|
346 |
+
$drc_result = explode("\n",$drc_result);
|
|
|
347 |
//clean up array
|
348 |
+
$drc_result = array_map('trim', $drc_result);
|
349 |
+
$drc_result = array_filter($drc_result);
|
350 |
+
|
351 |
+
}
|
352 |
+
else if(ini_get('allow_url_fopen'))
|
353 |
+
{
|
354 |
+
if ($this->getConfigFlag('debug')) {
|
355 |
+
Mage::log('Using fopen URL wrappers', null, 'fontis_australia.log');
|
356 |
}
|
357 |
+
|
358 |
+
$drc_result = file($url);
|
359 |
}
|
360 |
+
else
|
361 |
+
{
|
362 |
+
Mage::log('No download method available, could not contact DRC!', null, 'fontis_australia.log');
|
363 |
$a = array();
|
364 |
$a['err_msg'] = 'FAIL';
|
365 |
return $a;
|
366 |
}
|
367 |
+
Mage::log("DRC result: " . print_r($drc_result,true), null, 'fontis_australia.log');
|
368 |
+
|
369 |
+
$result = array();
|
370 |
+
foreach($drc_result as $vals)
|
371 |
+
{
|
372 |
+
$tokens = explode("=", $vals);
|
373 |
+
if(isset($tokens[1])) {
|
374 |
+
$result[$tokens[0]] = trim($tokens[1]);
|
375 |
+
} else {
|
376 |
+
return array('err_msg' => 'Parsing error on Australia Post results');
|
377 |
+
}
|
378 |
+
}
|
379 |
+
|
380 |
+
// save the drc data to lookup cache, with a timestamp.
|
381 |
+
if(is_array($drcCache)){
|
382 |
+
$drcCache[$fromPostCode][$toPostCode] = array('result'=>$result,'timestamp'=>time());
|
383 |
+
Mage::getSingleton('checkout/session')->setDrcCache($drcCache);
|
384 |
+
}
|
385 |
+
return $result;
|
386 |
+
}
|
387 |
|
388 |
/**
|
389 |
* Get allowed shipping methods
|
app/code/community/Fontis/Australia/Model/Shipping/Carrier/Eparcel.php
CHANGED
@@ -112,30 +112,36 @@ class Fontis_Australia_Model_Shipping_Carrier_Eparcel
|
|
112 |
|
113 |
return $result;
|
114 |
}
|
115 |
-
|
116 |
-
|
117 |
-
|
118 |
-
|
119 |
-
|
120 |
Mage::getSingleton('customer/session')->isLoggedIn()
|
121 |
-
AND
|
122 |
in_array(
|
123 |
Mage::getSingleton('customer/session')->getCustomerGroupId(),
|
124 |
-
explode(
|
125 |
-
|
126 |
-
|
|
|
127 |
)
|
128 |
);
|
129 |
-
|
130 |
-
|
131 |
-
|
132 |
-
|
133 |
-
|
134 |
-
|
135 |
-
|
136 |
-
|
137 |
-
|
138 |
-
|
|
|
|
|
|
|
|
|
|
|
139 |
|
140 |
public function getRate(Mage_Shipping_Model_Rate_Request $request)
|
141 |
{
|
112 |
|
113 |
return $result;
|
114 |
}
|
115 |
+
|
116 |
+
protected function _getChargeCode($rate)
|
117 |
+
{
|
118 |
+
/* Is this customer is in a ~business~ group ? */
|
119 |
+
$isBusinessCustomer = (
|
120 |
Mage::getSingleton('customer/session')->isLoggedIn()
|
121 |
+
AND
|
122 |
in_array(
|
123 |
Mage::getSingleton('customer/session')->getCustomerGroupId(),
|
124 |
+
explode(
|
125 |
+
',',
|
126 |
+
Mage::getStoreConfig('doghouse_eparcelexport/charge_codes/business_groups')
|
127 |
+
)
|
128 |
)
|
129 |
);
|
130 |
+
|
131 |
+
if ($isBusinessCustomer) {
|
132 |
+
if (isset($rate['charge_code_business']) && $rate['charge_code_business']) {
|
133 |
+
return $rate['charge_code_business'];
|
134 |
+
}
|
135 |
+
|
136 |
+
return Mage::getStoreConfig('doghouse_eparcelexport/charge_codes/default_charge_code_business');
|
137 |
+
} else {
|
138 |
+
if (isset($rate['charge_code_individual']) && $rate['charge_code_individual']) {
|
139 |
+
return $rate['charge_code_individual'];
|
140 |
+
}
|
141 |
+
|
142 |
+
return Mage::getStoreConfig('doghouse_eparcelexport/charge_codes/default_charge_code_individual');
|
143 |
+
}
|
144 |
+
}
|
145 |
|
146 |
public function getRate(Mage_Shipping_Model_Rate_Request $request)
|
147 |
{
|
app/code/community/Fontis/Australia/etc/config.xml
CHANGED
@@ -23,7 +23,7 @@
|
|
23 |
<config>
|
24 |
<modules>
|
25 |
<Fontis_Australia>
|
26 |
-
<version>2.2.
|
27 |
<depends>
|
28 |
<Mage_Shipping />
|
29 |
<Mage_Payment />
|
@@ -83,9 +83,6 @@
|
|
83 |
<australia_mysql4>
|
84 |
<class>Fontis_Australia_Model_Mysql4</class>
|
85 |
<entities>
|
86 |
-
<australia_postcode>
|
87 |
-
<table>australia_postcode</table>
|
88 |
-
</australia_postcode>
|
89 |
<eparcel>
|
90 |
<table>australia_eparcel</table>
|
91 |
</eparcel>
|
23 |
<config>
|
24 |
<modules>
|
25 |
<Fontis_Australia>
|
26 |
+
<version>2.2.5</version>
|
27 |
<depends>
|
28 |
<Mage_Shipping />
|
29 |
<Mage_Payment />
|
83 |
<australia_mysql4>
|
84 |
<class>Fontis_Australia_Model_Mysql4</class>
|
85 |
<entities>
|
|
|
|
|
|
|
86 |
<eparcel>
|
87 |
<table>australia_eparcel</table>
|
88 |
</eparcel>
|
app/code/community/Fontis/Australia/etc/system.xml
CHANGED
@@ -185,6 +185,24 @@
|
|
185 |
<show_in_website>1</show_in_website>
|
186 |
<show_in_store>1</show_in_store>
|
187 |
</specificerrmsg>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
188 |
</fields>
|
189 |
</australiapost>
|
190 |
<eparcel translate="label">
|
185 |
<show_in_website>1</show_in_website>
|
186 |
<show_in_store>1</show_in_store>
|
187 |
</specificerrmsg>
|
188 |
+
<cache translate="label">
|
189 |
+
<label>Cache Lookups</label>
|
190 |
+
<frontend_type>select</frontend_type>
|
191 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
192 |
+
<sort_order>999</sort_order>
|
193 |
+
<show_in_default>1</show_in_default>
|
194 |
+
<show_in_website>1</show_in_website>
|
195 |
+
<show_in_store>1</show_in_store>
|
196 |
+
</cache>
|
197 |
+
<debug translate="label">
|
198 |
+
<label>Debug</label>
|
199 |
+
<frontend_type>select</frontend_type>
|
200 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
201 |
+
<sort_order>1000</sort_order>
|
202 |
+
<show_in_default>1</show_in_default>
|
203 |
+
<show_in_website>1</show_in_website>
|
204 |
+
<show_in_store>1</show_in_store>
|
205 |
+
</debug>
|
206 |
</fields>
|
207 |
</australiapost>
|
208 |
<eparcel translate="label">
|
app/code/community/Fontis/Australia/sql/australia_setup/mysql4-install-2.2.0.php
CHANGED
@@ -97,10 +97,10 @@ $success = false;
|
|
97 |
try {
|
98 |
// Try using LOAD DATA which is extremely fast
|
99 |
$installer->run("LOAD DATA LOCAL INFILE '$postcodefile' INTO TABLE {$this->getTable('australia_postcode')}
|
100 |
-
|
101 |
-
|
102 |
-
|
103 |
-
|
104 |
$success = true;
|
105 |
} catch(Exception $e) {
|
106 |
$success = false;
|
@@ -108,22 +108,29 @@ try {
|
|
108 |
|
109 |
// Check if our LOAD DATA method worked (may not work in some environments)
|
110 |
if(!$success) {
|
111 |
-
//
|
|
|
112 |
$fp = fopen($postcodefile, 'r');
|
113 |
|
114 |
-
$_values =
|
115 |
-
$i =0;
|
|
|
116 |
while ($row = fgets($fp)) {
|
117 |
-
|
118 |
-
|
119 |
-
|
120 |
-
|
|
|
|
|
|
|
121 |
}
|
|
|
122 |
|
|
|
|
|
|
|
|
|
123 |
}
|
124 |
-
|
125 |
-
// Import all values in a single expression and commit, _much_ faster and avoids timeouts on shared hosting accounts
|
126 |
-
$installer->run("INSERT INTO {$this->getTable('au_postcode')} (postcode, city, region_code) VALUES ". $_values . ";");
|
127 |
|
128 |
fclose($fp);
|
129 |
}
|
97 |
try {
|
98 |
// Try using LOAD DATA which is extremely fast
|
99 |
$installer->run("LOAD DATA LOCAL INFILE '$postcodefile' INTO TABLE {$this->getTable('australia_postcode')}
|
100 |
+
FIELDS TERMINATED BY ','
|
101 |
+
OPTIONALLY ENCLOSED BY '\''
|
102 |
+
LINES TERMINATED BY '\\n'");
|
103 |
+
|
104 |
$success = true;
|
105 |
} catch(Exception $e) {
|
106 |
$success = false;
|
108 |
|
109 |
// Check if our LOAD DATA method worked (may not work in some environments)
|
110 |
if(!$success) {
|
111 |
+
// Here we import values in larger expressions, which is slower than LOAD DATA
|
112 |
+
// but should be available in all environments
|
113 |
$fp = fopen($postcodefile, 'r');
|
114 |
|
115 |
+
$_values = array();
|
116 |
+
$i = 0;
|
117 |
+
|
118 |
while ($row = fgets($fp)) {
|
119 |
+
$_values[] = '(' . trim($row) . ')';
|
120 |
+
|
121 |
+
// Process the file in batches
|
122 |
+
if($i++ % 1000 == 0) {
|
123 |
+
$insertValues = implode(',', $_values);
|
124 |
+
$installer->run("INSERT INTO {$this->getTable('australia_postcode')} (country_id, postcode, region_code, city) VALUES ". $insertValues . ";");
|
125 |
+
$_values = array();
|
126 |
}
|
127 |
+
}
|
128 |
|
129 |
+
// Insert any remaining values
|
130 |
+
if(count($_values)) {
|
131 |
+
$insertValues = implode(',', $_values);
|
132 |
+
$installer->run("INSERT INTO {$this->getTable('australia_postcode')} (country_id, postcode, region_code, city) VALUES ". $insertValues . ";");
|
133 |
}
|
|
|
|
|
|
|
134 |
|
135 |
fclose($fp);
|
136 |
}
|
app/code/community/Fontis/Australia/sql/australia_setup/mysql4-install-2.2.2.php
CHANGED
@@ -14,7 +14,8 @@
|
|
14 |
*
|
15 |
* @category Fontis
|
16 |
* @package Fontis_Australia
|
17 |
-
* @author Chris Norton
|
|
|
18 |
* @copyright Copyright (c) 2010 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
19 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
*/
|
@@ -100,7 +101,7 @@ try {
|
|
100 |
// Try using LOAD DATA which is extremely fast
|
101 |
$installer->run("LOAD DATA LOCAL INFILE '$postcodefile' INTO TABLE {$this->getTable('australia_postcode')}
|
102 |
FIELDS TERMINATED BY ','
|
103 |
-
OPTIONALLY ENCLOSED BY '\
|
104 |
LINES TERMINATED BY '\\n'");
|
105 |
|
106 |
$success = true;
|
14 |
*
|
15 |
* @category Fontis
|
16 |
* @package Fontis_Australia
|
17 |
+
* @author Chris Norton
|
18 |
+
* @author Jonathan Melnick
|
19 |
* @copyright Copyright (c) 2010 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
20 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
21 |
*/
|
101 |
// Try using LOAD DATA which is extremely fast
|
102 |
$installer->run("LOAD DATA LOCAL INFILE '$postcodefile' INTO TABLE {$this->getTable('australia_postcode')}
|
103 |
FIELDS TERMINATED BY ','
|
104 |
+
OPTIONALLY ENCLOSED BY '\''
|
105 |
LINES TERMINATED BY '\\n'");
|
106 |
|
107 |
$success = true;
|
app/design/frontend/base/default/layout/fontis_australia.xml
ADDED
@@ -0,0 +1,45 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* Fontis Australia Extension
|
5 |
+
*
|
6 |
+
* NOTICE OF LICENSE
|
7 |
+
*
|
8 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
10 |
+
* It is also available through the world-wide-web at this URL:
|
11 |
+
* http://opensource.org/licenses/osl-3.0.php
|
12 |
+
* If you did not receive a copy of the license and are unable to
|
13 |
+
* obtain it through the world-wide-web, please send an email
|
14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
15 |
+
*
|
16 |
+
* @category Fontis
|
17 |
+
* @package Fontis_Australia
|
18 |
+
* @author Chris Norton
|
19 |
+
* @copyright Copyright (c) 2008 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
20 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
21 |
+
*/
|
22 |
+
-->
|
23 |
+
<layout version="0.1.0">
|
24 |
+
<customer_address_form>
|
25 |
+
<reference name="footer">
|
26 |
+
<block type="core/template" name="fontis_australia_autocomplete" template="fontis/australia/postcode.phtml"/>
|
27 |
+
</reference>
|
28 |
+
</customer_address_form>
|
29 |
+
<customer_account_create>
|
30 |
+
<reference name="footer">
|
31 |
+
<block type="core/template" name="fontis_australia_autocomplete" template="fontis/australia/postcode.phtml"/>
|
32 |
+
</reference>
|
33 |
+
</customer_account_create>
|
34 |
+
<checkout_onepage_index>
|
35 |
+
<reference name="footer">
|
36 |
+
<block type="core/template" name="fontis_australia_autocomplete" template="fontis/australia/postcode-checkout.phtml"/>
|
37 |
+
</reference>
|
38 |
+
</checkout_onepage_index>
|
39 |
+
<checkout_onepage_success>
|
40 |
+
<reference name="checkout.success">
|
41 |
+
<block type="checkout/onepage_success" name="fontis.australia.bpay.success" template="fontis/australia/payment/bpay/success.phtml"/>
|
42 |
+
<block type="checkout/onepage_success" name="fontis.australia.directdeposit.success" template="fontis/australia/payment/directdeposit/success.phtml"/>
|
43 |
+
</reference>
|
44 |
+
</checkout_onepage_success>
|
45 |
+
</layout>
|
app/design/frontend/base/default/template/fontis/australia/payment/bpay/form.phtml
ADDED
@@ -0,0 +1,32 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Fontis Australia Extension
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Fontis
|
16 |
+
* @package Fontis_Australia
|
17 |
+
* @author Chris Norton
|
18 |
+
* @copyright Copyright (c) 2008 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
*/
|
21 |
+
?>
|
22 |
+
<fieldset class="form-list">
|
23 |
+
<ul id="payment_form_<?php echo $this->getMethodCode(); ?>" style="display:none">
|
24 |
+
<li>
|
25 |
+
<?php if ($this->getMethod()->getMessage()): ?>
|
26 |
+
<div class="input-box">
|
27 |
+
<p><?php echo $this->getMethod()->getMessage(); ?></p>
|
28 |
+
</div>
|
29 |
+
<?php endif; ?>
|
30 |
+
</li>
|
31 |
+
</ul>
|
32 |
+
</fieldset>
|
app/design/frontend/base/default/template/fontis/australia/payment/bpay/info.phtml
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Fontis Australia Extension
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Fontis
|
16 |
+
* @package Fontis_Australia
|
17 |
+
* @author Chris Norton
|
18 |
+
* @copyright Copyright (c) 2008 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
*/
|
21 |
+
?>
|
22 |
+
<?php if($this->getParentBlock() && $this->getParentBlock()->getModuleName() == 'Mage_Checkout'): ?>
|
23 |
+
<p><?php echo $this->getMethod()->getTitle() ?></p>
|
24 |
+
<?php else: ?>
|
25 |
+
<?php echo Mage::helper('australia/bpay')->bpayInfoBlock($this->getMethod()->getBillerCode(), $this->getMethod()->getRef()); ?>
|
26 |
+
<?php endif; ?>
|
app/design/frontend/base/default/template/fontis/australia/payment/bpay/success.phtml
ADDED
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Fontis Australia Extension
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Fontis
|
16 |
+
* @package Fontis_Australia
|
17 |
+
* @author Chris Norton
|
18 |
+
* @copyright Copyright (c) 2009 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
*/
|
21 |
+
?>
|
22 |
+
<?php
|
23 |
+
$order = Mage::getModel('sales/order')->loadByIncrementId($this->getOrderId());
|
24 |
+
$payment = $order->getPayment();
|
25 |
+
?>
|
26 |
+
<?php if($payment->getMethod() == 'bpay'): ?>
|
27 |
+
<?php
|
28 |
+
$bpay = Mage::getModel('australia/payment_bpay');
|
29 |
+
$data = array(
|
30 |
+
'biller_code' => $bpay->getBillerCode(),
|
31 |
+
'ref' => $bpay->getRef()
|
32 |
+
);
|
33 |
+
$payment->setAdditionalData(serialize($data));
|
34 |
+
$payment->save();
|
35 |
+
|
36 |
+
$order->addStatusToHistory('pending_bpay', 'Order placed with BPAY', false);
|
37 |
+
$order->save();
|
38 |
+
?>
|
39 |
+
<?php echo Mage::helper('australia/bpay')->bpayInfoBlock($data['biller_code'], $data['ref']); ?>
|
40 |
+
<?php endif; ?>
|
app/design/frontend/base/default/template/fontis/australia/payment/directdeposit/form.phtml
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Fontis Australia Extension
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Fontis
|
16 |
+
* @package Fontis_Australia
|
17 |
+
* @author Chris Norton
|
18 |
+
* @copyright Copyright (c) 2008 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
*/
|
21 |
+
?>
|
22 |
+
<fieldset class="form-list">
|
23 |
+
<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none">
|
24 |
+
<li>
|
25 |
+
<div class="input-box">
|
26 |
+
<?php if ($this->getMethod()->getAccountName()): ?>
|
27 |
+
<?php echo $this->__('<label>Account Name</label>: %s', $this->getMethod()->getAccountName()) ?><br />
|
28 |
+
<?php endif;?>
|
29 |
+
<?php if ($this->getMethod()->getAccountBSB()): ?>
|
30 |
+
<?php echo $this->__('<label>Account BSB</label>: %s', $this->getMethod()->getAccountBSB()) ?><br />
|
31 |
+
<?endif;?>
|
32 |
+
<?php if ($this->getMethod()->getAccountNumber()): ?>
|
33 |
+
<?php echo $this->__('<label>Account Number</label>: %s', $this->getMethod()->getAccountNumber()) ?><br />
|
34 |
+
<?php endif;?>
|
35 |
+
<?php if ($this->getMethod()->getMessage()): ?>
|
36 |
+
<p><?php echo $this->__('%s', $this->getMethod()->getMessage()); ?></p>
|
37 |
+
<?php endif;?>
|
38 |
+
</div>
|
39 |
+
</li>
|
40 |
+
</ul>
|
41 |
+
</fieldset>
|
app/design/frontend/base/default/template/fontis/australia/payment/directdeposit/info.phtml
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Fontis Australia Extension
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Fontis
|
16 |
+
* @package Fontis_Australia
|
17 |
+
* @author Chris Norton
|
18 |
+
* @copyright Copyright (c) 2008 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
*/
|
21 |
+
?>
|
22 |
+
<p><?php echo $this->getMethod()->getTitle() ?>
|
23 |
+
<?php //if($this->getInfo()->getAdditionalData()): ?>
|
24 |
+
<?php if($this->getAccountName()): ?><br /><?php echo $this->__('Account Name: %s', $this->getAccountName()); ?><?php endif; ?>
|
25 |
+
<?php if($this->getAccountBSB()): ?><br /><?php echo $this->__('Account BSB: %s', $this->getAccountBSB()); ?><?php endif; ?>
|
26 |
+
<?php if($this->getAccountNumber()): ?><br /><?php echo $this->__('Account Number: %s', $this->getAccountNumber()); ?><?php endif; ?>
|
27 |
+
<?php //endif;?>
|
28 |
+
</p>
|
app/design/frontend/base/default/template/fontis/australia/payment/directdeposit/success.phtml
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Fontis Australia Extension
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Fontis
|
16 |
+
* @package Fontis_Australia
|
17 |
+
* @author Chris Norton
|
18 |
+
* @copyright Copyright (c) 2009 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
*/
|
21 |
+
?>
|
22 |
+
<?php
|
23 |
+
$order = Mage::getModel('sales/order')->loadByIncrementId($this->getOrderId());
|
24 |
+
$payment = $order->getPayment();
|
25 |
+
?>
|
26 |
+
<?php if($payment->getMethod() == 'directdeposit_au'): ?>
|
27 |
+
<?php
|
28 |
+
$order->addStatusToHistory('pending_deposit', 'Order placed with Direct Deposit', false);
|
29 |
+
$order->save();
|
30 |
+
$data = @unserialize($payment->getAdditionalData());
|
31 |
+
?>
|
32 |
+
<div id="directdeposit_au_success">
|
33 |
+
<p class="message"><?php echo $this->__('Please use the following details to make payment:'); ?></p>
|
34 |
+
<?php if($data['account_name']): ?><br /><b><?php echo $this->__('Account Name: '); ?></b> <?php echo $data['account_name']; ?><?php endif; ?>
|
35 |
+
<?php if($data['account_bsb']): ?><br /><b><?php echo $this->__('Account BSB: '); ?></b> <?php echo $data['account_bsb']; ?><?php endif; ?>
|
36 |
+
<?php if($data['account_number']): ?><br /><b><?php echo $this->__('Account Number: '); ?></b> <?php echo $data['account_number']; ?><?php endif; ?>
|
37 |
+
</div>
|
38 |
+
<?php endif; ?>
|
app/design/frontend/base/default/template/fontis/australia/postcode-checkout.phtml
ADDED
@@ -0,0 +1,84 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Fontis Australia Extension
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Fontis
|
16 |
+
* @package Fontis_Australia
|
17 |
+
* @author Chris Norton
|
18 |
+
* @copyright Copyright (c) 2008 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
*/
|
21 |
+
?>
|
22 |
+
<script type="text/javascript">
|
23 |
+
|
24 |
+
//============ Billing ============//
|
25 |
+
var autocomplete_city_billing = new Element('div', { id: 'autocomplete_city_billing', 'class': 'search-autocomplete' });
|
26 |
+
$('billing:city').parentNode.appendChild(autocomplete_city_billing);
|
27 |
+
|
28 |
+
function updateAddressBilling(text, item) {
|
29 |
+
// Update state and postcode fields
|
30 |
+
var id = item.id;
|
31 |
+
var tokens = id.split('-');
|
32 |
+
|
33 |
+
// Assume item at index 1 is region_id, item at index 3 is postcode
|
34 |
+
$('billing:region_id').value = tokens[1];
|
35 |
+
$('billing:postcode').value = tokens[3];
|
36 |
+
}
|
37 |
+
|
38 |
+
// Create the autocompleter and assign it to a variable for future use.
|
39 |
+
var completer = new Ajax.Autocompleter("billing:city", "autocomplete_city_billing", "<?php echo $this->helper('australia')->getCitySuggestUrl();?>", {
|
40 |
+
afterUpdateElement: updateAddressBilling,
|
41 |
+
minChars: 2,
|
42 |
+
parameters: 'country=' + $F('billing:country_id')
|
43 |
+
});
|
44 |
+
|
45 |
+
// Detect when the country has changed and update the parameters sent by the autocompleter.
|
46 |
+
$('billing:country_id').observe('change', function() {
|
47 |
+
completer = new Ajax.Autocompleter("billing:city", "autocomplete_city_billing", "<?php echo $this->helper('australia')->getCitySuggestUrl();?>", {
|
48 |
+
afterUpdateElement: updateAddressBilling,
|
49 |
+
minChars: 2,
|
50 |
+
parameters: 'country=' + $F('billing:country_id')
|
51 |
+
});
|
52 |
+
});
|
53 |
+
|
54 |
+
//============ Shipping ============//
|
55 |
+
var autocomplete_city_shipping = new Element('div', { id: 'autocomplete_city_shipping', 'class': 'search-autocomplete' });
|
56 |
+
$('shipping:city').parentNode.appendChild(autocomplete_city_shipping);
|
57 |
+
|
58 |
+
function updateAddressShipping(text, item) {
|
59 |
+
// Update state and postcode fields
|
60 |
+
var id = item.id;
|
61 |
+
var tokens = id.split('-');
|
62 |
+
|
63 |
+
// Assume item at index 1 is region_id, item at index 3 is postcode
|
64 |
+
$('shipping:region_id').value = tokens[1];
|
65 |
+
$('shipping:postcode').value = tokens[3];
|
66 |
+
}
|
67 |
+
|
68 |
+
// Create the autocompleter and assign it to a variable for future use.
|
69 |
+
var completer = new Ajax.Autocompleter("shipping:city", "autocomplete_city_shipping", "<?php echo $this->helper('australia')->getCitySuggestUrl();?>", {
|
70 |
+
afterUpdateElement: updateAddressShipping,
|
71 |
+
minChars: 2,
|
72 |
+
parameters: 'country=' + $F('shipping:country_id')
|
73 |
+
});
|
74 |
+
|
75 |
+
// Detect when the country has changed and update the parameters sent by the autocompleter.
|
76 |
+
$('shipping:country_id').observe('change', function() {
|
77 |
+
completer = new Ajax.Autocompleter("shipping:city", "autocomplete_city_shipping", "<?php echo $this->helper('australia')->getCitySuggestUrl();?>", {
|
78 |
+
afterUpdateElement: updateAddressShipping,
|
79 |
+
minChars: 2,
|
80 |
+
parameters: 'country=' + $F('shipping:country_id')
|
81 |
+
});
|
82 |
+
});
|
83 |
+
|
84 |
+
</script>
|
app/design/frontend/base/default/template/fontis/australia/postcode.phtml
ADDED
@@ -0,0 +1,55 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Fontis Australia Extension
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Fontis
|
16 |
+
* @package Fontis_Australia
|
17 |
+
* @author Chris Norton
|
18 |
+
* @copyright Copyright (c) 2008 Fontis Pty. Ltd. (http://www.fontis.com.au)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
*/
|
21 |
+
?>
|
22 |
+
<script type="text/javascript">
|
23 |
+
|
24 |
+
// Create and insert the div that will hold the list of autocomplete items. This
|
25 |
+
// is added to the DOM immediately following the #city field.
|
26 |
+
var autocomplete_city = new Element('div', { id: 'autocomplete_city', 'class': 'search-autocomplete' });
|
27 |
+
$('city').parentNode.appendChild(autocomplete_city);
|
28 |
+
|
29 |
+
function updateAddress(text, item) {
|
30 |
+
// Update state and postcode fields
|
31 |
+
var id = item.id;
|
32 |
+
var tokens = id.split('-');
|
33 |
+
|
34 |
+
// Assume item at index 1 is region_id, item at index 3 is postcode
|
35 |
+
$('region_id').value = tokens[1];
|
36 |
+
$('zip').value = tokens[3];
|
37 |
+
}
|
38 |
+
|
39 |
+
// Create the autocompleter and assign it to a variable for future use.
|
40 |
+
var completer = new Ajax.Autocompleter("city", "autocomplete_city", "<?php echo $this->helper('australia')->getCitySuggestUrl();?>", {
|
41 |
+
afterUpdateElement: updateAddress,
|
42 |
+
minChars: 2,
|
43 |
+
parameters: 'country=' + $F('country')
|
44 |
+
});
|
45 |
+
|
46 |
+
// Detect when the country has changed and update the parameters sent by the autocompleter.
|
47 |
+
$('country').observe('change', function() {
|
48 |
+
completer = new Ajax.Autocompleter("city", "autocomplete_city", "<?php echo $this->helper('australia')->getCitySuggestUrl();?>", {
|
49 |
+
afterUpdateElement: updateAddress,
|
50 |
+
minChars: 2,
|
51 |
+
parameters: 'country=' + $F('country')
|
52 |
+
});
|
53 |
+
});
|
54 |
+
|
55 |
+
</script>
|
package.xml
CHANGED
@@ -1,18 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Fontis_Australia</name>
|
4 |
-
<version>2.2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Broad extension that provides functionality for Australian stores.</summary>
|
10 |
<description>This extension is intended to provide most of the functionality needed to run a Magento store in Australia. This includes all essential payment and shipping methods as well as small localisations such as adding the store's ABN, adding Australian states and territories to the region directory and adding in a postcode database.</description>
|
11 |
-
<notes
|
12 |
-
<authors><author><name>
|
13 |
-
<date>2013-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="Fontis"><dir name="Australia"><dir name="Block"><file name="Autocomplete.php" hash="38d0a8c86484df3f1ecdf717c31c0d32"/><dir name="Bpay"><file name="Form.php" hash="958e11d14d7c87054a68d34b60c498d6"/><file name="Info.php" hash="a28f40be3c76637eb43ba80c61031512"/></dir><dir name="Directdeposit"><file name="Form.php" hash="13589d5d85499678bdc62fde04107095"/><file name="Info.php" hash="0f31ac7451127c87813c823423a9057b"/></dir><file name="Getprice.php" hash="5a7bf428bdf3a2f6b829300c23ff3128"/><file name="Googleproducts.php" hash="ea0855bf1e2bd7b17c5bfd7f8621c0be"/><file name="Myshopping.php" hash="e0f1a55f3a9813a61c7e007499ee2847"/><file name="Shopbot.php" hash="23f9d9281bab84ef5a56205406acca5e"/><file name="Shoppingdotcom.php" hash="c8e591f21b7c4177a6cf08e2e5a5b8eb"/></dir><dir name="Helper"><file name="Bpay.php" hash="a2565444f18b28e70c8d29f802297057"/><file name="Data.php" hash="e493486d7a5ccd5589d99d08b136b819"/></dir><dir name="Model"><file name="Child.php" hash="475f761e6d50ce007fc264c492175181"/><dir name="Config"><file name="Condition.php" hash="c9e4791b79c3396fcc09d4360ce07f58"/><file name="CustomerGroupAccess.php" hash="e531a8049b9a877e01c2b806b065dbef"/><file name="CustomerGroups.php" hash="8014e56b1141cb9bbb63f807ec1c87a5"/><file name="ProductAttributes.php" hash="44f5a322c2c6c5e1ae7650a9633acd2c"/></dir><file name="FeedCronBase.php" hash="ddb265d96c3c6c8dbdeb16bc1c81c73d"/><dir name="Getprice"><file name="Child.php" hash="dfabad93d15f2429737557edf129e5b6"/><file name="Cron.php" hash="71a66c848b92673249c48490bef9f8d3"/></dir><file name="Getprice.php" hash="13b0ced9bb96501f63f4f18b53abc648"/><dir name="Googleproducts"><file name="Cron.php" hash="d32cca98a88e419351317685bf4e572f"/></dir><file name="Googleproducts.php" hash="ed6e75324fbaba5bc2ce1a5df9725d85"/><dir name="Myshopping"><file name="Child.php" hash="eed4b19b9461d31fa398804a6dd83b5b"/><file name="Cron.php" hash="1c57f4946c70cc15afdae9f72fb78f19"/></dir><file name="Myshopping.php" hash="0142fee7f03a38ae793054f35f4694d2"/><dir name="Mysql4"><dir name="Shipping"><dir name="Carrier"><dir name="Eparcel"><file name="Collection.php" hash="87f450c6b318060b83e7d7d0662cdf50"/></dir><file name="Eparcel.php" hash="0eb49c51ffa0905c37c36d803437cff1"/></dir></dir></dir><dir name="Payment"><file name="Bpay.php" hash="b60d9a61b06b100164fff49fc5113f71"/><file name="Directdeposit.php" hash="abd98cae3103f858e73ae9bc6e1bc3ec"/></dir><dir name="Shipping"><dir name="Carrier"><file name="Australiapost.php" hash="
|
16 |
<compatible/>
|
17 |
-
<dependencies><required><php><min>5.
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Fontis_Australia</name>
|
4 |
+
<version>2.2.5</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Broad extension that provides functionality for Australian stores.</summary>
|
10 |
<description>This extension is intended to provide most of the functionality needed to run a Magento store in Australia. This includes all essential payment and shipping methods as well as small localisations such as adding the store's ABN, adding Australian states and territories to the region directory and adding in a postcode database.</description>
|
11 |
+
<notes></notes>
|
12 |
+
<authors><author><name>Fontis</name><user>magento</user><email>magento@fontis.com.au</email></author></authors>
|
13 |
+
<date>2013-09-16</date>
|
14 |
+
<time>09:21:38</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="Fontis"><dir name="Australia"><dir name="Block"><file name="Autocomplete.php" hash="38d0a8c86484df3f1ecdf717c31c0d32"/><dir name="Bpay"><file name="Form.php" hash="958e11d14d7c87054a68d34b60c498d6"/><file name="Info.php" hash="a28f40be3c76637eb43ba80c61031512"/></dir><dir name="Directdeposit"><file name="Form.php" hash="13589d5d85499678bdc62fde04107095"/><file name="Info.php" hash="0f31ac7451127c87813c823423a9057b"/></dir><file name="Getprice.php" hash="5a7bf428bdf3a2f6b829300c23ff3128"/><file name="Googleproducts.php" hash="ea0855bf1e2bd7b17c5bfd7f8621c0be"/><file name="Myshopping.php" hash="e0f1a55f3a9813a61c7e007499ee2847"/><file name="Shopbot.php" hash="23f9d9281bab84ef5a56205406acca5e"/><file name="Shoppingdotcom.php" hash="c8e591f21b7c4177a6cf08e2e5a5b8eb"/></dir><dir name="Helper"><file name="Bpay.php" hash="a2565444f18b28e70c8d29f802297057"/><file name="Data.php" hash="e493486d7a5ccd5589d99d08b136b819"/></dir><dir name="Model"><file name="Child.php" hash="475f761e6d50ce007fc264c492175181"/><dir name="Config"><file name="Condition.php" hash="c9e4791b79c3396fcc09d4360ce07f58"/><file name="CustomerGroupAccess.php" hash="e531a8049b9a877e01c2b806b065dbef"/><file name="CustomerGroups.php" hash="8014e56b1141cb9bbb63f807ec1c87a5"/><file name="ProductAttributes.php" hash="44f5a322c2c6c5e1ae7650a9633acd2c"/></dir><file name="FeedCronBase.php" hash="ddb265d96c3c6c8dbdeb16bc1c81c73d"/><dir name="Getprice"><file name="Child.php" hash="dfabad93d15f2429737557edf129e5b6"/><file name="Cron.php" hash="71a66c848b92673249c48490bef9f8d3"/></dir><file name="Getprice.php" hash="13b0ced9bb96501f63f4f18b53abc648"/><dir name="Googleproducts"><file name="Cron.php" hash="d32cca98a88e419351317685bf4e572f"/></dir><file name="Googleproducts.php" hash="ed6e75324fbaba5bc2ce1a5df9725d85"/><dir name="Myshopping"><file name="Child.php" hash="eed4b19b9461d31fa398804a6dd83b5b"/><file name="Cron.php" hash="1c57f4946c70cc15afdae9f72fb78f19"/></dir><file name="Myshopping.php" hash="0142fee7f03a38ae793054f35f4694d2"/><dir name="Mysql4"><dir name="Shipping"><dir name="Carrier"><dir name="Eparcel"><file name="Collection.php" hash="87f450c6b318060b83e7d7d0662cdf50"/></dir><file name="Eparcel.php" hash="0eb49c51ffa0905c37c36d803437cff1"/></dir></dir></dir><dir name="Payment"><file name="Bpay.php" hash="b60d9a61b06b100164fff49fc5113f71"/><file name="Directdeposit.php" hash="abd98cae3103f858e73ae9bc6e1bc3ec"/></dir><dir name="Shipping"><dir name="Carrier"><file name="Australiapost.php" hash="59396f08ba69fa9eca7dde782411ca13"/><dir name="Eparcel"><dir name="Export"><file name="Abstract.php" hash="7e704c57695b3f6c01295f2539293741"/><file name="Csv.php" hash="0b629598d3fc4923f63549230c0fdcee"/><file name="Exception.php" hash="c548db3d6f8c03fa5d50a37c069be584"/></dir></dir><file name="Eparcel.php" hash="2f370c4ec21425cb33d7c6d9029785f7"/></dir><dir name="Config"><file name="Eparcel.php" hash="8c754cdc86316dbee53db68f0e2652bc"/><file name="Eparcelcondition.php" hash="b8cc830ab6e0e397d32bf574f60b0500"/><file name="Shippingmethods.php" hash="e9f180995d20abce68b6497e0114568b"/><file name="Weightunits.php" hash="e13ba9de393ae67420f863d4008c3c72"/></dir></dir><dir name="Shopbot"><file name="Child.php" hash="121df42f2ea7cc7945a88227412438ca"/><file name="Cron.php" hash="19ee9f6b965846be570ca18fd78cfb15"/></dir><file name="Shopbot.php" hash="0d3dfa8fa56098eb74dbea22c2ca3b41"/><dir name="Shoppingdotcom"><file name="Cron.php" hash="353db362d54aaeef11d0cddcf4a6a8a1"/></dir><file name="Shoppingdotcom.php" hash="26a3837c76ff71e6eeab80f527561dd6"/></dir><dir name="controllers"><file name="AjaxController.php" hash="5fb086e3236446b6a6f10f4c78eb3fcb"/><file name="EparcelController.php" hash="2a287dbe2fffa7c74a3a4835415eb79c"/></dir><dir name="etc"><file name="config.xml" hash="6e95e29c06c637e36685a8bc22976ee4"/><file name="system.xml" hash="70199a1a5a62d15a484c4b81ade3d929"/></dir><dir name="sql"><dir name="australia_setup"><file name="mysql4-install-0.7.0.php" hash="8aa6c64caf123d0898e4ebaa3ed0cffc"/><file name="mysql4-install-2.2.0.php" hash="a46b2a11640031bb1c81424803acd655"/><file name="mysql4-install-2.2.2.php" hash="0485b25aed56b159671fbd2727ea97af"/><file name="mysql4-upgrade-1.2.1-1.2.2.php" hash="9a381c07ec9ee53e2ffaa7ea7da4559d"/><file name="mysql4-upgrade-2.1.0-2.2.0.php" hash="e928ad23537c8a33ed767e873b0c9bb6"/><file name="mysql4-upgrade-2.2.1-2.2.2.php" hash="e3e0834f789e58d43ee6697dbb8353a9"/><file name="postcodes.csv" hash="e6e407c3fcf49625e62ee89f9404e667"/><file name="postcodes.txt" hash="21083a0f94e200259c9b4540666b251e"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="fontis"><dir name="australia"><dir name="payment"><dir name="bpay"><file name="form.phtml" hash="7245a655eac2513f8cd6c1a825586936"/><file name="info.phtml" hash="d4836cf6f5316b76b56ddefc48b67d94"/></dir><dir name="directdeposit"><file name="form.phtml" hash="0e5272781aa7c4d25c1c243fcf00487e"/><file name="info.phtml" hash="38112ef511c67c91a3f2ad43da7929da"/></dir></dir><dir name="system"><dir name="config"><dir name="form"><dir name="field"><file name="array_dropdown.phtml" hash="bdce71494213de5fe194873b5d0bed56"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="fontis_australia.xml" hash="d33f99fc5dfc156de09254e95a2c82eb"/></dir><dir name="template"><dir name="fontis"><dir name="australia"><dir name="payment"><dir name="bpay"><file name="form.phtml" hash="3895f9afa025444eb9a1cdc38582069d"/><file name="info.phtml" hash="47d1e0cc3ae676dff49990eba0ac4608"/><file name="success.phtml" hash="115a1710b1f3b0ef3ecf0b957651bb43"/></dir><dir name="directdeposit"><file name="form.phtml" hash="8cf9d09e42ba30206aabf01a3ec38239"/><file name="info.phtml" hash="8bc98b2fd1d1943f17d2831a67c97db3"/><file name="success.phtml" hash="0545f8c3c9d37a2045a20f442991e8d7"/></dir></dir><file name="postcode-checkout.phtml" hash="12e8e6f7ca321d59c52d968c9a4f1400"/><file name="postcode.phtml" hash="74240bff135724677d6a56c5ddea2ccf"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Fontis_Australia.xml" hash="a60b83cf1b1b449a16fe09da16342a4d"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="images"><dir name="fontis"><file name="bpay.png" hash="481c9ee07049203aca13d6d2c2948cf7"/></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
+
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|