Attached Files | 38550.diff [^] (13,750 bytes) 2018-05-15 10:56 [Show Content] [Hide Content]diff --git a/src-db/database/model/tables/OBVER_CONFIG.xml b/src-db/database/model/tables/OBVER_CONFIG.xml
--- a/src-db/database/model/tables/OBVER_CONFIG.xml
+++ b/src-db/database/model/tables/OBVER_CONFIG.xml
@@ -73,6 +73,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="TIMEOUT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="OBVER_CONFIG_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -229,6 +229,45 @@
<!--4A53E0EF812140688E0BFF8BFBFA219A--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
<!--4A53E0EF812140688E0BFF8BFBFA219A--></AD_COLUMN>
+<!--68DE827319214D428E7D9A4224D06F75--><AD_COLUMN>
+<!--68DE827319214D428E7D9A4224D06F75--> <AD_COLUMN_ID><![CDATA[68DE827319214D428E7D9A4224D06F75]]></AD_COLUMN_ID>
+<!--68DE827319214D428E7D9A4224D06F75--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--68DE827319214D428E7D9A4224D06F75--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--68DE827319214D428E7D9A4224D06F75--> <NAME><![CDATA[Timeout]]></NAME>
+<!--68DE827319214D428E7D9A4224D06F75--> <DESCRIPTION><![CDATA[Timeout of Verystar calls]]></DESCRIPTION>
+<!--68DE827319214D428E7D9A4224D06F75--> <HELP><![CDATA[Timeout of Verystar calls]]></HELP>
+<!--68DE827319214D428E7D9A4224D06F75--> <COLUMNNAME><![CDATA[Timeout]]></COLUMNNAME>
+<!--68DE827319214D428E7D9A4224D06F75--> <AD_TABLE_ID><![CDATA[97F4A1ECBE184F41B0022ED399146CC2]]></AD_TABLE_ID>
+<!--68DE827319214D428E7D9A4224D06F75--> <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--68DE827319214D428E7D9A4224D06F75--> <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--68DE827319214D428E7D9A4224D06F75--> <SEQNO><![CDATA[190]]></SEQNO>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--68DE827319214D428E7D9A4224D06F75--> <VALUEMIN><![CDATA[0]]></VALUEMIN>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--68DE827319214D428E7D9A4224D06F75--> <AD_ELEMENT_ID><![CDATA[485EB1412596442CA25D6283DBE10D53]]></AD_ELEMENT_ID>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--68DE827319214D428E7D9A4224D06F75--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--68DE827319214D428E7D9A4224D06F75--> <AD_MODULE_ID><![CDATA[CE34F6DC1FC8476187D31B9F9200B9FF]]></AD_MODULE_ID>
+<!--68DE827319214D428E7D9A4224D06F75--> <POSITION><![CDATA[19]]></POSITION>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--68DE827319214D428E7D9A4224D06F75--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--68DE827319214D428E7D9A4224D06F75--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--68DE827319214D428E7D9A4224D06F75--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--68DE827319214D428E7D9A4224D06F75--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--68DE827319214D428E7D9A4224D06F75--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--68DE827319214D428E7D9A4224D06F75--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--68DE827319214D428E7D9A4224D06F75--></AD_COLUMN>
+
<!--740A2A102324445BB43AD46A3DB581CF--><AD_COLUMN>
<!--740A2A102324445BB43AD46A3DB581CF--> <AD_COLUMN_ID><![CDATA[740A2A102324445BB43AD46A3DB581CF]]></AD_COLUMN_ID>
<!--740A2A102324445BB43AD46A3DB581CF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -70,6 +70,20 @@
<!--4856071602CF4F0692C2728374606334--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--4856071602CF4F0692C2728374606334--></AD_ELEMENT>
+<!--485EB1412596442CA25D6283DBE10D53--><AD_ELEMENT>
+<!--485EB1412596442CA25D6283DBE10D53--> <AD_ELEMENT_ID><![CDATA[485EB1412596442CA25D6283DBE10D53]]></AD_ELEMENT_ID>
+<!--485EB1412596442CA25D6283DBE10D53--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--485EB1412596442CA25D6283DBE10D53--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--485EB1412596442CA25D6283DBE10D53--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--485EB1412596442CA25D6283DBE10D53--> <COLUMNNAME><![CDATA[Timeout]]></COLUMNNAME>
+<!--485EB1412596442CA25D6283DBE10D53--> <NAME><![CDATA[Timeout (in Seconds)]]></NAME>
+<!--485EB1412596442CA25D6283DBE10D53--> <PRINTNAME><![CDATA[Timeout (in Seconds)]]></PRINTNAME>
+<!--485EB1412596442CA25D6283DBE10D53--> <DESCRIPTION><![CDATA[Timeout of Verystar calls]]></DESCRIPTION>
+<!--485EB1412596442CA25D6283DBE10D53--> <HELP><![CDATA[Timeout of Verystar calls]]></HELP>
+<!--485EB1412596442CA25D6283DBE10D53--> <AD_MODULE_ID><![CDATA[CE34F6DC1FC8476187D31B9F9200B9FF]]></AD_MODULE_ID>
+<!--485EB1412596442CA25D6283DBE10D53--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--485EB1412596442CA25D6283DBE10D53--></AD_ELEMENT>
+
<!--6B815663713D4618A607DA56B7B59A61--><AD_ELEMENT>
<!--6B815663713D4618A607DA56B7B59A61--> <AD_ELEMENT_ID><![CDATA[6B815663713D4618A607DA56B7B59A61]]></AD_ELEMENT_ID>
<!--6B815663713D4618A607DA56B7B59A61--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -103,7 +103,7 @@
<!--54847D8144B94427BA20F68A6ED691F8--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--54847D8144B94427BA20F68A6ED691F8--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--54847D8144B94427BA20F68A6ED691F8--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--54847D8144B94427BA20F68A6ED691F8--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--54847D8144B94427BA20F68A6ED691F8--> <SEQNO><![CDATA[120]]></SEQNO>
<!--54847D8144B94427BA20F68A6ED691F8--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--54847D8144B94427BA20F68A6ED691F8--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--54847D8144B94427BA20F68A6ED691F8--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -169,6 +169,34 @@
<!--6897D58DC96F4C72B6CF8FC946B1D2BB--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--6897D58DC96F4C72B6CF8FC946B1D2BB--></AD_FIELD>
+<!--848A014FAEE44692B11C5E014E3E31E4--><AD_FIELD>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <AD_FIELD_ID><![CDATA[848A014FAEE44692B11C5E014E3E31E4]]></AD_FIELD_ID>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <NAME><![CDATA[Timeout (in Seconds)]]></NAME>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <DESCRIPTION><![CDATA[Timeout of Verystar calls]]></DESCRIPTION>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <HELP><![CDATA[Timeout of Verystar calls]]></HELP>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <AD_TAB_ID><![CDATA[3883B07C208C4E2290A7539555154A2B]]></AD_TAB_ID>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <AD_COLUMN_ID><![CDATA[68DE827319214D428E7D9A4224D06F75]]></AD_COLUMN_ID>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <SEQNO><![CDATA[110]]></SEQNO>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <AD_MODULE_ID><![CDATA[CE34F6DC1FC8476187D31B9F9200B9FF]]></AD_MODULE_ID>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--848A014FAEE44692B11C5E014E3E31E4--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--848A014FAEE44692B11C5E014E3E31E4--></AD_FIELD>
+
<!--95ED893211594C9E81820525602EDC47--><AD_FIELD>
<!--95ED893211594C9E81820525602EDC47--> <AD_FIELD_ID><![CDATA[95ED893211594C9E81820525602EDC47]]></AD_FIELD_ID>
<!--95ED893211594C9E81820525602EDC47--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.retail.verystar/js/provider/mobileProvider.js b/web/org.openbravo.retail.verystar/js/provider/mobileProvider.js
--- a/web/org.openbravo.retail.verystar/js/provider/mobileProvider.js
+++ b/web/org.openbravo.retail.verystar/js/provider/mobileProvider.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2017 Openbravo S.L.U.
+ * Copyright (C) 2017-2018 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.
@@ -108,6 +108,7 @@
criteria.out_sn = 'OB' + OB.UTIL.get_UUID().substring(0, 14);
OB.UTIL.showLoading(true);
openPopup = function () {
+ criteria.timeout = true;
me.doShowPopup({
popup: 'OBVER_UI_TimeoutPopup',
args: {
diff --git a/web/org.openbravo.retail.verystar/js/provider/refundProvider.js b/web/org.openbravo.retail.verystar/js/provider/refundProvider.js
--- a/web/org.openbravo.retail.verystar/js/provider/refundProvider.js
+++ b/web/org.openbravo.retail.verystar/js/provider/refundProvider.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2017 Openbravo S.L.U.
+ * Copyright (C) 2017-2018 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.
@@ -157,6 +157,7 @@
criteria.refund_out_sn = 'OB' + OB.UTIL.get_UUID().substring(0, 14);
OB.UTIL.showLoading(true);
openPopup = function () {
+ criteria.timeout = true;
me.doShowPopup({
popup: 'OBVER_UI_TimeoutVoidPopup',
args: {
diff --git a/web/org.openbravo.retail.verystar/js/utils/verystarUtils.js b/web/org.openbravo.retail.verystar/js/utils/verystarUtils.js
--- a/web/org.openbravo.retail.verystar/js/utils/verystarUtils.js
+++ b/web/org.openbravo.retail.verystar/js/utils/verystarUtils.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2017 Openbravo S.L.U.
+ * Copyright (C) 2017-2018 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.
@@ -10,7 +10,6 @@
/*global, OBVER, _ */
OBVER.UTIL = {
- timeout: 15000,
validateAuthCode: function (authCode) {
if (!authCode) {
OB.UTIL.showI18NError('OBVER_MissingAuthCode');
@@ -138,7 +137,11 @@
if (callbackError && callbackError instanceof Function) {
callbackError(data);
}
- };
+ },
+ timeout = OB.MobileApp.model.get('OBVER_Config').timeout;
+ if (!timeout) {
+ timeout = 15;
+ }
process.exec(criteria, function (data) {
if (!data || data.exception) {
processCallbackError(data);
@@ -149,7 +152,7 @@
}
}, function (data) {
processCallbackError(data);
- }, true, OBVER.UTIL.timeout);
+ }, true, timeout * 1000);
},
addPayment: function (payment, paymentData, criteria, data, callback) {
var provider, i;
@@ -203,6 +206,7 @@
OB.UTIL.showLoading(true);
var criteria = removedPayment.get('paymentData').criteria,
openPopup = function () {
+ criteria.timeout = true;
me.doShowPopup({
popup: 'OBVER_UI_TimeoutVoidPopup',
args: {
|