Skip to content

Commit

Permalink
Merge 0a60a7f into feature/254__W-15353462-soft-credit-chunking-error
Browse files Browse the repository at this point in the history
  • Loading branch information
salesforce-org-metaci[bot] authored Nov 11, 2024
2 parents 0902ff6 + 0a60a7f commit 8d0630f
Show file tree
Hide file tree
Showing 9 changed files with 150 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Comment line immediately above ownership line is reserved for related other information. Please be careful while editing.
#ECCN:Open Source
105 changes: 105 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# Salesforce Open Source Community Code of Conduct

## About the Code of Conduct

Equality is a core value at Salesforce. We believe a diverse and inclusive
community fosters innovation and creativity, and are committed to building a
culture where everyone feels included.

Salesforce open-source projects are committed to providing a friendly, safe, and
welcoming environment for all, regardless of gender identity and expression,
sexual orientation, disability, physical appearance, body size, ethnicity, nationality,
race, age, religion, level of experience, education, socioeconomic status, or
other similar personal characteristics.

The goal of this code of conduct is to specify a baseline standard of behavior so
that people with different social values and communication styles can work
together effectively, productively, and respectfully in our open source community.
It also establishes a mechanism for reporting issues and resolving conflicts.

All questions and reports of abusive, harassing, or otherwise unacceptable behavior
in a Salesforce open-source project may be reported by contacting the Salesforce
Open Source Conduct Committee at [email protected].

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of gender
identity and expression, sexual orientation, disability, physical appearance,
body size, ethnicity, nationality, race, age, religion, level of experience, education,
socioeconomic status, or other similar personal characteristics.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy toward other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Personal attacks, insulting/derogatory comments, or trolling
* Public or private harassment
* Publishing, or threatening to publish, others' private information—such as
a physical or electronic address—without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
* Advocating for or encouraging any of the above behaviors

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned with this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project email
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the Salesforce Open Source Conduct Committee
at [email protected]. All complaints will be reviewed and investigated
and will result in a response that is deemed necessary and appropriate to the
circumstances. The committee is obligated to maintain confidentiality with
regard to the reporter of an incident. Further details of specific enforcement
policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership and the Salesforce Open Source Conduct
Committee.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][contributor-covenant-home],
version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html.
It includes adaptions and additions from [Go Community Code of Conduct][golang-coc],
[CNCF Code of Conduct][cncf-coc], and [Microsoft Open Source Code of Conduct][microsoft-coc].

This Code of Conduct is licensed under the [Creative Commons Attribution 3.0 License][cc-by-3-us].

[contributor-covenant-home]: https://www.contributor-covenant.org (https://www.contributor-covenant.org/)
[golang-coc]: https://golang.org/conduct
[cncf-coc]: https://github.com/cncf/foundation/blob/master/code-of-conduct.md
[microsoft-coc]: https://opensource.microsoft.com/codeofconduct/
[cc-by-3-us]: https://creativecommons.org/licenses/by/3.0/us/
21 changes: 21 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Contributing Guide For NPSP

This page lists the operational governance model of this project, as well as the recommendations and requirements for how to best contribute to NPSP. We strive to obey these as best as possible. As always, thanks for contributing – we hope these guidelines make it easier and shed some light on our approach and processes.

# Governance Model

## Salesforce Sponsored

The intent and goal of open sourcing this project is to increase the contributor and user base. However, only Salesforce employees will be given `admin` rights and will be the final arbitrars of what contributions are accepted or not.

# Issues, requests & ideas

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

# Code of Conduct
Please follow our [Code of Conduct](CODE_OF_CONDUCT.md).

