diff --git a/webht/third_party/pay/views/payment_list.php b/webht/third_party/pay/views/payment_list.php
index b08f7d83..8bd3d16f 100644
--- a/webht/third_party/pay/views/payment_list.php
+++ b/webht/third_party/pay/views/payment_list.php
@@ -33,6 +33,7 @@
         .creditcard-lianlian-color {background-color: #1985ff;}
         .modal {background-color: rgba(0,0,0,0.075);}
         .cht-color {background-color: #AD1818;}
+        .highlights-color {background-color: #eb5e26;}
         .trippest-color {background-color: #E83201;}
 
         .app-color {background-color: #EC3A4F;}
diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index ef74337d..4e9f87ff 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -709,6 +709,7 @@ class Index extends CI_Controller {
                 $post_data->GAI_API = $GAI_API;
                 $pn_receiver_account = $GAI_API->payee->email_address;
                 $pn_receiver_account_name = $GAI_API->payee->merchant;
+                // $pn_receiver_account_name = $this->fundsource_map($pn_receiver_account)->merchant;
                 break;
             case 'PAYMENT.SALE.REFUNDED':
             case 'PAYMENT.SALE.REVERSED':
@@ -749,7 +750,7 @@ class Index extends CI_Controller {
                 $GAI_API->res_links = $post_data->resource->links;
                 $post_data->GAI_API = $GAI_API;
                 $pn_receiver_account = $GAI_API->payee->email_address;
-                $pn_receiver_account_name = $pn_receiver_account===$default_payee->email_address ? $default_payee->merchant : $tp_payee->merchant;
+                $pn_receiver_account_name = $this->fundsource_map($pn_receiver_account)->merchant;
                 break;
             case 'PAYMENT.CAPTURE.REFUNDED': // todo: PAYMENT.CAPTURE.REVERSED
                 $fund_type = 'refund';
@@ -774,7 +775,8 @@ class Index extends CI_Controller {
 
                 $post_data->GAI_API = $GAI_API;
                 $pn_receiver_account = $GAI_API->payee->email_address;
-                $pn_receiver_account_name = $pn_receiver_account===$default_payee->email_address ? $default_payee->merchant : $tp_payee->merchant;
+                // $pn_receiver_account_name = $pn_receiver_account===$default_payee->email_address ? $default_payee->merchant : $tp_payee->merchant;
+                $pn_receiver_account_name = $this->fundsource_map($pn_receiver_account)->merchant;
 
                 break;
 
@@ -2192,4 +2194,32 @@ class Index extends CI_Controller {
         return $http_ret_code;
     }
 
+
+    private function fundsource_map($pn_receiver_account) {
+        $default_payee = new stdClass();
+        $default_payee->email_address = "pays@chinahighlights.com";
+        $default_payee->merchant_id = "JE4VX9SSVGTVN";
+        $default_payee->merchant = "cht";
+
+        $tp_payee = new stdClass();
+        $tp_payee->email_address = "pay@trippest.com";
+        $tp_payee->merchant_id = "5FUTQ9SU5P7CJ";
+        $tp_payee->merchant = "trippest";
+
+        $htravel_payee = new stdClass();
+        $htravel_payee->email_address = "pays@highlightstravel.com";
+        $htravel_payee->merchant_id = "BUTDAQXCYBPTA";
+        $htravel_payee->merchant = "Highlights";
+
+        $fundsource = array(
+            "pays@highlightstravel.com" => $htravel_payee, // business":"pay@trippest.com"
+            "pay@trippest.com" => $tp_payee, // business":"pay@trippest.com"
+            "pays@chinahighlights.com" => $default_payee, // "CHT",
+            "paypal@chinahighlights.com" => $default_payee, // "CHT",
+            "ycc@hainatravel.com" => "dev",
+            "0" => "unknown",
+        );
+        $find = isset($fundsource[$pn_receiver_account]) ? $fundsource[$pn_receiver_account] : $default_payee;
+        return $find;
+    }
 }
diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php
index b6067d11..12873286 100644
--- a/webht/third_party/paypal/models/note_model.php
+++ b/webht/third_party/paypal/models/note_model.php
@@ -216,7 +216,7 @@ class Note_model extends CI_Model {
         }
     }
     private $code_fundsource = array(
-        "pay@highlightstravel.com" => "Highlights", // business":"pay@trippest.com"
+        "pays@highlightstravel.com" => "Highlights", // business":"pay@trippest.com"
         "pay@trippest.com" => "Trippest", // business":"pay@trippest.com"
         "pays@chinahighlights.com" => "", // "CHT",
         "paypal@chinahighlights.com" => "2", // "CHT",