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

Upgrade select2-rails to 4.0 #10613

Merged
merged 14 commits into from
Dec 28, 2020

Conversation

przemosk
Copy link
Contributor

@przemosk przemosk commented Dec 14, 2020

TODO:

  • deal with removing last element i.e products in promotions form
  • after refresh on customer step in admin checkout values from fields are hidden by clear_address_fields() js function, check why
  • css styles

@przemosk przemosk added the WIP label Dec 14, 2020
@squash-labs
Copy link

squash-labs bot commented Dec 14, 2020

Manage this branch in Squash

Test this branch here: https://spark-solutionsupgrade-select2-t55g2.squash.io

@MatthewKennedy
Copy link
Contributor

MatthewKennedy commented Dec 14, 2020

@przemosk I tried to update select2 to v4 -> https://github.com/MatthewKennedy/spree/tree/select2-v4

I remember battling away with this, I think I fixed it in the end. see if the js from tis file helps with the address fields. https://github.com/MatthewKennedy/spree/blob/select2-v4/backend/app/assets/javascripts/spree/backend/checkouts/edit.js

@przemosk
Copy link
Contributor Author

@przemosk I tried to update select2 to v4 -> https://github.com/MatthewKennedy/spree/tree/select2-v4

I remember battling away with this, I think I fixed it in the end. see if the js from tis file helps with the address fields. https://github.com/MatthewKennedy/spree/blob/select2-v4/backend/app/assets/javascripts/spree/backend/checkouts/edit.js

@MatthewKennedy will take a look, thanks ! 😄

@MatthewKennedy
Copy link
Contributor

MatthewKennedy commented Dec 14, 2020

@przemosk You may need to use some of the view files here is the js relies on a change in those:
https://github.com/MatthewKennedy/spree/tree/select2-v4/backend/app/views/spree/admin/orders/customer_details

Pick through the changes and see if there is anything in there that is helpful.

@damianlegawiec damianlegawiec changed the title WIP: Upgrade select2-rails gem Upgrade select2-rails gem Dec 28, 2020
@damianlegawiec damianlegawiec marked this pull request as ready for review December 28, 2020 16:08
@damianlegawiec damianlegawiec changed the title Upgrade select2-rails gem Upgrade select2-rails to 4.0 Dec 28, 2020
@damianlegawiec damianlegawiec force-pushed the upgrade-select2-gem branch 3 times, most recently from 09151a8 to cff9154 Compare December 28, 2020 18:22
@damianlegawiec damianlegawiec merged commit 7f5b849 into spree:master Dec 28, 2020
@@ -26,5 +26,5 @@ Gem::Specification.new do |s|

s.add_development_dependency 'rspec'
# Temporary hack until https://github.com/wycats/thor/issues/234 is fixed
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this comment still required?

Copy link
Member

Choose a reason for hiding this comment

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

@poudelprakash nah, can be removed, feel free to submit a PR with this change

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