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

Entered data missing when entering the wrong date for from, to in cart rule #20895

Merged
merged 8 commits into from
Feb 14, 2019
Merged

Entered data missing when entering the wrong date for from, to in cart rule #20895

merged 8 commits into from
Feb 14, 2019

Conversation

realadityayadav
Copy link
Member

@realadityayadav realadityayadav commented Feb 3, 2019 •
edited
Loading

Description (*)

Changes in DataProvider and Save Controller for Persistance of Form Data In Cart Price Rule
Updated Files -
-> app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
-> app/code/Magento/SalesRule/Model/Rule/DataProvider.php

Fixed Issues (if relevant)

  1. Entered data missing when entering the wrong date for from, to in cart rule #20888 : Entered data missing when entering the wrong date for from, to in cart rule
  2. ...

Manual testing scenarios (*)

1 - Admin -> Marketing -> Cart Rule -> Add New
2 - Fill the all requird item
3 - Enter 'from'(Field) date grater than(>) 'to'(Field) date

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

Aditya Yadav added 2 commits February 3, 2019 10:12
Added Changes of Data Persistance for issue - #20888
3da7c76
Changes in support of Issue 20888
d697ea6 
Added Consideration of Data Persistance incase of Failed Submission of form.
@magento-engcom-team
Copy link
Contributor

Hi @adityayadav-cedcoss. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento-engcom-team give me test instance - deploy test instance based on PR changes
  • @magento-engcom-team give me 2.3-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

@irajneeshgupta irajneeshgupta changed the title 2.3 develop adityayadav Entered data missing when entering the wrong date for from, to in cart rule Feb 3, 2019
Update Save.php
8faf8e9 
Added Constructor Arguments.
sivaschenko
sivaschenko requested changes Feb 3, 2019
View reviewed changes
Copy link
Member

@sivaschenko sivaschenko left a comment

Choose a reason for hiding this comment

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

Hi @adityayadav-cedcoss , thanks for the contribution! There are a couple of minor changes that should be done. Please take a look at my code review comments

app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php Outdated Show resolved Hide resolved
app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php Outdated Show resolved Hide resolved
app/code/Magento/SalesRule/Model/Rule/DataProvider.php Outdated Show resolved Hide resolved
app/code/Magento/SalesRule/Model/Rule/DataProvider.php Outdated Show resolved Hide resolved
@realadityayadav
Copy link
Member Author

@sivaschenko Please take a look at the updates made.

@magento-cicd2
Copy link
Contributor

magento-cicd2 commented Feb 6, 2019 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

sivaschenko
sivaschenko reviewed Feb 6, 2019
View reviewed changes
app/code/Magento/SalesRule/Model/Rule/DataProvider.php Outdated
@@ -55,13 +62,15 @@ public function __construct(
CollectionFactory $collectionFactory,
\Magento\Framework\Registry $registry,
\Magento\SalesRule\Model\Rule\Metadata\ValueProvider $metadataValueProvider,
DataPersistorInterface $dataPersistor,
Copy link
Member

Choose a reason for hiding this comment

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

Please add this dependency in a backward compatible way, see "Adding a parameter to Constructor" section of https://devdocs.magento.com/guides/v2.3/contributor-guide/backward-compatible-development/#php

Copy link
Member Author

Choose a reason for hiding this comment

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

Added the necessary changes @sivaschenko

@sivaschenko
Copy link
Member

Thanks for updates @realadityayadav ! Please add new constructor parameter to app/code/Magento/SalesRule/Model/Rule/DataProvider.php in backward compatible way and sign the CLA. Then I will be able to process this PR

@sivaschenko sivaschenko self-assigned this Feb 6, 2019
@magento-engcom-team
Copy link
Contributor

Hi @sivaschenko, thank you for the review.
ENGCOM-4215 has been created to process this Pull Request

@magento-engcom-team magento-engcom-team mentioned this pull request Feb 14, 2019
Closed
@magento-engcom-team magento-engcom-team merged commit bc92929 into magento:2.3-develop Feb 14, 2019
@ghost
Copy link

ghost commented Feb 14, 2019

Hi @realadityayadav, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

magento-engcom-team pushed a commit that referenced this pull request Feb 14, 2019
@sidolov
ENGCOM-4215: Entered data missing when entering the wrong date for fr…
3b761f1 
…om, to in cart rule #20895
@magento-engcom-team magento-engcom-team added this to the Release: 2.3.2 milestone Feb 14, 2019
@realadityayadav realadityayadav deleted the 2.3-develop-adityayadav branch March 23, 2019 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sivaschenko sivaschenko sivaschenko approved these changes

Assignees

@sivaschenko sivaschenko

Labels
Award: bug fix Community Insider: Cedcommerce community-insider-contribution Component: SalesRule Event: mm19in Progress: accept Release Line: 2.3
Projects
None yet
Milestone
Release: 2.3.2
Development

Successfully merging this pull request may close these issues.
5 participants
@realadityayadav @magento-engcom-team @magento-cicd2 @sivaschenko @p-bystritsky