Merge branch 'feature/pay'

webht/third_party/paypal/models/paypal_model.php

@@ -570,9 +570,9 @@ class Paypal_model extends CI_Model {
     public function get_money_b($pn_invoice) {
         $sql = "SELECT BIZ_GroupAccountInfo.*
                 from BIZ_GroupAccountInfo
-                where DeleteFlag=0 and GAI_AccreditNo=?
+                where DeleteFlag=0 and ( GAI_AccreditNo=? or GAI_Memo=? )
                 ";
-        $query = $this->HT->query($sql, array($pn_invoice));
+        $query = $this->HT->query($sql, array($pn_invoice, $pn_invoice));
         $result = $query->result();
         return $result;
     }