Skip to content

[FW][REF] Subscriptions: rewrite overview, integrate products page #12843

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

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 9, 2025

Task: 4710396

Forward-Port-Of: #12823

@robodoo
Copy link
Collaborator

robodoo commented Apr 9, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 9, 2025

@StraubCreative @samueljlieber cherrypicking of pull request #12823 failed.

stdout:

Auto-merging content/applications/sales/sales/products_prices/prices/pricing.rst
CONFLICT (content): Merge conflict in content/applications/sales/sales/products_prices/prices/pricing.rst
Auto-merging content/applications/sales/subscriptions.rst
CONFLICT (content): Merge conflict in content/applications/sales/subscriptions.rst
Auto-merging content/applications/sales/subscriptions/automatic_alerts.rst
CONFLICT (content): Merge conflict in content/applications/sales/subscriptions/automatic_alerts.rst
Auto-merging content/applications/sales/subscriptions/closing.rst
Auto-merging content/applications/sales/subscriptions/ecommerce.rst
CONFLICT (modify/delete): content/applications/sales/subscriptions/products.rst deleted in aca3c2b1b8775310e852bdc874afc1e43af936a6 and modified in 5dcb8e7bb4e97a3967abf3e48749e80f2351372b.  Version 5dcb8e7bb4e97a3967abf3e48749e80f2351372b of content/applications/sales/subscriptions/products.rst left in tree.
Auto-merging content/applications/sales/subscriptions/renewals.rst
Auto-merging content/applications/sales/subscriptions/reports.rst
Auto-merging content/applications/sales/subscriptions/upselling.rst
CONFLICT (content): Merge conflict in content/applications/sales/subscriptions/upselling.rst

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@StraubCreative StraubCreative force-pushed the 17.0-16.0-subscriptions-update-overview-page-zst-428096-fw branch from 2ad225a to 2ab61de Compare April 10, 2025 22:01
@C3POdoo C3POdoo requested review from a team April 10, 2025 22:03
@StraubCreative
Copy link
Contributor

2ab61de: resolve merge conflicts.

Version-specific changes incoming: updated 17.0 screenshots, Recurrence Periods --> Recurring Plans verbiage + form/field coverage, etc.

@StraubCreative StraubCreative force-pushed the 17.0-16.0-subscriptions-update-overview-page-zst-428096-fw branch from 2ab61de to c1ae5f1 Compare April 10, 2025 23:41
@StraubCreative
Copy link
Contributor

StraubCreative commented Apr 10, 2025

Version-specific changes incoming: updated 17.0 screenshots, Recurrence Periods --> Recurring Plans verbiage + form/field coverage, etc.

Applied on c1ae5f1. Includes new screenshots, language updates around buttons, fields, etc., additional form coverage as it relates to new features and layout in 17.0 (2+ new sub-sections at ~79 lines), etc.

@StraubCreative StraubCreative self-assigned this Apr 10, 2025
@StraubCreative StraubCreative force-pushed the 17.0-16.0-subscriptions-update-overview-page-zst-428096-fw branch from c1ae5f1 to 7900da9 Compare April 10, 2025 23:49
@StraubCreative
Copy link
Contributor

7900da9: updated 17.0 redirects file to accommodate subscriptions/products removal.

@StraubCreative
Copy link
Contributor

@samueljlieber can you TR this for me, please. There were a number of substantial changes made since the 16.0 version on #12823, and I could also use a SC on the cherry-pick (if it all went through okay).

Also, for the version-specific edits made here, +2 points? Making the edits on the FW just bypassed a new PR is all (more efficient imo) however the same work was done. Lmk what you think 🙏

TIA!

Copy link
Contributor

@samueljlieber samueljlieber left a comment

Choose a reason for hiding this comment

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

Hi @StraubCreative, nice job on the version-specific edits and resolving the conflicts! I found just a couple quick fixes in my review, please address these before merging this FWP!

Thank you!

@StraubCreative StraubCreative force-pushed the 17.0-16.0-subscriptions-update-overview-page-zst-428096-fw branch from 7900da9 to f4858da Compare April 11, 2025 17:54
@StraubCreative
Copy link
Contributor

f4858da: TR CRs applied.

Checks pass, can continue along the merge chain ✅
..
@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 11, 2025
closes #12823

closes #12843

Signed-off-by: Samuel Lieber (sali) <[email protected]>
Signed-off-by: Zachary Straub (zst) <[email protected]>
@robodoo robodoo closed this Apr 11, 2025
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.

4 participants