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
@@ -1909,6 +1909,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2005,6 +2017,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2761,6 +2785,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -495,6 +495,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -402,6 +402,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
@@ -7,7 +7,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
diff --git a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
--- a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
+++ b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
@@ -152,6 +152,7 @@
// Quotations
"components/modalcreateorderfromquotation",
"components/modalreactivatequotation",
+ "components/modalrejectquotation",
// Detection of change in context
"components/modalcontextchanged",
"components/modalproductcharacteristic",
diff --git a/src/org/openbravo/retail/posterminal/QuotationsReject.java b/src/org/openbravo/retail/posterminal/QuotationsReject.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/retail/posterminal/QuotationsReject.java
@@ -0,0 +1,49 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2015 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.posterminal;
+
+import javax.servlet.ServletException;
+
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.common.order.Order;
+import org.openbravo.model.common.order.RejectReason;
+import org.openbravo.service.json.JsonConstants;
+
+public class QuotationsReject extends JSONProcessSimple {
+
+ @Override
+ public JSONObject exec(JSONObject jsonsent) throws JSONException, ServletException {
+ JSONObject result = new JSONObject();
+ OBContext.setAdminMode(true);
+ try {
+ String orderid = jsonsent.getString("orderid");
+ String rejectReasonId = jsonsent.getString("rejectReasonId");
+ Order order = OBDal.getInstance().get(Order.class, orderid);
+ RejectReason reason = OBDal.getInstance().get(RejectReason.class, rejectReasonId);
+ if (order != null && reason != null) {
+ order.setDocumentStatus("CJ");
+ order.setRejectReason(reason);
+ OBDal.getInstance().save(order);
+ }
+ JSONArray respArray = new JSONArray();
+ respArray.put(order);
+ result.put(JsonConstants.RESPONSE_DATA, respArray);
+ result.put(JsonConstants.RESPONSE_STATUS, JsonConstants.RPCREQUEST_STATUS_SUCCESS);
+ } finally {
+ OBContext.restorePreviousMode();
+ }
+ return result;
+ }
+
+}
diff --git a/src/org/openbravo/retail/posterminal/term/RejectReason.java b/src/org/openbravo/retail/posterminal/term/RejectReason.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/retail/posterminal/term/RejectReason.java
@@ -0,0 +1,35 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2015 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.posterminal.term;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.retail.posterminal.ProcessHQLQuery;
+
+public class RejectReason extends ProcessHQLQuery {
+
+ @Override
+ protected boolean isAdminMode() {
+ return true;
+ }
+
+ @Override
+ protected List getQuery(JSONObject jsonsent) throws JSONException {
+ return Arrays
+ .asList(new String[] { "from RejectReason where active = 'Y' and $readableSimpleCriteria and $activeCriteria order by name" });
+ }
+
+ @Override
+ protected boolean bypassPreferenceCheck() {
+ return true;
+ }
+}
diff --git a/web/org.openbravo.retail.posterminal/js/components/menu.js b/web/org.openbravo.retail.posterminal/js/components/menu.js
--- a/web/org.openbravo.retail.posterminal/js/components/menu.js
+++ b/web/org.openbravo.retail.posterminal/js/components/menu.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2012 Openbravo S.L.U.
+ * Copyright (C) 2012-2015 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.
@@ -627,6 +627,53 @@
});
enyo.kind({
+ name: 'OB.UI.MenuRejectQuotation',
+ kind: 'OB.UI.MenuAction',
+ permission: 'OBPOS_quotation.rejections',
+ events: {
+ onShowRejectQuotation: ''
+ },
+ i18nLabel: 'OBPOS_RejectQuotation',
+ tap: function () {
+ if (this.disabled) {
+ return true;
+ }
+ this.inherited(arguments); // Manual dropdown menu closure
+ if (OB.MobileApp.model.hasPermission(this.permission, true)) {
+ this.doShowRejectQuotation();
+ }
+ },
+ updateVisibility: function (model) {
+ if (OB.MobileApp.model.hasPermission(this.permission, true) && model.get('isQuotation') && model.get('hasbeenpaid') === 'Y') {
+ this.show();
+ } else {
+ this.hide();
+ }
+ },
+ init: function (model) {
+ var receipt = model.get('order'),
+ me = this;
+ me.hide();
+
+ model.get('leftColumnViewManager').on('order', function () {
+ this.updateVisibility(receipt);
+ this.adjustVisibilityBasedOnPermissions();
+ }, this);
+
+ model.get('leftColumnViewManager').on('multiorder', function () {
+ me.hide();
+ }, this);
+
+ receipt.on('change:isQuotation', function (model) {
+ this.updateVisibility(model);
+ }, this);
+ receipt.on('change:hasbeenpaid', function (model) {
+ this.updateVisibility(model);
+ }, this);
+ }
+});
+
+enyo.kind({
name: 'OB.UI.MenuPaidReceipts',
kind: 'OB.UI.MenuAction',
permission: 'OBPOS_retail.paidReceipts',
diff --git a/web/org.openbravo.retail.posterminal/js/components/modalrejectquotation.js b/web/org.openbravo.retail.posterminal/js/components/modalrejectquotation.js
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.retail.posterminal/js/components/modalrejectquotation.js
@@ -0,0 +1,97 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2015 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 B, Backbone, $, _, enyo */
+
+enyo.kind({
+ kind: 'OB.UI.ModalDialogButton',
+ name: 'OB.OBPOSPointOfSale.UI.Modals.btnModalRejectQuotationCancel',
+ i18nContent: 'OBMOBC_LblCancel',
+ tap: function () {
+ this.doHideThisPopup();
+ }
+});
+enyo.kind({
+ kind: 'OB.UI.ModalDialogButton',
+ name: 'OB.OBPOSPointOfSale.UI.Modals.btnModalRejectQuotationAccept',
+ i18nContent: 'OBMOBC_LblOk',
+ events: {
+ onRejectQuotationDone: ''
+ },
+ tap: function () {
+ this.doRejectQuotationDone();
+ this.doHideThisPopup();
+ }
+});
+enyo.kind({
+ kind: 'OB.UI.List',
+ name: 'OB.UI.ModalRejectQuotationRejectReason',
+ classes: 'combo',
+ style: 'width: 80%',
+ renderLine: enyo.kind({
+ kind: 'enyo.Option',
+ initComponents: function () {
+ this.inherited(arguments);
+ this.setValue(this.model.get('id'));
+ this.setContent(this.model.get('_identifier'));
+ }
+ }),
+ renderEmpty: 'enyo.Control',
+ initComponents: function () {
+ this.setCollection(new Backbone.Collection());
+ }
+});
+
+
+enyo.kind({
+ kind: 'OB.UI.ModalAction',
+ name: 'OB.UI.ModalRejectQuotation',
+ myId: 'modalRejectQuotation',
+ bodyContent: {
+ components: [{
+ name: 'labelRejectReason',
+ style: 'text-align: right; padding-right:10px; width: 40%; height: 40px; float: left;'
+ }, {
+ style: 'width: 50%; float: left;',
+ kind: 'OB.UI.ModalRejectQuotationRejectReason',
+ name: 'rejectReason'
+ }]
+ },
+ i18nHeader: 'OBPOS_RejectQuotation',
+ bodyButtons: {
+ components: [{
+ kind: 'OB.OBPOSPointOfSale.UI.Modals.btnModalRejectQuotationAccept'
+ }, {
+ kind: 'OB.OBPOSPointOfSale.UI.Modals.btnModalRejectQuotationCancel'
+ }]
+ },
+ events: {
+ onRejectQuotation: ''
+ },
+ handlers: {
+ onRejectQuotationDone: 'doRejectQuotationDone'
+ },
+ doRejectQuotationDone: function () {
+ this.doRejectQuotation({
+ rejectReason: this.$.bodyContent.$.rejectReason.getValue()
+ });
+ },
+ initComponents: function () {
+ this.inherited(arguments);
+ this.$.bodyContent.$.labelRejectReason.setContent(OB.I18N.getLabel('OBPOS_lblRejectReason'));
+ var rejectReasonCollection = [];
+ _.each(OB.MobileApp.model.get('rejectReasons'), function (reason) {
+ rejectReasonCollection.push(new Backbone.Model({
+ id: reason.id,
+ _identifier: reason._identifier
+ }));
+ });
+ this.$.bodyContent.$.rejectReason.getCollection().reset(rejectReasonCollection);
+ }
+});
\ No newline at end of file
diff --git a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js
@@ -335,6 +335,22 @@
}
});
+ this.addPropertiesLoader({
+ properties: ['rejectReasons'],
+ loadFunction: function (terminalModel) {
+ OB.info('[terminal] Loading... ' + this.properties);
+ var me = this;
+ new OB.DS.Request('org.openbravo.retail.posterminal.term.RejectReason').exec(null, function (data) {
+ if (data && data.exception) {
+ terminalModel.set(me.properties[0], []);
+ } else {
+ terminalModel.set(me.properties[0], data);
+ }
+ terminalModel.propertiesReady(me.properties);
+ });
+ }
+ });
+
this.get('dataSyncModels').push({
name: 'Customer',
model: OB.Model.ChangedBusinessPartners,
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
@@ -1606,11 +1606,24 @@
this.set('id', null);
this.save();
},
-
- rejectQuotation: function () {
- OB.UTIL.showWarning('reject!!');
+ rejectQuotation: function (rejectReasonId, scope, callback) {
+ var process = new OB.DS.Process('org.openbravo.retail.posterminal.QuotationsReject');
+ OB.UTIL.showLoading(true);
+ process.exec({
+ orderid: this.get('id'),
+ rejectReasonId: rejectReasonId
+ }, function (data) {
+ OB.UTIL.showLoading(false);
+ if (!data || data.exception) {
+ OB.UTIL.showError(OB.I18N.getLabel('OBPOS_ErrRejectQuotation'));
+ } else {
+ OB.UTIL.showSuccess(OB.I18N.getLabel('OBPOS_SuccessRejectQuotation'));
+ }
+ if (callback) {
+ callback.call(scope, data !== null);
+ }
+ });
},
-
resetOrderInvoice: function () {
if (OB.MobileApp.model.hasPermission('OBPOS_receipt.invoice')) {
this.set('generateInvoice', false);
@@ -2090,8 +2103,6 @@
silent: true
});
},
-
-
// for each line, decrease the qtyOffer of promotions and remove the lines with qty 0
removeQtyOffer: function () {
var linesPending = new Backbone.Collection();
@@ -2169,7 +2180,6 @@
return false;
}
},
-
// if there is a promtion of type "applyNext" that it has been applied previously in the line, then It is replaced
// by the first promotion applied. Ex:
// Ex: prod1 - qty 5 - disc3x2 & discPriceAdj -> priceAdj is applied first to 5 units
@@ -2224,7 +2234,6 @@
desc += ']';
return desc;
}
-
});
var OrderList = Backbone.Collection.extend({
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
@@ -26,6 +26,7 @@
onShowCreateOrderPopup: 'showCreateOrderPopup',
onReactivateQuotation: 'reactivateQuotation',
onShowReactivateQuotation: 'showReactivateQuotation',
+ onShowRejectQuotation: 'showRejectQuotation',
onRejectQuotation: 'rejectQuotation',
onQuotations: 'quotations',
onShowDivText: 'showDivText',
@@ -141,6 +142,9 @@
kind: 'OB.UI.ModalReactivateQuotation',
name: 'modalReactivateQuotation'
}, {
+ kind: 'OB.UI.ModalRejectQuotation',
+ name: 'modalRejectQuotation'
+ }, {
kind: 'OB.UI.ModalReceiptPropertiesImpl',
name: 'receiptPropertiesDialog'
}, {
@@ -198,9 +202,9 @@
kind: 'OB.OBPOSPointOfSale.UI.Modals.ModalPaymentsSelect',
name: 'modalPaymentsSelect'
}, {
- kind: 'OB.UI.ModalModulesInDev',
- name: 'modalModulesInDev'
- }]
+ kind: 'OB.UI.ModalModulesInDev',
+ name: 'modalModulesInDev'
+ }]
}, {
name: 'mainSubWindow',
isMainSubWindow: true,
@@ -512,14 +516,23 @@
});
},
+ showRejectQuotation: function () {
+ this.doShowPopup({
+ popup: 'modalRejectQuotation'
+ });
+ },
+
reactivateQuotation: function () {
this.model.get('order').reactivateQuotation();
this.model.get('orderList').saveCurrent();
return true;
},
- rejectQuotation: function () {
- this.model.get('order').rejectQuotation();
- this.model.get('orderList').saveCurrent();
+ rejectQuotation: function (inSender, inEvent) {
+ this.model.get('order').rejectQuotation(inEvent.rejectReason, this, function (success) {
+ if (success) {
+ this.deleteCurrentOrder(inSender, inEvent);
+ }
+ });
return true;
},
showDivText: function (inSender, inEvent) {
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-left.js
@@ -450,6 +450,10 @@
});
this.menuEntries.push({
+ kind: 'OB.UI.MenuRejectQuotation'
+ });
+
+ this.menuEntries.push({
kind: 'OB.UI.MenuCreateOrderFromQuotation'
});