Attached Files | image.core.diff [^] (896 bytes) 2014-10-17 11:57 [Show Content] [Hide Content]diff --git a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-product-browser.js b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-product-browser.js
--- a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-product-browser.js
+++ b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-product-browser.js
@@ -37,7 +37,7 @@
this.$.price.setContent(OB.I18N.formatCurrency(this.model.get('standardPrice')));
var image;
if (OB.MobileApp.model.get('permissions')["OBPOS_retail.productImages"]) {
- image = OB.UTIL.getImageURL(this.model.get('id'));
+ image = OB.UTIL.getImageURL(this.model);
this.$.thumbnail.setImgUrl(image);
} else {
image = this.model.get('img');
@@ -292,4 +292,4 @@
this.title.text(OB.I18N.getLabel('OBMOBC_LblNoCategory'));
}
}
-});
\ No newline at end of file
+});
image.posterminal.diff [^] (4,080 bytes) 2014-10-17 12:29 [Show Content] [Hide Content]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
@@ -54,7 +54,7 @@
this.$.price.setContent(OB.I18N.formatCurrency(this.model.get('standardPrice')));
if (OB.MobileApp.model.get('permissions')["OBPOS_retail.productImages"]) {
- this.$.icon.applyStyle('background-image', 'url(' + OB.UTIL.getImageURL(this.model.get('id')) + '), url(' + "../org.openbravo.mobile.core/assets/img/box.png" + ')');
+ this.$.icon.applyStyle('background-image', 'url(' + OB.UTIL.getImageURL(this.model) + '), url(' + "../org.openbravo.mobile.core/assets/img/box.png" + ')');
this.$.thumbnail.hide();
} else {
this.$.thumbnail.setImg(this.model.get('img'));
@@ -68,4 +68,4 @@
setIdentifierContent: function () {
return this.model.get('_identifier');
}
-});
\ No newline at end of file
+});
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
@@ -428,7 +428,7 @@
this.$.msgaction.hide();
this.$.msgedit.show();
if (OB.MobileApp.model.get('permissions')["OBPOS_retail.productImages"]) {
- this.$.icon.applyStyle('background-image', 'url(' + OB.UTIL.getImageURL(this.line.get('product').get('id')) + '), url(' + "../org.openbravo.mobile.core/assets/img/box.png" + ')');
+ this.$.icon.applyStyle('background-image', 'url(' + OB.UTIL.getImageURL(this.line.get('product')) + '), url(' + "../org.openbravo.mobile.core/assets/img/box.png" + ')');
this.$.editlineimage.hide();
} else {
this.$.editlineimage.setImg(this.line.get('product').get('img'));
@@ -520,4 +520,4 @@
this.inherited(arguments);
this.setContent(OB.I18N.getLabel('OBPOS_checkStock'));
}
-});
\ No newline at end of file
+});
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/ps-productdetailsview.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/ps-productdetailsview.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/ps-productdetailsview.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/ps-productdetailsview.js
@@ -276,7 +276,7 @@
}
this.headerComponent.$.productName.setContent(params.product.get('_identifier') + ' (' + params.product.get('uOMsymbol') + ')');
if (OB.MobileApp.model.get('permissions')["OBPOS_retail.productImages"]) {
- this.bodyComponent.$.productImage.applyStyle('background-image', 'url(' + OB.UTIL.getImageURL(params.product.get('id')) + '), url(' + "../org.openbravo.mobile.core/assets/img/box.png" + ')');
+ this.bodyComponent.$.productImage.applyStyle('background-image', 'url(' + OB.UTIL.getImageURL(params.product) + '), url(' + "../org.openbravo.mobile.core/assets/img/box.png" + ')');
} else {
this.bodyComponent.$.productImage.applyStyle('background-image', 'url(data:image/png;base64,' + params.product.get('img') + ')');
}
@@ -295,4 +295,4 @@
kind: 'OB.OBPOSPointOfSale.UI.ProductDetailsView_body',
name: 'body'
}
-});
\ No newline at end of file
+});
diff --git a/web/org.openbravo.retail.posterminal/js/utils/ob-utilitiesuipos.js b/web/org.openbravo.retail.posterminal/js/utils/ob-utilitiesuipos.js
--- a/web/org.openbravo.retail.posterminal/js/utils/ob-utilitiesuipos.js
+++ b/web/org.openbravo.retail.posterminal/js/utils/ob-utilitiesuipos.js
@@ -20,8 +20,16 @@
}
};
-OB.UTIL.getImageURL = function (id) {
+OB.UTIL.getImageURL = function (prod) {
var imageUrl = 'productImages/';
+
+ var id = '';
+ if (_.isString(prod)) {
+ id=prod;
+ } else {
+ prod.get('id');
+ }
+
var i;
for (i = 0; i < id.length; i += 3) {
if (i !== 0) {
|