Changeset 18706 for branches/version-2_4

Timestamp:

2010/06/16 14:02:59 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100616043149-lhr1rbqldxfqlakc

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/SC_View.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_View.php
data/class/pages/admin/customer/LC_Page_Admin_Customer.php 15568@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcustomer%2FLC_Page_Admin_Customer.php

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100616050255-mkan21dnvj9wx8ks

bzr:revno:

1919

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

bzr:text-parents:

data/class/SC_View.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/feature-module-update:16741
data/class/pages/admin/customer/LC_Page_Admin_Customer.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:17791

bzr:timestamp:

2010-06-16 14:02:55.463999987 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-06-16T05:02:55.464000Z

Message:

merged r18591, r18595, r18597, r18599

• 管理画面からの仮登録メール再送の不具合を修正(#616)

Location:

branches/version-2_4/data/class

Files:

• SC_View.php (modified) (1 diff)
• pages/admin/customer/LC_Page_Admin_Customer.php (modified) (1 diff)

branches/version-2_4/data/class/SC_View.php

@@ -221 +221 @@
 
 class SC_MobileView extends SC_SiteView {
-    function SC_MobileView() {
-        parent::SC_SiteView();
+    function SC_MobileView($cart = true) {
+        parent::SC_SiteView($cart);
         $this->_smarty->template_dir = MOBILE_TEMPLATE_DIR;
         $this->_smarty->compile_dir = MOBILE_COMPILE_DIR;

branches/version-2_4/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -215 +215 @@
         // 登録メール再送
         if ($_POST['mode'] == "resend_mail") {
-            $arrRet = $objQuery->select("name01, name02, secret_key, email", "dtb_customer","customer_id = ? AND del_flg <> 1 AND status = 1", array($_POST["edit_customer_id"]));
+            $arrRet = $objQuery->select("name01, name02, secret_key, email, email_mobile", "dtb_customer","customer_id = ? AND del_flg <> 1 AND status = 1", array($_POST["edit_customer_id"]));
             if( is_array($arrRet) === true && count($arrRet) > 0 ){
 
                 $CONF = $objDb->sf_getBasisData();
                 $this->CONF = $CONF;
-                $objMailText = new SC_SiteView();
+                /**
+                 * 携帯メールアドレスが登録されていれば携帯サイトから仮会員登録したものと判定する。
+                 * TODO: とりあえずの簡易的な判定なので、将来的には判定ルーチンを修正した方が良い。
+                 */
+                if (!empty($arrRet[0]['email_mobile'])) {
+                    $objMailText = new SC_MobileView(false);
+                    $this->to_name01 = $arrRet[0]['name01'];
+                    $this->to_name02 = $arrRet[0]['name02'];
+                } else {
+                    $objMailText = new SC_SiteView(false);
+                }
                 $objMailText->assignobj($this);
                 $mailHelper = new SC_Helper_Mail_Ex();