# License
By contributing your code, you agree to license your contribution under the terms of our project [LICENSE](LICENSE) and to sign the [Salesforce CLA](https://cla.salesforce.com/sign-cla)
7 changes: 7 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## Security

Please report any security issue to [[email protected]](mailto:[email protected])
as soon as it is discovered. This library limits its runtime dependencies in
order to reduce the total cost of ownership as much as can be, but all consumers
should remain vigilant and have their security stakeholders review all third-party
products (3PP) like this one and their dependencies.
4 changes: 2 additions & 2 deletions force-app/main/default/classes/BDI_DataImportService.cls
Original file line number Diff line number Diff line change
Expand Up @@ -626,9 +626,9 @@ global with sharing class BDI_DataImportService {
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
Expected_Total_Batch_Amount__c, Batch_Table_Columns__c, LastModifiedDate, GiftBatch__c
FROM DataImportBatch__c WHERE Id= :listDI[0].NPSP_Data_Import_Batch__c LIMIT 1];
if (listBatch.size() > 0 ) {
if (listBatch.size() > 0 && listBatch[0].GiftBatch__c) {
GiftBatch giftBatch = new GiftBatch(listBatch[0]);
Boolean firstInstallmentPaid = giftBatch.shouldPayFirstInstallment();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private class GiftEntryProcessorQueue_TEST {
BDI_MappingServiceAdvanced.DEFAULT_DATA_IMPORT_FIELD_MAPPING_SET_NAME;
UTIL_CustomSettingsFacade.setDataImportSettings(dataImportSettings);

DataImportBatch__c giftBatch = new DataImportBatch__c();
DataImportBatch__c giftBatch = new DataImportBatch__c(GiftBatch__c = true);
insert giftBatch;

List<DataImport__c> giftsToInsert = new List<DataImport__c>();
Expand Down
8 changes: 4 additions & 4 deletions force-app/main/default/lwc/geBatchWizard/geBatchWizard.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ export default class geBatchWizard extends NavigationMixin(LightningElement) {
this.formSections.forEach(section => {
if (section.elements) {
section.elements.forEach(element => {
if (batchLevelDefaults[element.fieldApiName]) {
element.value = batchLevelDefaults[element.fieldApiName].value;
if (batchLevelDefaults[element.customLabel]) {
element.value = batchLevelDefaults[element.customLabel].value;
}
});
}
Expand Down Expand Up @@ -459,10 +459,10 @@ export default class geBatchWizard extends NavigationMixin(LightningElement) {
if (dataImportBatch.apiName === formElement.objectApiName) {
dataImportBatch.fields[formElement.fieldApiName] = formElement.value;
} else {
batchDefaults[formElement.fieldApiName] = {
batchDefaults[formElement.label] = {
objectApiName: formElement.objectApiName,
fieldApiName: formElement.fieldApiName,
value: formElement.value
value: isNotEmpty(formElement.value) ? formElement.value : undefined
};
}
}
Expand Down
7 changes: 6 additions & 1 deletion force-app/main/default/lwc/geFormRenderer/geFormRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1668,7 +1668,7 @@ export default class GeFormRenderer extends LightningElement{
sections.forEach(section => {
section.elements.forEach(element => {
for (let key in batchDefaultsObject) {
if (batchDefaultsObject.hasOwnProperty(key)) {
if (batchDefaultsObject.hasOwnProperty(key) && key === element.customLabel) {
const batchDefault = batchDefaultsObject[key];
if (batchDefault.objectApiName === element.objectApiName &&
batchDefault.fieldApiName === element.fieldApiName) {
Expand Down Expand Up @@ -2651,6 +2651,11 @@ export default class GeFormRenderer extends LightningElement{
? this.CUSTOM_LABELS.geTextUpdating
: this.CUSTOM_LABELS.geTextSaving;
delete dataImportFromFormState[apiNameFor(PAYMENT_AUTHORIZE_TOKEN)];
Object.keys(dataImportFromFormState).forEach((field)=>{
if(dataImportFromFormState[field] === undefined) {
dataImportFromFormState[field] = null;
}
})
const upsertResponse = await upsertDataImport({
dataImport: JSON.stringify(dataImportFromFormState)
});
Expand Down
3 changes: 2 additions & 1 deletion force-app/main/default/lwc/utilInput/utilInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ export default class utilInput extends LightningElement {
return {
objectApiName: this.objectApiName,
fieldApiName: this.fieldApiName,
value: this.fieldValue
value: this.fieldValue,
label: this.uiLabel
};
}

Expand Down

0 comments on commit 8d0630f

Please sign in to comment.