Skip to content

[IMP]website_sale_order_validity: show button when validity is not set #441

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

Open
fw-bot-adhoc wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open

[IMP]website_sale_order_validity: show button when validity is not set #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions website_sale_order_validity/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@
{
"name": "Website Sale Order Validity",
"category": "Hidden",
<<<<<<< 34e8a2bb381834ffacc21da3e1057b622fb6bc45
"version": "19.0.1.0.0",
||||||| e7e58b710377ce866e106cceedba707e9b207673
"version": "18.0.1.0.0",
=======
"version": "18.0.1.1.0",
>>>>>>> 6c3aeefddb696eeef3faf9942a310037f8176aec
"author": "ADHOC SA",
"website": "www.adhoc.com.ar",
"license": "AGPL-3",
Expand Down
10 changes: 10 additions & 0 deletions website_sale_order_validity/views/templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,19 @@
</div>
</xpath>
</template>
<<<<<<< 34e8a2bb381834ffacc21da3e1057b622fb6bc45
<template id="navigation_buttons" name="Navigation buttons" inherit_id="website_sale.navigation_buttons">
<xpath expr="//t[@t-if='website_sale_order and website_sale_order.website_order_line']/.." position="attributes">
<attribute name="t-if">website_sale_order.validity_date and website_sale_order.validity_date &gt;= datetime.datetime.now().date()</attribute>
||||||| e7e58b710377ce866e106cceedba707e9b207673
<template name="Checkout layout page" id="checkout_layout" inherit_id="website_sale.checkout_layout">
<xpath expr="//div[@t-if='website_sale_order and website_sale_order.website_order_line']//div//t[@t-call='website_sale.navigation_buttons']" position="attributes">
<attribute name="t-if">website_sale_order.validity_date and website_sale_order.validity_date &gt;= datetime.datetime.now().date()</attribute>
=======
<template name="Checkout layout page" id="checkout_layout" inherit_id="website_sale.checkout_layout">
<xpath expr="//div[@t-if='website_sale_order and website_sale_order.website_order_line']//div//t[@t-call='website_sale.navigation_buttons']" position="attributes">
<attribute name="t-if">not website_sale_order.validity_date or website_sale_order.validity_date &gt;= datetime.datetime.now().date()</attribute>
>>>>>>> 6c3aeefddb696eeef3faf9942a310037f8176aec
</xpath>
<xpath expr="//t[@t-if='website_sale_order and website_sale_order.website_order_line']/.." position="after">
<div t-if="website_sale_order.validity_date and website_sale_order.validity_date &lt; datetime.datetime.now().date()" class="alert alert-warning text-center mt-3" role="alert">
Expand Down
Loading