SalesforceFoundation · salesforce-org-metaci · Sep 22, 2023 · Sep 25, 2023 · Oct 9, 2023 · Oct 9, 2023
diff --git a/.github/ISSUE_TEMPLATE/read-this-for-all-support-and-questions.md b/.github/ISSUE_TEMPLATE/read-this-for-all-support-and-questions.md
@@ -0,0 +1,15 @@
+---
+name: READ THIS FOR ALL SUPPORT AND QUESTIONS
+about: 'GO HERE: http://sfdc.co/npchub'
+title: ''
+labels: invalid
+assignees: ''
+
+---
+
+==== IMPORTANT NOTES ====
+
+The Nonprofit Success Pack team does not review or respond to support requests or questions posted in this repository.
+
+Instead, please post all questions and issues directly in the Nonprofit Hub of the Trailblazer Community: http://sfdc.co/npchub
+========================================================================
diff --git a/README.md b/README.md
@@ -1,20 +1,36 @@
 ![Salesforce Nonprofit Success Pack](https://cloud.githubusercontent.com/assets/450473/18836784/15e1774a-83c7-11e6-8434-0521d4fbebc0.png "Salesforce Nonprofit Success Pack")
 
-#### For Users
+## Important Note
 
-* <a href="https://trailhead.salesforce.com/trailblazer-community/groups/0F94S000000kHitSAE?tab=discussion&sort=LAST_MODIFIED_DATE_DESC" target="_blank">Ask questions or get help</a>
-* <a href="https://github.com/SalesforceFoundation/NPSP/issues/new" target="_blank">Log a confirmed Issue</a> or <a href="https://ideas.salesforce.com/s/search#t=All&sort=relevancy" target="_blank">Feature Request</a>
-* <a href="https://help.salesforce.com/s/articleView?id=sfdo.Nonprofit_Success_Pack.htm&type=5" target="_blank">Nonprofit Success Pack (NPSP) Documentation</a>
-* Check out existing <a href="https://github.com/SalesforceFoundation/NPSP/labels/bug" target="_blank">bugs</a> and <a href="https://ideas.salesforce.com/s/search#t=All&sort=relevancy&f:@sfcategoryfull=[Nonprofit%7CNonprofit%20Success%20Pack]" target="_blank">feature and enhancement requests.</a>
-* <a href="https://github.com/SalesforceFoundation/NPSP/releases" target="_blank">Release Notes and Beta Releases</a>
+In 2023, Salesforce launched the Nonprofit Cloud which is at the foundation of Salesforce for Nonprofits. Nonprofit Cloud helps teams unify their data to work beyond silos and better collaborate, share, learn from, and use their data. Use Nonprofit Cloud as your a single solution to begin or continue in your digital transformation journey.  Read more about the [new Nonprofit Cloud](https://www.salesforce.com/blog/new-nonprofit-cloud/). Some key highlights:
+
+* Salesforce will to continue support our managed package products, including the Nonprofit Success Pack. Tens of thousands of customers use our current managed package products to achieve great results. 
+* Many of our ISV partners are building fantastic solutions for our managed packages as well as the new Nonprofit Cloud. We’re working with these partners to ensure that they understand our new product architecture, and are able to bring their years of experience and learnings to the new Nonprofit Cloud.
+* Salesforce remains deeply committed to nonprofit pricing. There are many new capabilities within the new Nonprofit Cloud and we work hard to maintain our nonprofit discounts across the new products. Our goals are to simplify access to nonprofit technology and make it easier for customers to get started.
+* Salesforce continues to grant free licenses with the Power of Us Program for the managed packages and Nonprofit Cloud. With Nonprofit Cloud, the Power of Us program also includes more features than ever to accelerate and deepen the nonprofit experience.
+* Take the new product for a test drive. Sign-up for a [Nonprofit Cloud Trial org](https://help.salesforce.com/s/articleView?id=sfdo.NPC_Create_Nonprofit_Cloud_Trial_Org.htm&type=5).
+* Visit the [Nonprofit Hub](https://trailhead.salesforce.com/trailblazer-community/groups/0F9300000001ocxCAA?tab=discussion&sort=LAST_MODIFIED_DATE_DESC) to chat with others about how nonprofits use Salesforce for social good.
+
+---
+### For Nonprofit Success Pack Users and admins
+
+* Check out existing [Nonprofit feature and enhancement requests](https://ideas.salesforce.com/s/search#t=All&sort=relevancy&f:@sfcategoryfull=[Nonprofit%7CNonprofit%20Cloud,Nonprofit%7CNonprofit%20Success%20Pack%20(NPSP)%20-%20Managed%20Package]).
+* [Ask questions or get help with the Nonprofit Success Pack](https://trailhead.salesforce.com/trailblazer-community/groups/0F94S000000kHitSAE)
+* [Ask for support or questions with other Nonprofit Users and Partners](https://trailhead.salesforce.com/trailblazer-community/groups/0F9300000001ocxCAA)
+* [Nonprofit Success Pack (NPSP) Documentation](https://help.salesforce.com/s/articleView?id=sfdo.Nonprofit_Success_Pack.htm)
+* [Release Notes](https://sfdc.co/bnL4Cb)
+* [Known Issues](https://issues.salesforce.com/#f[sfcategoryfull]=Nonprofit%7CNonprofit%20Success%20Pack%20(NPSP)%20-%20Managed%20Package)
+
+###  Try out the Nonprofit Success Pack
 
-#### Try it out
 You can install NPSP utilizing our custom application installer into any Developer Edition, Sandbox or Enterprise Edition Salesforce org.
-* <a href="https://install.salesforce.org/products/npsp" target="_blank">NPSP Installer</a>
 
-#### Meta
+* [NPSP Installer](https://install.salesforce.org/products/npsp)
+
+### Try out the New Nonprofit Cloud
+
+* [Nonprofit Cloud Learning Org Signup](https://help.salesforce.com/s/articleView?id=sfdo.NPC_Create_Nonprofit_Cloud_Trial_Org.htm&type=5)
 
-The Nonprofit Success Pack (“NPSP”) is an open-source package licensed by Salesforce.org (“SFDO”) under the BSD-3 Clause License, found at https://opensource.org/licenses/BSD-3-Clause. ANY MASTER SUBSCRIPTION AGREEMENT YOU OR YOUR ENTITY MAY HAVE WITH SFDO DOES NOT APPLY TO YOUR USE OF NPSP. NPSP IS PROVIDED “AS IS” AND AS AVAILABLE, AND SFDO MAKES NO WARRANTY OF ANY KIND REGARDING NPSP, WHETHER EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, FREEDOM FROM DEFECTS OR NON-INFRINGEMENT, TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW.
-SFDO WILL HAVE NO LIABILITY ARISING OUT OF OR RELATED TO YOUR USE OF NPSP FOR ANY DIRECT DAMAGES OR FOR ANY LOST PROFITS, REVENUES, GOODWILL OR INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, EXEMPLARY, COVER, BUSINESS INTERRUPTION OR PUNITIVE DAMAGES, WHETHER AN ACTION IS IN CONTRACT OR TORT AND REGARDLESS OF THE THEORY OF LIABILITY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR IF A REMEDY OTHERWISE FAILS OF ITS ESSENTIAL PURPOSE. THE FOREGOING DISCLAIMER WILL NOT APPLY TO THE EXTENT PROHIBITED BY LAW. SFDO DISCLAIMS ALL LIABILITY AND INDEMNIFICATION OBLIGATIONS FOR ANY HARM OR DAMAGES CAUSED BY ANY THIRD-PARTY HOSTING PROVIDERS.
+### Meta
 
-_ducking-octo-happiness, laughing-archer_
+The Nonprofit Success Pack (“NPSP”) is an open-source package licensed by Salesforce.org (“SFDO”) under the BSD-3 Clause License, found at https://opensource.org/licenses/BSD-3-Clause. ANY MASTER SUBSCRIPTION AGREEMENT YOU OR YOUR ENTITY MAY HAVE WITH SFDO DOES NOT APPLY TO YOUR USE OF NPSP. NPSP IS PROVIDED “AS IS” AND AS AVAILABLE, AND SFDO MAKES NO WARRANTY OF ANY KIND REGARDING NPSP, WHETHER EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, FREEDOM FROM DEFECTS OR NON-INFRINGEMENT, TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW. SFDO WILL HAVE NO LIABILITY ARISING OUT OF OR RELATED TO YOUR USE OF NPSP FOR ANY DIRECT DAMAGES OR FOR ANY LOST PROFITS, REVENUES, GOODWILL OR INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, EXEMPLARY, COVER, BUSINESS INTERRUPTION OR PUNITIVE DAMAGES, WHETHER AN ACTION IS IN CONTRACT OR TORT AND REGARDLESS OF THE THEORY OF LIABILITY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR IF A REMEDY OTHERWISE FAILS OF ITS ESSENTIAL PURPOSE. THE FOREGOING DISCLAIMER WILL NOT APPLY TO THE EXTENT PROHIBITED BY LAW. SFDO DISCLAIMS ALL LIABILITY AND INDEMNIFICATION OBLIGATIONS FOR ANY HARM OR DAMAGES CAUSED BY ANY THIRD-PARTY HOSTING PROVIDERS.
@@ -224,15 +224,15 @@ tasks:
     github_release:
         options:
             release_content: |
-                Check out the Salesforce Release Notes on [Salesforce Help & Training](https://sfdc.co/bnL4Cb).
+                Check out the [Salesforce Release Notes](https://sfdc.co/bnL4Cb) or [Known Issues](https://issues.salesforce.com/) for details.
 
     github_release_notes:
         options:
             trial_info: "`TBD`"
 
     is_rd2_enabled:
         description: This preflight check ensures that Enhanced Recurring Donations is enabled
-        class_path: tasks.is_rd2_enabled
+        class_path: tasks.check_rd2_enablement.is_rd2_enabled
         group: NPSP
 
     robot:

diff --git a/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegate.cmp b/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegate.cmp
@@ -55,8 +55,9 @@
     <lightning:layout horizontalAlign="spread" multipleRows="true" class="slds-hide" aura:id="enablementDisabled">
         <lightning:layoutItem padding="horizontal-large" size="10">
             <div class="slds-illustration slds-illustration_large">
-                <br /><br />
-                <img src="/img/chatter/OpenRoad.svg" class="slds-illustration__svg" alt="OpenRoad" />
+                <div class="slds-m-vertical_medium">
+                    <img src="/img/chatter/OpenRoad.svg" class="slds-illustration__svg" alt="OpenRoad" />
+                </div>
                 <div class="slds-text-longform">
                     <h3 class="slds-text-heading_medium">{!$Label.c.RD2_EnablementDisabledHeader}</h3>
                     <p>
@@ -77,7 +78,9 @@
 
         <lightning:layoutItem padding="horizontal-large" class="slds-p-top_large" size="12">
             <lightning:layout multipleRows="true">
-                <h2 class="title slds-text-heading_small">{!$Label.c.RD2_EnablementPrepTitle}</h2>
+                <lightning:layoutItem size="12">
+                    <h2 class="title slds-text-heading_small">{!$Label.c.RD2_EnablementPrepTitle}</h2>
+                </lightning:layoutItem>
                 <lightning:layoutItem class="slds-p-top_small" size="12">
                     <lightning:formattedRichText class="slds-text-longform"
                         value="{!$Label.c.RD2_EnablementPrepIntro}" />

diff --git a/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegateController.js b/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegateController.js
@@ -28,6 +28,16 @@
         helper.handleBatchEvent(component, event, 'v.dryRunBatch');
         helper.refreshDryRun(component);
         helper.refreshEnable(component);
+        var status = event.Hp.batchProgress.status;
+        var dryRunJob = component.find("dryRunJob");
+        if (["Completed", "Aborted"].includes(status)) {
+            if(dryRunJob){
+                helper.setFocus(component, 'dryRunJob');
+            }
+            else{
+                helper.setFocus(component, 'dryRun2Job');
+            }
+        }
     },
     handleDryRunError: function (component, event, helper) {
         helper.handleBatchError(component, event, 'dryRun');
@@ -44,6 +54,10 @@
     handleMigrationStatusChange: function (component, event, helper) {
         helper.handleBatchEvent(component, event, 'v.migrationBatch');
         helper.refreshMigration(component);
+        var status = event.Hp.batchProgress.status;
+            if (["Completed", "Aborted"].includes(status)) {
+                helper.setFocus(component, 'migrationJob');
+            }
     },
     handleMigrationError: function (component, event, helper) {
         helper.handleBatchError(component, event, 'migration');

diff --git a/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegateHelper.js b/force-app/main/default/aura/RD2_EnablementDelegate/RD2_EnablementDelegateHelper.js
@@ -599,5 +599,22 @@
     hideSpinner: function (component, element) {
         var spinner = component.find(element);
         $A.util.addClass(spinner, 'slds-hide');
-    }
+    },
+    /**
+     * @description: Autofocus 
+     */
+    setFocus: function (component, elementId) {
+        window.setTimeout(() => { 
+           try { var element = component.find(elementId); 
+               if (element) { 
+                   element.getElement().setAttribute('tabindex', '0'); 
+                   element.getElement().focus(); 
+                   element.getElement().setAttribute('tabindex', '-1'); 
+               } 
+           } catch (error) { 
+                   console.error('Error setting focus on element:', error); 
+
+           } 
+           }, 0); 
+   }
 })
diff --git a/force-app/main/default/classes/ALLO_ManageAllocations_CTRL.cls b/force-app/main/default/classes/ALLO_ManageAllocations_CTRL.cls
@@ -93,6 +93,10 @@ public with sharing class ALLO_ManageAllocations_CTRL {
         objectFields.add(Allocation__c.General_Accounting_Unit__c.getDescribe().getSobjectField());
 
         for(Schema.FieldSetMember additionalField : additionalAllocationFields) {
+            Schema.DescribeFieldResult fieldResult = additionalField.getSObjectField().getDescribe();
+            if (fieldResult.isCalculated() || !fieldResult.permissionable || additionalField.getFieldPath().contains('__r')) {
+                continue;
+            }
             objectFields.add(additionalField.getSObjectField());
         }
 

diff --git a/force-app/main/default/classes/BDI_DataImportService.cls b/force-app/main/default/classes/BDI_DataImportService.cls
@@ -94,9 +94,13 @@ global with sharing class BDI_DataImportService {
             'Status__c != \'' + BDI_DataImport_API.bdiImported + '\'',
             'Id =: dataImportIds'
         };
+		List<String> selectClause = new List<String>{
+            String.join(listStrDataImportFields, ','),
+                DATAIMPORT_BATCH_NUMBER_FIELD
+        };
 
         return new UTIL_Query()
-            .withSelectFields(listStrDataImportFields)
+            .withSelectFields(selectClause)
             .withFrom(DataImport__c.SObjectType)
             .withWhere(whereClauses)
             // this ensures consistency for our test code, but also should
@@ -619,6 +623,25 @@ global with sharing class BDI_DataImportService {
 
             this.listDI = checkRDFields(listDI);
 
+            if (apexJobId != null && listDI.size() > 0) {
+                List<DataImportBatch__c> listBatch = [SELECT Name, Batch_Number__c, Batch_Status__c, Batch_Defaults__c, 
+                                            Form_Template__c, RequireTotalMatch__c, Expected_Count_of_Gifts__c, 
+                                            Expected_Total_Batch_Amount__c, Batch_Table_Columns__c, LastModifiedDate 
+                                            FROM DataImportBatch__c WHERE Id= :listDI[0].NPSP_Data_Import_Batch__c LIMIT 1];
+                if (listBatch.size() > 0 ) {
+                    GiftBatch giftBatch = new GiftBatch(listBatch[0]);
+                    Boolean firstInstallmentPaid = giftBatch.shouldPayFirstInstallment();
+
+                    for (DataImport__c dataImport : listDI) {
+                        if(dataImport.Recurring_Donation_Recurring_Type__c != null) {
+                            dataImport.Donation_Date__c = null;
+                            if (!firstInstallmentPaid) {
+                                dataImport.Donation_Amount__c = null;
+                            }
+                        }
+                    }
+                }
+            }
             // do any performance optimizations to avoid unnecessary code
             disableAllOppRollups();
 

diff --git a/force-app/main/default/classes/BDI_DataImport_API.cls b/force-app/main/default/classes/BDI_DataImport_API.cls
@@ -158,6 +158,28 @@ global with sharing class BDI_DataImport_API {
         return apexJobId;
     }
 
+    global static Id processDataImportRecords(Data_Import_Settings__c diSettings,
+                                                List<Id> dataImportIds,
+                                                Boolean isDryRun, Id batchId) {
+        Id apexJobId;
+        if (dataImportIds != null && dataImportIds.size() > 0) {
+            // Use configured data import settings if none provided.
+            if (diSettings == null) {
+                diSettings = UTIL_CustomSettingsFacade.getDataImportSettings();
+            }
+            Savepoint sp = Database.setSavepoint();
+            try {
+                BDI_DataImport_BATCH batch = new BDI_DataImport_BATCH(batchId, dataImportIds, new BDI_DataImportService(isDryRun, BDI_DataImportService.getDefaultMappingService()));
+                apexJobId = Database.executeBatch(batch, integer.valueOf(diSettings.Batch_Size__c));
+            } catch (Exception ex) {
+                Database.rollback(sp);
+                ex.setMessage(System.label.bdiAPISelectedError + ' ' + ex.getMessage());
+                throw ex;
+            }
+        }
+        return apexJobId;
+    }
+
     /*******************************************************************************************************
     * @description The return result object for each batch that is provided to processDataImportBatches()
     */