Update version

README.md

@@ -15,6 +15,7 @@ This (MJW) version automatically calculates the gift-aid amount when the contrib
 to meet current CiviCRM Coding standards and improves performance significantly.
 
 This extension is currently "equivalent" to https://github.com/compucorp/uk.co.compucorp.civicrm.giftaid/releases/tag/3.1.0 (all changes have been reviewed and merged if appropriate).
+
 ## Installation
 
 See: https://docs.civicrm.org/sysadmin/en/latest/customize/extensions/#installing-a-new-extension

docs/declaration.md

@@ -2,12 +2,19 @@
 
 On install, a "Gift Aid" profile was created for you.
 If you add this to a contribution page the user can make the gift aid declaration:
-![Gift Aid Declaration via profile](/images/profilegiftaid.png)
+![Gift Aid Declaration via profile](images/profilegiftaid.png)
 
 It will then appear on the contact record:
-![Gift Aid Declarations on Contact Record](/images/profilegiftaid.png)
+![Gift Aid Declarations on Contact Record](images/profilegiftaid.png)
 
-If a user creates a gift aid declaration of *Yes* or *Yes in the past 4 years* and later submits a declaration with "No" 
-an end_date will be set and the declaration will be closed.
+## Declaration status
+* Yes, and for donations made in the past 4 years.
+* Yes, today and in the future.
+* No.
 
-A new declaration will be created if the user submits another with *Yes*.
+To maintain a full audit trail every time the user changes the declaration status it will be closed:
+* End date set to "now".
+* Reason ended: Contact declined.
+
+The *current* declaration represents the current status and will not have an end date set. This applies even if the
+declaration is "No" - because it will represent a time period between start_date/end_date where the contact was not eligible.

docs/release/release_notes.md

+## Release 3.3.2
+
+* Handle transitions between the 3 declaration states without losing information - create a new declaration when state is changed.
+* Refactor creating/updating declaration when contribution is created/updated.
+* Properly escape SQL parameters when updating gift aid declaration.
+* Extract code to check if charity column exists.
+
 ## Release 3.3.1
 
 * Major performance improvement to "Add to Batch".
@@ -21,7 +28,7 @@ This allows us to create a new declaration (as it will be the user filling in a
 * Match on OptionValue value when running upgrader as name is not always consistent.
 
 ## Release 3.2
-* Be stricter checking eligible_for_gift_aid variable type 
+* Be stricter checking eligible_for_gift_aid variable type
 * Fix issues with entity definition and regenerate
 * Fix PHP notice
 * Refactor addtobatch for performance, refactor upgrader for reliability

info.xml

 <?xml version="1.0" encoding="iso-8859-1" ?>
  <extension key="uk.co.compucorp.civicrm.giftaid" type="module">
-  <downloadUrl>https://github.com/compucorp/uk.co.compucorp.civicrm.giftaid</downloadUrl>
   <file>civigiftaid</file>
   <name>CiviCRM UK GiftAid (MJW version)</name>
   <description>
@@ -9,6 +8,7 @@
   </description>
   <urls>
     <url desc="Main Extension Page">https://github.com/mattwire/uk.co.compucorp.civicrm.giftaid</url>
+    <url desc="Support">https://www.mjwconsult.co.uk/support</url>
     <url desc="Licensing">https://civicrm.org/licensing</url>
   </urls>
   <license>AGPL</license>
@@ -16,7 +16,7 @@
     <author>MJW Consulting, Erawat Chamanont, Jamie Novick, Guanhuan Chen, Robin Mitra</author>
     <email>mjw@mjwconsult.co.uk, jamie@compucorp.co.uk, guanhuan@compucorp.co.uk</email>
   </maintainer>
-  <releaseDate>2019-12-27</releaseDate>
+  <releaseDate>2020-02-24</releaseDate>
   <version>3.3.2</version>
   <develStage>beta</develStage>
   <compatibility>