Merge branch 'feature/pay'

webht/third_party/paypal/models/paypal_model.php

@@ -21,7 +21,7 @@ class Paypal_model extends CI_Model {
         if ($ordertype == 'B' || $ordertype == 'A') {
             $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,COLI_GRI_SN,OPI_Email,OPI_FirstName,OPI_SN,OPI_Name,COLI_WebCode,COLI_Department,COLI_PayManner,COLI_State $fieldsql from BIZ_ConfirmLineInfo
                             LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
-               where COLI_ID =?";
+               where COLI_ID =? and COLI_State<>50 ";
             $query = $this->HT->query($sql, array($COLI_ID));
             $result = $query->result();
         }
@@ -67,7 +67,7 @@ class Paypal_model extends CI_Model {
         if (empty($result) && $ordertype == 'B') {
             $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,COLI_GRI_SN,OPI_SN,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_State $fieldsql from BIZ_ConfirmLineInfo
                             LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
-               where COLI_GroupCode like '%-$COLI_ID%'";
+               where COLI_GroupCode like '%-$COLI_ID%' and COLI_State<>50";
             $query = $this->HT->query($sql);
             $result = $query->result();
         }