Changeset 713 for trunk/phpbms/modules

Timestamp:

01/05/10 11:43:59 (2 years ago)

Author:

nate

Message:

• Updated SugarCRM import to work with new uuid system and to be compatible with v5.5.0 of SugerCRM.

Location:

trunk/phpbms/modules/bms

Files:

• clients_import.php (modified) (1 diff)
• include/clients.php (modified) (6 diffs)

trunk/phpbms/modules/bms/clients_import.php

@@ -128 +128 @@
                 // the forms list.
 
-                $list = array("phpBMS csv file" => 0, "Sugar CRM (v5.0)" => 1);
+                $list = array("phpBMS csv file" => 0, "Sugar CRM (v5.5.0)" => 1);
                 $default = 0;
                 if(isset($_POST["importType"]))

trunk/phpbms/modules/bms/include/clients.php

@@ -1189 +1189 @@
                                                 case "employees":
                                                 case "ticker_symbol":
+                                                case "id":
                                                         if($data)
                                                                 $addComments .= "\n".str_replace("_"," ",$name).": ".trim($data);
@@ -1276 +1277 @@
                                                                 $this->revertID = $theid;
 
+                                                        $theuuid = getUuid($this->table->db, "tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083", (int) $theid);
+                                                        
                                                         //If it is a sugarcrm import, insert the shipping address as well
                                                         $addressVerify = array();
@@ -1299 +1302 @@
                                                                                         `addresstorecord`.`defaultshipto` = '0'
                                                                                 WHERE
-                                                                                        `addresstorecord`.`recordid` = '".((int) $theid)."'
+                                                                                        `addresstorecord`.`recordid` = '".mysql_real_escape_string($theuuid)."'
                                                                                         AND
-                                                                                        `addresstorecord`.`tabledefid` = '2';
+                                                                                        `addresstorecord`.`tabledefid` = 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083';
                                                                                 ";
 
@@ -1307 +1310 @@
 
                                                                         $variables["title"] = "Main Shipping Address";
-                                                                        $variables["tabledefid"] = 2;
-                                                                        $variables["recordid"] = $theid;
+                                                                        $variables["tabledefid"] = "tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083";
+                                                                        $variables["recordid"] = $theuuid;
                                                                         $variables["defaultshipto"] = 1;
                                                                         $variables["primary"] = 0;
                                                                         $variables["existingaddressid"] = false;
+                                                                        $variables["uuid"] = uuid($this->table->address->prefix);
 
                                                                         $addressVerify = $this->table->address->verifyVariables($variables);//verify address
@@ -1391 +1395 @@
                                                         `addresses2`.`custom8` AS `shipcustom8`
                                                 FROM
-                                                        ((((clients INNER JOIN addresstorecord AS `addresstorecord1` ON clients.id = addresstorecord1.recordid AND addresstorecord1.tabledefid=2 AND addresstorecord1.primary=1) INNER JOIN addresses AS addresses1 ON  addresstorecord1.addressid = addresses1.id)LEFT JOIN addresstorecord AS `addresstorecord2` on clients.id = addresstorecord2.recordid AND addresstorecord2.tabledefid=2 AND addresstorecord2.primary=0 AND addresstorecord2.defaultshipto=1) LEFT JOIN addresses AS addresses2 ON  addresstorecord2.addressid = addresses2.id)
+                                                        ((((clients INNER JOIN addresstorecord AS `addresstorecord1` ON clients.uuid = addresstorecord1.recordid AND addresstorecord1.tabledefid='tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083' AND addresstorecord1.primary=1) INNER JOIN addresses AS addresses1 ON  addresstorecord1.addressid = addresses1.uuid)LEFT JOIN addresstorecord AS `addresstorecord2` on clients.uuid = addresstorecord2.recordid AND addresstorecord2.tabledefid='tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083' AND addresstorecord2.primary=0 AND addresstorecord2.defaultshipto=1) LEFT JOIN addresses AS addresses2 ON  addresstorecord2.addressid = addresses2.uuid)
                                                 WHERE
                                                         `clients`.`id` IN (".$inStatement.")
@@ -1437 +1441 @@
 
                                 //list of values that should not be displayed
-                                $removalArray = array("id", "modifiedby", "modifieddate", "createdby", "creationdate", "notes", "title", "shiptoname");
+                                $removalArray = array("id", "modifiedby", "modifieddate", "createdby", "creationdate", "notes", "title", "shiptoname", "uuid");
                                 //gets the address table's columnnames/information (fields)
                                 $addressArray = $this->table->address->fields;