Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config 增加Trippest站点;退款处理的客人邮件:+外联的签名

Browse Source
feature/pay
lyt 6 years ago
parent cc7fc45dba
commit 1ce0e268df
4 changed files with 85 additions and 58 deletions
Show Stats Download Patch File Download Diff File

3
webht/config/config.php
Unescape Escape View File

@ -376,5 +376,6 @@ $config['site'] = array(
'gl' => array('site_code' => 'gl', 'site_id' => 90, 'site_lgc' => '1', 'site_url' => 'https://www.guilinchina.net'), 'gl' => array('site_code' => 'gl', 'site_id' => 90, 'site_lgc' => '1', 'site_url' => 'https://www.guilinchina.net'),
'mbj' => array('site_code' => 'mbj', 'site_id' => 98, 'site_lgc' => '1', 'site_url' => 'https://www.mybeijingchina.com'), 'mbj' => array('site_code' => 'mbj', 'site_id' => 98, 'site_lgc' => '1', 'site_url' => 'https://www.mybeijingchina.com'),
'ct' => array('site_code' => 'ct', 'site_id' => 1000, 'site_lgc' => '104', 'site_url' => 'https://www.chinatravel.com'), 'ct' => array('site_code' => 'ct', 'site_id' => 1000, 'site_lgc' => '104', 'site_url' => 'https://www.chinatravel.com'),
'dct' => array('site_code' => 'dct', 'site_id' => 99, 'site_lgc' => '1', 'site_url' => 'https://www.diychinatours.com') 'dct' => array('site_code' => 'dct', 'site_id' => 99, 'site_lgc' => '1', 'site_url' => 'https://www.diychinatours.com'),
'trippest' => array('site_code' => 'trippest', 'site_id' => 0, 'site_lgc' => '1', 'site_url' => 'https://www.trippest.com')
); );

104
webht/third_party/paypal/controllers/index.php vendored
Unescape Escape View File

