Skip to content

Commit

Permalink
Add withdrawable funds to drawdown controlling table
Browse files Browse the repository at this point in the history
  • Loading branch information
Dominic Tubach committed Jan 8, 2025
1 parent 2c53d1f commit bd92bed
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
civicrm-image-tags: [ '5-drupal', '5.72-drupal-php8.0' ]
civicrm-image-tags: [ '5-drupal', '5.80-drupal-php8.1' ]
name: PHPUnit with Docker image michaelmcandrew/civicrm:${{ matrix.civicrm-image-tags }}
env:
CIVICRM_IMAGE_TAG: ${{ matrix.civicrm-image-tags }}
Expand Down
2 changes: 1 addition & 1 deletion ci/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"sort-packages": true
},
"require": {
"civicrm/civicrm-core": "^5.72"
"civicrm/civicrm-core": "^5.80"
}
}
4 changes: 2 additions & 2 deletions info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<url desc="Support">https://github.com/systopia/funding/issues</url>
<url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate></releaseDate>
<releaseDate/>
<version>0.17-dev</version>
<develStage>dev</develStage>
<compatibility>
<ver>5.72</ver>
<ver>5.80</ver>
</compatibility>
<comments/>
<requires>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,15 @@
'tally' => [
'fn' => 'SUM',
],
'rewrite' => '',
],
[
'type' => 'field',
'key' => 'COUNT_id',
'dataType' => 'Integer',
'label' => E::ts('Withdrawable Funds'),
'sortable' => TRUE,
'rewrite' => '{($SUM_amount_approved - $SUM_FundingCase_FundingPayoutProcess_funding_case_id_01_FundingPayoutProcess_FundingDrawdown_payout_process_id_01_amount_paid_out)|crmMoney:$currency}',
],
[
'type' => 'field',
Expand Down

0 comments on commit bd92bed

Please sign in to comment.