Addressvalidator - Version 1.4.3

Version Notes

test notes

Download this release

Release Info

Developer Extensions Store
Extension Addressvalidator
Version 1.4.3
Comparing to
See all releases


Code changes from version 1.4.1 to 1.4.3

Files changed (4) hide show
  1. app/code/community/Aydus/Addressvalidator/Helper/Data.php +1 -2
  2. app/code/community/Aydus/Addressvalidator/Model/Observer.php +4 -2
  3. app/code/community/Aydus/Addressvalidator/etc/config.xml +1 -1
  4. package.xml +4 -4
app/code/community/Aydus/Addressvalidator/Helper/Data.php CHANGED
@@ -238,7 +238,6 @@ class Aydus_Addressvalidator_Helper_Data extends Mage_Core_Helper_Abstract {
238
 
239
  $customerAddress = Mage::getModel('customer/address')->load($customerAddressId);
240
  $customerAddress->addData($data);
241
- $customerAddress->setPopulated(1);
242
  $customerAddress->save();
243
 
244
  if ($customerAddress->getId()){
@@ -263,6 +262,7 @@ class Aydus_Addressvalidator_Helper_Data extends Mage_Core_Helper_Abstract {
263
 
264
  if (@$postData['use_for_shipping']){
265
 
 
266
  $quote = Mage::getSingleton('checkout/session')->getQuote();
267
  $shippingAddress = $quote->getShippingAddress();
268
 
@@ -276,7 +276,6 @@ class Aydus_Addressvalidator_Helper_Data extends Mage_Core_Helper_Abstract {
276
 
277
  $customerShippingAddress = Mage::getModel('customer/address')->load($customerAddressId);
278
  $customerShippingAddress->addData($data);
279
- $customerShippingAddress->setPopulated(1);
280
  $customerShippingAddress->save();
281
 
282
  if ($customerShippingAddress->getId()){
238
 
239
  $customerAddress = Mage::getModel('customer/address')->load($customerAddressId);
240
  $customerAddress->addData($data);
 
241
  $customerAddress->save();
242
 
243
  if ($customerAddress->getId()){
262
 
263
  if (@$postData['use_for_shipping']){
264
 
265
+ unset($data['address_id']);
266
  $quote = Mage::getSingleton('checkout/session')->getQuote();
267
  $shippingAddress = $quote->getShippingAddress();
268
 
276
 
277
  $customerShippingAddress = Mage::getModel('customer/address')->load($customerAddressId);
278
  $customerShippingAddress->addData($data);
 
279
  $customerShippingAddress->save();
280
 
281
  if ($customerShippingAddress->getId()){
app/code/community/Aydus/Addressvalidator/Model/Observer.php CHANGED
@@ -44,7 +44,7 @@ class Aydus_Addressvalidator_Model_Observer extends Mage_Core_Model_Abstract {
44
  $postData = $request->getParam('shipping');
45
  }
46
  $postData['customer_address_id'] = $addressValidated;
47
- $helper->setAddressData($address, $postData, false);
48
  return $observer;
49
  }
50
 
@@ -153,8 +153,10 @@ class Aydus_Addressvalidator_Model_Observer extends Mage_Core_Model_Abstract {
153
  public function updateAddressValidated($observer)
154
  {
155
  $customerAddress = $observer->getCustomerAddress();
 
 
156
 
157
- if ($customerAddress->getId() && !$customerAddress->getPopulated()){
158
 
159
  $validatedAddress = Mage::getModel('aydus_addressvalidator/address');
160
  $validatedAddress->load($customerAddress->getId(), 'address_id');
44
  $postData = $request->getParam('shipping');
45
  }
46
  $postData['customer_address_id'] = $addressValidated;
47
+ $helper->setAddressData($address, $postData, true);
48
  return $observer;
49
  }
50
 
153
  public function updateAddressValidated($observer)
154
  {
155
  $customerAddress = $observer->getCustomerAddress();
156
+ $request = Mage::app()->getRequest();
157
+ $moduleName = $request->getModuleName();
158
 
159
+ if ($customerAddress->getId() && $moduleName != 'checkout'){
160
 
161
  $validatedAddress = Mage::getModel('aydus_addressvalidator/address');
162
  $validatedAddress->load($customerAddress->getId(), 'address_id');
app/code/community/Aydus/Addressvalidator/etc/config.xml CHANGED
@@ -11,7 +11,7 @@
11
  <config>
12
  <modules>
13
  <Aydus_Addressvalidator>
14
- <version>1.4.1</version>
15
  </Aydus_Addressvalidator>
16
  </modules>
17
  <phpunit>
11
  <config>
12
  <modules>
13
  <Aydus_Addressvalidator>
14
+ <version>1.4.3</version>
15
  </Aydus_Addressvalidator>
16
  </modules>
17
  <phpunit>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Addressvalidator</name>
4
- <version>1.4.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/OSL-3.0">Open Software License</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Validate billing and shipping addresses in the One Page Checkout. Customer submits billing and shipping addresses and is shown a popup of valid addresses to choose from. With support for UPS, USPS, Fedex, Address Doctor and Melissa Data.</description>
11
  <notes>test notes</notes>
12
  <authors><author><name>Extensions Store</name><user>Extension</user><email>admin@extensions-store.com</email></author><author><name>Extensions Store</name><user>Extension</user><email>admin@extensions-store.com</email></author></authors>
13
- <date>2015-08-21</date>
14
- <time>01:17:43</time>
15
- <contents><target name="magecommunity"><dir name="Aydus"><dir name="Addressvalidator"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><file name="Validexceptions.php" hash="cc648c12bc605c14f6127638ceddbe2d"/></dir></dir></dir></dir><dir name="Checkout"><dir name="Onepage"><file name="Billing.php" hash="6be15561b9b09a101bf009734c5ee3a1"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="ed254c7dd29cc384b67f91ae42a6b53d"/></dir><dir name="Model"><file name="Address.php" hash="1a8180e69fd0ad58b0fa0d3423c490c0"/><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><dir name="Addressdoctor"><file name="Validcodes.php" hash="fde2d39e5876e12c36857d896cae88c6"/></dir><file name="Service.php" hash="63d35c97530c54ce49deee6a1a746375"/></dir></dir></dir></dir><file name="Observer.php" hash="64637a622866fa51e9131c1861a10b98"/><dir name="Resource"><dir name="Address"><file name="Collection.php" hash="f1d88a6e347f83971dd3b41781e8f073"/></dir><file name="Address.php" hash="6638c5f7e07684441c895337c72d6c83"/></dir><dir name="Service"><file name="Abstract.php" hash="281351d7c63b1e92f1cb36f3135f35fb"/><file name="Addressdoctor.php" hash="484ed6246dc1e5ad93cca07d87d76680"/><file name="Fedex.php" hash="1608ae2c935597975816c61dd4a00a90"/><file name="Melissadata.php" hash="629c48b5ab2a40fa177c5a0a2b2e5607"/><file name="Ups.php" hash="9dbcb0dd63eb6bf864b61790fd9d8930"/><file name="Usps.php" hash="f29c986b213806e363a4f51ff19d0c53"/></dir></dir><dir name="Test"><dir name="Controller"><dir name="TestController"><dir name="fixtures"><file name="testController.yaml" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir><file name="TestController.php" hash="b0df7546fc56bd869d805a96e209ee77"/></dir><dir name="Helper"><dir name="TestHelper"><dir name="fixtures"><file name="testHelper.yaml" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir><file name="TestHelper.php" hash="3089d78a75d13084f9482995e807a37f"/></dir><dir name="Model"><dir name="TestModel"><dir name="fixtures"><file name="testModel.yaml" hash="ebcadfcfe7ac7469233f4d5124985792"/></dir></dir><file name="TestModel.php" hash="12609ff92a073dc75d8607482a48c870"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="ec0ecd573275c3b98e98fe85c3d8bbf5"/><file name="config.xml" hash="ef080e432356cff13ee1465442ebad11"/><file name="system.xml" hash="269708db3262764131ed8410e476257c"/></dir><file name="readme.md" hash="99ee8caa9700fc61ebd943728645896c"/><dir name="sql"><dir name="aydus_addressvalidator_setup"><file name="install-1.0.0.php" hash="a3d556dd3c24a7cc8bad23ed556b61a0"/><file name="upgrade-1.3.0-1.4.0.php" hash="f1d251e2c674b055a991c09dc540ddfb"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="aydus"><file name="addressvalidator.xml" hash="f0610f66ee0426e7b7aff9e4ac90d6da"/></dir></dir><dir name="template"><dir name="aydus"><dir name="addressvalidator"><file name="popup.phtml" hash="b7698d87698e3af70161449c379e6f6b"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Aydus_Addressvalidator.xml" hash="b0a4f06b24da23ad6fe75178e987c89d"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="aydus"><file name="addressvalidator.css" hash="c2499e0b4a71cdd7c5456496aefd502b"/></dir></dir><dir name="images"><dir name="aydus"><dir name="addressvalidator"><file name="LOGO_L.gif" hash="5aa294d5345e5b4cc83e92f8ae443283"/><file name="LOGO_S.gif" hash="0654a9638a3b7787f35495ad17dc7363"/></dir></dir></dir><dir name="js"><dir name="aydus"><dir name="addressvalidator"><file name="address.js" hash="5917b0b84e3bae21c347d692d462a0e7"/></dir><file name="addressvalidator.js" hash="4a297c9c0c3d3f9ddacf9cf80e054d6f"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Addressvalidator</name>
4
+ <version>1.4.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/OSL-3.0">Open Software License</license>
7
  <channel>community</channel>
10
  <description>Validate billing and shipping addresses in the One Page Checkout. Customer submits billing and shipping addresses and is shown a popup of valid addresses to choose from. With support for UPS, USPS, Fedex, Address Doctor and Melissa Data.</description>
11
  <notes>test notes</notes>
12
  <authors><author><name>Extensions Store</name><user>Extension</user><email>admin@extensions-store.com</email></author><author><name>Extensions Store</name><user>Extension</user><email>admin@extensions-store.com</email></author></authors>
13
+ <date>2015-08-26</date>
14
+ <time>02:11:20</time>
15
+ <contents><target name="magecommunity"><dir name="Aydus"><dir name="Addressvalidator"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><file name="Validexceptions.php" hash="cc648c12bc605c14f6127638ceddbe2d"/></dir></dir></dir></dir><dir name="Checkout"><dir name="Onepage"><file name="Billing.php" hash="6be15561b9b09a101bf009734c5ee3a1"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="ddeebd105082f4c92032b66c5f7b9a33"/></dir><dir name="Model"><file name="Address.php" hash="1a8180e69fd0ad58b0fa0d3423c490c0"/><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><dir name="Addressdoctor"><file name="Validcodes.php" hash="fde2d39e5876e12c36857d896cae88c6"/></dir><file name="Service.php" hash="63d35c97530c54ce49deee6a1a746375"/></dir></dir></dir></dir><file name="Observer.php" hash="6880647ac3abdfec539f85450fc01aa0"/><dir name="Resource"><dir name="Address"><file name="Collection.php" hash="f1d88a6e347f83971dd3b41781e8f073"/></dir><file name="Address.php" hash="6638c5f7e07684441c895337c72d6c83"/></dir><dir name="Service"><file name="Abstract.php" hash="281351d7c63b1e92f1cb36f3135f35fb"/><file name="Addressdoctor.php" hash="484ed6246dc1e5ad93cca07d87d76680"/><file name="Fedex.php" hash="1608ae2c935597975816c61dd4a00a90"/><file name="Melissadata.php" hash="629c48b5ab2a40fa177c5a0a2b2e5607"/><file name="Ups.php" hash="9dbcb0dd63eb6bf864b61790fd9d8930"/><file name="Usps.php" hash="f29c986b213806e363a4f51ff19d0c53"/></dir></dir><dir name="Test"><dir name="Controller"><dir name="TestController"><dir name="fixtures"><file name="testController.yaml" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir><file name="TestController.php" hash="b0df7546fc56bd869d805a96e209ee77"/></dir><dir name="Helper"><dir name="TestHelper"><dir name="fixtures"><file name="testHelper.yaml" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir><file name="TestHelper.php" hash="3089d78a75d13084f9482995e807a37f"/></dir><dir name="Model"><dir name="TestModel"><dir name="fixtures"><file name="testModel.yaml" hash="ebcadfcfe7ac7469233f4d5124985792"/></dir></dir><file name="TestModel.php" hash="12609ff92a073dc75d8607482a48c870"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="ec0ecd573275c3b98e98fe85c3d8bbf5"/><file name="config.xml" hash="1c44ced59b4404214278941488d2fbc0"/><file name="system.xml" hash="269708db3262764131ed8410e476257c"/></dir><file name="readme.md" hash="99ee8caa9700fc61ebd943728645896c"/><dir name="sql"><dir name="aydus_addressvalidator_setup"><file name="install-1.0.0.php" hash="a3d556dd3c24a7cc8bad23ed556b61a0"/><file name="upgrade-1.3.0-1.4.0.php" hash="f1d251e2c674b055a991c09dc540ddfb"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="aydus"><file name="addressvalidator.xml" hash="f0610f66ee0426e7b7aff9e4ac90d6da"/></dir></dir><dir name="template"><dir name="aydus"><dir name="addressvalidator"><file name="popup.phtml" hash="b7698d87698e3af70161449c379e6f6b"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Aydus_Addressvalidator.xml" hash="b0a4f06b24da23ad6fe75178e987c89d"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="aydus"><file name="addressvalidator.css" hash="c2499e0b4a71cdd7c5456496aefd502b"/></dir></dir><dir name="images"><dir name="aydus"><dir name="addressvalidator"><file name="LOGO_L.gif" hash="5aa294d5345e5b4cc83e92f8ae443283"/><file name="LOGO_S.gif" hash="0654a9638a3b7787f35495ad17dc7363"/></dir></dir></dir><dir name="js"><dir name="aydus"><dir name="addressvalidator"><file name="address.js" hash="5917b0b84e3bae21c347d692d462a0e7"/></dir><file name="addressvalidator.js" hash="4a297c9c0c3d3f9ddacf9cf80e054d6f"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>