You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/10/04 19:19:07 UTC
svn commit: r701675 - in /ofbiz/trunk/specialpurpose:
pos/data/DemoRetail.xml pos/entitydef/entitymodel.xml
webpos/data/DemoPosData.xml webpos/webapp/webpos/Login.ftl
Author: mrisaliti
Date: Sat Oct 4 10:19:07 2008
New Revision: 701675
URL: http://svn.apache.org/viewvc?rev=701675&view=rev
Log:
Add a new "terminalName" on PosTerminal entity and then show it on web pos login (Issue OFBIZ-1981)
Modified:
ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml
ofbiz/trunk/specialpurpose/pos/entitydef/entitymodel.xml
ofbiz/trunk/specialpurpose/webpos/data/DemoPosData.xml
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl
Modified: ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml?rev=701675&r1=701674&r2=701675&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/data/DemoRetail.xml Sat Oct 4 10:19:07 2008
@@ -81,7 +81,9 @@
-->
<!-- use this one when the scheduled PUSH service is not enabled -->
- <PosTerminal posTerminalId="pos-1" facilityId="MyRetailStore"/>
+ <PosTerminal posTerminalId="pos-1" terminalName="Pos Terminal 1" facilityId="MyRetailStore"/>
+ <PosTerminal posTerminalId="pos-2" terminalName="Pos Terminal 2" facilityId="MyRetailStore"/>
+ <PosTerminal posTerminalId="pos-3" terminalName="Pos Terminal 3" facilityId="MyRetailStore"/>
<!-- NOTE: this should be commented out for testing the POS without inventory, but should be included on PSS and MCS machines to handle inventory issuance -->
<!-- <InventoryItem facilityId="MyRetailStore" inventoryItemId="9100" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-1001"/>
Modified: ofbiz/trunk/specialpurpose/pos/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/entitydef/entitymodel.xml?rev=701675&r1=701674&r2=701675&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/entitydef/entitymodel.xml Sat Oct 4 10:19:07 2008
@@ -45,6 +45,7 @@
<field name="posTerminalId" type="id-ne"></field>
<field name="facilityId" type="id"></field>
<field name="pushEntitySyncId" type="id"></field>
+ <field name="terminalName" type="name"></field>
<prim-key field="posTerminalId"/>
</entity>
<entity entity-name="PosTerminalLog"
Modified: ofbiz/trunk/specialpurpose/webpos/data/DemoPosData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/data/DemoPosData.xml?rev=701675&r1=701674&r2=701675&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/data/DemoPosData.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/data/DemoPosData.xml Sat Oct 4 10:19:07 2008
@@ -31,7 +31,4 @@
<Enumeration description="Petty Cash out" enumCode="CASH_OUT_REASON" enumId="CASH_OUT_REASON" sequenceId="03" enumTypeId="POS_PAID_REASON_OUT"/>
<ProductStorePaymentSetting productStoreId="9100" paymentMethodTypeId="PERSONAL_CHECK" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService=""/>
-
- <PosTerminal posTerminalId="pos-2" facilityId="MyRetailStore"/>
- <PosTerminal posTerminalId="pos-3" facilityId="MyRetailStore"/>
</entity-engine-xml>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl?rev=701675&r1=701674&r2=701675&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl Sat Oct 4 10:19:07 2008
@@ -53,7 +53,7 @@
<td>
<select name="posTerminalId" id="posTerminalId">
<#list posTerminals as posTerminal>
- <option value="${posTerminal.posTerminalId}">${posTerminal.posTerminalId}</option>
+ <option value="${posTerminal.posTerminalId}">${posTerminal.terminalName}</option>
</#list>
</select>
</td>