Changeset 431

Timestamp:

08/15/08 13:00:46

Author:

nate

Message:

• Added support for a Sugar CRM accounts export files in the clients' import page.
  
• Corrected html quoting (in particular its absence) in the imports' confirmation table.
  
• Formating changes on general_import.php and the table specific import pages.
  

Files:

• trunk/phpbms/include/imports.php (modified) (2 diffs)
• trunk/phpbms/modules/base/general_import.php (modified) (1 diff)
• trunk/phpbms/modules/base/users_import.php (modified) (1 diff)
• trunk/phpbms/modules/bms/clients_import.php (modified) (4 diffs)
• trunk/phpbms/modules/bms/include/clients.php (modified) (5 diffs)
• trunk/phpbms/modules/bms/javascript/clients_import.js (added)
• trunk/phpbms/modules/bms/products_import.php (modified) (1 diff)

trunk/phpbms/include/imports.php

@@ -67 +67 @@
-                        }//end swtich
-                
- 
+
-                
-                
@@ -297 +297 @@
-                                                        foreach($fieldsArray as $field => $junk){
-                                                                ?><td nowrap="nowrap"><?php
-$record[$field]
+formatVariable($record[$field])
-                                                                ?></td><?php
-                                                        }//end foreach

trunk/phpbms/modules/base/general_import.php

@@ -170 +170 @@
-                        <legend>import</legend>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                </fieldset>

trunk/phpbms/modules/base/users_import.php

@@ -169 +169 @@
-                        <legend>import</legend>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                </fieldset>

trunk/phpbms/modules/bms/clients_import.php

@@ -76 +76 @@
-        //if you are going to overide the class you would instantiate
-        // like this
+                        
+                        $importType = "csv";
+                        if(isset($_POST["importType"])){
+                                
+                                switch($_POST["importType"]){
+                                        
+                                        case 0:
+                                                $importType = "csv";
+                                        break;
+                                        
+                                        case 1:
+                                                $importType = "sugarcrm";
+                                        break;
+                                        
+                                }//end switch
+                                
+                        }//end if
-        
-                        $thetable = new clients($db,2,$backurl);
-
+, $importType
-        
-        //and if you are setting the backurl, make sure you pass that as well
@@ -104 +121 @@
-        // will be using below.
-        $phpbms->cssIncludes[] = "pages/imports.css";
-//$phpbms->jsIncludes[] = "modules/[modulename]/javascript/[tablename]
+$phpbms->jsIncludes[] = "modules/bms/javascript/clients_import
-
-        // if you need to define a body onlload function, do so with the phpbms property
@@ -129 +146 @@
-                // for each field we will use, create the field object and add it to 
-                // the forms list.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-                // if you neeed to add additional attributes toa field, it's easy.
@@ -168 +183 @@
-                <?php
-                if($import->pageType == "main"){ ?>
- 
+
-                        <legend>import</legend>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                </fieldset>
+                <?php
+                }else{
+                ?>
+                        <!-- This input is to be able to keep the importType the same for both the initial upload and the final upload -->
+                        <input id="importType" name="importType" type="hidden" value="<?php echo (isset($_POST["importType"]))?($_POST["importType"]):('0'); ?>" />
-                <?php
-                }//end if

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

@@ -434 +434 @@
-        class clientsImport extends phpbmsImport{
-                
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        
-                }//end method --clientsImport--
+                
+                
+                function _parseFromData($data){
+                        
+                        if($this->importType == "sugarcrm"){
+                                
+                                $this->importType = "csv";
+                                $switchedFrom = "sugarcrm";
+                                
+                        }//end if
+                        
+                        $thereturn = parent::_parseFromData($data);
+                        
+                        if(isset($switchedFrom))
+                                $this->importType = $switchedFrom;
+                        
+                        return $thereturn;
+                
+                }//end method --_parseFromFile--
+                
+                
+                function _formatSugarVariables($rows, $titles){
+                        
+                        //Replace the titles with valid ones
+                        //(At the moment we only really need
+                        //the correct count, but, it seems
+                        //logical to correct the titles in case
+                        //they are needed in the future)
+                        $newTitles = array();
+                        foreach($titles as $index => $name){
+                                
+                                switch($name){
+                                        
+                                        case "name":
+                                                $newTitles[] = "company";
+                                        break;
+                                        
+                                        case "date_entered":
+                                                $newTitles[] = "becameclient";
+                                        break;
+                                        
+                                        case "description":
+                                                $newTitles[] = "comments";
+                                        break;
+                                        
+                                        case "deleted":
+                                                $newTitles[] = "inactive";
+                                        break;
+                                        
+                                        case "account_type":
+                                                $newTitles[] = "type";
+                                        break;
+                                        
+                                        case "industry":
+                                                $newTitles[] = "category";
+                                        break;
+                                        
+                                        case "phone_fax":
+                                                $newTitles[] = "fax";
+                                        break;
+                                        
+                                        case "billing_address_street":
+                                                $newTitles[] = "address1";
+                                        break;
+                                        
+                                        case "billing_address_city":
+                                                $newTitles[] = "city";
+                                        break;
+                                        
+                                        case "billing_address_state":
+                                                $newTitles[] = "state";
+                                        break;
+                                        
+                                        case "billing_address_postalcode":
+                                                $newTitles[] = "postalcode";
+                                        break;
+                                        
+                                        case "billing_address_country":
+                                                $newTitles[] = "country";
+                                        break;
+                                        
+                                        case "phone_office":
+                                                $newTitles[] = "workphone";
+                                        break;
+                                        
+                                        case "phone_alternate":
+                                                $newTitles[] = "otherphone";
+                                        break;
+                                        
+                                        case "website":
+                                                $newTitles[] = "webaddress";
+                                        break;
+                                        
+                                        case "shipping_address_street":
+                                                $newTitles[] = "shipaddress1";
+                                        break;
+                                        
+                                        case "shipping_address_city":
+                                                $newTitles[] = "shipcity";
+                                        break;
+                                        
+                                        case "shipping_address_state":
+                                                $newTitles[] = "shipstate";
+                                        break;
+                                        
+                                        case "shipping_address_postalcode":
+                                                $newTitles[] = "shippostalcode";
+                                        break;
+                                        
+                                        case "shipping_address_country":
+                                                $newTitles[] = "shipcountry";
+                                        break;
+                                        
+                                }//end switch
+                                
+                        }//end foreach
+                        
+                        
+                        $newRows = array();
+                        foreach($rows as $rowData){
+                                
+                                $newRowData = array();
+                                $addComments = "";
+                                foreach($rowData as $name => $data){
+                                        
+                                        switch($name){
+                                        
+                                                case "name":
+                                                        $newRowData["company"] = trim($data);
+                                                break;
+                                                
+                                                case "date_entered":
+                                                        $newRowData["becameclient"] = trim($data);
+                                                break;
+                                                
+                                                case "description":
+                                                        $newRowData["comments"] = trim($data);
+                                                break;
+                                                
+                                                case "deleted":
+                                                        $newRowData["inactive"] = trim($data);
+                                                break;
+                                                
+                                                case "industry":
+                                                        $newRowData["category"] = trim($data);
+                                                break;
+                                                
+                                                case "account_type":
+                                                        $newRowData["type"] = trim($data);
+                                                break;
+                                                
+                                                case "phone_fax":
+                                                        $newRowData["fax"] = trim($data);
+                                                break;
+                                                
+                                                case "billing_address_street":
+                                                        $newRowData["address1"] = trim($data);
+                                                break;
+                                                
+                                                case "billing_address_city":
+                                                        $newRowData["city"] = trim($data);
+                                                break;
+                                                
+                                                case "billing_address_state":
+                                                        $newRowData["state"] = trim($data);
+                                                break;
+                                                
+                                                case "billing_address_postalcode":
+                                                        $newRowData["postalcode"] = trim($data);
+                                                break;
+                                                
+                                                case "billing_address_country":
+                                                        $newRowData["country"] = trim($data);
+                                                break;
+                                                
+                                                case "phone_office":
+                                                        $newRowData["workphone"] = trim($data);
+                                                break;
+                                                
+                                                case "phone_alternate":
+                                                        $newRowData["otherphone"] = trim($data);
+                                                break;
+                                                
+                                                case "website":
+                                                        $newRowData["webaddress"] = trim($data);
+                                                break;
+                                                
+                                                case "shipping_address_street":
+                                                        $newRowData["shipaddress1"] = trim($data);
+                                                break;
+                                                
+                                                case "shipping_address_city":
+                                                        $newRowData["shipcity"] = trim($data);
+                                                break;
+                                                
+                                                case "shipping_address_state":
+                                                        $newRowData["shipstate"] = trim($data);
+                                                break;
+                                                
+                                                case "shipping_address_postalcode":
+                                                        $newRowData["shippostalcode"] = trim($data);
+                                                break;
+                                                
+                                                case "shipping_address_country":
+                                                        $newRowData["shipcountry"] = trim($data);
+                                                break;
+                                                
+                                                case "annual_revenue":
+                                                case "rating":
+                                                case "ownership":
+                                                case "employees":
+                                                case "ticker_symbol":
+                                                        if($data)
+                                                                $addComments .= "\n".str_replace("_"," ",$name).": ".trim($data);
+                                                break;
+                                                
+                                        }//end switch
+                                        
+                                }//end foreach
+                                
+                                if($newRowData["type"] == "prospect")
+                                        $newRowData["becameclient"] = NULL;
+                                
+                                $newRowData["comments"] .= $addComments;
+                                $newRows[] = $newRowData;
+                                
+                        }//end foreach
+                        
+                        $thereturn["rows"] = $newRows;
+                        $thereturn["titles"] = $newTitles;
+                        return $thereturn;
+                        
+                }//end method --_formatSugarvariables--
+                
+                
+                function importRecords($rows, $titles){
+                        
+                        switch($this->importType){
+                                
+                                case "sugarcrm":
+                                        $thereturn = $this->_formatSugarVariables($rows, $titles);
+                                        $rows = $thereturn["rows"];
+                                        $titles = $thereturn["titles"];
+                                
+                                case "csv":                     
+                                        //count total fieldnames (top row of csv document)
+                                        $fieldNum = count($titles);
+                                        
+                                        //the file starts at line number 1, but since line 1 is
+                                        //supposed to be the fieldnames in the table(s), the lines
+                                        //being insereted start @ 2.
+                                        $rowNum = 2;
+                                        
+                                        //get the data one row at a time
+                                        foreach($rows as $rowData){
+                                                
+                                                $theid = 0;
+                                                
+                                                //trim off leading/trailing spaces
+                                                $trimmedRowData = array();