odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] point_of_sale: orderlines are correctly merged 

bzr revid: fva@openerp.com-20120523124754-lxzbqmzx2r9tn11p
This commit is contained in:
Frédéric van der Essen 2012-05-23 14:47:54 +02:00
parent c4861d05ad
commit 7bd09320ce
3 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
addons/point_of_sale/controllers.py
View File

@ -14,14 +14,12 @@ class PointOfSaleController(openerpweb.Controller):
method = 'iface_%s' % iface
return getattr(self, method)(request, **kwargs)
def iface_light(self, request, status):
return True
@openerpweb.jsonrequest
def scan_item_success(self, request):
"""
A product has been scanned with success
"""
print 'scan_item_success'
return False
@openerpweb.jsonrequest
@ -29,85 +27,74 @@ class PointOfSaleController(openerpweb.Controller):
"""
A product has been scanned without success
"""
return False
@openerpweb.jsonrequest
def do_help(self, request, status):
if status == 1:
return help_needed(request)
else:
return help_cancelled(request)
print 'scan_item_error_unrecognized'
return
@openerpweb.jsonrequest
def help_needed(self, request):
"""
The user wants an help (ex: light is on)
"""
return self.signal_help(request, status=True)
print "help_needed"
return
@openerpweb.jsonrequest
def help_cancelled(self, request):
def help_canceled(self, request):
"""
The user stops the help request
"""
return self.signal_help(request, status=False)
print "help_canceled"
return
@openerpweb.jsonrequest
def weighting_start(self, request):
print "weighting_start"
return False
@openerpweb.jsonrequest
def weighting_read_kg(self, request):
print "weighting_read_kg"
return 0.0
@openerpweb.jsonrequest
def weighting_end(self, request):
print "weighting_end"
return False
@openerpweb.jsonrequest
def payment_request(self, request, price, method, info):
"""
The PoS will activate the method payment
"""
return False
#@openerpweb.jsonrequest
#def weighting_start(self, request):
# return False
def is_payment_accepted(self, request):
return False
#@openerpweb.jsonrequest
#def weighting_read_kg(self, request):
# return 0.0
#@openerpweb.jsonrequest
#def weighting_end(self, request):
# return False
#openerpweb.jsonrequest
def do_weighting(self, request):
# Start the weighting
# Wait for 10 sec
# IDEA: Thread, Signal ?
# return a dict with the value or the error
return {'weight' : 0.5}
def do_payment(self, request, price, method, info):
#return {'status' : 'ACCEPTED', 'reason' : ''}
return {'status' : 'REFUSED', 'reason' : 'Payment blocked'}
#@openerpweb.jsonrequest
#def payment_request(self, request, price, method, info):
# """
# The PoS will activate the method payment
# """
# return False
#@openerpweb.jsonrequest
#def is_payment_accepted(self, request):
# return False
#@openerpweb.jsonrequest
#def payment_cancelled(self, request):
# return False
def payment_cancelled(self, request):
return False
@openerpweb.jsonrequest
def transaction_start(self, request):
print 'transaction_start'
return False
@openerpweb.jsonrequest
def transaction_end(self, request):
print 'transaction_end'
return False
@openerpweb.jsonrequest
def cashier_mode_activated(self, request):
print 'cashier_mode_activated'
return False
@openerpweb.jsonrequest
def cashier_mode_deactivated(self, request):
print 'cashier_mode_deactivated'
return False

27
addons/point_of_sale/static/src/js/pos_devices.js
View File

@ -16,28 +16,46 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
// methods are used both to signal an event, and to fetch information.
module.ProxyDevice = instance.web.Class.extend({
init: function(options){
options = options || {};
url = options.url || 'http://localhost:8069';
this.connection = new instance.web.JsonRPC();
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); }
this.connection.rpc('/pos/'+name, params || {}, callback || success_callback, error_callback);
},
//a product has been scanned and recognized with success
scan_item_success: function(){
this.message('scan_item_success');
console.log('PROXY: scan item success');
},
//a product has been scanned but not recognized
scan_item_error_unrecognized: function(){
this.message('scan_item_error_unrecognized');
console.log('PROXY: scan item error');
},
//the client is asking for help
help_needed: function(){
this.message('help_needed');
console.log('PROXY: help needed');
},
//the client does not need help anymore
help_canceled: function(){
this.message('help_canceled');
console.log('PROXY: help canceled');
},
//the client is starting to weight
weighting_start: function(){
this.message('weighting_start');
console.log('PROXY: weighting start');
},
@ -45,6 +63,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
// is called at regular interval (up to 10x/sec) between a weighting_start()
// and a weighting_end()
weighting_read_kg: function(){
this.message('weighting_read_kg');
console.log('PROXY: weighting read');
//return Math.random() + 0.1;
return window.debug_devices.weight;
@ -52,6 +71,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
// the client has finished weighting products
weighting_end: function(){
this.message('weighting_end');
console.log('PROXY: weighting end');
},
@ -59,6 +79,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
// method: 'mastercard' | 'cash' | ... ? TBD
// info: 'extra information to display on the payment terminal' ... ? TBD
payment_request: function(price, method, info){
this.message('payment_request',{'price':price,'method':method,'info':info});
console.log('PROXY: payment request:',price,method,info);
},
@ -66,6 +87,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
// has paid the required money
// returns 'waiting_for_payment' | 'payment_accepted' | 'payment_rejected'
is_payment_accepted: function(){
this.message('is_payment_accepted');
console.log('PROXY: is payment accepted ?');
//return 'waiting_for_payment'; // 'payment_accepted' | 'payment_rejected'
return window.debug_devices.payment_status;
@ -73,26 +95,31 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
// the client cancels his payment
payment_canceled: function(){
this.message('payment_canceled');
console.log('PROXY: payment canceled by client');
},
// called when the client logs in or starts to scan product
transaction_start: function(){
this.message('transaction_start');
console.log('PROXY: transaction start');
},
// called when the clients has finished his interaction with the machine
transaction_end: function(){
this.message('transaction_end');
console.log('PROXY: transaction end');
},
// called when the POS turns to cashier mode
cashier_mode_activated: function(){
this.message('cashier_mode_activated');
console.log('PROXY: cashier mode activated');
},
// called when the POS turns to client mode
cashier_mode_deactivated: function(){
this.message('cashier_mode_deactivated');
console.log('PROXY: client mode activated');
},
});

2
addons/point_of_sale/static/src/js/pos_models.js
View File

@ -65,7 +65,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
this.session = session;
this.categories = {};
this.barcode_reader = new module.BarcodeReader({'pos': this}); // used to read barcodes
this.proxy = new module.ProxyDevice({'pos': this}); // used to communicate to the hardware devices via a local proxy
this.proxy = new module.ProxyDevice(); // used to communicate to the hardware devices via a local proxy
// default attributes values. If null, it will be loaded below.
this.set({