Index: branches/version-2/data/class/SC_Fpdf.php
===================================================================
--- branches/version-2/data/class/SC_Fpdf.php	(revision 17724)
+++ branches/version-2/data/class/SC_Fpdf.php	(revision 18007)
@@ -1,3 +1,3 @@
-<?php
+<?php
 /*
  * This file is part of EC-CUBE
@@ -33,10 +33,10 @@
 
 class SC_Fpdf {
-    function SC_Fpdf($arrData, $tpl_pdf = "template_nouhin01.pdf") {
+    function SC_Fpdf($download, $title, $tpl_pdf = "template_nouhin01.pdf") {
         $this->arrData = $arrData;
         // デフォルトの設定
         $this->tpl_pdf = PDF_TEMPLATE_DIR . $tpl_pdf;  // テンプレートファイル
-        $this->pdf_download = $arrData[download];      // PDFのダウンロード形式（0:表示、1:ダウンロード）
-        $this->tpl_title = $arrData['title'];
+        $this->pdf_download = $download;      // PDFのダウンロード形式（0:表示、1:ダウンロード）
+        $this->tpl_title = $title;
         $this->tpl_dispmode = "real";      // 表示モード
         $masterData = new SC_DB_MasterData_Ex();
@@ -68,4 +68,9 @@
         // PDFを読み込んでページ数を取得
         $pageno = $this->pdf->setSourceFile($this->tpl_pdf);
+    }
+
+
+    function setData($arrData) {
+        $this->arrData = $arrData;
 
         // ページ番号よりIDを取得
@@ -92,12 +97,13 @@
 
         //ロゴ画像
-        $this->pdf->Image(PDF_IMG_DIR. 'logo.png', 124, 46, 60);
-
-        $this->createPdf();
+        $logo_file = PDF_TEMPLATE_DIR . 'logo.png';
+        $this->pdf->Image($logo_file, 124, 46, 40);
+
     }
 
     function setShopData() {
         // ショップ情報
-		$objInfo = new SC_SiteInfo();
+
+        $objInfo = new SC_SiteInfo();
         $arrInfo = $objInfo->data;
 
@@ -110,13 +116,15 @@
         $this->lfText(125, 74, $text, 8);  //都道府県+住所1
         $this->lfText(125, 77, $arrInfo['law_addr02'], 8);          //住所2
+
         $text = "TEL: ".$arrInfo['law_tel01']."-".$arrInfo['law_tel02']."-".$arrInfo['law_tel03'];
-		//FAX番号が存在しない場合は表示していない
-		//."　"."FAX: ".$arrInfo['law_fax01']."-".$arrInfo['law_fax02']."-".$arrInfo['law_fax03']
-		if(strlen($arrInfo['law_fax01']) > 0){
-			$text .= "　"."FAX: ".$arrInfo['law_fax01']."-".$arrInfo['law_fax02']."-".$arrInfo['law_fax03'];
-		}
+        if ( strlen($arrInfo['law_fax01']) > 0 && strlen($arrInfo['law_fax02']) > 0 && strlen($arrInfo['law_fax03']) > 0 ) {
+            $text .= "　FAX: ".$arrInfo['law_fax01']."-".$arrInfo['law_fax02']."-".$arrInfo['law_fax03'];
+        }
         $this->lfText(125, 80, $text, 8);  //TEL・FAX
-        $text = "Email: ".$arrInfo['law_email'];
-        $this->lfText(125, 83, $text, 8);      //Email
+
+        if ( strlen($arrInfo['law_email']) > 0 ) {
+            $text = "Email: ".$arrInfo['law_email'];
+            $this->lfText(125, 83, $text, 8);      //Email
+        }
     }
 
@@ -131,6 +139,7 @@
 
     function setOrderData() {
-        $objInfo = new SC_SiteInfo(); 
-        $arrInfo = $objInfo->data; 
+        // ショップ情報
+        $objInfo = new SC_SiteInfo();
+        $arrInfo = $objInfo->data;
         // DBから受注情報を読み込む
         $this->lfGetOrderData($this->arrData['order_id']);
@@ -165,5 +174,5 @@
         $this->pdf->Cell(0, 45, '', 0, 2, '', 0, '');
 
-        $this->pdf->SetFont('SJIS', '', 9);
+        $this->pdf->SetFont('SJIS', '', 8);
 
         $monetary_unit = $this->sjis_conv("円");
@@ -275,10 +284,10 @@
         // PDFをブラウザに送信
 ob_clean();
-        if($this->pdf_download == 1) {
-          $filename = "nouhinsyo-No".$this->arrData['order_id'].".pdf";
+        if ($this->pdf->PageNo() == 1) {
+            $filename = "nouhinsyo-No".$this->arrData['order_id'].".pdf";
+          } else {
+            $filename = "nouhinsyo.pdf";
+          }
           $this->pdf->Output($this->sjis_conv($filename), D);
-        } else {
-          $this->pdf->Output();
-        }
 
         // 入力してPDFファイルを閉じる