PostcodeNl_Api - Version 1.0.6.5

Version Notes

Changes:
- Fix an issue with the regular expressions updated in the previous version

Download this release

Release Info

Developer Magento Core Team
Extension PostcodeNl_Api
Version 1.0.6.5
Comparing to
See all releases


Code changes from version 1.0.6.4 to 1.0.6.5

Files changed (6) hide show
  1. app/code/community/PostcodeNl/Api/Helper/Data.php +4 -0
  2. app/code/community/PostcodeNl/Api/etc/config.xml +1 -1
  3. app/locale/en_US/PostcodeNl_Api.csv +1 -0
  4. app/locale/nl_NL/PostcodeNl_Api.csv +1 -0
  5. js/postcodenl/api/lookup.js +4 -4
  6. package.xml +5 -6
app/code/community/PostcodeNl/Api/Helper/Data.php CHANGED
@@ -129,6 +129,10 @@ class PostcodeNl_Api_Helper_Data extends Mage_Core_Helper_Abstract
129
  $sendResponse['message'] = $this->__('Unknown postcode + housenumber combination.');
130
  $sendResponse['messageTarget'] = 'housenumber';
131
  break;
 
 
 
 
132
  default:
133
  $sendResponse['message'] = $this->__('Validation error, please use manual input.');
134
  $sendResponse['messageTarget'] = 'housenumber';
129
  $sendResponse['message'] = $this->__('Unknown postcode + housenumber combination.');
130
  $sendResponse['messageTarget'] = 'housenumber';
131
  break;
132
+ case 'PostcodeNl_Controller_Address_InvalidHouseNumberException':
133
+ $sendResponse['message'] = $this->__('Housenumber format is not valid.');
134
+ $sendResponse['messageTarget'] = 'housenumber';
135
+ break;
136
  default:
137
  $sendResponse['message'] = $this->__('Validation error, please use manual input.');
138
  $sendResponse['messageTarget'] = 'housenumber';
app/code/community/PostcodeNl/Api/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <PostcodeNl_Api>
5
- <version>1.0.6.4</version>
6
  </PostcodeNl_Api>
7
  </modules>
8
  <frontend>
2
  <config>
3
  <modules>
4
  <PostcodeNl_Api>
5
+ <version>1.0.6.5</version>
6
  </PostcodeNl_Api>
7
  </modules>
8
  <frontend>
app/locale/en_US/PostcodeNl_Api.csv CHANGED
@@ -1,4 +1,5 @@
1
  "Unknown postcode + housenumber combination.","Unknown postcode + housenumber combination."
 
2
  "Housenumber addition `{addition}` is unknown.","Housenumber addition `{addition}` is unknown."
3
  "Housenumber addition required.","Housenumber addition required."
4
  "Invalid postcode format, use `1234AB` format.","Invalid postcode format, use `1234AB` format."
1
  "Unknown postcode + housenumber combination.","Unknown postcode + housenumber combination."
2
+ "Housenumber format is not valid.","Housenumber format is not valid."
3
  "Housenumber addition `{addition}` is unknown.","Housenumber addition `{addition}` is unknown."
4
  "Housenumber addition required.","Housenumber addition required."
5
  "Invalid postcode format, use `1234AB` format.","Invalid postcode format, use `1234AB` format."
app/locale/nl_NL/PostcodeNl_Api.csv CHANGED
@@ -1,4 +1,5 @@
1
  "Unknown postcode + housenumber combination.","Onbekende postcode + huisnummer combinatie."
 
2
  "Housenumber addition `{addition}` is unknown.","Huisnummer toevoeging `{addition}` is onbekend."
3
  "Housenumber addition required.","Huisnummer toevoeging vereist."
4
  "Invalid postcode format, use `1234AB` format.","Onbekend postcode formaat, gebruik het `1234AB` formaat."
1
  "Unknown postcode + housenumber combination.","Onbekende postcode + huisnummer combinatie."
2
+ "Housenumber format is not valid.","Onbekend huisnummer formaat."
3
  "Housenumber addition `{addition}` is unknown.","Huisnummer toevoeging `{addition}` is onbekend."
4
  "Housenumber addition required.","Huisnummer toevoeging vereist."
