Version 1.8.2: Fix some warnings about getting properties of non-objects

Makefile

 BASE=ordernumber
 PLUGINTYPE=vmshopper
-VERSION=1.8.1
+VERSION=1.8.2
 
 PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
 

ordernumber.php

@@ -2,7 +2,7 @@
 /**
  * @package VirtueMart 2 OrderNumber plugin for Joomla! 2.5
  * @author Reinhold Kainhofer, reinhold@kainhofer.com
- * @copyright (C) 2012 - Reinhold Kainhofer
+ * @copyright (C) 2012-2014 - Reinhold Kainhofer
  * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
 **/
 
@@ -88,42 +88,47 @@ class plgVmShopperOrdernumber extends vmShopperPlugin {
             "[ampm]" => date("a"),
             "[minute]" => date("i"),
             "[second]" => date("s"),
-            "[userid]" => $details->virtuemart_user_id,
-            "[vendorid]" => $details->virtuemart_vendor_id
+            "[userid]" => $details->virtuemart_user_id
         );
+        if (isset($details->virtuemart_vendor_id)) $reps["[vendorid]"] = $details->virtuemart_vendor_id;
+        
         if ($nrtype==0 or $nrtype == 1) { // Order nr and Invoice nr
-            $reps["[ipaddress]"] = $details->ip_address;
+            if (isset($details->ip_address)) $reps["[ipaddress]"] = $details->ip_address;
         }
         if ($nrtype==1 or $nrtype==2) { // Invoice nr and Customer nr
-            $reps["[email]"] = $details->email;
-            $reps["[title]"] = $details->title;
-            $reps["[firstname]"] = $details->first_name;
-            $reps["[middlename]"] = $details->middle_name;
-            $reps["[lastname]"] = $details->last_name;
-
-            $reps["[company]"] = $details->company;
-            $reps["[zip]"] = $details->zip;
-            $reps["[city]"] = $details->city;
+            if (isset($details->email)) $reps["[email]"] = $details->email;
+            if (isset($details->title)) $reps["[title]"] = $details->title;
+            if (isset($details->first_name)) $reps["[firstname]"] = $details->first_name;
+            if (isset($details->middle_name)) $reps["[middlename]"] = $details->middle_name;
+            if (isset($details->last_name)) $reps["[lastname]"] = $details->last_name;
+
+            if (isset($details->company)) $reps["[company]"] = $details->company;
+            if (isset($details->zip)) $reps["[zip]"] = $details->zip;
+            if (isset($details->city)) $reps["[city]"] = $details->city;
         
-            $reps["[countryid]"] = $details->virtuemart_country_id;
-            $country = $this->getCountryFromID ($details->virtuemart_country_id);
-            $reps["[country]"] = $country->country_name;
-            $reps["[countrycode2]"] = $country->country_2_code;
-            $reps["[countrycode3]"] = $country->country_3_code;
+            if (isset($details->virtuemart_country_id)) $reps["[countryid]"] = $details->virtuemart_country_id;
+            if (isset($details->virtuemart_country_id)) {
+                $country = $this->getCountryFromID ($details->virtuemart_country_id);
+                if ($country) {
+                    $reps["[country]"] = $country->country_name;
+                    $reps["[countrycode2]"] = $country->country_2_code;
+                    $reps["[countrycode3]"] = $country->country_3_code;
+                }
+            }
 
-            $reps["[stateid]"] = $details->virtuemart_state_id;
+            if (isset($details->virtuemart_state_id)) $reps["[stateid]"] = $details->virtuemart_state_id;
         }
         if ($nrtype==1) {
             // Only for Invoice:
-            $reps["[ordernumber]"] = $details->order_number;
-            $reps["[orderid]"] = $details->virtuemart_order_id;
-            $reps["[orderstatus]"] = $details->order_status;
+            if (isset($details->order_number)) $reps["[ordernumber]"] = $details->order_number;
+            if (isset($details->virtuemart_order_id)) $reps["[orderid]"] = $details->virtuemart_order_id;
+            if (isset($details->order_status)) $reps["[orderstatus]"] = $details->order_status;
         }
         if ($nrtype==2) {
             // Customer number:
-            $reps["[username]"] = $details->username;
-            $reps["[name]"] = $details->name;
-            $reps["[user_is_vendor]"] = $details->user_is_vendor;
+            if (isset($details->username)) $reps["[username]"] = $details->username;
+            if (isset($details->name)) $reps["[name]"] = $details->name;
+            if (isset($details->user_is_vendor)) $reps["[user_is_vendor]"] = $details->user_is_vendor;
         }
         return str_ireplace (array_keys($reps), array_values($reps), $fmt);
     }

ordernumber.script.php

 <?php
 defined('_JEXEC') or die('Restricted access');
+/**
+ * Installation script for the plugin
+ *
+ * @copyright Copyright (C) 2013 Reinhold Kainhofer, office@open-tools.net
+ * @license GPL v3+,  http://www.gnu.org/copyleft/gpl.html
+ */
 
 class plgVmShopperOrdernumberInstallerScript
 {

ordernumber.xml

@@ -5,10 +5,10 @@
     <author>Reinhold Kainhofer</author>
     <authorEmail>office@open-tools.net</authorEmail>
     <authorUrl>http://www.open-tools.net/</authorUrl>
-    <copyright>Copyright (C) 2012-2013 Reinhold Kainhofer. All rights reserved.</copyright>
+    <copyright>Copyright (C) 2012-2014 Reinhold Kainhofer. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-3.0.html GNU/GPLv3</license>
-    <version>1.8.1</version>
-    <releaseDate>2013-02-26</releaseDate>
+    <version>1.8.2</version>
+    <releaseDate>2014-01-13</releaseDate>
     <releaseType>Minor update</releaseType>
     <downloadUrl>http://www.open-tools.net/virtuemart-2-extensions/vm2-ordernumber-plugin.html</downloadUrl>