Changeset 673

Timestamp:

11/04/09 12:11:05 (3 years ago)

Author:

nate

Message:

• Added relevant filenames to pdf reports.
  • Sales order and receipt based pdfs have had the company name of the client and the id of the sales order or receipt added. Multipile sales orders add "multiple" instead.
  • Label pdfs have had a relevant company name added. Multiple clients add "multiple" instead.
  • The note summary pdf has had the note id added. Multiple notes add "multiple" instead.
  • The aritems clientstatement pdf has had a relevant date added.
• Work was based off of patch in ticket #334.

Location:

trunk/phpbms

Files:

• fpdf/fpdf.php (modified) (2 diffs)
• include/common_functions.php (modified) (1 diff)
• modules/base/report/notes_summary.php (modified) (2 diffs)
• modules/bms/report/aritems_clientstatement.php (modified) (1 diff)
• modules/bms/report/clients_folderlabels.php (modified) (1 diff)
• modules/bms/report/clients_mailinglabels.php (modified) (1 diff)
• modules/bms/report/clients_notesummary.php (modified) (2 diffs)
• modules/bms/report/clients_shippinglabels.php (modified) (1 diff)
• modules/bms/report/invoices_pdfinvoice.php (modified) (1 diff)
• modules/bms/report/invoices_pdfpackinglist.php (modified) (7 diffs)
• modules/bms/report/invoices_pdfquote.php (modified) (3 diffs)
• modules/bms/report/invoices_pdfworkorder.php (modified) (5 diffs)
• modules/bms/report/invoices_pdf_class.php (modified) (4 diffs)
• modules/bms/report/invoices_shippinglabels.php (modified) (1 diff)
• modules/bms/report/receipts_pdf.php (modified) (4 diffs)
• report/general_labels.php (modified) (3 diffs)

trunk/phpbms/fpdf/fpdf.php

@@ -1163 +1163 @@
         }
         $mqr=get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
+        @set_magic_quotes_runtime(0);
         foreach($this->FontFiles as $file=>$info)
         {
@@ -1201 +1201 @@
                 $this->_out('endobj');
         }
-        set_magic_quotes_runtime($mqr);
+        @set_magic_quotes_runtime($mqr);
         foreach($this->fonts as $k=>$font)
         {

trunk/phpbms/include/common_functions.php

@@ -1124 +1124 @@
 
 
+/*
+ * function cleanFilename       
+ * @param $string
+ * @return string $string with only alpha-numeric characters, periods (.),
+ * dashes (-), and underscores (_)
+ */
+
+function cleanFilename($string) {
+        
+        $pattern = "/[^\w\d\.\-\_]/";
+        $string = preg_replace($pattern, "", $string);
+        
+        return $string;
+        
+}//end function --cleanFilename--
+
+
 
 function htmlFormat($string,$quotes=false){

trunk/phpbms/modules/base/report/notes_summary.php

@@ -86 +86 @@
         $pdf->SetY($topmargin+.43+.1);
         $pdf->SetLineWidth(.01);
+        
+        $filename = "Notes_Summary";
+        
+        $thisCount = $db->numRows($thequery);
         while($therecord=$db->fetchArray($thequery)) {
+                
                 $pdf->SetFont("Arial","",9);
                 $pdf->SetX($leftmargin+.125);
@@ -104 +109 @@
                 $pdf->Line($leftmargin+.25,$pdf->GetY(),$paperwidth-$rightmargin-.25,$pdf->GetY());
                 $pdf->SetY($pdf->GetY()+.25);
+                
+                $thisId = $therecord["id"];
+                
         }// end fetch_array while loop
+        
+        if($thisCount === 1)
+                $filename .= "_".$thisId;
+        elseif((int)$thisCount)
+                $filename .= "_Multiple";
 
-        $pdf->Output();
+        $filename = cleanFilename($filename);
+        $filename .= ".pdf";
+        
+        $pdf->Output($filename, 'D');
         exit();
 ?>

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

@@ -481 +481 @@
         function output($to = "screen"){
 
-                $this->pdf->Output();
+                $filename = 'Client_Statement_'.date('Ymd').'.pdf';
+                $filename = cleanFilename($filename);
+                $this->pdf->output($filename, 'D');
 
         }//end method

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

@@ -87 +87 @@
                 return $pdf;
         }
+        $filename = 'Folderlabels_Clients';
 
         require("report/general_labels.php");

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

@@ -93 +93 @@
                 return $pdf;
         }
+        $filename = 'Mailinglabels_Clients';
 
         require("../../../report/general_labels.php");

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

@@ -91 +91 @@
 
         $pdf->SetY($topmargin+.43+.1);
+        $filename = "Client_Notes";
 
+        $thisCount = $db->numRows($clientquery);
         while($clientrecord=$db->fetchArray($clientquery)) {
+                
+                $theName = $clientRecord["thename"];
+                
                 $querystatement = "
                         SELECT
@@ -165 +170 @@
         }
 
-        $pdf->Output();
+        if($thisCount == 1){
+                if($thename)
+                        $filename .= '_'.$thename;
+        }elseif($thisCount)
+                $filename .= "_Multiple";
+        
+        $filename = str_replace(" ", "_", $filename);
+        $filename = cleanFilename($filename);
+        $filename .= ".pdf";
+        
+        $pdf->Output($filename, "D");
         exit();
 ?>

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

@@ -98 +98 @@
         }
 
+        $filename = 'Shippinglabels_Clients';
         require("../../../report/general_labels.php");
 ?>

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

@@ -46 +46 @@
 
         //set encoding to latin1 (fpdf doesnt like utf8)
-        $sqlEncoding = "latin1";        
+        $sqlEncoding = "latin1";
         require_once("../../../include/session.php");
-        
+
         include("modules/bms/report/invoices_pdf_class.php");
-        
+
         $report = new invoicePDF($db, 'P', 'in', 'Letter');
         $report->setupFromPrintScreen();
         $report->generate();
-        $report->output();
         
+        $filename = "Invoice";
+        if($report->count === 1){
+                
+                if($report->invoicerecord["company"])
+                        $filename .= "_".$report->invoicerecord["company"];
+                
+                $filename .= "_".$report->invoicerecord["id"];
+                
+        }elseif((int)$report->count)
+                $filename .= "_Multiple";
+        
+        $filename .= ".pdf";
+        $report->output('screen', $filename);
+
 }//end if
 

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

@@ -39 +39 @@
 
         if(!isset($_SESSION["userinfo"]["id"])){
-        
+
                 //IE needs caching to be set to private in order to display PDFS
                 session_cache_limiter('private');
-        
+
                 //set encoding to latin1 (fpdf doesnt like utf8)
-                $sqlEncoding = "latin1";        
+                $sqlEncoding = "latin1";
                 require_once("../../../include/session.php");
-        
+
         }//end if
-        
+
         if(!class_exists("invoicePDF"))
                 include("invoices_pdf_class.php");
-        
+
         class  packinglistPDF extends invoicePDF{
-        
+
                 var $title = "Packing List";
                 var $showShipNameInShipTo = false;
-                                
+
                 function packinglistPDF($db, $orientation='P', $unit='mm', $format='Letter'){
-        
+
                         $this->invoicePDF($db, $orientation, $unit, $format);
-                        
-                }//end method
-        
+
+                }//end method
+
 
                 function initialize(){
@@ -68 +68 @@
 
                         $pdf = &$this->pdf;
-                        
+
                         $topinfo = array();
                         $topinfo[] = new pdfColumn("Order ID", "id", 0.75);
                         $topinfo[] = new pdfColumn("Order Date", "orderdate", 1, "date");
                         $topinfo[] = new pdfColumn("Client PO", "ponumber", 0);
-                        
+
                         $size = 0;
                         foreach($topinfo as $column)
                                 $size += $column->size;
-                                
+
                         $topinfo[2]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
 
-                        $this->topinfo = $topinfo;                      
-                        
+                        $this->topinfo = $topinfo;
+
                         $lineitems = array();
                         $lineitems[] = new pdfColumn("Product / (Part Number)", "parts", 0);
@@ -89 +89 @@
                         $lineitems[] = new pdfColumn("Qty", "quantity", 0.5, "real","R");
                         $lineitems[] = new pdfColumn("Weight Ext.", "extended", 0.75, "real", "R");
-                                                
+
                         $size = 0;
                         foreach($lineitems as $column)
                                 $size += $column->size;
-                                
+
                         $lineitems[0]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-                        
+
                         $this->lineitems = $lineitems;
-                        
+
                         $totalsinfo = array();
                         $totalsinfo[] = new pdfColumn("Shipping Method", "shippingname", 0);
@@ -103 +103 @@
                         $totalsinfo[] = new pdfColumn("Total Weight", "totalweight", 1, "real", "R");
                         $totalsinfo[] = new pdfColumn("Shipping", "shipping", 1, "currency", "R");
-                                                                        
+
                         $size = 0;
                         foreach($totalsinfo as $column)
                                 $size += $column->size;
-                                
+
                         $totalsinfo[0]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
 
@@ -114 +114 @@
                 }//end method
 
-                        
+
                 function _addNotes(){
-                
+
                         $pdf = &$this->pdf;
-                
+
                         $height = 1;
                         $nextPos = $pdf->GetY() + $height + 0.125;
-                
+
                         $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
                         $pdf->setStyle("header");
                         $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Special Instructions", 1, 2, "L", 1);
-                                                
+
                         $pdf->setStyle("normal");
                         $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
                         $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->invoicerecord["specialinstructions"]);
-                        
+
                         $pdf->SetXY($pdf->leftmargin, $nextPos);
-                
-                }//end method
-                
-                
+
+                }//end method
+
+
                 function _getLineItems(){
-                
+
                         $querystatement = "
                         SELECT
@@ -154 +154 @@
 
                         $queryresult = $this->db->query($querystatement);
-                        
+
                         //determine estimated total boxes
                         $this->invoicerecord["estimatedboxes"] = 0;
                         while($therecord = $this->db->fetchArray($queryresult)){
-                        
+
                                 if($therecord["isprepackaged"])
                                         $this->invoicerecord["estimatedboxes"] += $therecord["quantity"];
                                 else
                                         $this->invoicerecord["estimatedboxes"] += $therecord["quantity"] * $therecord["packagesperitem"];
-                                
+
                         }//endwhile
-                        
+
                         $this->db->seek($queryresult, 0);
-                        
+
                         return $queryresult;
-                
-                }//end method
-                
+
+                }//end method
+
                 function _addTotals(){
 
                         $pdf = &$this->pdf;
-                                                        
+
                         $height = .5;
                         $nextPos = $pdf->GetY() + $height + 0.125;
-                
+
                         $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-                        
+
                         $pdf->setStyle("header");
                         foreach($this->totalsinfo as $column)
                                 $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-                        
+
                         $pdf->setStyle("normal");
                         $pdf->SetFont("Arial", "B", 10);
                         $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
-                        
+
                         foreach($this->totalsinfo as $column){
-                        
+
                                 if($column->format != "")
                                         $value = formatVariable($this->invoicerecord[$column->fieldname], $column->format);
                                 else
-                                        $value = $this->invoicerecord[$column->fieldname];                              
-                        
+                                        $value = $this->invoicerecord[$column->fieldname];
+
                                 $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
 
                         }//end foreach
-                                        
+
                 }//end method
 
@@ -208 +208 @@
         //=============================================================================
         if(!isset($noOutput)){
-                        
+
                 $report = new packinglistPDF($db, 'P', 'in', 'Letter');
-                
+
                 $report->setupFromPrintScreen();
                 $report->generate();
-                $report->output();
+                $filename = "Packing_List";
                 
+                if($report->count === 1){
+                        
+                        if($report->invoicerecord["company"])
+                                $filename .= "_".$report->invoicerecord["company"];
+                        
+                        $filename .= "_".$report->invoicerecord["id"];
+                        
+                }elseif((int)$report->count)
+                        $filename .= "_Multiple";
+                
+                $report->output('screen', $filename);
+
         }//end if
 ?>

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

@@ -43 +43 @@
 
         //set encoding to latin1 (fpdf doesnt like utf8)
-        $sqlEncoding = "latin1";        
+        $sqlEncoding = "latin1";
         require_once("../../../include/session.php");
 
@@ -58 +58 @@
 
                 $this->invoicePDF($db, $orientation, $unit, $format);
-                
+
         }//end method
-        
+
         function initialize(){
                 parent::initialize();
-                
+
                 unset($this->totalsinfo[5]);
-                                
+
         }//end method
 
@@ -73 +73 @@
 //=============================================================================
 if(!isset($noOutput)){
-                
+
         $report = new quotePDF($db, 'P', 'in', 'Letter');
         $report->showShipNameInShipTo = false;
-        
+
         $report->setupFromPrintScreen();
         $report->generate();
-        $report->output();
         
+        $filename = "Quote";
+        if($report->count === 1){
+                
+                if($report->invoicerecord["company"])
+                        $filename .= "_".$report->invoicerecord["company"];
+                
+                $filename .= "_".$report->invoicerecord["id"];
+                
+        }elseif((int)$report->count)
+                $filename .= "_Multiple";
+        
+        $filename .= ".pdf";
+        
+        $report->output('screen', $filename);
+
 }//end if
 

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

@@ -38 +38 @@
 */
         if(!isset($_SESSION["userinfo"]["id"])){
-        
+
                 //IE needs caching to be set to private in order to display PDFS
                 session_cache_limiter('private');
 
                 //set encoding to latin1 (fpdf doesnt like utf8)
-                $sqlEncoding = "latin1";        
+                $sqlEncoding = "latin1";
                 require_once("../../../include/session.php");
-        
+
         }//end if
-        
+
         if(!class_exists("invoicePDF"))
                 include("invoices_pdf_class.php");
-        
+
         class  workorderPDF extends invoicePDF{
-        
+
                 var $title = "Work Order";
                 var $lineitemBoxHeight = 3.75;
-                
+
                 function workorderPDF($db, $orientation='P', $unit='mm', $format='Letter'){
-        
+
                         $this->invoicePDF($db, $orientation, $unit, $format);
-                        
+
                 }//end method
-        
-        
+
+
                 function _addNotes(){
-                
+
                         $pdf = &$this->pdf;
-                
+
                         $height = 1;
                         $nextPos = $pdf->GetY() + $height + 0.125;
-                
+
                         $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
                         $pdf->setStyle("header");
                         $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Special Instructions", 1, 2, "L", 1);
-                                                
+
                         $pdf->setStyle("normal");
                         $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
                         $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->invoicerecord["specialinstructions"]);
-                        
+
                         $pdf->SetXY($pdf->leftmargin, $nextPos);
-                
+
                 }//end method
-                
+
                 function _addPaymentDetails(){
 
@@ -90 +90 @@
 
                         switch($this->invoicerecord["paymenttype"]){
-                        
+
                                 case "draft":
                                         $columns[0]->size = 1.5;
@@ -102 +102 @@
                                         $columns[] = new pdfColumn("Exp.", "ccexpiration", 1);
                                         $columns[] = new pdfColumn("Verification/Pin", "ccverification", 1);
-                                        break;                                  
-                        
+                                        break;
+
                         }//end switch
-                                                
+
                         $size = 0;
                         foreach($columns as $column)
                                 $size += $column->size;
-                                                        
+
                         $i = count($columns) -1;
-                                
+
                         $columns[$i]->size += $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-                        
+
                         $height = 0.5;
                         $nextPos = $pdf->GetY() + $height + 0.125;
-                
+
                         $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-                        
+
                         $pdf->setStyle("header");
 
                         foreach($columns as $column)
                                 $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-                                
+
                         $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
-                        
+
                         $pdf->setStyle("normal");
                         $pdf->SetFont("Arial", "B", 10);
@@ -132 +132 @@
 
                 }//end method
-                
+
         }//end class
 
@@ -139 +139 @@
 //=============================================================================
 if(!isset($noOutput)){
-                
+
         $report = new workorderPDF($db, 'P', 'in', 'Letter');
-        
+
         $report->setupFromPrintScreen();
         $report->generate();
-        $report->output();
+        $filename = 'Work_Order';
+        if($report->count === 1){
+                
+                if($report->invoicerecord["company"])
+                        $filename .= "_".$report->invoicerecord["company"];
+                
+                $filename .= "_".$report->invoicerecord["id"];
+                
+        }elseif((int)$report->count)
+                $filename .= "_Multiple";
         
+        $filename .= ".pdf";
+        $report->output('screen', $filename);
+
 }//end if
 

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

