diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml index c9819effc..b97c44145 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml @@ -2,7 +2,7 @@ select DATE_FORMAT(pmt_transactions.transaction_time,'%Y-%m-%d') as weekstart from act_charity inner JOIN pmt_transactions on act_charity.client_id = pmt_transactions.client_id - where dayofweek(pmt_transactions.transaction_time)=2 and pmt_transactions.transaction_time>=#{begin} and pmt_transactions.transaction_time<=#{end} and pmt_transactions.transaction_time>=act_charity.active_time + where dayofweek(pmt_transactions.transaction_time)=2 and pmt_transactions.transaction_time>=#{begin} and pmt_transactions.transaction_time<=#{end} and pmt_transactions.refund_id is null and pmt_transactions.channel != 'Settlement' group by weekstart order by weekstart asc; diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 10872beb9..0119b7692 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -307,13 +307,13 @@ margin-bottom: 10%;"/> -