0027190: Add custom filters to Product Search - Openbravo Issue Tracking System

diff --git a/web/org.openbravo.retail.posterminal/js/components/order.js b/web/org.openbravo.retail.posterminal/js/components/order.js --- a/web/org.openbravo.retail.posterminal/js/components/order.js +++ b/web/org.openbravo.retail.posterminal/js/components/order.js @@ -66,7 +66,7 @@ handlers: { onCheckBoxBehaviorForTicketLine: 'checkBoxForTicketLines' }, - style: 'position: relative; padding: 10px;', + style: 'position: relative; padding: 10px; height: 35px', components: [{ name: 'lblTotal', style: 'float: left; width: 40%;' @@ -81,6 +81,11 @@ }], renderTotal: function (newTotal) { this.$.totalgross.setContent(OB.I18N.formatCurrency(newTotal)); + OB.MobileApp.model.hookManager.executeHooks('OBPOS_UpdateTotalReceiptLine', { + totalline: this + }, function (args) { + //All should be done in module side + }); }, renderQty: function (newQty) { this.$.totalqty.setContent(newQty); @@ -99,6 +104,11 @@ initComponents: function () { this.inherited(arguments); this.$.lblTotal.setContent(OB.I18N.getLabel('OBPOS_LblTotal')); + OB.MobileApp.model.hookManager.executeHooks('OBPOS_RenderTotalReceiptLine', { + totalline: this + }, function (args) { + //All should be done in module side + }); } }); diff --git a/web/org.openbravo.retail.posterminal/js/components/renderproduct.js b/web/org.openbravo.retail.posterminal/js/components/renderproduct.js --- a/web/org.openbravo.retail.posterminal/js/components/renderproduct.js +++ b/web/org.openbravo.retail.posterminal/js/components/renderproduct.js @@ -7,7 +7,7 @@ ************************************************************************************ */ -/*global enyo */ +/*global enyo, _ */ enyo.kind({ name: 'OB.UI.RenderProduct', @@ -34,6 +34,10 @@ name: 'identifier' }, { style: 'color: #888888', + name: 'filterAttr', + allowHtml: true + }, { + style: 'color: #888888', name: 'bottonLine' }] }, { @@ -47,7 +51,19 @@ }], initComponents: function () { this.inherited(arguments); + // Build filter info from filter attributes + var filterTxt = '', + filterAttr = this.model.get("filterAttr"); + if (filterAttr && _.isArray(filterAttr) && filterAttr.length > 0) { + filterAttr.forEach(function (attr) { + if (filterTxt !== '') { + filterTxt = filterTxt + attr.separator; + } + filterTxt = filterTxt + attr.value; + }); + } this.$.identifier.setContent(this.setIdentifierContent()); + this.$.filterAttr.setContent(filterTxt); if (this.model.get('showchdesc')) { this.$.bottonLine.setContent(this.model.get('characteristicDescription')); } diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js --- a/web/org.openbravo.retail.posterminal/js/model/order.js +++ b/web/org.openbravo.retail.posterminal/js/model/order.js @@ -817,6 +817,11 @@ } if (args.line) { args.receipt.addUnit(args.line, args.qty); + if (!_.isUndefined(args.attrs)) { + _.each(_.keys(args.attrs), function (key) { + args.line.set(key, attrs[key]); + }); + } args.line.trigger('selected', args.line); } else { args.receipt.createLine(args.p, args.qty, args.options, args.attrs); @@ -1144,6 +1149,7 @@ } } var newline = new OrderLine({ + id: OB.Dal.get_uuid(), product: p, uOM: p.get('uOM'), qty: OB.DEC.number(units), diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js --- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js @@ -70,6 +70,7 @@ onRightToolDisabled: 'rightToolbarDisabled', onSelectCharacteristicValue: 'selectCharacteristicValue', onSelectBrand: 'selectBrand', + onSelectFilter: 'selectFilter', onShowLeftHeader: 'doShowLeftHeader', onWarehouseSelected: 'warehouseSelected', onClearUserInput: 'clearUserInput' @@ -182,6 +183,9 @@ }, { kind: 'OB.UI.ModalProductBrand', name: "modalproductbrand" + }, { + kind: 'OB.UI.ModalSearchFilterBuilder', + name: 'modalsearchfilterbuilder' }] }, { name: 'mainSubWindow', @@ -822,6 +826,9 @@ value: inEvent }); }, + selectFilter: function (inSender, inEvent) { + this.waterfall('onCustomFilterUpdate', inEvent); + }, warehouseSelected: function (inSender, inEvent) { this.waterfall('onModifyWarehouse', inEvent); }, diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js --- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js @@ -311,6 +311,7 @@ tap: function () { OB.MobileApp.view.scanningFocus(false); if (this.disabled === false) { + OB.UI.SearchProductCharacteristic.prototype.filtersCustomClear(); this.doTabChange({ tabPanel: this.tabPanel, keyboard: false,

Issue History
Date Modified	Username	Field	Change
2014-07-25 09:29	ebecerra	New Issue
2014-07-25 09:29	ebecerra	Assigned To	=> marvintm
2014-07-25 09:29	ebecerra	OBNetwork customer	=> No
2014-07-25 09:29	ebecerra	Triggers an Emergency Pack	=> No
2014-09-03 11:32	rafademiguel	File Added: issue_27190_org.openbravo.retail.posterminal.diff
2014-09-03 11:47	rafademiguel	File Added: issue_27190_org.openbravo.mobile.core.diff
2014-09-03 11:47	rafademiguel	File Added: iconAdd.png
2014-09-05 08:19	eintelau	Issue Monitored: eintelau
2014-11-17 11:34	jpcalvente	Issue Monitored: jpcalvente
2014-11-27 11:24	hgbot	Checkin
2014-11-27 11:24	hgbot	Note Added: 0072058
2014-11-27 11:24	hgbot	Status	new => resolved
2014-11-27 11:24	hgbot	Resolution	open => fixed
2014-11-27 11:24	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.mobile.core/rev/18dc6a1611cc8af2a59d2e2bc96d30d42edf65ca [^]
2014-11-28 14:04	marvintm	Review Assigned To	=> marvintm
2014-11-28 14:04	marvintm	Status	resolved => closed
2014-11-28 14:04	marvintm	Fixed in Version	=> RR15Q1
2014-12-01 16:01	shuehner	Assigned To	marvintm => rafademiguel
2014-12-01 17:33	rafademiguel	Assigned To	rafademiguel => ebecerra
2014-12-01 17:33	rafademiguel	Status	closed => new
2014-12-01 17:33	rafademiguel	Resolution	fixed => open
2014-12-01 17:33	rafademiguel	Fixed in Version	RR15Q1 =>
2014-12-01 17:33	rafademiguel	Status	new => scheduled
2014-12-01 17:33	rafademiguel	fix_in_branch	=> pi
2014-12-01 17:33	rafademiguel	Status	scheduled => resolved
2014-12-01 17:33	rafademiguel	Resolution	open => fixed
2014-12-01 17:33	rafademiguel	Status	resolved => closed
2015-01-28 12:54	hgbot	Checkin
2015-01-28 12:54	hgbot	Note Added: 0073855
2015-03-04 10:11	rafademiguel	Note Added: 0075141

Notes
(0072058) hgbot (developer) 2014-11-27 11:24	Repository: erp/pmods/org.openbravo.mobile.core Changeset: 18dc6a1611cc8af2a59d2e2bc96d30d42edf65ca Author: Rafa de Miguel <rafael.demiguel <at> openbravo.com> Date: Thu Nov 27 11:23:53 2014 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.mobile.core/rev/18dc6a1611cc8af2a59d2e2bc96d30d42edf65ca [^] Fixed issue 27190: Add custom filters to Product Search --- M src-db/database/sourcedata/AD_MESSAGE.xml M src/org/openbravo/mobile/core/MobileCoreComponentProvider.java M web/org.openbravo.mobile.core/assets/css/ob-standard.css M web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js A web/org.openbravo.mobile.core/assets/img/iconAdd.png A web/org.openbravo.mobile.core/source/retail/component/ob-retail-filterbuilder.js ---

(0073855) hgbot (developer) 2015-01-28 12:54	Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: 73f0f5706dd377bf358a481be5602ff13e6b8815 Author: Aaron Calero <aaron.calero <at> openbravo.com> Date: Wed Jan 28 12:51:46 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/73f0f5706dd377bf358a481be5602ff13e6b8815 [^] Related to issue 27349 and issue 27190: Changed hookManager calls to prevent deprecation messages --- M web/org.openbravo.retail.posterminal/js/components/order.js ---

(0075141) rafademiguel (viewer) 2015-03-04 10:11	Changeset related to issue: https://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/d9b38ac11663 [^]

Relationships [ Relation Graph ] [ Dependency Graph ]