5
  "Invalid postcode format, use `1234AB` format.","Onbekend postcode formaat, gebruik het `1234AB` formaat."
js/postcodenl/api/lookup.js CHANGED
@@ -250,11 +250,11 @@ document.observe("dom:loaded", function()
250
  var housenumber_mixed = $(prefix + 'postcode_housenumber').getValue().trim();
251
  // Number, followed by non alphanumberic chars, and then additional number ("123 A", "123-rood", etc)
252
  // or: Number, followed directly by a letter and then alphanumeric/space charcters ("123b3", "123berk 23", etc)
253
- var housenumber_match = housenumber_mixed.match('/^('+ this.REGEXP_HOUSENUMBER +')([^0-9a-z]*('+ this.REGEXP_HOUSENUMBER_ADDITION +'))?$/i');
254
 
255
  var housenumber_addition_select = $(prefix +'postcode_housenumber_addition') ? $(prefix +'postcode_housenumber_addition').getValue() : null;
256
 
257
- var housenumber = housenumber_match ? housenumber_match[1].trim() : '';
258
 
259
  var housenumber_addition = '';
260
 
@@ -644,7 +644,7 @@ document.observe("dom:loaded", function()
644
  var housenumber_addition = '';
645
  if (PCNLAPI_CONFIG.useStreet2AsHouseNumber && $(prefix + street2))
646
  {
647
- housenumber_match = $(prefix + street2).getValue().match(('/^('+ this.REGEXP_HOUSENUMBER +')([^0-9a-z]*('+ this.REGEXP_HOUSENUMBER_ADDITION +'))?$/i'));
648
  if (housenumber_match)
649
  {
650
  housenumber = housenumber_match[1].trim();
@@ -653,7 +653,7 @@ document.observe("dom:loaded", function()
653
  }
654
  else
655
  {
656
- housenumber_match = $(prefix + street1).getValue().match('/^('+ this.REGEXP_STREET +')\s+('+ this.REGEXP_HOUSENUMBER +')([^0-9a-z]*('+ this.REGEXP_HOUSENUMBER_ADDITION +'))?$/i');
657
  if (housenumber_match)
658
  {
659
  housenumber = housenumber_match[2].trim();
250
  var housenumber_mixed = $(prefix + 'postcode_housenumber').getValue().trim();
251
  // Number, followed by non alphanumberic chars, and then additional number ("123 A", "123-rood", etc)
252
  // or: Number, followed directly by a letter and then alphanumeric/space charcters ("123b3", "123berk 23", etc)
253
+ var housenumber_match = housenumber_mixed.match('^('+ this.REGEXP_HOUSENUMBER +')([^0-9a-zA-Z]*('+ this.REGEXP_HOUSENUMBER_ADDITION +'))?$');
254
 
255
  var housenumber_addition_select = $(prefix +'postcode_housenumber_addition') ? $(prefix +'postcode_housenumber_addition').getValue() : null;
256
 
257
+ var housenumber = housenumber_match ? housenumber_match[1].trim() : housenumber_mixed;
258
 
259
  var housenumber_addition = '';
260
 
644
  var housenumber_addition = '';
645
  if (PCNLAPI_CONFIG.useStreet2AsHouseNumber && $(prefix + street2))
646
  {
647
+ housenumber_match = $(prefix + street2).getValue().match('^('+ this.REGEXP_HOUSENUMBER +')([^0-9a-zA-Z]*('+ this.REGEXP_HOUSENUMBER_ADDITION +'))?$');
648
  if (housenumber_match)
649
  {
650
  housenumber = housenumber_match[1].trim();
653
  }
654
  else
655
  {
656
+ housenumber_match = $(prefix + street1).getValue().match('^('+ this.REGEXP_STREET +')\s+('+ this.REGEXP_HOUSENUMBER +')([^0-9a-zA-Z]*('+ this.REGEXP_HOUSENUMBER_ADDITION +'))?$');
657
  if (housenumber_match)
658
  {
659
  housenumber = housenumber_match[2].trim();
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>PostcodeNl_Api</name>
4
- <version>1.0.6.4</version>
5
  <stability>stable</stability>
6
  <license>Simplified BSD License</license>
7
  <channel>community</channel>
@@ -16,12 +16,11 @@
16
  &#xD;
17
  The postcode Magento plugin from Postcode.nl is free of charge, based on a Fair-Use policy. The use of the Postcode.nl Magento plugin is subject to our Terms and Conditions.</description>
18
  <notes>Changes:&#xD;
19
- - Improved housenumber/addition splitting&#xD;
20
- - Fixed compatibility with MageGo LightCheckout</notes>
21
  <authors><author><name>Postcode.nl Technical Support</name><user>auto-converted</user><email>tech@postcode.nl</email></author></authors>
22
- <date>2013-03-06</date>
23
- <time>10:45:23</time>
24
- <contents><target name="magecommunity"><dir name="PostcodeNl"><dir name="Api"><dir name="Block"><file name="Jsinit.php" hash="79bb826a50ce0cf4f87cc2f958bfafa1"/></dir><dir name="Helper"><file name="Data.php" hash="1dc6157d08029c42ed743ca3a2350a14"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="PcnlController.php" hash="a40a5c71a9a7a7ba3fd22f5b072d9050"/></dir><file name="JsonController.php" hash="273cdee0eb176860a68dd1788d9fef08"/></dir><dir name="etc"><file name="adminhtml.xml" hash="207cb9b9ca018f5e3d1b684e6e8615eb"/><file name="config.xml" hash="891131b1fd47cc1bc85c5d348712153e"/><file name="system.xml" hash="d9e1b3fdd30fe837605781ada45b92e4"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="postcodenl"><dir name="api"><file name="lookup.xml" hash="4d99ee42b7bcfcff9dcfb41dcb51c838"/></dir></dir></dir><dir name="template"><dir name="postcodenl"><dir name="api"><file name="jsinit.phtml" hash="e08a3ce7a48801bf997dbd4f6743b53f"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><dir name="postcodenl"><dir name="api"><file name="lookup.xml" hash="6ec9c69d8cab0db75011fce8e478f6ee"/></dir></dir></dir><dir name="template"><dir name="postcodenl"><dir name="api"><file name="jsinit.phtml" hash="339610e5950a53c3966d80cccf9bede4"/></dir></dir></dir></dir></dir><dir name="base"><dir name="default"><dir name="layout"><dir name="postcodenl"><dir name="api"><file name="lookup.xml" hash="f59eb1b9834a5a71c07ce55d7f98fbd8"/></dir></dir></dir><dir name="template"><dir name="postcodenl"><dir name="api"><file name="jsinit.phtml" hash="339610e5950a53c3966d80cccf9bede4"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="PostcodeNl_Api.csv" hash="d8f9ff15eb17aa09a7a40a72aa890095"/></dir><dir name="nl_NL"><file name="PostcodeNl_Api.csv" hash="d196b00bf35dec9fc858b5fc4f9dac9f"/></dir></target><target name="mageweb"><dir name="js"><dir name="postcodenl"><dir name="api"><file name="lookup.js" hash="e820b2b7a1192e7ba71ebe5715129ec1"/></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="postcodenl"><dir name="api"><dir name="css"><file name="lookup.css" hash="c58103b505f8bcdf55cea1159ca21e27"/></dir><dir name="images"><file name="postcode-logo.png" hash="da02bc29be1057a0201e63f81ee4bd02"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="postcodenl"><dir name="api"><dir name="css"><file name="lookup.css" hash="def30283baa30441588be03adb47feb6"/></dir><dir name="images"><file name="postcode-logo.png" hash="da02bc29be1057a0201e63f81ee4bd02"/></dir></dir></dir></dir></dir><dir name="base"><dir name="default"><dir name="postcodenl"><dir name="api"><dir name="css"><file name="lookup.css" hash="fe1592be0c02d48e29a18d4e3d778548"/></dir><dir name="images"><file name="postcode-logo.png" hash="da02bc29be1057a0201e63f81ee4bd02"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="PostcodeNl_Api.xml" hash="feeaf95128ffe4ad109ed8b0b8bc85ab"/></dir></target></contents>
25
  <compatible/>
26
  <dependencies/>
27
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>PostcodeNl_Api</name>
4
+ <version>1.0.6.5</version>
5
  <stability>stable</stability>
6
  <license>Simplified BSD License</license>
7
  <channel>community</channel>
16
  &#xD;
17
  The postcode Magento plugin from Postcode.nl is free of charge, based on a Fair-Use policy. The use of the Postcode.nl Magento plugin is subject to our Terms and Conditions.</description>
18
  <notes>Changes:&#xD;
19
+ - Fix an issue with the regular expressions updated in the previous version</notes>
 
20
  <authors><author><name>Postcode.nl Technical Support</name><user>auto-converted</user><email>tech@postcode.nl</email></author></authors>
21
+ <date>2013-03-07</date>
22
+ <time>14:45:23</time>
23
+ <contents><target name="magecommunity"><dir name="PostcodeNl"><dir name="Api"><dir name="Block"><file name="Jsinit.php" hash="79bb826a50ce0cf4f87cc2f958bfafa1"/></dir><dir name="Helper"><file name="Data.php" hash="61a06558abc25e99e36b8bc2efc29f1c"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="PcnlController.php" hash="a40a5c71a9a7a7ba3fd22f5b072d9050"/></dir><file name="JsonController.php" hash="273cdee0eb176860a68dd1788d9fef08"/></dir><dir name="etc"><file name="adminhtml.xml" hash="207cb9b9ca018f5e3d1b684e6e8615eb"/><file name="config.xml" hash="a9bcea58dc3b6d28182d19402870cd02"/><file name="system.xml" hash="d9e1b3fdd30fe837605781ada45b92e4"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="postcodenl"><dir name="api"><file name="lookup.xml" hash="4d99ee42b7bcfcff9dcfb41dcb51c838"/></dir></dir></dir><dir name="template"><dir name="postcodenl"><dir name="api"><file name="jsinit.phtml" hash="e08a3ce7a48801bf997dbd4f6743b53f"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><dir name="postcodenl"><dir name="api"><file name="lookup.xml" hash="6ec9c69d8cab0db75011fce8e478f6ee"/></dir></dir></dir><dir name="template"><dir name="postcodenl"><dir name="api"><file name="jsinit.phtml" hash="339610e5950a53c3966d80cccf9bede4"/></dir></dir></dir></dir></dir><dir name="base"><dir name="default"><dir name="layout"><dir name="postcodenl"><dir name="api"><file name="lookup.xml" hash="f59eb1b9834a5a71c07ce55d7f98fbd8"/></dir></dir></dir><dir name="template"><dir name="postcodenl"><dir name="api"><file name="jsinit.phtml" hash="339610e5950a53c3966d80cccf9bede4"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="PostcodeNl_Api.csv" hash="e906b29f07ffd60defa504be687f8238"/></dir><dir name="nl_NL"><file name="PostcodeNl_Api.csv" hash="a87ec754c45a12ea048792503b5d6dcd"/></dir></target><target name="mageweb"><dir name="js"><dir name="postcodenl"><dir name="api"><file name="lookup.js" hash="a75f02ae214914d396c64fdf9cd5d26e"/></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="postcodenl"><dir name="api"><dir name="css"><file name="lookup.css" hash="c58103b505f8bcdf55cea1159ca21e27"/></dir><dir name="images"><file name="postcode-logo.png" hash="da02bc29be1057a0201e63f81ee4bd02"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="postcodenl"><dir name="api"><dir name="css"><file name="lookup.css" hash="def30283baa30441588be03adb47feb6"/></dir><dir name="images"><file name="postcode-logo.png" hash="da02bc29be1057a0201e63f81ee4bd02"/></dir></dir></dir></dir></dir><dir name="base"><dir name="default"><dir name="postcodenl"><dir name="api"><dir name="css"><file name="lookup.css" hash="fe1592be0c02d48e29a18d4e3d778548"/></dir><dir name="images"><file name="postcode-logo.png" hash="da02bc29be1057a0201e63f81ee4bd02"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="PostcodeNl_Api.xml" hash="feeaf95128ffe4ad109ed8b0b8bc85ab"/></dir></target></contents>
24
  <compatible/>
25
  <dependencies/>
26
  </package>