Changeset 20013

Timestamp:

2011/01/20 14:06:03 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20012

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/order/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Findex.tpl
data/Smarty/templates/admin/pdf/nouhinsyo1.pdf 19735@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fadmin%2Fpdf%2Fnouhinsyo1.pdf
data/class/SC_Fpdf.php 17182@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Fpdf.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2742

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/order/index.tpl [email protected]
data/Smarty/templates/admin/pdf/nouhinsyo1.pdf [email protected]
data/class/SC_Fpdf.php [email protected]

bzr:timestamp:

2011-01-20 14:05:58.295000076 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-20T05:05:58.295000Z

Message:

#843(複数配送先の指定)

• PDF関連を修正

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/order/index.tpl (modified) (1 diff)
• Smarty/templates/admin/pdf/nouhinsyo1.pdf (modified) (previous)
• class/SC_Fpdf.php (modified) (2 diffs)

branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl

@@ -57 +57 @@
     function fnOpenPdfSettingPage(action){
         var fm = document.form1;
-        var WIN;
-        WIN = window.open("about:blank", "pdf", "width=500,height=600,scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no");
+        win02("about:blank", "pdf", "620","650");
         
         // 退避

branches/version-2_5-dev/data/class/SC_Fpdf.php

@@ -99 +99 @@
         // ショップ情報
 
-        $objInfo = new SC_SiteInfo();
-        $arrInfo = $objInfo->data;
+        $objDb = new SC_Helper_DB_Ex();
+        $arrInfo = $objDb->sfGetBasisData();
 
         $this->lfText(125, 60, $arrInfo['shop_name'], 8, 'B');          //ショップ名
@@ -152 +152 @@
         // お届け先情報
         $this->pdf->SetFont('SJIS', '', 10);
-        $text = "〒 ".$this->arrDisp['deliv_zip01']." - ".$this->arrDisp['deliv_zip02'];
-        $this->lfText(22, 128, $text, 10); //お届け先郵便番号
-        $text = $this->arrPref[$this->arrDisp['deliv_pref']] . $this->arrDisp['deliv_addr01'];
-        $this->lfText(26, 132, $text, 10); //お届け先都道府県+住所1
-        $this->lfText(26, 136, $this->arrDisp['deliv_addr02'], 10); //お届け先住所2
-        $text = $this->arrDisp['deliv_name01']."　".$this->arrDisp['deliv_name02']."　様";
-        $this->lfText(26, 140, $text, 10); //お届け先氏名
-
-        $this->lfText(144, 121, SC_Utils_Ex::sfDispDBDate($this->arrDisp['create_date']), 10); //ご注文日
-        $this->lfText(144, 131, $this->arrDisp['order_id'], 10); //注文番号
+        $this->lfText(25, 125, SC_Utils_Ex::sfDispDBDate($this->arrDisp['create_date']), 10); //ご注文日
+        $this->lfText(25, 135, $this->arrDisp['order_id'], 10); //注文番号
 
         $this->pdf->SetFont('SJIS', 'B', 15);