Skip to content

Commit 9a29a9a

Browse files
guanhuanguanhuan
committed
Merged in PG-352-update_giftaid_report (pull request civicrm#7)
Update giftaid report
2 parents 59e25de + 325fd2d commit 9a29a9a

File tree

3 files changed

+50
-38
lines changed

3 files changed

+50
-38
lines changed

‎sites/all/civicrm_extensions/uk.co.compucorp.civicrm.giftaid/CRM/Civigiftaid/Report/Form/Contribute/GiftAid.php

+45-36
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ public function __construct() {
5555
'filters' =>
5656
array(
5757
'batch_id' => array(
58-
'title' => 'Batch',
58+
'title' => ts('Batch'),
5959
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
6060
'options' => CRM_Civigiftaid_Utils_Contribution::getBatchIdTitle('id desc'),
6161
),
6262
),
6363
'fields' => array(
6464
'batch_id' => array(
6565
'name' => 'batch_id',
66-
'title' => 'Batch ID',
66+
'title' => ts('Batch ID'),
6767
'no_display' => TRUE,
68-
'required' => TRUE
68+
'required' => TRUE,
6969
)
7070
)
7171
),
@@ -75,19 +75,19 @@ public function __construct() {
7575
'fields' => array(
7676
'prefix_id' => array(
7777
'name' => 'prefix_id',
78-
'title' => 'Title',
78+
'title' => ts('Title'),
7979
'no_display' => FALSE,
8080
'required' => TRUE,
8181
),
8282
'first_name' => array(
8383
'name' => 'first_name',
84-
'title' => 'First Name',
84+
'title' => ts('First Name'),
8585
'no_display' => FALSE,
8686
'required' => TRUE,
8787
),
8888
'last_name' => array(
8989
'name' => 'last_name',
90-
'title' => 'Last Name',
90+
'title' => ts('Last Name'),
9191
'no_display' => FALSE,
9292
'required' => TRUE,
9393
),
@@ -99,19 +99,17 @@ public function __construct() {
9999
'fields' => array(
100100
'contribution_id' => array(
101101
'name' => 'id',
102-
'title' => 'Payment No',
103-
'no_display' => FALSE,
104-
'required' => TRUE,
102+
'title' => ts('Payment No'),
105103
),
106104
'contact_id' => array(
107105
'name' => 'contact_id',
108-
'title' => 'Donor Name',
106+
'title' => ts('Donor Name'),
109107
'no_display' => FALSE,
110-
'required' => FALSE,
108+
'required' => TRUE,
111109
),
112110
'receive_date' => array(
113111
'name' => 'receive_date',
114-
'title' => 'Contribution Date',
112+
'title' => ts('Donation Date'),
115113
'no_display' => FALSE,
116114
'required' => TRUE,
117115
),
@@ -123,9 +121,9 @@ public function __construct() {
123121
'fields' => array(
124122
'financial_type_id' => array(
125123
'name' => 'id',
126-
'title' => 'Financial Type No',
124+
'title' => ts('Financial Type No'),
127125
'no_display' => TRUE,
128-
'required' => TRUE,
126+
'required' => FALSE,
129127
),
130128
),
131129
),
@@ -135,11 +133,30 @@ public function __construct() {
135133
'grouping' => 'contact-fields',
136134
'fields' =>
137135
array(
138-
'street_address' => NULL,
139-
'city' => NULL,
140-
'state_province_id' => array('title' => ts('State/Province'),),
141-
'country_id' => array('title' => ts('Country'),),
142-
'postal_code' => NULL,
136+
'street_address' => array(
137+
'name' => 'street_address',
138+
'title' => ts('Street Address'),
139+
'no_display' => FALSE,
140+
'required' => TRUE,
141+
),
142+
'city' => array(
143+
'name' => 'city',
144+
'title' => ts('City'),
145+
),
146+
'state_province_id' => array(
147+
'name' => 'state_province_id',
148+
'title' => ts('State/Province'),
149+
),
150+
'country_id' => array(
151+
'name' => 'country_id',
152+
'title' => ts('Country'),
153+
),
154+
'postal_code' => array(
155+
'name' => 'postal_code',
156+
'title' => ts('Postcode'),
157+
'no_display' => FALSE,
158+
'required' => TRUE,
159+
),
143160
),
144161
),
145162
'civicrm_line_item' =>
@@ -148,35 +165,27 @@ public function __construct() {
148165
'fields' => array(
149166
'id' => array(
150167
'name' => 'id',
151-
'title' => 'Line Item No',
152-
'no_display' => FALSE,
153-
'required' => TRUE,
168+
'title' => ts('Line Item No'),
154169
),
155170
'amount' => array(
156171
'name' => 'line_total',
157-
'title' => 'Line Total',
172+
'title' => ts('Amount'),
158173
'no_display' => FALSE,
159174
'required' => TRUE,
160175
'type' => CRM_Utils_Type::T_MONEY
161176
),
162177
'quantity' => array(
163178
'name' => 'qty',
164-
'title' => 'Qty',
165-
'no_display' => FALSE,
166-
'required' => TRUE,
179+
'title' => ts('Quantity'),
167180
'type' => CRM_Utils_Type::T_INT
168181
),
169182
'entity_table' => array(
170183
'name' => 'entity_table',
171-
'title' => 'Item',
172-
'no_display' => FALSE,
173-
'required' => TRUE,
184+
'title' => ts('Item'),
174185
),
175186
'label' => array(
176187
'name' => 'label',
177-
'title' => 'Description',
178-
'no_display' => FALSE,
179-
'required' => TRUE,
188+
'title' => ts('Description'),
180189
),
181190
),
182191
)
@@ -471,15 +480,15 @@ private function reorderColumns() {
471480
'donor name',
472481
'item',
473482
'description',
474-
'contribution date',
483+
'donation date',
475484
'street address',
476485
'city',
477486
'county',
478487
'country',
479-
'postal code',
488+
'postcode',
480489
'eligible for gift aid?',
481-
'qty',
482-
'line total',
490+
'quantity',
491+
'amount',
483492
'gift aid amount',
484493
'batch name'
485494
);

‎sites/all/civicrm_extensions/uk.co.compucorp.civicrm.giftaid/info.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
<license>AGPL</license>
1717
<maintainer>
1818
<author>Erawat Chamanont, Jamie Novick, Guanhuan Chen, Robin Mitra</author>
19-
<email>[email protected], [email protected], [email protected]</email>
19+
<email>[email protected], [email protected]</email>
2020
</maintainer>
2121
<releaseDate>2016-06-05</releaseDate>
2222
<version>3.0beta</version>
2323
<develStage>beta</develStage>
2424
<compatibility>
25-
<ver>4.x</ver>
25+
<ver>4.5</ver>
26+
<ver>4.6</ver>
27+
<ver>4.7</ver>
2628
</compatibility>
2729
<comments>For support, please contact project team on the forums. (http://forum.civicrm.org) or create a new issue on https://github.com/Compucorp/uk.co.compucorp.civicrm.giftaid/issues
2830
</comments>

‎sites/all/civicrm_extensions/uk.co.compucorp.civicrm.giftaid/sql/upgrade_20.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE `civicrm_value_gift_aid_submission` CHANGE `batch_name` `batch_name` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL

0 commit comments

Comments
 (0)