Ignore:
Timestamp:
2013/09/19 11:49:03 (7 years ago)
Author:
m_uehara
Message:

#2363 r23177, r23181 - r23186, r23188 - r23191, r23194, r23197, r23199 - r23218, r23220, r23223 - r23225 をマージ

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php

    r23124 r23230  
    318318     * @param  integer $customer_id 会員ID 
    319319     * @param  boolean $is_mobile   false(default):PCアドレスにメールを送る true:携帯アドレスにメールを送る 
     320     * @param $resend_flg true  仮登録メール再送 
    320321     * @return boolean true:成功 false:失敗 
    321      */ 
    322     public function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false) 
     322     *   
     323     */ 
     324    public function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false, $resend_flg = false) 
    323325    { 
    324326        // 会員データの取得 
     
    344346 
    345347        $objHelperMail  = new SC_Helper_Mail_Ex(); 
    346  
    347         // 仮会員が有効の場合 
    348         if (CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1) { 
     348        // 仮会員が有効の場合     
     349        if (CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1 or $arrCustomerData['status'] == 1 and $resend_flg == true) { 
    349350            $subject        = $objHelperMail->sfMakeSubject('会員登録のご確認', $objMailText); 
    350351            $toCustomerMail = $objMailText->fetch('mail_templates/customer_mail.tpl'); 
     
    352353            $subject        = $objHelperMail->sfMakeSubject('会員登録のご完了', $objMailText); 
    353354            $toCustomerMail = $objMailText->fetch('mail_templates/customer_regist_mail.tpl'); 
     355             
    354356        } 
    355357 
Note: See TracChangeset for help on using the changeset viewer.