@ -653,6 +653,8 @@ class Index extends CI_Controller {
$ordertype = 'T'; $ordertype = 'T';
} elseif (substr($ordertype_temp, 0, 1) == 'B') { } elseif (substr($ordertype_temp, 0, 1) == 'B') {
$ordertype = 'B'; $ordertype = 'B';
} elseif (substr($ordertype_temp, 0, 1) == 'A') {
$ordertype = 'A';
} }
} }
// 2018.05.28 for Trippest, tourMaster的订单号是01开头 // 2018.05.28 for Trippest, tourMaster的订单号是01开头
@ -909,10 +911,9 @@ class Index extends CI_Controller {
return false; return false;
} }
$orderid_info = json_decode($orderid_info); $orderid_info = json_decode($orderid_info);
// for trippest tourMaster 2018.05.28
if ($orderid_info->ordertype == 'TP') { if (in_array($orderid_info->ordertype, array('TP', 'A')) ) {
$this->trippest_note($orderid_info, $item); $orderid_info->ordertype = 'B';
return false;
} }
//根据订单号查找外联信息 //根据订单号查找外联信息
@ -968,52 +969,59 @@ class Index extends CI_Controller {
return false; return false;
} }
$web_code = $advisor_info->COLI_WebCode;
$site_info = $this->config->item('site');
if ( ! isset($site_info[$web_code])) {
$web_code = 'cht';
}
$site_info = $site_info[$web_code];
$advisor_detail = $this->Paypal_model->get_advisor_detail($advisor_info->OPI_SN, $site_info['site_lgc']);
$item->advisor_detail = $advisor_detail;
$item->site = $site_info['site_url'];
//添加邮件发送记录 //添加邮件发送记录
//给外联发送通知邮件 if ($item->pn_send !== 'send' && substr($item->pn_send, 0, 5) !== 'send-') {
$fromName = !empty($item->pn_payer) ? $item->pn_payer : ''; // 客人邮件中的外联落款
$fromEmail = !empty($item->pn_payer_email) ? $item->pn_payer_email : ''; // $web_code = 'cht'; // 默认cht
$toName = !empty($opi_firstname) ? $opi_firstname : ''; $web_lgc = 1;
$toEmail = !empty($opi_email) ? $opi_email : ''; $web_code = strtolower($advisor_info->COLI_WebCode);
$subject = $orderid_info->orderid . '_' . $orderid_info->ordertype . ' / ' . $item->pn_mc_gross . $item->pn_mc_currency . ' / ' . $fromName; $site_info = $this->config->item('site');
$body = $this->load->view('mail_templete', $item, true); if (isset($site_info[$web_code])) {
$M_RelatedInfo = $item->pn_sn; $site_info = $site_info[$web_code];
$M_AddTime = $item->pn_payment_date; $item->site = $site_info['site_url'];
$M_State = 0; $web_lgc = $site_info['site_lgc'];
$this->Paypal_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'paypal note'); }
// 通知客人, 客人邮箱 $advisor_detail = $this->Paypal_model->get_advisor_detail($advisor_info->COLI_SN, $advisor_info->OPI_SN, $web_lgc);
$customer_detail = $this->Paypal_model->get_customer_detail($advisor_info->COLI_SN, $orderid_info->ordertype); $item->advisor_detail = $advisor_detail;
$c_fromName = $advisor_detail->OPI2_Name;
$c_fromEmail = $advisor_detail->OPI_Email; //给外联发送通知邮件
$c_toName = $customer_detail->fullname; $fromName = !empty($item->pn_payer) ? $item->pn_payer : '';
$c_toEmail = $customer_detail->email; $fromEmail = !empty($item->pn_payer_email) ? $item->pn_payer_email : '';
$c_subject = $item->pn_mc_currency . " " . str_replace('-', '', $item->pn_mc_gross) . " Refunded to your account, booking number " . $item->pn_invoice; $toName = !empty($opi_firstname) ? $opi_firstname : '';
$c_body = $this->load->view('refund_buyer', $item, true); $toEmail = !empty($opi_email) ? $opi_email : '';
$c_M_RelatedInfo = $item->pn_sn; $subject = $orderid_info->orderid . '_' . $orderid_info->ordertype . ' / ' . $item->pn_mc_gross . $item->pn_mc_currency . ' / ' . $fromName;
$c_M_AddTime = $item->pn_payment_date; $body = $this->load->view('mail_templete', $item, true);
$c_M_State = 0; $M_RelatedInfo = $item->pn_sn;
$this->Paypal_model->save_automail( $M_AddTime = $item->pn_payment_date;
$c_fromName, $M_State = 0;
$c_fromEmail, $this->Paypal_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'paypal note');
$c_toName, // 通知客人, 客人邮箱
$c_toEmail, $customer_detail = $this->Paypal_model->get_customer_detail($advisor_info->COLI_SN, $orderid_info->ordertype);
$c_subject, $c_fromName = $advisor_detail->fullname;
$c_body, $opi_email_list = explode(";", $advisor_detail->email); // 解析外联的邮件
$c_M_RelatedInfo, $c_fromEmail = trim($opi_email_list[0]);
$c_M_State, $c_toName = $customer_detail->fullname;
$c_M_AddTime, $c_toEmail = $customer_detail->email;
'paypal refund receipt'); $c_subject = $item->pn_mc_currency . " " . str_replace('-', '', $item->pn_mc_gross) . " Refunded to your account, booking number " . $item->pn_invoice;
$this->Note_model->update_send($item->pn_txn_id, 'send-customer'); $c_body = $this->load->view('refund_buyer', $item, true);
// TODO 通知财务, 如果已做账 $c_M_RelatedInfo = $item->pn_sn;
$c_M_AddTime = $item->pn_payment_date;
$c_M_State = 0;
$this->Paypal_model->save_automail(
$c_fromName,
$c_fromEmail,
$c_toName,
$c_toEmail,
$c_subject,
$c_body,
$c_M_RelatedInfo,
$c_M_State,
$c_M_AddTime,
'paypal refund receipt');
$this->Note_model->update_send($item->pn_txn_id, 'send-customer');
}
//添加邮件发送记录 end //添加邮件发送记录 end
// TODO 如果已做账, 标记需要通知财务send-to-finance, 通知时间用订单日志记录
return ; return ;
} }