@@ -46 +46 @@
                 var $showShipNameInShipTo = true;
                 var $lineitemBoxHeight = 4.25;
+                
+                /**
+                  * $count
+                  * @var int The number of invoice records being displayed
+                  */
+                var $count;
 
                 function invoicePDF($db, $orientation='P', $unit='mm', $format='Letter'){
@@ -171 +177 @@
                         $queryresult = $this->db->query($querystatement);
 
-                        if($this->db->numRows($queryresult) == 0){
-
+                        $this->count = $this->db->numRows($queryresult);
+                        if($this->count == 0){
+                                
                                 $this->_showNoRecords();
                                 exit;
@@ -505 +512 @@
                                 products.partnumber
                         FROM
-                                lineitems LEFT JOIN products ON lineitems.productid = products.id
+                                lineitems LEFT JOIN products ON lineitems.productid = products.uuid
                         WHERE
                                 lineitems.invoiceid ='".((int) $this->invoicerecord["id"])."'
@@ -609 +616 @@
 
                                 case "screen":
-                                        $this->pdf->Output();
+                                        $userinfo = cleanFilename((string)$userinfo);
+                                        $this->pdf->Output($userinfo, 'D');
                                         break;
 

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

@@ -111 +111 @@
                 return $pdf;
         }
-
+        $filename = 'Shippinglabels_invoice';
         session_cache_limiter('private');
         require_once("../../../include/session.php");

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

@@ -53 +53 @@
                 var $title = "Receipt";
                 var $lineitemBoxHeight = 4.25;
+                /**
+                  * $count
+                  * @var int The number of invoice records being displayed
+                  */
+                var $count;
 
                 function receiptPDF($db, $orientation='P', $unit='mm', $format='Letter'){
@@ -177 +182 @@
                         $queryresult = $this->db->query($querystatement);
 
-                        if($this->db->numRows($queryresult) == 0){
+                        
+                        $this->count = $this->db->numRows($queryresult);
+                        if($this->count == 0){
 
                                 $this->_showNoRecords();
@@ -632 +639 @@
 
                                 case "screen":
-                                        $this->pdf->Output();
+                                        $userinfo = cleanFilename((string)$userinfo);
+                                        $this->pdf->Output($userinfo, 'D');
                                         break;
 
@@ -703 +711 @@
         $report->setupFromPrintScreen();
         $report->generate();
-        $report->output();
+        
+        $filename = 'Receipts_';
+        if($report->count === 1){
+                
+                if($report->invoicerecord["company"])
+                        $filename .= "_".$report->invoicerecord["company"];
+                
+                $filename .= "_".$report->invoicerecord["id"];
+                
+        }elseif((int)$report->count)
+                $filename .= "_Multiple";
+        
+        $filename .= ".pdf";
+        $report->output('screen', $filename);
 
 }//end if

trunk/phpbms/report/general_labels.php

@@ -97 +97 @@
                 }
 
+                $thisCount = $db->numRows($thequery);
                 while($therecord=$db->fetchArray($thequery)) {
 
@@ -116 +117 @@
                         $they+=$labelheight;
                         $rowcount++;
+                        
+                        $company = $therecord["company"];
+                        
                 }// end fetch_array while loop
 
-                $pdf->Output();
+                if($thisCount === 1){
+                        if($company)
+                                $filename .= "_".$company;
+                }elseif((int)$thisCount)
+                        $filename .= "_Multiple";
+                                
+                                
+                $filename = cleanFilename($filename);
+                $filename .= ".pdf";
+                $pdf->Output($filename, 'D');
                 exit();
         } else {
@@ -139 +152 @@
                 <p align="right">
                         <input name="command" type="submit" class="Buttons" id="print" value="print" />
-                        <input name="cancel" type="button" class="Buttons" id="cancel" value="canel" onclick="window.close();" />
+                        <input name="cancel" type="button" class="Buttons" id="cancel" value="cancel" onclick="window.close();" />
                 </p>
 </div>