Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add company fields to campaign condition #5628

Merged
merged 20 commits into from Nov 16, 2018
Merged

Add company fields to campaign condition #5628

merged 20 commits into from Nov 16, 2018

Conversation

kuzmany
Copy link
Member

@kuzmany kuzmany commented Jan 23, 2018 •
edited

Q A
Bug fix?
New feature? y
Automated tests included?
Related user documentation PR URL
Related developer documentation PR URL
Issues addressed (#s or URLs) #6674
BC breaks?
Deprecations?

Bugfix/feature request donate by https://www.testin.cn/

Description:

Company fields added to campaign contact field condition

image

Steps to test this PR:

  1. Create campaign with condition and action
  2. Create condition based on contact company fields (for example Company Address 1).
    Also create condition based on contact field (Address 1 or email or Firstname or whatever)
  3. Run campaign. Test if condition based on contact or company fields works properly

@kuzmany kuzmany changed the title WIP: Add company fields to campaign condition Add company fields to campaign condition Jan 23, 2018
@npracht
Copy link
Member

npracht commented Jan 24, 2018

/label feature request

@mautibot mautibot added the feature A new feature for inclusion in minor or major releases label Jan 24, 2018
@npracht
Copy link
Member

npracht commented Jan 24, 2018

/label ready to test

@mautibot mautibot added the ready-to-test PR's that are ready to test label Jan 24, 2018
@dbhurley dbhurley added this to the 2.13.0 milestone Mar 4, 2018
@npracht
Copy link
Member

npracht commented Mar 12, 2018

Label: Pending test confirmation

@mautibot mautibot added the pending-test-confirmation PR's that require one test before they can be merged label Mar 12, 2018
npracht
npracht previously approved these changes Mar 12, 2018
View reviewed changes
Copy link
Member

@npracht npracht left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is working as expected.

@mautibot mautibot added the code-review-needed PR's that require a code review before merging label Mar 12, 2018
@escopecz escopecz self-assigned this Mar 22, 2018
@javjim
Copy link

javjim commented Mar 27, 2018

Working properly thanks!

@javjim javjim added ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged and removed pending-test-confirmation PR's that require one test before they can be merged ready-to-test PR's that are ready to test labels Mar 27, 2018
@alanhartless alanhartless added the needs-automated-tests PR's that need automated tests before they can be merged label Mar 27, 2018
@alanhartless alanhartless modified the milestones: 2.13.0, 2.14.0 Mar 27, 2018
@mautibot mautibot added the pending-test-confirmation PR's that require one test before they can be merged label Mar 27, 2018
alanhartless
alanhartless suggested changes Mar 27, 2018
View reviewed changes
Copy link
Contributor

@alanhartless alanhartless left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add tests for your new methods and your new code additions if possible. Don't worry about existing code. If something is not testable due to the old code and new classes/methods can't be used for your code, then it's fine.Thanks!!

@escopecz escopecz removed the pending-test-confirmation PR's that require one test before they can be merged label Mar 27, 2018
@npracht npracht added this to To do in Testing 2.15.0 Oct 16, 2018
@npracht npracht self-assigned this Nov 7, 2018
npracht
npracht approved these changes Nov 7, 2018
View reviewed changes
Copy link
Member

@npracht npracht left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@npracht npracht added ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged and removed code-review-needed PR's that require a code review before merging ready-to-test PR's that are ready to test labels Nov 7, 2018
@npracht npracht moved this from To do to Ready to commit in Testing 2.15.0 Nov 7, 2018
@Woeler
Copy link
Contributor

Woeler commented Nov 8, 2018

@alanhartless @heathdutton How's your reviews on this now?

@Woeler Woeler added pending-feedback PR's and issues that are awaiting feedback from the author and removed ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged labels Nov 16, 2018
@Woeler Woeler moved this from Ready to commit to Pending feedback in Testing 2.15.0 Nov 16, 2018
@kuzmany kuzmany added pending-test-confirmation PR's that require one test before they can be merged and removed pending-feedback PR's and issues that are awaiting feedback from the author labels Nov 16, 2018
@kuzmany
Copy link
Member Author

kuzmany commented Nov 16, 2018

@Woeler I marked as Pending test confirmation. Please decide what next

@Woeler
Copy link
Contributor

Woeler commented Nov 16, 2018

@kuzmany I have pinged @heathdutton and @alanhartless to re-check here. Then we can get this in.

@Woeler Woeler added ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged and removed pending-test-confirmation PR's that require one test before they can be merged labels Nov 16, 2018
@Woeler Woeler moved this from Pending feedback to To do in Testing 2.15.0 Nov 16, 2018
@Woeler Woeler moved this from To do to Ready to commit in Testing 2.15.0 Nov 16, 2018
@Woeler Woeler removed the ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged label Nov 16, 2018
@Woeler Woeler merged commit 602b7b9 into mautic:staging Nov 16, 2018
Testing 2.15.0 automation moved this from Ready to commit to Merged Nov 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alanhartless alanhartless alanhartless approved these changes

@heathdutton heathdutton heathdutton approved these changes

@npracht npracht npracht approved these changes

@Noa83 Noa83 Noa83 approved these changes

Assignees

@npracht npracht

Labels
feature A new feature for inclusion in minor or major releases
Projects
No open projects
Testing 2.15.0
  
Merged
Milestone
2.15.0
Development

Successfully merging this pull request may close these issues.

None yet