Index: branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php	(revision 20841)
+++ branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php	(revision 20888)
@@ -931,4 +931,32 @@
 
     /**
+     * ダウンロード可能フラグを, 受注詳細に設定する.
+     *
+     * ダウンロード可能と判断されるのは, 以下の通り.
+     *
+     * 1. ダウンロード可能期限が期限内かつ, 入金日が入力されている
+     * 2. 販売価格が 0 円である
+     *
+     * 受注詳細行には, is_downloadable という真偽値が設定される.
+     * @param array 受注詳細の配列
+     * @return void
+     */
+    function setDownloadableFlgTo(&$arrOrderDetail) {
+        foreach (array_keys($arrOrderDetail) as $key) {
+            // 販売価格が 0 円
+            if ($arrOrderDetail[$key]['price'] == '0') {
+                $arrOrderDetail[$key]['is_downloadable'] = true;
+            }
+            // ダウンロード期限内かつ, 入金日あり
+            elseif ($arrOrderDetail[$key]['effective'] == '1'
+                    && !SC_Utils_Ex::isBlank($arrOrderDetail[$key]['payment_date'])) {
+                $arrOrderDetail[$key]['is_downloadable'] = true;
+            } else {
+                $arrOrderDetail[$key]['is_downloadable'] = false;
+            }
+        }
+    }
+
+    /**
      * 配送情報を取得する.
      *
Index: branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_History.php	(revision 20764)
+++ branches/version-2_11-dev/data/class/pages/mypage/LC_Page_Mypage_History.php	(revision 20888)
@@ -94,4 +94,5 @@
         // 受注商品明細の取得
         $this->tpl_arrOrderDetail = $objPurchase->getOrderDetail($order_id);
+        $objPurchase->setDownloadableFlgTo($this->tpl_arrOrderDetail);
         // 受注メール送信履歴の取得
         $this->tpl_arrMailHistory = $this->lfGetMailHistory($order_id);
Index: branches/version-2_11-dev/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- branches/version-2_11-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 20764)
+++ branches/version-2_11-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 20888)
@@ -64,10 +64,12 @@
                     <td class="alignC">
                     <!--{if $orderDetail.product_type_id == $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                        <!--{if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
+                        <!--{if $orderDetail.is_downloadable}-->
                             <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$tpl_arrOrderData.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
-                        <!--{elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
-                            <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（入金確認中）
-                        <!--{elseif $orderDetail.effective != "1"}-->
-                            <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（期限切れ）
+                        <!--{else}-->
+                            <!--{if $orderDetail.payment_date == "" && $orderDetail.effective == "0"}-->
+                                <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（入金確認中）
+                            <!--{else}-->
+                                <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（期限切れ）
+                            <!--{/if}-->
                         <!--{/if}-->
                     <!--{else}-->
Index: branches/version-2_11-dev/data/Smarty/templates/mobile/mypage/history.tpl
===================================================================
--- branches/version-2_11-dev/data/Smarty/templates/mobile/mypage/history.tpl	(revision 20764)
+++ branches/version-2_11-dev/data/Smarty/templates/mobile/mypage/history.tpl	(revision 20888)
@@ -45,10 +45,12 @@
 商品種別：
 <!--{if $orderDetail.product_type_id == $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-<!--{if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
+<!--{if $orderDetail.is_downloadable}-->
 <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$tpl_arrOrderData.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a><br>
-<!--{elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
+<!--{else}-->
+<!--{if $orderDetail.payment_date == "" && $orderDetail.effective == "0"}-->
 <!--{$arrProductType[$orderDetail.product_type_id]}--><br>（入金確認中）<br>
-<!--{elseif $orderDetail.effective != "1"}-->
+<!--{else}-->
 <!--{$arrProductType[$orderDetail.product_type_id]}--><br>（期限切れ）<br>
+<!--{/if}-->
 <!--{/if}-->
 <!--{else}-->
Index: branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/history.tpl
===================================================================
--- branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 20764)
+++ branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 20888)
@@ -57,10 +57,12 @@
                     <td><!--{$orderDetail.product_code|h}--></td>
                     <td><!--→商品名--><a<!--{if $orderDetail.enable}--> href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$orderDetail.product_id|u}-->"<!--{/if}-->><!--{$orderDetail.product_name|h}--></a><!--←商品名--><br /><!--→商品種別--><!--{if $orderDetail.product_type_id == $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                        <!--{if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
+                        <!--{if $orderDetail.is_downloadable}-->
                             <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$tpl_arrOrderData.order_id}-->&amp;product_id=<!--{$orderDetail.product_id}-->&amp;product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
-                        <!--{elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
-                            <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（入金確認中）
-                        <!--{elseif $orderDetail.effective != "1"}-->
-                            <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（期限切れ）
+                        <!--{else}-->
+                            <!--{if $orderDetail.payment_date == "" && $orderDetail.effective == "0"}-->
+                                <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（入金確認中）
+                            <!--{else}-->
+                                <!--{$arrProductType[$orderDetail.product_type_id]}--><BR />（期限切れ）
+                            <!--{/if}-->
                         <!--{/if}-->
                     <!--{else}-->