pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[imp] improved dc check

Browse Source 
bzr revid: rlo@openerp.com-20120329100427-r5pk59e5dnne99ou
This commit is contained in:
Roberto López López (OpenERP)
2012-03-29 12:04:27 +02:00
parent 6178afe4be
commit c67aea4ed7
1 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/pos.js
+33 -24
View File
@@ -1260,6 +1260,38 @@ openerp.point_of_sale = function(db) {
return _ref = p.pos_categ_id[0], _.indexOf(c.subtree, _ref) >= 0;
});
(this.shop.get('products')).reset(products);
var checkEan = function(code) {
// EAN control digit calculation
var st1 = code.slice();
var st2 = st1.slice(0,st1.length-1).reverse();
// some EAN13 barcodes have a length of 12, as they start by 0
while (st2.length < 12) {
st2.push(0);
}
console.log('code: '+code.join(','));
console.log('st1: '+st1.join(','));
console.log('st2: '+st2.join(','));
var countSt3 = 1;
var st3 = 0;
$.each(st2, function() {
if (countSt3%2 === 1) {
st3 += this;
}
countSt3 ++;
});
st3 *= 3;
var st4 = 0;
var countSt4 = 1;
$.each(st2, function() {
if (countSt4%2 === 0) {
st4 += this;
}
countSt4 ++;
});
var st5 = st3 + st4;
var cd = (10 - (st5%10)) % 10;
return code[code.length-1] === cd;
}
var self = this;
// bind barcode reader event
var codeNumbers = [];
@@ -1281,30 +1313,7 @@ openerp.point_of_sale = function(db) {
// a barcode reader
var barcode = codeNumbers.join('');
var selectedOrder = self.shop.get('selectedOrder');
// EAN digit control calculation
var st1 = codeNumbers;
var st2 = st1.slice(0,12).reverse();
var countSt3 = 1;
var st3 = 0;
$.each(st2, function() {
if (countSt3%2 === 1) {
st3 += this;
}
countSt3 ++;
});
st3 *= 3;
var st4 = 0;
var countSt4 = 1;
$.each(st2, function() {
if (countSt4%2 === 0) {
st4 += this;
}
countSt4 ++;
});
var st5 = st3 + st4;
var dc = (10 - (st5%10)) % 10;
// End of EAN digit control calculation
if (Number(barcode.charAt(12)) !== dc) {
if (!checkEan(codeNumbers)) {
// barcode read error, raise warning
$(QWeb.render('pos-scan-warning')).dialog({
resizable: false,