summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDhaval Panchal <dpa@odoo.com>2015-12-28 12:51:22 +0530
committerYannick Tivisse <yti@odoo.com>2016-04-12 17:21:15 +0200
commita04bda67e86e01edebd5981a903c3df2c39efd35 (patch)
tree4a668b474499e86533da3c5f1a935244814c89bf
parentf303fab21d315d0db34260cf19bc70ad972864e6 (diff)
[IMP] sale: Pay option appears when the document is a confirmed SO.
-rw-r--r--addons/website_quote/views/website_quotation.xml17
1 files changed, 14 insertions, 3 deletions
diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml
index dc8594ed2f0..75b1086e6e9 100644
--- a/addons/website_quote/views/website_quotation.xml
+++ b/addons/website_quote/views/website_quotation.xml
@@ -174,9 +174,12 @@
<div class="col-md-3 hidden-print">
<div class="bs-sidebar">
<div class="text-center" t-if="quotation.state in ('draft', 'sent', 'waiting_date')" style="padding: 10px">
- <a t-if="order_valid" class="btn btn-primary btn-block" data-toggle="modal" data-target="#modalaccept">
+ <a t-if="order_valid and not quotation.require_payment" class="btn btn-primary btn-block" data-toggle="modal" data-target="#modalaccept">
<i class="fa fa-check"></i> Accept Order
</a>
+ <a t-if="order_valid and quotation.require_payment" class="btn btn-primary btn-block" data-toggle="modal" data-target="#modalaccept">
+ <i class="fa fa-check"></i> Accept &amp; Pay
+ </a>
<a t-if="not order_valid" href="#discussion" class="btn btn-info btn-block o_normalwhitespace">
<strong>This offer expired!</strong><br/>
Contact us for new quote.
@@ -187,7 +190,7 @@
</a>
</div>
</div>
- <div class="text-center" t-if="need_payment" style="padding: 10px">
+ <div class="text-center" t-if="need_payment or (quotation.state in ('sale') and quotation.require_payment and tx_state != 'done')" style="padding: 10px">
<a class="btn btn-primary btn-block" data-toggle="modal" data-target="#modalaccept">
<i class="fa fa-check"></i> Pay Now
</a>
@@ -381,13 +384,21 @@
<t t-call="website_quote.so_quotation_content"/>
<div class="text-center hidden-print mt16 mb16" id="quotation_toolbar" t-if="quotation.state in ('draft', 'sent', 'waiting_date')">
- <a class="btn btn-success" data-toggle="modal" data-target="#modalaccept" t-if="order_valid">
+ <a class="btn btn-success" data-toggle="modal" data-target="#modalaccept" t-if="order_valid and not quotation.require_payment">
<i class="fa fa-check"></i> Accept
</a>
+ <a class="btn btn-success" data-toggle="modal" data-target="#modalaccept" t-if="order_valid and quotation.require_payment">
+ <i class="fa fa-check"></i> Accept &amp; Pay
+ </a>
<a class="btn btn-danger" data-toggle="modal" data-target="#modaldecline">
<i class="fa fa-times"></i> Reject
</a>
</div>
+ <div class="text-center" t-if="need_payment or (quotation.state in ('sale') and quotation.require_payment and tx_state != 'done')" style="padding: 10px">
+ <a class="btn btn-primary" data-toggle="modal" data-target="#modalaccept">
+ <i class="fa fa-check"></i> Pay Now
+ </a>
+ </div>
</div><!-- //col-md-9 -->
</div>