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

[FIX] point_of_sale: crash when adding product. Also draft of new categories system

Browse Source 
bzr revid: fva@openerp.com-20120529133141-wz1op0ep6a1l18e0
This commit is contained in:
Frédéric van der Essen
2012-05-29 15:31:41 +02:00
parent bd78e2ce68
commit df65b651e5
3 changed files with 167 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/pos_models.js
+134 -7
View File
@@ -64,9 +64,17 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
this.build_tree = _.bind(this.build_tree, this); // ???
this.session = session;
this.categories = {};
this.root_category = null;
this.barcode_reader = new module.BarcodeReader({'pos': this}); // used to read barcodes
this.proxy = new module.ProxyDevice(); // used to communicate to the hardware devices via a local proxy
// pos settings
this.use_scale = false;
this.use_proxy_printer = false;
this.use_virtual_keyboard = false;
this.use_websql = false;
this.use_barcode_scanner = false;
// default attributes values. If null, it will be loaded below.
this.set({
'nbr_pending_operations': 0,
@@ -125,7 +133,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
}
});
var tax_def = fetch('account.tax', ['amount','price_include','type'])
.then(function(result){
self.set({'taxes': result});
@@ -156,6 +163,12 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
[['id','=', pos_session.config_id[0]]]
).then(function(result){
self.set({'pos_config': result[0]});
this.use_scale = result[0].iface_electronic_scale || false;
this.use_proxy_printer = result[0].iface_print_via_proxy || false;
this.use_virtual_keyboard = result[0].iface_vkeyboard || false;
this.use_websql = result[0].iface_websql || false;
this.use_barcode_scanner = result[0].iface_barscan || false;
this.use_selfcheckout = result[0].iface_self_checkout || false;
});
var bank_def = fetch(
@@ -165,7 +178,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
).then(function(result){
self.set({'bank_statements':result});
});
var journal_def = fetch(
'account.journal',
@@ -201,6 +213,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
$.when(cat_def, prod_def, session_def, tax_def, prod_process_def, this.get_app_data(), this.flush())
.then(function(){
self.build_tree();
self.build_categories();
self.set({'cashRegisters' : new module.CashRegisterCollection(self.get('bank_statements'))});
console.log('cashRegisters:',self.get('cashRegisters'));
self.ready.resolve();
@@ -322,12 +335,126 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
});
});
},
/*
build_category_tree : function() {
build_categories : function(){
var categories = this.get('categories');
for(var i = 0; i <
}*/
// I guess this builds a tree of categories ? TODO ask Niv for more info.
var products = this.get('product_list');
//append the content of array2 into array1
function append(array1, array2){
for(var i = 0, len = array2.length; i < len; i++){
array1.push(array2[i]);
}
}
function appendSet(set1, set2){
for(key in set2){
set1[key] = set2[key];
}
}
var categories_by_id = {};
for(var i = 0; i < categories.length; i++){
categories_by_id[categories[i].id] = categories[i];
}
var root_category = {
name : 'Root',
id : 0,
parent : null,
childrens : [],
};
// add parent and childrens field to categories, find root_categories
for(var i = 0; i < categories.length; i++){
var cat = categories[i];
cat.parent = categories_by_id[cat.parent_id[0]];
if(!cat.parent){
root_category.childrens.push(cat);
cat.parent = root_category;
}
cat.childrens = [];
for(var j = 0; j < cat.child_id.length; j++){
cat.childrens.push(categories_by_id[ cat.child_id[j] ]);
}
}
categories.push(root_category);
// set some default fields for next steps
for(var i = 0; i < categories.length; i++){
var cat = categories[i];
cat.product_list = []; //list of all products in the category
cat.product_set = {}; // [product.id] === true if product is in category
cat.weightable_product_list = [];
cat.weightable_product_set = {};
cat.regular_product_list = []; //not weightable
cat.regular_product_set = {};
cat.progeny = [];
}
this.root_category = root_category;
console.log('categories:',categories);
//we add the products to the categories.
for(var i = 0, len = products.length; i < len; i++){
var product = products[i];
var cat = categories_by_id[product.pos_categ_id[0]];
if(cat){
cat.product_list.push(product);
cat.product_set[product.id] = true;
if(product.weightable){
cat.weightable_product_list.push(product);
cat.weightable_product_set[product.id] = true;
}else{
cat.regular_product_list.push(product);
cat.regular_product_set[product.id] = true;
}
}
}
// add ancestor field to categories, contains the list of parents of parents, from root to parent
function make_ancestors(cat, ancestors){
cat.ancestors = ancestors.slice(0);
ancestors.push(cat);
for(var i = 0; i < cat.childrens.length; i++){
make_ancestors(cat.childrens[i], ancestors.slice(0));
}
}
// add progeny field to categories, contains all subcategories of a category
function make_progeny(cat){
for(var i = 0; i < cat.childrens.length; i++){
make_progeny(cat.childrens[i]);
cat.progeny.push(cat.childrens[i]);
append(cat.progeny,cat.childrens[i].progeny);
}
}
//add the products of the subcategories to the parent categories
function make_products(cat){
for(var i = 0; i < cat.childrens.length; i++){
make_products(cat.childrens[i]);
append(cat.product_list, cat.childrens[i].product_list);
append(cat.weightable_product_list, cat.childrens[i].weightable_product_list);
append(cat.regular_product_list, cat.childrens[i].regular_product_list);
appendSet(cat.product_set, cat.childrens[i].product_set);
appendSet(cat.weightable_product_set, cat.childrens[i].weightable_product_set);
appendSet(cat.regular_product_set, cat.childrens[i].regular_product_set);
}
}
make_ancestors(root_category,[]);
make_progeny(root_category);
make_products(root_category);
},
build_tree: function() {
var c, id, _i, _len, _ref, _ref2;
_ref = this.get('categories');
addons/point_of_sale/static/src/js/pos_screens.js
+1 -3
View File
@@ -306,9 +306,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
});
this.product_categories_widget.replace($('.placeholder-ProductCategoriesWidget'));
this.product_list_widget = new module.ProductListWidget(null,{
pos:this.pos,
pos_widget:this.pos_widget,
this.product_list_widget = new module.ProductListWidget(this,{
only_weightable: true,
weight: this.pos.proxy.weighting_read_kg(),
});
addons/point_of_sale/static/src/js/pos_widgets.js
+32 -4
View File
@@ -487,12 +487,40 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
on_change_category: function(id) {},
});
/*
module.ProductCategoriesWidget2 = module.PosBaseWidget.extend({
template: 'ProductCategoriesWidget',
init: function(parent, options){
this._super(parent,options);
this.onlyWeightable = false;
this.current_category = this.pos.;
this.child_categories = [];
this.breadcrumb = [];
},
set_category : function(category){
this.current_category = category;
var child_list = [];
if(!category){
this.pos.root_categories;
this.breadcrumb = [];
}else{
this.categories = category.childrens
this.breadcrumb
}
renderElement: function(){
var self = this;
this.$element.empty();
},
});
*/
module.ProductListWidget = module.ScreenWidget.extend({
template:'ProductListWidget',
init: function(parent, options) {
this._super(parent);
this._super(parent,options);
console.log('ProductListWidget:',this);
this.model = options.model;
this.pos = options.pos;
this.pos.get('products').bind('reset', this.renderElement, this);
this.product_list = [];
this.weight = options.weight;
@@ -520,7 +548,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
return !self.only_weightable || (product.get('pos_category') && product.get('pos_category').to_weight);
})
.map(function(product) {
var product = new module.ProductWidget(this, {
var product = new module.ProductWidget(self, {
model: product,
weight: self.weight,
})
@@ -906,7 +934,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
},
default_client_screen: 'welcome',
default_cashier_screen: 'products',
default_mode: this.pos.get('pos_config').iface_self_checkout ? 'client' : 'cashier',
default_mode: this.pos.use_selfcheckout ? 'client' : 'cashier',
});
window.screen_selector = this.screen_selector; //DEBUG