[FIX] fix in js + cleaning
bzr revid: fp@tinyerp.com-20140125203052-hg0t1qis1ngtcs5c
This commit is contained in:
parent
0ff4c48cb9
commit
f95b2528f8
|
@ -107,6 +107,8 @@ class sale_quote(http.Controller):
|
||||||
def update(self, line_id=None, remove=False, unlink=False, order_id=None, token=None, **post):
|
def update(self, line_id=None, remove=False, unlink=False, order_id=None, token=None, **post):
|
||||||
order = request.registry.get('sale.order').browse(request.cr, SUPERUSER_ID, int(order_id))
|
order = request.registry.get('sale.order').browse(request.cr, SUPERUSER_ID, int(order_id))
|
||||||
assert token == order.access_token, 'Access denied, wrong token!'
|
assert token == order.access_token, 'Access denied, wrong token!'
|
||||||
|
if order.state not in ('draft','sent'):
|
||||||
|
return False
|
||||||
if unlink:
|
if unlink:
|
||||||
request.registry.get('sale.order.line').unlink(request.cr, SUPERUSER_ID, [int(line_id)], context=request.context)
|
request.registry.get('sale.order.line').unlink(request.cr, SUPERUSER_ID, [int(line_id)], context=request.context)
|
||||||
return False
|
return False
|
||||||
|
|
|
@ -23,37 +23,43 @@ $(document).ready(function () {
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var empty_sign = false;
|
||||||
$('#modelaccept').on('shown.bs.modal', function (e) {
|
$('#modelaccept').on('shown.bs.modal', function (e) {
|
||||||
$("#signature").empty().jSignature({'decor-color' : '#D1D0CE'});
|
$("#signature").empty().jSignature({'decor-color' : '#D1D0CE'});
|
||||||
|
empty_sign = $("#signature").jSignature("getData",'image');
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#sign_clean').on('click', function (e) {
|
$('#sign_clean').on('click', function (e) {
|
||||||
$("#signature").jSignature('reset');
|
$("#signature").jSignature('reset');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
$('form.js_accept_json').submit(function(ev){
|
$('form.js_accept_json').submit(function(ev){
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
var $link = $(ev.currentTarget);
|
var $link = $(ev.currentTarget);
|
||||||
var href = $link.attr("action");
|
var href = $link.attr("action");
|
||||||
var order_id = href.match(/accept\/([0-9]+)/);
|
var order_id = href.match(/accept\/([0-9]+)/);
|
||||||
var token = href.match(/token=(.*)/);
|
var token = href.match(/token=(.*)/);
|
||||||
|
if (token)
|
||||||
|
token = token[1];
|
||||||
|
|
||||||
var signer_name = $("#name").val();
|
var signer_name = $("#name").val();
|
||||||
var sign = $("#signature").jSignature("getData",'image')[1];
|
var sign = $("#signature").jSignature("getData",'image');
|
||||||
|
var is_empty = sign?empty_sign[1]==sign[1]:false;
|
||||||
$('#signer').toggleClass('has-error', ! signer_name);
|
$('#signer').toggleClass('has-error', ! signer_name);
|
||||||
$('#drawsign').toggleClass('panel-error', ! sign.length);
|
$('#drawsign').toggleClass('panel-danger', is_empty).toggleClass('panel-default', ! is_empty);
|
||||||
|
|
||||||
if (! signer_name)
|
if (is_empty || ! signer_name)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
openerp.jsonRpc("/quote/accept/", 'call', {
|
openerp.jsonRpc("/quote/accept/", 'call', {
|
||||||
'order_id': parseInt(order_id[1]),
|
'order_id': parseInt(order_id[1]),
|
||||||
'token': token[1],
|
'token': token,
|
||||||
'signer': signer_name,
|
'signer': signer_name,
|
||||||
'sign': sign?JSON.stringify(sign):false,
|
'sign': sign?JSON.stringify(sign[1]):false,
|
||||||
}).then(function (data) {
|
}).then(function (data) {
|
||||||
$('#modelaccept').modal('hide');
|
$('#modelaccept').modal('hide');
|
||||||
window.location.replace(url +'/quote/'+order_id[1]+'/'+token[1]+'?message=3');
|
window.location.href = '/quote/'+order_id[1]+'/'+token+'?message=3';
|
||||||
});
|
});
|
||||||
return false
|
return false
|
||||||
});
|
});
|
||||||
|
|
|
@ -259,7 +259,7 @@
|
||||||
|
|
||||||
<div class="alert alert-warning alert-dismissable" t-if="quotation.state == 'cancel'">
|
<div class="alert alert-warning alert-dismissable" t-if="quotation.state == 'cancel'">
|
||||||
<button type="button" class="close hidden-print" data-dismiss="alert" aria-hidden="true">&times;</button>
|
<button type="button" class="close hidden-print" data-dismiss="alert" aria-hidden="true">&times;</button>
|
||||||
<strong>This quotation has been canceled.</strong> Contact <span t-field="quotation.user_id"/> ( <span t-if="quotation.user_id.email"> <span class="fa fa-envelope" t-field="quotation.user_id.email" /></span> <span t-if="quotation.user_id.phone"> <span class="fa fa-phone" t-field="quotation.user_id.phone"/></span> ) in order to ask a new quote.
|
<strong>This quotation has been canceled.</strong> Contact <span t-field="quotation.user_id"/> (<span t-if="quotation.user_id.email" t-field="quotation.user_id.email"/>, <span t-if="quotation.user_id.phone" t-field="quotation.user_id.phone"/>) to ask a new quote.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal fade" id="modeldecline" role="dialog" aria-hidden="true">
|
<div class="modal fade" id="modeldecline" role="dialog" aria-hidden="true">
|
||||||
|
|
Loading…
Reference in New Issue