From c316dad6d676e07d4e6983dfb865aaff39a9bd85 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 23 May 2012 15:00:11 +0200 Subject: [PATCH] [IMP] proxy upgraded to new JsonRPC API bzr revid: fva@openerp.com-20120523130011-mhso33xqk9aau5kc --- addons/point_of_sale/controllers.py | 25 +++++++++++---------- addons/point_of_sale/static/src/js/pos_devices.js | 4 ++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/addons/point_of_sale/controllers.py b/addons/point_of_sale/controllers.py index 8b72144..66922d8 100644 --- a/addons/point_of_sale/controllers.py +++ b/addons/point_of_sale/controllers.py @@ -20,7 +20,7 @@ class PointOfSaleController(openerpweb.Controller): A product has been scanned with success """ print 'scan_item_success' - return False + return @openerpweb.jsonrequest def scan_item_error_unrecognized(self, request): @@ -49,7 +49,7 @@ class PointOfSaleController(openerpweb.Controller): @openerpweb.jsonrequest def weighting_start(self, request): print "weighting_start" - return False + return @openerpweb.jsonrequest def weighting_read_kg(self, request): @@ -59,42 +59,43 @@ class PointOfSaleController(openerpweb.Controller): @openerpweb.jsonrequest def weighting_end(self, request): print "weighting_end" - return False - - + return @openerpweb.jsonrequest def payment_request(self, request, price, method, info): """ The PoS will activate the method payment """ - return False + print "payment_request: price:"+str(price)+" method:"+str(method)+" info:"+str(info) + return #@openerpweb.jsonrequest def is_payment_accepted(self, request): - return False + print "is_payment_accepted" + return #@openerpweb.jsonrequest def payment_cancelled(self, request): - return False + print "payment_cancelled" + return @openerpweb.jsonrequest def transaction_start(self, request): print 'transaction_start' - return False + return @openerpweb.jsonrequest def transaction_end(self, request): print 'transaction_end' - return False + return @openerpweb.jsonrequest def cashier_mode_activated(self, request): print 'cashier_mode_activated' - return False + return @openerpweb.jsonrequest def cashier_mode_deactivated(self, request): print 'cashier_mode_deactivated' - return False + return diff --git a/addons/point_of_sale/static/src/js/pos_devices.js b/addons/point_of_sale/static/src/js/pos_devices.js index 540d25d..13de46f 100644 --- a/addons/point_of_sale/static/src/js/pos_devices.js +++ b/addons/point_of_sale/static/src/js/pos_devices.js @@ -24,8 +24,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal this.connection.setup(url); }, message : function(name,params,callback){ - var success_callback = function(result){ console.log('SUCCESS:'+name+': ',result); } - var error_callback = function(result){ console.log('ERROR:'+name+': ',result); } + var success_callback = function(result){ console.log('PROXY SUCCESS:'+name+': ',result); } + var error_callback = function(result){ console.log('PROXY ERROR:'+name+': ',result); } this.connection.rpc('/pos/'+name, params || {}, callback || success_callback, error_callback); }, -- 1.7.10.4