From f68a11b42617ba821ce174b5f59e8d5eeb1dc928 Mon Sep 17 00:00:00 2001
From: reindertvetter <reindert@myparcel.nl>
Date: Wed, 19 Oct 2016 10:40:02 +0200
Subject: [PATCH] hot fix postnl location

---
 .../TIG/MyParcel2014/Model/Observer/SavePgAddress.php          | 3 ++-
 app/code/community/TIG/MyParcel2014/etc/config.xml             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/community/TIG/MyParcel2014/Model/Observer/SavePgAddress.php b/app/code/community/TIG/MyParcel2014/Model/Observer/SavePgAddress.php
index 8c7a8d8a..e2620636 100755
--- a/app/code/community/TIG/MyParcel2014/Model/Observer/SavePgAddress.php
+++ b/app/code/community/TIG/MyParcel2014/Model/Observer/SavePgAddress.php
@@ -125,7 +125,7 @@ public function copyAddressToOrder(Varien_Event_Observer $observer)
         $myParcelData['browser'] = $_SERVER['HTTP_USER_AGENT'];
         $order->setMyparcelData(json_encode($myParcelData));
 
-        if(key_exists('location', $myParcelData)){
+        if($myParcelData === null || !key_exists('location', $myParcelData)){
             Mage::getModel('tig_myparcel/checkout_service')->removePgAddress($quote);
             return $this;
         }
@@ -139,6 +139,7 @@ public function copyAddressToOrder(Varien_Event_Observer $observer)
             $order->setMyparcelSendDate($sDropOff);
         }
 
+
         /**
          * Get the PakjeGemak address for this quote.
          */
diff --git a/app/code/community/TIG/MyParcel2014/etc/config.xml b/app/code/community/TIG/MyParcel2014/etc/config.xml
index 9ea9fe77..f119ec66 100755
--- a/app/code/community/TIG/MyParcel2014/etc/config.xml
+++ b/app/code/community/TIG/MyParcel2014/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <TIG_MyParcel2014>
-            <version>1.7.14</version>
+            <version>1.7.15</version>
         </TIG_MyParcel2014>
     </modules>
     <global>