28
webht/third_party/paypal/models/paypal_model.php vendored
Unescape Escape View File

@ -612,12 +612,30 @@ class Paypal_model extends CI_Model {
return $this->HT->query($sql)->row(); return $this->HT->query($sql)->row();
} }
public function get_advisor_detail($OPI_SN, $lgc=1) public function get_advisor_detail($COLI_SN, $OPI_SN, $lgc=1)
{ {
$sql = "SELECT OPI_SN,OPI_MoveTelephone,OPI_Telephone,OPI_Email,OPI2_Name,OPI2_FirstName,OPI2_LastName $advisor_signature = $this->get_advisor_signature($COLI_SN);
FROM [Tourmanager].[dbo].[V_Operator_Info] if (empty($advisor_signature)) {
where OPI_SN=? and LGC_LGC=? "; $sql = "SELECT OPI_SN, '+86-'+OPI_MoveTelephone mobile,'+86-773-'+OPI_Telephone tel,OPI_Email email,OPI2_Name fullname,OPI2_FirstName,OPI2_LastName
return $this->HT->query($sql, array($OPI_SN, $lgc))->row(); FROM [Tourmanager].[dbo].[V_Operator_Info]
where OPI_SN=? and LGC_LGC=? ";
$advisor_signature = $this->HT->query($sql, array($OPI_SN, $lgc))->row();
}
return $advisor_signature;
}
public function get_advisor_signature($COLI_SN)
{
$sql = "SELECT top 1 dbo.agenter_user.Name fullname, dbo.agenter_user.tel,
dbo.agenter_user.Email email, dbo.agenter_user.mobile, OPI_DEI_SN, COLI_OPI_ID
FROM dbo.BIZ_ConfirmLineInfo
INNER JOIN dbo.agenter_user ON dbo.BIZ_ConfirmLineInfo.COLI_OPI_ID = dbo.agenter_user.AU_OPI_SN
AND
(dbo.BIZ_ConfirmLineInfo.COLI_WebCode = dbo.agenter_user.agenter
OR (COLI_WebCode in ('EXPCH','MESENLLA','traba','wayaway','guias') and agenter='VAC')
)
LEFT JOIN OperatorInfo on COLI_OPI_ID = OPI_SN
WHERE (dbo.BIZ_ConfirmLineInfo.COLI_SN = ?)";
return $this->HT->query($sql, array($COLI_SN))->row();
} }
public function get_customer_detail($COLI_SN, $ordertype) public function get_customer_detail($COLI_SN, $ordertype)

8
webht/third_party/paypal/views/refund_buyer.php vendored
Unescape Escape View File

@ -34,10 +34,10 @@
<pre style="font-family: Verdana, Arial, Helvetica, sans-serif;font-size:13px;"> <pre style="font-family: Verdana, Arial, Helvetica, sans-serif;font-size:13px;">
Best Regards! Best Regards!
<?php echo $advisor_detail->OPI2_Name ?>, Travel Advisor<br> <?php echo $advisor_detail->fullname ?>, Travel Advisor<br>
Tel: +86-773-<?php echo $advisor_detail->OPI_Telephone ?> Mobile: +86-<?php echo $advisor_detail->OPI_MoveTelephone ?><br> Tel: <?php echo $advisor_detail->tel ?> Mobile: <?php echo $advisor_detail->mobile ?><br>
E-mail: <?php echo $advisor_detail->OPI_Email ?><br> E-mail: <?php echo $advisor_detail->email ?><br>
<?php echo $site; ?><br> <?php if(isset($site)) { echo $site . '<br>'; } ?>
Address: Building 6, Chuangyi Business Park, 70 Qilidian Road, Guilin, Guangxi, 541004, China Address: Building 6, Chuangyi Business Park, 70 Qilidian Road, Guilin, Guangxi, 541004, China
</pre> </pre>
</div> </div>

Write Preview
Loading…
Cancel
Save