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.

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

Bring some JS and CSS code from spree_backend related to orders admin #4616

Merged
merged 5 commits into from
Jan 30, 2020

Conversation

luisramos0
Copy link
Contributor

@luisramos0 luisramos0 commented Dec 19, 2019

What? Why?

Continues #4595

What should we test?

  • Verify the edit product page has the usual style and positioning of elements.
  • Verify you can add, edit and remove images from a product
  • Verify the orders search page and the order edit page have the usual style and positioning of elements.
  • In the list of payments of an order, make sure the outstanding balance tag is in the correct place with correct style

Release notes

Changelog Category: Changed
Bring javascript code related to orders from spree_backend so we can make OFN independent of Spree.

@luisramos0
Copy link
Contributor Author

I rebased and added a dependency needed (admin/globals/variables.scss which is already added on another PR) to make the precompilation process work here.
Ready for testing.

@lin-d-hop lin-d-hop added the pr-staged-uk staging.openfoodnetwork.org.uk label Jan 30, 2020
@lin-d-hop
Copy link
Contributor

This is looking good.
Tested all steps and compared to UK production. Everything is exactly as it should be.
Ready to go!

@lin-d-hop
Copy link
Contributor

@luisramos0 except now there is a conflict

@lin-d-hop lin-d-hop added feedback-needed and removed pr-staged-uk staging.openfoodnetwork.org.uk labels Jan 30, 2020
@luisramos0
Copy link
Contributor Author

it's a tiny conflict in the all css file, I dont think this can create problems, I will merge now.

@luisramos0 luisramos0 merged commit 768631a into openfoodfoundation:master Jan 30, 2020
@luisramos0 luisramos0 deleted the orders_js branch January 30, 2020 11:37
@luisramos0 luisramos0 mentioned this pull request Feb 6, 2020
18 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants