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

10.0 mig website sale require login #138

Merged
merged 8 commits into from
Oct 26, 2017

Conversation

iledarn
Copy link

@iledarn iledarn commented Nov 2, 2016

This depends on #137 and includes its commits. You have to review only commit e0cd9e3

@pedrobaeza pedrobaeza mentioned this pull request Nov 2, 2016
15 tasks
Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

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

I guess you rebased this on top of #137, so I'm marking this one as WIP until it gets merged.

Some of my comments go for that one, but it's not my fault, you should have said this, please take the time to write a description for your PRs from now on, and do 1 PR per addon when possible 😉


.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/113/9.0
Copy link
Member

Choose a reason for hiding this comment

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

10.0

"web_tour",
],
"data": [
"views/assets.xml",
Copy link
Member

Choose a reason for hiding this comment

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

Please put this as demo data: OCA/maintainer-tools#213 (comment)

not optional_products and website_sale_order and
website_sale_order.website_order_line)">
<a class="btn btn-primary pull-right mb32"
href="/web/signup?redirect=/shop/checkout">
Copy link
Member

Choose a reason for hiding this comment

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

Clicking on this gives a 404 error if I create the config parameter auth_signup.allow_uninvited and set it to True:

captura de pantalla de 2016-11-03 11-15-22

I'm thinking that, given the controller is now for users, probably all these patches in the view are simply not required. Just go to /shop/checkout and you will get redirected to /web/login?redirect=/shop/checkout automatically, and enable the sign up option and there it will be. It is a good moment to drop many (if not all) of this XML if possible.


.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/113/9.0
Copy link
Member

Choose a reason for hiding this comment

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

10.0

Copy link
Author

@iledarn iledarn Nov 3, 2016

Choose a reason for hiding this comment

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

do 1 PR per addon when possible

@yajo, I agree about the description. But in this case when website_sale_require_login depends on website_sale_suggest_create_account I cannot separate commits.
@pedrobaeza says here OCA/hr#259:
"Second PR must include all the commits from the first one (the migration of hr_public_holidays), plus the commit/s for migrating the module hr_holidays_compute_days. This way, you can review the first PR, as well as reviewing code from specific commits in the second PR, or reviewing functionally the second one. If the first one gets merged, you rebase the second one and you have the second PR clean with only the commits for the second module."

So I did as he said

Copy link
Member

Choose a reason for hiding this comment

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

Weird, sometimes he asks for 1 and sometimes for some... 😏

Well, I reviewed commits from #137 here, so that's the consequence. At least do add a description in your pulls for us to know that before losing time on it, please 😊

Copy link
Member

@pedrobaeza pedrobaeza Nov 4, 2016

Choose a reason for hiding this comment

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

@yajo, it's not weird. If you read carefully my instructions, the rule of one module per PR is still being respected. But if someone wants to review it, he/she needs all the files. The only problem is that @iledarn hadn't included proper instructions. I have added this text in the main comment:

This depends on #137 and includes its commits. You have to review only commit e0cd9e355025e75465b84fe62e59b9731c6fad45

@ovnicraft
Copy link
Member

@iledarn any updates for this module ? if you resolve @yajo reviews IMO is ready to merge.

@pedrobaeza
Copy link
Member

Please solve conflicts (removing the commits from website_sale_suggest_create_account)

@iledarn iledarn force-pushed the 10.0-mig-website_sale_require_login branch from 653b0dd to 2325ff4 Compare September 22, 2017 11:30
@iledarn
Copy link
Author

iledarn commented Sep 22, 2017

@pedrobaeza listo

@iledarn iledarn force-pushed the 10.0-mig-website_sale_require_login branch from 2325ff4 to 67265e8 Compare September 22, 2017 11:37

<odoo>

<template id="assets_frontend" inherit_id="website_sale.assets_frontend">
Copy link
Member

Choose a reason for hiding this comment

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

Call the template demo_assets_frontend and move the file into demo directory.

Copy link
Member

Choose a reason for hiding this comment

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

Still missing.

@iledarn
Copy link
Author

iledarn commented Sep 25, 2017

@yajo done

"views/website_sale.xml",
],
'demo': [
"demo/demo_assets_frontend.xml",
Copy link
Member

Choose a reason for hiding this comment

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

Just demo/demo_assets.xml


<odoo>

<template id="assets_frontend" inherit_id="website_sale.assets_frontend">
Copy link
Member

Choose a reason for hiding this comment

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

Still missing.


<odoo>

<template id="assets_frontend" inherit_id="website_sale.assets_frontend">
Copy link
Member

Choose a reason for hiding this comment

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

Still missing rename of this view.

@iledarn
Copy link
Author

iledarn commented Sep 27, 2017

@yajo done

@yelizariev
Copy link
Member

I have added unittests here: iledarn#1
@iledarn please merge

@yelizariev
Copy link
Member

It's completely green now

@yelizariev
Copy link
Member

Can "work in progress" tag be removed?

@pedrobaeza
Copy link
Member

#172 is now merged, so you need to rebase + removing useless commits (you can do it making an interactive rebase) for having this ready to be merged.

@iledarn
Copy link
Author

iledarn commented Oct 2, 2017

@pedrobaeza I've already done the ineractive rebase dropping #172 commits . There are 20 website_sale_require_login commits and 2 website_sale_wishlist commits in this PR

@pedrobaeza pedrobaeza force-pushed the 10.0-mig-website_sale_require_login branch from 182ede4 to cc01fe2 Compare October 26, 2017 16:26
@pedrobaeza
Copy link
Member

Merging after organizing a bit the commit story. Thanks to all for working on having this + fixing tests.

@pedrobaeza pedrobaeza merged commit 295b68b into OCA:10.0 Oct 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants