Changeset 697

Timestamp:

12/31/09 16:25:28 (2 years ago)

Author:

brieb

Message:

• fixed e-mailing of PDF invoice and quotes

Location:

trunk/phpbms/modules/bms

Files:

• include/invoices.php (modified) (10 diffs)
• report/invoices_pdf_class.php (modified) (2 diffs)

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

@@ -1212 +1212 @@
 
                 }//end method - insertRecord
-                
+
                 /*
                  * function api_searchByClientUuid
@@ -1227 +1227 @@
                  * were encountered, or the original $requestData if there was an error
                  */
-                
+
                 function api_searchByClientUuid($requestData, $returnUuid = true) {
-                        
+
                         /**
-                          *  check for required field 
+                          *  check for required field
                           */
                         if(!isset($requestData["clientid"])){
@@ -1237 +1237 @@
                                 $response["message"] = "Data does not contain a key of 'clientid'.";
                                 $response["details"] = $requestData;
-                                
+
                                 return $response;
                         }//end if
-                        
+
                         /**
-                          *  do sql search 
+                          *  do sql search
                           */
                         $querystatement = "
@@ -1253 +1253 @@
                                         `clientid` = '".mysql_real_escape_string($requestData["clientid"])."'
                         ";
-                        
+
                         if(isset($requestData["type"]))
                                 $querystatement .= "AND `type` = '".mysql_real_escape_string($requestData["type"])."'";
-                        
+
                         if(isset($requestData["startdate"]))
                                 $querystatement .= "AND `creationdate` >= '".mysql_real_escape_string($requestData["startdate"])."'";
-                                
+
                         if(isset($requestData["enddate"]))
                                 $querystatement .= "AND `creationdate` <= '".mysql_real_escape_string($requestData["enddate"])."'";
-                        
+
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         /**
-                          *  report findings 
+                          *  report findings
                           */
                         $thereturn["details"] = array();
@@ -1272 +1272 @@
                         $thereturn["type"] = "result";
                         while($therecord = $this->db->fetchArray($queryresult)){
-                                
+
                                 if($returnUuid)
                                         $thereturn["details"][] = $therecord["uuid"];
                                 else
                                         $thereturn["details"][] = $therecord["id"];
-                                
+
                         }//end while
-                        
+
                         return $thereturn;
-                        
+
                 }//end function --api_searchByClientUuid--
 
@@ -1459 +1459 @@
                                 $this->db->setEncoding("latin1");
 
-                                include("modules/bms/report/invoices_pdf_class.php");
+                                require_once("report/report_class.php");
+                                include("modules/bms/report/invoices_pdf_class.php");
 
                                 $processed = 0;
@@ -1465 +1466 @@
                                 foreach($this->idsArray as $id){
 
-                                        $report = new invoicePDF($this->db, 'P', 'in', 'Letter');
+                                        $report = new invoicePDF($this->db, 'rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', 'P', 'in', 'Letter');
 
                                         if(!$useUuid)
@@ -1493 +1494 @@
 
 
-                function email_quote($useUuid){
+                function email_quote($useUuid = false){
 
                                 if(DEMO_ENABLED == "true")
@@ -1501 +1502 @@
 
                                 $noOutput = true;
+                                require_once("report/report_class.php");
                                 include("modules/bms/report/invoices_pdf_class.php");
                                 include("modules/bms/report/invoices_pdfquote.php");
@@ -1508 +1510 @@
                                 foreach($this->idsArray as $id){
 
-                                        $report = new quotePDF($this->db, 'P', 'in', 'Letter');
+                                        $report = new quotePDF($this->db, 'rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', 'P', 'in', 'Letter');
 
                                         if(!$useUuid)

trunk/phpbms/modules/bms/report/invoices_pdf_class.php

@@ -789 +789 @@
                             $to =               $this->invoicerecord["email"];
                             $from =     $userinfo["email"];
-                            $subject =  "Your ".$this->title." from ".COMPANY_NAME;
-                            $message =  "Attached is your ".$this->title." from ".COMPANY_NAME."\n\n" .
+                            $subject =  "Your ".$this->settings["reportTitle"]." from ".COMPANY_NAME;
+                            $message =  "Attached is your ".$this->settings["reportTitle"]." from ".COMPANY_NAME."\n\n" .
                                                     "The attachment requires Adobe Acrobat Reader to view. \n If you do not " .
                                                     "have Acrobat Reader, you can download it at http://www.adobe.com  \n\n" .
@@ -815 +815 @@
                             $message .= "--{$mime_boundary}\n" .
                                              "Content-Type: {application/pdf};\n" .
-                                             " name=\"".$this->title.$this->invoicerecord["id"].".pdf\"\n" .
+                                             " name=\"".$this->settings["reportTitle"].$this->invoicerecord["id"].".pdf\"\n" .
                                              "Content-Disposition: attachment;\n" .
-                                             " filename=\"".$this->title.$this->invoicerecord["id"].".pdf\"\n" .
+                                             " filename=\"".$this->settings["reportTitle"].$this->invoicerecord["id"].".pdf\"\n" .
                                              "Content-Transfer-Encoding: base64\n\n" .
                                              $pdf . "\n\n" .