Changeset 18403

Timestamp:

2009/12/01 16:23:09 (13 years ago)

Author:

kajiwara

Message:

#553 壊れた帳票がダウンロードされる不具合、白紙のページが表示されてしまう不具合を修正

Location:

branches/version-2_4/data

Files:

• Smarty/templates/default/admin/order/edit.tpl (modified) (2 diffs)
• class/pages/admin/order/LC_Page_Admin_Order_Pdf.php (modified) (1 diff)

branches/version-2_4/data/Smarty/templates/default/admin/order/edit.tpl

@@ -48 +48 @@
         df.deliv_addr02.value = df.order_addr02.value;
     }
+
+    function fnOpenPdfSettingPage(action){
+        var WIN;
+        WIN = window.open("about:blank", "pdf", "width=500,height=600,scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no");
+
+        // 退避
+        tmpTarget = document.form1.target;
+        tmpMode = document.form1.mode.value;
+        tmpAction = document.form1.action;
+
+        document.form1.target = "pdf";
+        document.form1.mode.value = 'pdf';
+        document.form1.action = action;
+        document.form1.submit();
+        WIN.focus();
+
+        // 復元
+        document.form1.target = tmpTarget;
+        document.form1.mode.value = tmpMode;
+        document.form1.action = tmpAction;
+    }
 //-->
 </script>
@@ -129 +150 @@
                             <td bgcolor="#f2f1ec" width="110">帳票</td>
                             <td bgcolor="#ffffff">
-                              <input type="button" name="address_input" value="帳票の作成" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf_input','500','650'); return false;" />
+                              <input type="button" name="address_input" value="帳票の作成" onClick="fnOpenPdfSettingPage('pdf.php?order_id=<!--{$tpl_order_id}-->','pdf_input','500','650'); return false;" />
                             </td>
                             </tr>

branches/version-2_4/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php

@@ -111 +111 @@
                 }
                 $objFpdf->createPdf();
+                exit;
             }
             break;