Skip to content

Commit

Permalink
Merge pull request #39 from SalesforceFoundation/feature/settings-str…
Browse files Browse the repository at this point in the history
…ing-review

Feature/settings string review
  • Loading branch information
David Habib committed May 19, 2016
2 parents e4d4b3c + f9cfdcc commit 0b7a80f
Show file tree
Hide file tree
Showing 20 changed files with 22 additions and 62 deletions.
2 changes: 1 addition & 1 deletion cumulusci.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cumulusci.package.name=Recurring Donations
cumulusci.package.namespace=npe03
cumulusci.package.apiVersion=29.0
cumulusci.package.apiVersion=36.0
cumulusci.package.installClass=
cumulusci.package.uninstallClass=
cumulusci.github.url.raw=https://raw.github.com/SalesforceFoundation/Recurring_Donations
2 changes: 1 addition & 1 deletion src/classes/RecurringDonations.cls-meta.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>29.0</apiVersion>
<apiVersion>36.0</apiVersion>
<status>Active</status>
</ApexClass>
2 changes: 1 addition & 1 deletion src/classes/RecurringDonationsPkgVersionCheck.cls-meta.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>29.0</apiVersion>
<apiVersion>36.0</apiVersion>
<status>Active</status>
</ApexClass>
2 changes: 1 addition & 1 deletion src/classes/RecurringDonations_BATCH.cls-meta.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>29.0</apiVersion>
<apiVersion>36.0</apiVersion>
<status>Active</status>
</ApexClass>
2 changes: 1 addition & 1 deletion src/classes/RecurringDonations_SCHED.cls-meta.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>29.0</apiVersion>
<apiVersion>36.0</apiVersion>
<status>Active</status>
</ApexClass>
2 changes: 1 addition & 1 deletion src/classes/RecurringDonations_TEST.cls-meta.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>29.0</apiVersion>
<apiVersion>36.0</apiVersion>
<status>Active</status>
</ApexClass>
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,12 @@
<style>CustomLinks</style>
</layoutSections>
<quickActionList>
<quickActionListItems>
<quickActionName>FeedItem.TextPost</quickActionName>
</quickActionListItems>
<quickActionListItems>
<quickActionName>Recurring_Donation__c.Quick_Update</quickActionName>
</quickActionListItems>
<quickActionListItems>
<quickActionName>Recurring_Donation__c.New_Opportunity</quickActionName>
</quickActionListItems>
<quickActionListItems>
<quickActionName>FeedItem.ContentPost</quickActionName>
</quickActionListItems>
<quickActionListItems>
<quickActionName>NewNote</quickActionName>
</quickActionListItems>
Expand Down
4 changes: 1 addition & 3 deletions src/objects/Custom_Field_Mapping__c.object
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
<customSettingsType>List</customSettingsType>
<customSettingsVisibility>Public</customSettingsVisibility>
<description>Maps Recurring Donation fields to Opportunity fields.</description>
<enableFeeds>false</enableFeeds>
<fields>
<fullName>Opportunity_Field__c</fullName>
<deprecated>false</deprecated>
<description>The Opportunity field to receive the value from the Recurring Donation field. Note that these fields must have the same data type.</description>
<externalId>false</externalId>
<inlineHelpText>The Opportunity field to receive the value from the Recurring Donation field. Note that these fields must have the same data type.</inlineHelpText>
Expand All @@ -19,7 +17,6 @@
</fields>
<fields>
<fullName>Recurring_Donation_Field__c</fullName>
<deprecated>false</deprecated>
<description>The Recurring Donation field to copy to the Opportunity field. Note that these fields must have the same data type.</description>
<externalId>false</externalId>
<inlineHelpText>The Recurring Donation field to copy to the Opportunity field. Note that these fields must have the same data type.</inlineHelpText>
Expand All @@ -31,4 +28,5 @@
<unique>false</unique>
</fields>
<label>Custom Field Mapping</label>
<visibility>Public</visibility>
</CustomObject>
4 changes: 1 addition & 3 deletions src/objects/Custom_Installment_Settings__c.object
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
<customSettingsType>List</customSettingsType>
<customSettingsVisibility>Public</customSettingsVisibility>
<description>Defines custom installment periods for open-ended donations.</description>
<enableFeeds>false</enableFeeds>
<fields>
<fullName>Increment__c</fullName>
<deprecated>false</deprecated>
<description>The type of time period the Custom Installment Period covers. Weeks, Months, Days</description>
<externalId>false</externalId>
<inlineHelpText>The type of time period the Custom Installment Period covers.</inlineHelpText>
Expand All @@ -19,7 +17,6 @@
</fields>
<fields>
<fullName>Value__c</fullName>
<deprecated>false</deprecated>
<description>The amount of time the Custom Installment Period covers.</description>
<externalId>false</externalId>
<inlineHelpText>The amount of time the Custom Installment Period covers.</inlineHelpText>
Expand All @@ -32,4 +29,5 @@
<unique>false</unique>
</fields>
<label>Custom Installment Settings</label>
<visibility>Public</visibility>
</CustomObject>
1 change: 0 additions & 1 deletion src/objects/Opportunity.object
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<fields>
<fullName>Recurring_Donation__c</fullName>
<deleteConstraint>SetNull</deleteConstraint>
<deprecated>false</deprecated>
<externalId>false</externalId>
<label>Recurring Donation</label>
<referenceTo>Recurring_Donation__c</referenceTo>
Expand Down
22 changes: 5 additions & 17 deletions src/objects/Recurring_Donation__c.object
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<actionName>View</actionName>
<type>Default</type>
</actionOverrides>
<allowInChatterGroups>false</allowInChatterGroups>
<compactLayoutAssignment>NPSP_Recurring_Donation_Compact_Layout</compactLayoutAssignment>
<compactLayouts>
<fullName>NPSP_Recurring_Donation_Compact_Layout</fullName>
Expand All @@ -53,15 +54,17 @@
<label>NPSP Recurring Donation Compact Layout</label>
</compactLayouts>
<deploymentStatus>Deployed</deploymentStatus>
<deprecated>false</deprecated>
<description>Recurring Donations with no end date.</description>
<enableActivities>false</enableActivities>
<enableBulkApi>true</enableBulkApi>
<enableFeeds>false</enableFeeds>
<enableHistory>true</enableHistory>
<enableReports>true</enableReports>
<enableSearch>true</enableSearch>
<enableSharing>true</enableSharing>
<enableStreamingApi>true</enableStreamingApi>
<fields>
<fullName>Amount__c</fullName>
<deprecated>false</deprecated>
<externalId>false</externalId>
<label>Amount</label>
<precision>18</precision>
Expand All @@ -74,7 +77,6 @@
<fields>
<fullName>Contact__c</fullName>
<deleteConstraint>SetNull</deleteConstraint>
<deprecated>false</deprecated>
<externalId>false</externalId>
<label>Contact</label>
<referenceTo>Contact</referenceTo>
Expand All @@ -87,7 +89,6 @@
<fields>
<fullName>Date_Established__c</fullName>
<defaultValue>Today()</defaultValue>
<deprecated>false</deprecated>
<externalId>false</externalId>
<label>Date Established</label>
<required>false</required>
Expand All @@ -97,7 +98,6 @@
</fields>
<fields>
<fullName>Donor_Name__c</fullName>
<deprecated>false</deprecated>
<externalId>false</externalId>
<formula>if(
LEN(Contact__c)&gt;0,
Expand All @@ -114,7 +114,6 @@
</fields>
<fields>
<fullName>Installment_Amount__c</fullName>
<deprecated>false</deprecated>
<externalId>false</externalId>
<formula>IF(

Expand All @@ -139,7 +138,6 @@ OR(
</fields>
<fields>
<fullName>Installment_Period__c</fullName>
<deprecated>false</deprecated>
<description>How often you’ll receive the donations. NOTE: Changing the installment period for an existing Fixed-Length Recurring Donation may result in the loss and re-creation of open opportunities. Any data associated with those opportunities may be lost.</description>
<externalId>false</externalId>
<inlineHelpText>How often you’ll receive the donations. NOTE: Changing the installment period for an existing Fixed-Length Recurring Donation may result in the loss and re-creation of open opportunities. Any data associated with those opportunities may be lost.</inlineHelpText>
Expand Down Expand Up @@ -174,7 +172,6 @@ OR(
<fields>
<fullName>Installments__c</fullName>
<defaultValue>1</defaultValue>
<deprecated>false</deprecated>
<description>Number of installments (donations) you expect to receive. For Fixed-Length Recurring Donations only.</description>
<externalId>false</externalId>
<inlineHelpText>Number of installments (donations) you expect to receive. For Fixed-Length Recurring Donations only.</inlineHelpText>
Expand All @@ -189,7 +186,6 @@ OR(
</fields>
<fields>
<fullName>Last_Payment_Date__c</fullName>
<deprecated>false</deprecated>
<description>Date of the last payment for this Recurring Donation</description>
<externalId>false</externalId>
<inlineHelpText>Do Not Enter. The NPSP calculates this value automatically based on the last time a child donation was marked Posted.</inlineHelpText>
Expand All @@ -201,7 +197,6 @@ OR(
</fields>
<fields>
<fullName>Next_Payment_Date__c</fullName>
<deprecated>false</deprecated>
<description>Holds the date of the next recurring payment. Manually editing this field will recalculate all future opportunity&apos;s close dates based on the scheduled defined.</description>
<externalId>false</externalId>
<inlineHelpText>The date on which you want the next donation to occur. This date also determines the date of all future donations.</inlineHelpText>
Expand All @@ -213,7 +208,6 @@ OR(
</fields>
<fields>
<fullName>Open_Ended_Status__c</fullName>
<deprecated>false</deprecated>
<externalId>false</externalId>
<inlineHelpText>Choose Open for an Open-Ended Recurring Donation. Choose None for a Fixed Length Recurring Donation. Choose Closed to close a Recurring Donation.</inlineHelpText>
<label>Open Ended Status</label>
Expand All @@ -239,7 +233,6 @@ OR(
<fields>
<fullName>Organization__c</fullName>
<deleteConstraint>SetNull</deleteConstraint>
<deprecated>false</deprecated>
<externalId>false</externalId>
<label>Organization</label>
<referenceTo>Account</referenceTo>
Expand All @@ -251,7 +244,6 @@ OR(
</fields>
<fields>
<fullName>Paid_Amount__c</fullName>
<deprecated>false</deprecated>
<description>Total Amount paid on this Recurring Donation</description>
<externalId>false</externalId>
<inlineHelpText>Do Not Enter. The NPSP calculates this value automatically as donations are made and marked Posted.</inlineHelpText>
Expand All @@ -266,7 +258,6 @@ OR(
<fields>
<fullName>Recurring_Donation_Campaign__c</fullName>
<deleteConstraint>SetNull</deleteConstraint>
<deprecated>false</deprecated>
<externalId>false</externalId>
<label>Campaign</label>
<referenceTo>Campaign</referenceTo>
Expand All @@ -278,7 +269,6 @@ OR(
</fields>
<fields>
<fullName>Schedule_Type__c</fullName>
<deprecated>false</deprecated>
<description>Tells Salesforce how to compute the amount for each child opportunity, based on what you&apos;ve entered in the Amount field. For Fixed-Length Recurring Donations only.</description>
<externalId>false</externalId>
<inlineHelpText>Tells Salesforce how to compute the amount for each child opportunity, based on what you&apos;ve entered in the Amount field. For Fixed-Length Recurring Donations only.</inlineHelpText>
Expand All @@ -300,7 +290,6 @@ OR(
</fields>
<fields>
<fullName>Total_Paid_Installments__c</fullName>
<deprecated>false</deprecated>
<description>Total number of installments paid on this Recurring Donation.</description>
<externalId>false</externalId>
<inlineHelpText>Do Not Enter. The NPSP calculates this value automatically as donations are made and marked Posted.</inlineHelpText>
Expand All @@ -315,7 +304,6 @@ OR(
</fields>
<fields>
<fullName>Total__c</fullName>
<deprecated>false</deprecated>
<externalId>false</externalId>
<formula>IF(TEXT( Open_Ended_Status__c) = $Label.RecurringDonationOpenStatus, 0,
CASE(
Expand Down
4 changes: 1 addition & 3 deletions src/objects/Recurring_Donations_Error_Queue__c.object
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomObject xmlns="http://soap.sforce.com/2006/04/metadata">
<customSettingsType>List</customSettingsType>
<customSettingsVisibility>Public</customSettingsVisibility>
<description>DEPRECATED. Recurring Donations are now stored in the System Error Log.</description>
<enableFeeds>false</enableFeeds>
<fields>
<fullName>Error_Message__c</fullName>
<deprecated>false</deprecated>
<description>Error message for the operation on the associated Recurring Donation record</description>
<externalId>false</externalId>
<inlineHelpText>Error message for the operation on the associated Recurring Donation record</inlineHelpText>
Expand All @@ -19,7 +17,6 @@
</fields>
<fields>
<fullName>Recurring_Donation_ID__c</fullName>
<deprecated>false</deprecated>
<description>ID of the affected Recurring Donation record</description>
<externalId>false</externalId>
<inlineHelpText>ID of the affected Recurring Donation record</inlineHelpText>
Expand All @@ -31,4 +28,5 @@
<unique>false</unique>
</fields>
<label>DEPRECATED-RD Error Queue</label>
<visibility>Public</visibility>
</CustomObject>
Loading

0 comments on commit 0b7a80f

Please sign in to comment.