diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml +++ b/src-db/database/sourcedata/AD_MESSAGE.xml @@ -324,6 +324,18 @@ + + + + + + + + + + + + diff --git a/src/org/openbravo/retail/giftcards/CheckDuplicityOfID.java b/src/org/openbravo/retail/giftcards/CheckDuplicityOfID.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/retail/giftcards/CheckDuplicityOfID.java @@ -0,0 +1,74 @@ +/* + ************************************************************************************ + * Copyright (C) 2014 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +package org.openbravo.retail.giftcards; + +import java.util.ArrayList; + +import javax.servlet.ServletException; + +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; +import org.hibernate.criterion.Restrictions; +import org.openbravo.base.exception.OBException; +import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBCriteria; +import org.openbravo.dal.service.OBDal; +import org.openbravo.retail.giftcards.org.openbravo.retail.giftcards.GiftCardInst; +import org.openbravo.retail.posterminal.JSONProcessSimple; + +public class CheckDuplicityOfID extends JSONProcessSimple { + @Override + public JSONObject exec(JSONObject jsonData) throws JSONException, ServletException { + String strGCId; + JSONArray gcids = null; + OBContext.setAdminMode(true); + JSONObject result = new JSONObject(); + int status = 0; + ArrayList objIds = new ArrayList(); + OBContext.setAdminMode(); + try { + strGCId = jsonData.getString("gcid"); + if ("null".equals(strGCId)) { + gcids = jsonData.getJSONArray("gcids"); + } + OBCriteria obc = OBDal.getInstance().createCriteria(GiftCardInst.class); + if (!"null".equals(strGCId)) { + obc.add(Restrictions.eq(GiftCardInst.PROPERTY_SEARCHKEY, strGCId)); + } else { + for (int i = 0; i < gcids.length(); i++) { + objIds.add(gcids.getJSONObject(i).getString("gcid")); + } + obc.add(Restrictions.in(GiftCardInst.PROPERTY_SEARCHKEY, objIds)); + } + + obc.setMaxResults(1); + if (obc.uniqueResult() == null) { + result.put("used", false); + } else { + GiftCardInst gcins = (GiftCardInst) obc.uniqueResult(); + result.put("used", true); + result.put("id", gcins.getSearchKey()); + result.put("cancellation", true); + } + + } catch (Exception e) { + throw new OBException(); + } finally { + OBContext.restorePreviousMode(); + } + + JSONObject finalResult = new JSONObject(); + finalResult.put("data", result); + finalResult.put("status", status); + return finalResult; + } + +} \ No newline at end of file diff --git a/src/org/openbravo/retail/giftcards/GCNVComponentProvider.java b/src/org/openbravo/retail/giftcards/GCNVComponentProvider.java --- a/src/org/openbravo/retail/giftcards/GCNVComponentProvider.java +++ b/src/org/openbravo/retail/giftcards/GCNVComponentProvider.java @@ -63,6 +63,7 @@ grhelper.add("components/GiftCardMessage.js"); grhelper.add("components/GiftCardSearchDialog.js"); grhelper.add("components/GiftCardMenu.js"); + grhelper.add("preaddpaymenthook.js"); return grhelper.getGlobalResources(); } diff --git a/web/org.openbravo.retail.giftcards/js/components/lineproperties.js b/web/org.openbravo.retail.giftcards/js/components/lineproperties.js --- a/web/org.openbravo.retail.giftcards/js/components/lineproperties.js +++ b/web/org.openbravo.retail.giftcards/js/components/lineproperties.js @@ -1,13 +1,13 @@ /* ************************************************************************************ - * Copyright (C) 2012 Openbravo S.L.U. + * Copyright (C) 2012-2014 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. ************************************************************************************ */ -/*global enyo, Backbone, $ */ +/*global enyo, Backbone, $, _ */ (function () { @@ -33,23 +33,12 @@ modelProperty: 'giftcardid', i18nLabel: 'GCNV_LblGiftCardID', applyValue: function (orderline) { - - if (this.getValue()) { - this.doSetLineProperty({ - line: orderline, - property: this.modelProperty, - value: this.getValue() - }); - return true; - } else { - this.propertiesDialog.owner.doShowPopup({ - popup: 'GCNV_UI_Message', - args: { - message: OB.I18N.getLabel('GCNV_LblGiftCardInvalid') - } - }); - return false; - } + this.doSetLineProperty({ + line: orderline, + property: this.modelProperty, + value: this.getValue() + }); + return true; }, showProperty: function (orderline, callback) { // Show the property only for giftcards... @@ -98,4 +87,40 @@ }); } + + var origTap = OB.UI.ReceiptPropertiesDialogApply.prototype.tap; + OB.UI.ReceiptPropertiesDialogApply.prototype.tap = _.wrap(OB.UI.ReceiptPropertiesDialogApply.prototype.tap, function (wrapped) { + + var tap = _.bind(origTap, this), + serverCallCheckDuplicity = new OB.DS.Process('org.openbravo.retail.giftcards.CheckDuplicityOfID'), + giftid = this.owner.owner.propertycomponents.giftcardid; + if (giftid.getValue()) { + return serverCallCheckDuplicity.exec({ + gcid: giftid.getValue() + }, function (data) { + if (data && !data.exception) { + if (data.used) { // if gc ID is in used by another gc + giftid.propertiesDialog.owner.doShowPopup({ + popup: 'GCNV_UI_Message', + args: { + message: OB.I18N.getLabel('GCNV_DuplicatedID') + } + }); + return false; + } else { + tap(); + } + } + }); + } else { + giftid.propertiesDialog.owner.doShowPopup({ + popup: 'GCNV_UI_Message', + args: { + message: OB.I18N.getLabel('GCNV_LblGiftCardInvalid') + } + }); + return false; + } + + }); }()); \ No newline at end of file diff --git a/web/org.openbravo.retail.giftcards/js/preaddpaymenthook.js b/web/org.openbravo.retail.giftcards/js/preaddpaymenthook.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.retail.giftcards/js/preaddpaymenthook.js @@ -0,0 +1,57 @@ +/* + ************************************************************************************ + * Copyright (C) 2014 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + + +(function () { + //OB.MobileApp.model.hookManager.registerHook('OBPOS_preAddPayment', function (args, callbacks) { + OB.MobileApp.model.hookManager.registerHook('OBPOS_PreOrderSave', function (args, callbacks) { + var order = args.receipt, + i, gcids = [], + serverCallCheckDuplicity = new OB.DS.Process('org.openbravo.retail.giftcards.CheckDuplicityOfID'); + for (i = 0; i < order.get('lines').length; i++) { + if (order.get('lines').at(i).get('product').get('giftCardType')) { + if (order.get('lines').at(i).get('giftcardid') === "") { + OB.UTIL.showError(OB.I18N.getLabel('GCNV_LblGiftCardInvalid')); + gcids = []; + break; + } else { + gcids.push({ + gcid: order.get('lines').at(i).get('giftcardid') + }); + + } + } + + } +// gcids.push({ +// gcid: '1' +// }); + if (gcids.length > 0) { + serverCallCheckDuplicity.exec({ + gcid: null, + gcids: gcids + }, function (data) { + if (data && !data.exception) { + if (data.used) { // if gc ID is in used by another gc + OB.UTIL.showError(data.id + ' ' + OB.I18N.getLabel('GCNV_DuplicatedID')); + args.cancellation = true; + OB.MobileApp.model.hookManager.callbackExecutor(args, callbacks); + } else { + OB.MobileApp.model.hookManager.callbackExecutor(args, callbacks); + } + } + }); + } else { + OB.MobileApp.model.hookManager.callbackExecutor(args, callbacks); + } + return; + + }); + +}()); \ No newline at end of file