Index: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php	(revision 20580)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php	(revision 20697)
@@ -129,5 +129,5 @@
                 break;
             case 'multiple':
-                // 複数配送先用？
+                // 複数配送先用
                 break;
             default :
@@ -215,9 +215,8 @@
     function lfRegistDataNonMember($objFormParam) {
         $arrRegistColumn = $objFormParam->getDbArray();
-
-        foreach ($arrRegistColumn as $data) {
-            $arrRegist['shipping_' . $data['column'] ] = $array[ $data['column'] ];
-        }
-        if (count($shipping) >= DELIV_ADDR_MAX) {
+        foreach ($arrRegistColumn as $key => $val) {
+            $arrRegist['shipping_' . $key ] = $val;
+        }
+        if (count($_SESSION['shipping']) >= DELIV_ADDR_MAX) {
             SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", false, '別のお届け先最大登録数に達しています。');
         } else {
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	(revision 20670)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	(revision 20697)
@@ -545,5 +545,5 @@
         $objQuery->delete($table, $where, array($order_id));
 
-         foreach ($arrParams as $arrShipping) {
+         foreach ($arrParams as $key => $arrShipping) {
 
             $arrValues = $objQuery->extractOnlyColsOf($table, $arrShipping);
@@ -558,4 +558,8 @@
             }
 
+            // 非会員購入の場合は shipping_id が存在しない
+            if (!isset($arrValues['shipping_id'])) {
+                $arrValues['shipping_id'] = $key;
+            }
             $arrValues['order_id'] = $order_id;
             $arrValues['create_date'] = 'Now()';