Changeset 21302 for branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php

Timestamp:

2011/10/28 18:58:18 (15 years ago)

Author:

shutta

Message:

#1527 (端末種別の判別ルーチンの統一)
Net_UserAgent_Mobile::isMobile()な処理をSC_Display_Ex::detectDevice()に統一。
但し、SC_Mobile_UserAgent::isNonMobile()は、対象から除外した。

File:

• branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php (modified) (2 diffs)

branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php

@@ -431 +431 @@
             }
 
-            if (Net_UserAgent_Mobile::isMobile()
-                && in_array('email', $keys)) {
+            if ((SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE)
+                && in_array('email', $keys)
+            ) {
                 $email_mobile = $objCustomer->getValue('email_mobile');
                 if (empty($email_mobile)) {
@@ -1060 +1061 @@
     function sendOrderMail($orderId) {
         $mailHelper = new SC_Helper_Mail_Ex();
-        $mailHelper->sfSendOrderMail($orderId,
-                                     SC_MobileUserAgent_Ex::isMobile() ? 2 : 1);
+        $template_id =
+            SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ? 2 : 1;
+        $mailHelper->sfSendOrderMail($orderId, $template_id);
     }