Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/models/vendor_money_model.php

@@ -447,11 +447,15 @@ class Vendor_money_model extends CI_Model {
                 select
                 gri.GRI_Name,
                 ro.money total_income,
-                (select SUM(COLD_TotalPrice) from BIZ_ConfirmLineDetail d where d.DeleteFlag=0 and d.COLD_PlanVEI_SN not in ($all_vendor)
+                (select SUM(COLD_TotalPrice) from BIZ_ConfirmLineDetail d
+                    inner join BIZ_PackageOrderInfo p on p.POI_COLD_SN=d.COLD_SN
+                    where d.DeleteFlag=0
                     and COLD_COLI_SN=coli.COLI_SN
+                    and ( d.COLD_PlanVEI_SN not in ($all_vendor) or
+                        p.POI_QuotationType=4 )
                 ) as other_price,
-                (select isnull(SUM(cast(GCI_priceCNY as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and GCI_combineNo<>'cancel' ) as TLD_total_price,
-                (select isnull(SUM(cast(GCI_agencyReceipt as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and GCI_combineNo is not null ) as TLD_agency_receipt,
+                (select isnull(SUM(cast(GCI_priceCNY as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and isnull(GCI_combineNo,'') not in ('','cancel','forbidden') ) as TLD_total_price,
+                (select isnull(SUM(cast(GCI_agencyReceipt as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and isnull(GCI_combineNo,'') not in ('','cancel','forbidden') ) as TLD_agency_receipt,
                 (select isnull(SUM(cast(GAI_SSJE as decimal(10,2))),0) from BIZ_GroupAccountInfo where GAI_COLI_SN=COLI_SN
                     --and GAI_Type in (" . PAY_OTHER . ")
                     AND GAI_VEI_SN in ($all_vendor,1343) -- 图兰朵的代收

webht/third_party/trippestOrderSync/views/order_report_precheck.php

@@ -116,8 +116,7 @@
             <h1>Trippest &amp; 地接账单预审核</h1>
             <ul class="nav navbar-nav navbar-right pull-right" style="margin:7.5px 0;">
                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><?php $userdata = $this->session->userdata('admin_chtcdn');
-                                                                                                                    echo $userdata['OPI_Name']; ?> <span class="caret"></span></a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><?php $userdata = $this->session->userdata('admin_chtcdn'); echo $userdata['OPI_Name']; ?> <span class="caret"></span></a>
                     <ul class="dropdown-menu" role="menu">
                         <li><a href="<?php echo site_url('login/logout'); ?>">退出</a></li>
                     </ul>
@@ -295,7 +294,7 @@
                                 } elseif ($ep['HT_receipt_err'] > 0) {
                                     echo "<p class=\"text-left\">" . $ep["refund_memo"] . "</p>";
                                 } elseif ($ep['other_price'] !== NULL) {
-                                    echo "<p>其他供应商接待的报价/美金:" . $ep['other_price'] . "</p>";
+                                    echo "<p>其他供应商接待的报价或综费结算部分(美金):" . $ep['other_price'] . "</p>";
                                 } elseif ($ep['vendor_order'] !== null) {
                                     // echo "<p>数据未更新, 请到HT中操作.</p>";
                                 }