Merge Civi4.6 branch #27

guanhuan · 2015-11-18T12:23:00Z

No description provided.

… aid batch, same like when we validate the contributions to be displayed in gift aid summary page

Check contribution status when adding to gift aid batch

Check contribution status.

…from PHP.

… class.

…lass.

…to gift aid, and add styling.

…ine items.

…and use it for all the contributions in templates for adding/removing to/from gift aid.

…collapsed, minor style improvements.

…lect that these are now line items (previously, financial items).

…ribution ID to it.

…tions, having financial types enabled in the settings (i.e. only show gift aidable line items when contributions are expanded in the list).

…, show a message indicating this, when the contribution is expanded.

PG-114

PG-107

Removed Duplicate Fields

PG-110

…cific settings (i.e. DAO/BAO, API, etc. for BatchSettings). This will allow freezing settings (i.e. financial types enabled, globally enabled) applicable to a batch when it's being created, in order to avoid the issue where changing these settings later changes the result set in the report, which is misleading.

…ucture.

… for Gift Aid, at the time of batch creation.

… settings.

Merge Civi4.6 branch

rajeshrhino and others added 30 commits November 25, 2014 17:58

Check contribution completed status when adding contributions to gift…

8a15b9f

… aid batch, same like when we validate the contributions to be displayed in gift aid summary page

Fix CiviCRM 4.5 compatibility

ad8a95d

Merge pull request #15 from rajeshrhino/master

f73f614

Check contribution status when adding to gift aid batch

Merge pull request #18 from compucorp/master

360ae6a

Check contribution status.

Remove created_date from xml

2ce354d

Fix the new status rule for batch and add more details

b1981f0

Implement version compatibility

a227191

Adjust template

720b8c6

Pre release

8be3313

Fix removing contribution from batch validation

a8b2655

Fix pass by reference during call to invoke() as this is now removed …

d98c1b1

…from PHP.

Fix formatting for template for adding to batch.

058cdd3

Fix formatting for template for removing from batch.

c38efd7

Apply Drupal coding standards to CRM_Civigiftaid_Form_Task_AddToBatch…

2e9fa9a

… class.

Apply Drupal coding standards to CRM_Civigiftaid_Utils_Contribution c…

f12058e

…lass.

Add nested line items for each contribution in the screen for adding …

bdeb811

…to gift aid, and add styling.

Cleanup.

58fe02d

Make the template for removing gift add from batch also have nested l…

bb18a76

…ine items.

Move inline JS to a separate script file.

06625ab

Style improvements.

925df29

Make the nested line items table center aligned.

1af1566

Make the contributions collapsed by default.

b65bff6

Move the logic for nested line items table into a separate template, …

7881e74

…and use it for all the contributions in templates for adding/removing to/from gift aid.

Add admin form for storing extension settings such as financial types.

90234d9

Apply Drupal coding standards and cleanup the extension file.

e41c061

Turn the select list for Financial Types Enabled into Select2 widget.

e0eb017

Make the financial items fade in/out when contributions are expanded/…

c6c3e13

…collapsed, minor style improvements.

Format line items and contribution amounts as money.

f6325dc

Rename references to 'financial-items' to 'line-items', to better ref…

29b3530

…lect that these are now line items (previously, financial items).

Make the sub-template for line items more modular by passing the cont…

449597c

…ribution ID to it.

robinmitra and others added 27 commits August 18, 2015 11:48

Only show line items for contributions, during batch add/remove opera…

a9f28d3

…tions, having financial types enabled in the settings (i.e. only show gift aidable line items when contributions are expanded in the list).

If a contribution doesn't have any applicable gift-aidable line items…

3c88cb2

…, show a message indicating this, when the contribution is expanded.

Reorder and rename the quantity column in the report.

e3f3c55

Fix a bug where giftAidEligible hook had a extraneous field.

cda9b8c

PG-107

74db661

Removed Duplicate Fields

f9e7a7d

PG-114

7a44e3b

Merge pull request #25 from nishant-bhorodia/PG-114

5ef8f7d

PG-114

Merge pull request #23 from nishant-bhorodia/PG-107

885d3ff

PG-107

Removed the duplicate gift aid column

241aea9

Merge pull request #24 from nishant-bhorodia/PG-105

c085d7b

Removed Duplicate Fields

PG-110

11d86b7

Merge pull request #26 from nishant-bhorodia/PG-110

553fb7d

PG-110

Convert short array syntax to traditional one.

e4914e1

Cleanup.

2e1a6af

PG-141: Add DB upgrades needed to support the batch settings data str…

a34c57c

…ucture.

PG-141: Save batch settings during batch creation.

28a5fb2

PG-141: Make the report take into account the financial types enabled…

669bd52

… for Gift Aid, at the time of batch creation.

Merge branch 'fix-report' into civi4.6

2f945d2

PG-168: Set 'globally enabled' to true by default, in the extension's…

294e5d7

… settings.

PG-168: Add package.json and gulpfile for automating builds.

c527a0f

PG-168: Add build script to NPM, for convenient building.

ec791a5

PG-168: Add help text for 'globally enable' setting.

61d00e7

PG-168: Fix Gulp watch paths.

35d5ed9

Alpha3 release

6ddbc2f

Add instructions into extension README

e81d713

guanhuan added a commit that referenced this pull request Nov 18, 2015

Merge pull request #27 from compucorp/civi4.6

9fbce1d

Merge Civi4.6 branch

guanhuan merged commit 9fbce1d into master Nov 18, 2015

michael-chaplin-gmcvo mentioned this pull request Jun 6, 2018

DB Error: no such field when running a report #54

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge Civi4.6 branch #27

Merge Civi4.6 branch #27

guanhuan commented Nov 18, 2015

Merge Civi4.6 branch #27

Merge Civi4.6 branch #27

Conversation

guanhuan commented Nov 18, 2015