0022201: Default Payment type sould be configurable

diff --git a/src-db/database/model/tables/OBPOS_TERMINALTYPE.xml b/src-db/database/model/tables/OBPOS_TERMINALTYPE.xml --- a/src-db/database/model/tables/OBPOS_TERMINALTYPE.xml +++ b/src-db/database/model/tables/OBPOS_TERMINALTYPE.xml @@ -69,9 +69,16 @@ <default><![CDATA[N]]></default> <onCreateDefault><![CDATA['N']]></onCreateDefault> </column> + <column name="OBPOS_APP_PAYMENT_TYPE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="C_DOCTYPE" name="OBPOS_DOCTYPE_QUOT_ID"> <reference local="C_DOCTYPEQUOT_ID" foreign="C_DOCTYPE_ID"/> </foreign-key> + <foreign-key foreignTable="OBPOS_APP_PAYMENT_TYPE" name="OBPOS_TERMINALTYPE_PAYTYPE"> + <reference local="OBPOS_APP_PAYMENT_TYPE_ID" foreign="OBPOS_APP_PAYMENT_TYPE_ID"/> + </foreign-key> <foreign-key foreignTable="AD_CLIENT" name="OBPOS_TERTYPE_AD_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 @@ -466,6 +466,41 @@  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[1D2A657E7EC6449592461B3AFF3E82AC]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Payment Method]]></NAME> + <DESCRIPTION><![CDATA[Payment Method]]></DESCRIPTION> + <HELP><![CDATA[Generic POS Terminal payment method which defines the generic settings for it, such as payment method (card, cash...) and cash up and cash management settings.]]></HELP> + <COLUMNNAME><![CDATA[Obpos_App_Payment_Type_ID]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[1ECA0B99F44F4FD1854B7DDA9292A75F]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> + <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[180]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[79160EA002E24CE686C91226AEF1CBAF]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <POSITION><![CDATA[18]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> + <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> + <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[1EB3DAB3554949B182943774B94E09DE]]></AD_COLUMN_ID>  <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 @@ -368,6 +368,35 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> +<AD_FIELD> + <AD_FIELD_ID><![CDATA[220C630E74C348CEB46EBC094BA4BDD5]]></AD_FIELD_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Default Payment Method]]></NAME> + <DESCRIPTION><![CDATA[Default Payment Method]]></DESCRIPTION> + <HELP><![CDATA[Generic POS Terminal payment method which defines the generic settings for it, such as payment method (card, cash...) and cash up and cash management settings.]]></HELP> + <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> + <AD_TAB_ID><![CDATA[D01039797B054BE69CA5770B8CFB933C]]></AD_TAB_ID> + <AD_COLUMN_ID><![CDATA[1D2A657E7EC6449592461B3AFF3E82AC]]></AD_COLUMN_ID> + <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> + <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> + <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> + <ISREADONLY><![CDATA[N]]></ISREADONLY> + <SEQNO><![CDATA[220]]></SEQNO> + <ISSAMELINE><![CDATA[N]]></ISSAMELINE> + <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> + <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO> + <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> + <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> + <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> + <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +</AD_FIELD> + <AD_FIELD>  <AD_FIELD_ID><![CDATA[29AC40AC973D400CB5200D8B8C14145D]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js --- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js @@ -155,13 +155,19 @@ }); }, shown: function () { - var keyboard = this.owner.owner; + var me = this, i, max, p, + keyboard = this.owner.owner; keyboard.showKeypad('coins'); keyboard.showSidepad('sidedisabled'); - //TODO: defaulting to cash using its hardcoded value, should be configurable - keyboard.defaultcommand = 'OBPOS_payment.cash'; - keyboard.setStatus('OBPOS_payment.cash'); + for (i = 0, max = OB.POS.modelterminal.get('payments').length; i < max; i++) { + p = OB.POS.modelterminal.get('payments')[i]; + if (p.paymentMethod.id === OB.POS.modelterminal.get('terminal').terminalType.paymentMethod) { + keyboard.defaultcommand = OB.POS.modelterminal.get('payments')[i].payment.searchKey; + keyboard.setStatus(OB.POS.modelterminal.get('payments')[i].payment.searchKey); + break; + } + } } });

Notes
(0053987) jecharri (viewer) 2012-11-05 11:53	Ticket 17807

(0054969) hgbot (developer) 2012-12-17 11:47	Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: c77b2d44d300ccdbe71a779e257e7a59b447979d Author: Miguel de Juana <miguel.dejuana <at> openbravo.com> Date: Mon Dec 17 11:47:21 2012 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/c77b2d44d300ccdbe71a779e257e7a59b447979d [^] Fixed issue 22201: Default Payment type is configurable --- M src-db/database/model/tables/OBPOS_TERMINALTYPE.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_FIELD.xml M web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js ---

(0055017) hgbot (developer) 2012-12-17 17:50	Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: e5c7bbe771c769b772a0f1d8d73ecbde5789b00c Author: Miguel de Juana <miguel.dejuana <at> openbravo.com> Date: Mon Dec 17 17:50:24 2012 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/e5c7bbe771c769b772a0f1d8d73ecbde5789b00c [^] Related to issue 22201: Filter Payment Method selector by Pos Terminal Type --- M src-db/database/model/tables/OBPOS_TERMINALTYPE.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_VAL_RULE.xml ---

(0055107) adrianromero (viewer) 2012-12-20 11:31	Verified in live builds

Issue History
Date Modified	Username	Field	Change
2012-11-05 11:52	jecharri	New Issue
2012-11-05 11:52	jecharri	Assigned To	=> adrianromero
2012-11-05 11:52	jecharri	OBNetwork customer	=> Yes
2012-11-05 11:53	jecharri	Note Added: 0053987
2012-12-11 15:43	migueldejuana	File Added: issue22201.diff
2012-12-17 11:47	hgbot	Checkin
2012-12-17 11:47	hgbot	Note Added: 0054969
2012-12-17 11:47	hgbot	Status	new => resolved
2012-12-17 11:47	hgbot	Resolution	open => fixed
2012-12-17 11:47	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/c77b2d44d300ccdbe71a779e257e7a59b447979d [^]
2012-12-17 17:50	hgbot	Checkin
2012-12-17 17:50	hgbot	Note Added: 0055017
2012-12-20 11:31	adrianromero	Note Added: 0055107
2012-12-20 11:31	adrianromero	Status	resolved => closed

Relationships [ Relation Graph ] [ Dependency Graph ]