Author: jleroux
Date: Thu Jul 28 16:36:25 2016
New Revision: 1754432

URL: http://svn.apache.org/viewvc?rev=1754432&view=rev
Log:
After removing the POS at r1754402, I tried the webPos and found that it missed 
the terminal data. As I suspected it was due to POS data and data model which 
were used by the webPos. For now I decided to add them all in webpos. We will 
see later which parts we can safely remove.

Added:
    ofbiz/trunk/specialpurpose/webpos/data/DemoRetail.xml   (with props)
    ofbiz/trunk/specialpurpose/webpos/data/PosSecurityData.xml   (with props)
    ofbiz/trunk/specialpurpose/webpos/data/PosSyncSettings.xml   (with props)
    ofbiz/trunk/specialpurpose/webpos/data/PosTypeData.xml   (with props)
    ofbiz/trunk/specialpurpose/webpos/entitydef/
    ofbiz/trunk/specialpurpose/webpos/entitydef/entitymodel.xml   (with props)
Modified:
    ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml
    ofbiz/trunk/specialpurpose/webpos/ofbiz-component.xml

Modified: ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml?rev=1754432&r1=1754431&r2=1754432&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml 
(original)
+++ ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml Thu Jul 
28 16:36:25 2016
@@ -259,7 +259,8 @@ under the License.
     <EntityGroupEntry entityGroupId="6920" 
entityOrPackage="org.apache.ofbiz.content.website" applEnumId="ESIA_INCLUDE"/>
     <EntityGroup entityGroupId="6930" entityGroupName="Technical: Login and 
Security"/>
     <EntityGroupEntry entityGroupId="6930" 
entityOrPackage="org.apache.ofbiz.security" applEnumId="ESIA_INCLUDE"/>
-    <EntityGroup entityGroupId="6990" entityGroupName="Technical: OAGIS, 
Other"/>
+-    <EntityGroup entityGroupId="6990" entityGroupName="Technical: WebPOS, 
OAGIS, Other"/>
+-    <EntityGroupEntry entityGroupId="6990" 
entityOrPackage="org.apache.ofbiz.pos.terminal" applEnumId="ESIA_INCLUDE"/>
     <EntityGroupEntry entityGroupId="6990" 
entityOrPackage="org.apache.ofbiz.specialpurpose.oagis" 
applEnumId="ESIA_INCLUDE"/>
     <EntityGroupEntry entityGroupId="6990" 
entityOrPackage="org.apache.ofbiz.catalina.session" applEnumId="ESIA_INCLUDE"/>
 </entity-engine-xml>

Added: ofbiz/trunk/specialpurpose/webpos/data/DemoRetail.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/data/DemoRetail.xml?rev=1754432&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/data/DemoRetail.xml (added)
+++ ofbiz/trunk/specialpurpose/webpos/data/DemoRetail.xml Thu Jul 28 16:36:25 
2016
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<entity-engine-xml>
+    <UserLogin userLoginId="1" partyId="admin" 
currentPassword="356a192b7913cf4c54574d18bdf24699395428d4" passwordHint="The 
Number One, Yeah, Literally"/>
+    <UserLogin userLoginId="2" partyId="ltdadmin" 
currentPassword="a54bed37c5b3b28ee30760b5c8d1bbd735ef10cf" passwordHint="The 
Number Two, Yeah, Literally"/>
+    <UserLoginSecurityGroup groupId="POSCLERK" userLoginId="1" 
fromDate="2001-01-01 12:00:00.0"/>
+    <UserLoginSecurityGroup groupId="POSCLERK" userLoginId="2" 
fromDate="2001-01-01 12:00:00.0"/>
+    <Facility facilityId="MyRetailStore" ownerPartyId="Company" 
facilityTypeId="RETAIL_STORE" facilityName="My Retail Store" 
description="Example Retail (POS) Store"/>
+    <ContactMech contactMechId="9300" contactMechTypeId="POSTAL_ADDRESS"/>
+    <ContactMech contactMechId="9301" contactMechTypeId="TELECOM_NUMBER"/>
+    <PostalAddress contactMechId="9300" toName="My Retail Store" attnName="" 
address1="7 E. 8th St. #308" city="New York" postalCode="10003" 
countryGeoId="USA" stateProvinceGeoId="NY"/>
+    <TelecomNumber contactMechId="9301" areaCode="212" 
contactNumber="555-5555"/>
+    <FacilityContactMech facilityId="MyRetailStore" contactMechId="9300" 
fromDate="2001-05-13 12:00:00.0"/>
+    <FacilityContactMech facilityId="MyRetailStore" contactMechId="9301" 
fromDate="2001-05-13 12:00:00.0"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9300" contactMechPurposeTypeId="PUR_RET_LOCATION" 
fromDate="2004-07-26 16:49:50.161"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9300" contactMechPurposeTypeId="GENERAL_LOCATION" 
fromDate="2004-07-26 16:49:54.497"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9300" contactMechPurposeTypeId="PAYMENT_LOCATION" 
fromDate="2004-07-26 16:49:58.747"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9300" contactMechPurposeTypeId="BILLING_LOCATION" 
fromDate="2004-07-26 16:50:05.459"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9300" contactMechPurposeTypeId="SHIP_ORIG_LOCATION" 
fromDate="2004-07-26 16:50:09.65"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9300" contactMechPurposeTypeId="SHIPPING_LOCATION" 
fromDate="2004-07-26 16:50:13.755"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9301" contactMechPurposeTypeId="PHONE_SHIPPING" 
fromDate="2001-05-13 12:00:00.0"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9301" contactMechPurposeTypeId="PHONE_SHIP_ORIG" 
fromDate="2001-05-13 12:00:00.0"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9301" contactMechPurposeTypeId="PHONE_PAYMENT" 
fromDate="2004-07-26 16:48:47.311"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9301" contactMechPurposeTypeId="PHONE_BILLING" 
fromDate="2004-07-26 16:48:51.652"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9301" contactMechPurposeTypeId="PHONE_SHIP_ORIG" 
fromDate="2004-07-26 16:49:04.176"/>
+    <FacilityContactMechPurpose facilityId="MyRetailStore" 
contactMechId="9301" contactMechPurposeTypeId="PHONE_SHIPPING" 
fromDate="2004-07-26 16:49:09.267"/>
+
+    <ProductStore productStoreId="9100" storeName="OFBiz Physical Retail 
Store" companyName="Apache OFBiz" title="Open For Retail"
+        subtitle="Part of the Apache OFBiz Family of Open Source Software" 
payToPartyId="Company" daysToCancelNonPay="30" prorateShipping="Y" 
prorateTaxes="Y"
+        inventoryFacilityId="MyRetailStore" oneInventoryFacility="Y" 
checkInventory="N" reserveInventory="Y"
+        reserveOrderEnumId="INVRO_FIFO_REC" requireInventory="N" 
isImmediatelyFulfilled="Y"
+        defaultLocaleString="en_US" defaultCurrencyUomId="USD" 
allowPassword="Y" explodeOrderItems="N" retryFailedAuths="N" 
manualAuthIsCapture="Y"
+        headerApprovedStatus="ORDER_APPROVED" 
itemApprovedStatus="ITEM_APPROVED" digitalItemApprovedStatus="ITEM_APPROVED" 
headerDeclinedStatus="ORDER_REJECTED"
+        itemDeclinedStatus="ITEM_REJECTED" 
headerCancelStatus="ORDER_CANCELLED" itemCancelStatus="ITEM_CANCELLED" 
orderNumberPrefix="RS"
+        authDeclinedMessage="There has been a problem with your method of 
payment. Please try a different method or call customer service."
+        authFraudMessage="Your order has been rejected and your account has 
been disabled due to fraud."
+        authErrorMessage="Problem connecting to payment processor."
+        visualThemeId="EC_DEFAULT" autoApproveInvoice="Y" 
shipIfCaptureFails="Y" autoApproveOrder="Y"/>
+
+    <ProductStorePaymentSetting productStoreId="9100" 
paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" 
paymentService="alwaysApproveWithCaptureCCProcessor" 
paymentCustomMethodId="CC_AUTH_CAPTURE_ALWA"/>
+    <ProductStorePaymentSetting productStoreId="9100" 
paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" 
paymentService="testCCRelease" paymentCustomMethodId="CC_RELEASE_TEST"/>
+    <ProductStorePaymentSetting productStoreId="9100" 
paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" 
paymentService="testCCCapture" paymentCustomMethodId="CC_CAPTURE_TEST"/>
+    <ProductStorePaymentSetting productStoreId="9100" 
paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REAUTH" 
paymentService="alwaysApproveCCProcessor" 
paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>
+    <ProductStorePaymentSetting productStoreId="9100" 
paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_REFUND" 
paymentService="testCCRefund" paymentCustomMethodId="CC_REFUND_TEST"/>
+    <ProductStorePaymentSetting productStoreId="9100" 
paymentMethodTypeId="EFT_ACCOUNT" paymentServiceTypeEnumId="PRDS_PAY_AUTH" 
paymentService="alwaysApproveEFTProcessor" 
paymentCustomMethodId="EFT_AUTH_ALWAYSAPPRO"/>
+    <ProductStorePaymentSetting productStoreId="9100" 
paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" 
paymentService="" paymentCustomMethodId=""/>
+
+    <ProductStoreFacility productStoreId="9100" facilityId="MyRetailStore" 
fromDate="2001-05-13 12:00:00.0"/>
+    <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" 
productStoreId="9100" fromDate="2001-05-13 12:00:00.0"/>
+
+    <ProductStoreCatalog productStoreId="9100" prodCatalogId="DemoCatalog" 
fromDate="2001-05-13 12:00:00.0" sequenceNum="1"/>
+
+    <Facility facilityId="MyRetailStore" productStoreId="9100" 
defaultInventoryItemTypeId="NON_SERIAL_INV_ITEM"/>
+
+    <!-- Use these SKUs in the POS terminal -->
+    <GoodIdentification goodIdentificationTypeId="SKU" productId="GZ-1000" 
idValue="12345" lastUpdatedStamp="2005-07-12 06:31:15.251" 
lastUpdatedTxStamp="2005-07-12 06:31:14.897" createdStamp="2005-07-12 
06:31:15.251" createdTxStamp="2005-07-12 06:31:14.897"/>
+    <GoodIdentification goodIdentificationTypeId="OTHER_ID" 
productId="GZ-1001" idValue="12345" lastUpdatedStamp="2005-07-12 06:31:15.251" 
lastUpdatedTxStamp="2005-07-12 06:31:14.897" createdStamp="2005-07-12 
06:31:15.251" createdTxStamp="2005-07-12 06:31:14.897"/>
+    <GoodIdentification goodIdentificationTypeId="SKU" productId="GZ-1001" 
idValue="67890" lastUpdatedStamp="2005-07-12 06:31:32.803" 
lastUpdatedTxStamp="2005-07-12 06:31:32.749" createdStamp="2005-07-12 
06:31:32.803" createdTxStamp="2005-07-12 06:31:32.749"/>
+
+
+    <!-- use this one when the scheduled PUSH service is enabled
+    <PosTerminal posTerminalId="pos-1" terminalName="Pos Terminal 1" 
facilityId="MyRetailStore" pushEntitySyncId="5505"/>
+    <PosTerminal posTerminalId="pos-2" terminalName="Pos Terminal 2" 
facilityId="MyRetailStore" pushEntitySyncId="5505"/>
+    <PosTerminal posTerminalId="pos-3" terminalName="Pos Terminal 3" 
facilityId="MyRetailStore" pushEntitySyncId="5505"/>
+    -->
+
+    <!-- use this one when the scheduled PUSH service is not enabled -->
+    <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"/>
+    <InventoryItemDetail inventoryItemId="9100" 
inventoryItemDetailSeqId="0001" availableToPromiseDiff="20" 
quantityOnHandDiff="20"/> -->
+    <!-- NOTE: for testing now leaving out GZ-5005 which is the other default 
product with a button in the POS, should create a new inventory item with 
negative QOH -->
+
+    <EnumerationType description="Pos Paid Reason In" 
enumTypeId="POS_PAID_REASON_IN" hasTable="N" parentTypeId=""/>
+    <Enumeration description="Banking during the day" 
enumCode="BANKING_IN_REASON" enumId="BANKING_IN_REASON" sequenceId="01" 
enumTypeId="POS_PAID_REASON_IN"/>
+    <Enumeration description="Change added to Till's float" 
enumCode="CHANGE_IN_REASON" enumId="CHANGE_IN_REASON" sequenceId="02" 
enumTypeId="POS_PAID_REASON_IN"/>
+    <Enumeration description="Petty Cash Paid into Till" 
enumCode="CASH_IN_REASON" enumId="CASH_IN_REASON" sequenceId="03" 
enumTypeId="POS_PAID_REASON_IN"/>
+
+    <EnumerationType description="Pos Paid Reason Out" 
enumTypeId="POS_PAID_REASON_OUT" hasTable="N" parentTypeId=""/>
+    <Enumeration description="Banking during the day" 
enumCode="BANKING_OUT_REASON" enumId="BANKING_OUT_REASON" sequenceId="01" 
enumTypeId="POS_PAID_REASON_OUT"/>
+    <Enumeration description="Petty Cash out" enumCode="CASH_OUT_REASON" 
enumId="CASH_OUT_REASON" sequenceId="03" enumTypeId="POS_PAID_REASON_OUT"/>
+
+    <!-- _NA_ TaxAuthority defs -->
+    <TaxAuthority taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" 
includeTaxInPrice="N"/>
+    <TaxAuthorityGlAccount taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" 
organizationPartyId="Company" glAccountId="224000"/>
+    <TaxAuthorityCategory taxAuthGeoId="_NA_" taxAuthPartyId="_NA_" 
productCategoryId="20111"/> <!-- Micro Widgets, a category to be used to test 
categorized rates -->
+    <!-- taxAuthorityRateSeqId left blank to be auto-sequenced during the EE 
XML import -->
+    <TaxAuthorityRateProduct taxAuthorityRateSeqId="9006" taxAuthGeoId="_NA_" 
taxAuthPartyId="_NA_" taxAuthorityRateTypeId="SALES_TAX" productStoreId="9100"
+        productCategoryId="" titleTransferEnumId="" minItemPrice="25.00" 
minPurchase="0.00" taxShipping="N" taxPercentage="1" taxPromotions="N"
+        fromDate="2008-12-03 00:00:00.001" thruDate="" description="1% OFB 
_NA_ Tax"/>
+
+</entity-engine-xml>
+
+

Propchange: ofbiz/trunk/specialpurpose/webpos/data/DemoRetail.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/webpos/data/DemoRetail.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/webpos/data/DemoRetail.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/specialpurpose/webpos/data/PosSecurityData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/data/PosSecurityData.xml?rev=1754432&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/data/PosSecurityData.xml (added)
+++ ofbiz/trunk/specialpurpose/webpos/data/PosSecurityData.xml Thu Jul 28 
16:36:25 2016
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<entity-engine-xml>
+    <SecurityGroup description="POS Clerk" groupId="POSCLERK"/>
+    <SecurityGroupPermission groupId="POSCLERK" permissionId="ORDERMGR_VIEW"/>
+    <SecurityGroupPermission groupId="POSCLERK" permissionId="ORDERMGR_NOTE"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="ORDERMGR_UPDATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="ORDERMGR_CREATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="PARTYMGR_PCM_CREATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" permissionId="PARTYMGR_VIEW"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="PARTYMGR_CREATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="PARTYMGR_UPDATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" permissionId="PARTYMGR_NOTE"/>
+    <SecurityGroupPermission groupId="POSCLERK" permissionId="PAY_INFO_VIEW"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="PAY_INFO_UPDATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="PAY_INFO_CREATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" permissionId="CATALOG_VIEW"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="ACCOUNTING_CREATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="ACCOUNTING_UPDATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="ACCOUNTING_COMM_VIEW"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="ACCTG_ATX_CREATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="ACCTG_ATX_UPDATE"/>
+    <SecurityGroupPermission groupId="POSCLERK" 
permissionId="ACCTG_PREF_ADMIN"/>
+    <SecurityGroupPermission groupId="POSCLERK" permissionId="FACILITY_ADMIN"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/specialpurpose/webpos/data/PosSecurityData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/webpos/data/PosSecurityData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/webpos/data/PosSecurityData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/specialpurpose/webpos/data/PosSyncSettings.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/data/PosSyncSettings.xml?rev=1754432&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/data/PosSyncSettings.xml (added)
+++ ofbiz/trunk/specialpurpose/webpos/data/PosSyncSettings.xml Thu Jul 28 
16:36:25 2016
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!-- To know more about this setting please read the documentation 
http://cwiki.apache.org/confluence/x/bgFk -->
+
+<entity-engine-xml>
+<!-- MCS->PSS Central Server to Per Store Server -->
+    <EntityGroup entityGroupId="5500" entityGroupName="POS: Central Server to 
Per Store Server"/>
+    <!-- these are used to update sync settings on the POS terminals from the 
central server -->
+    <EntityGroupEntry entityGroupId="5500" 
entityOrPackage="org.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
+    <!-- this is the general product information needed for pricing, 
promotions, basic product info, etc; the per store server will also include 
inventory, etc information -->
+    <EntityGroupEntry entityGroupId="5500" entityOrPackage="org.ofbiz.product" 
applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5500" 
entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5500" 
entityOrPackage="org.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5500" entityOrPackage="PosTerminal" 
applEnumId="ESIA_INCLUDE"/>
+
+<!-- PSS->POS Per Store Server to POS Terminal -->
+    <EntityGroup entityGroupId="5501" entityGroupName="POS: Per Store Server 
to POS Terminal"/>
+    <!-- these are used to update sync settings on the POS terminals from the 
central server -->
+    <EntityGroupEntry entityGroupId="5501" 
entityOrPackage="org.ofbiz.entity.group" applEnumId="ESIA_INCLUDE"/>
+    <!-- this is the general product information needed for pricing, 
promotions, basic product info, etc -->
+    <EntityGroupEntry entityGroupId="5501" 
entityOrPackage="org.ofbiz.product.product" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5501" 
entityOrPackage="org.ofbiz.product.price" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5501" 
entityOrPackage="org.ofbiz.product.promo" applEnumId="ESIA_INCLUDE"/>
+    <!-- org.ofbiz.product.category is needed for certain promotions, probably 
won't be used much for category browsing in the POS -->
+    <EntityGroupEntry entityGroupId="5501" 
entityOrPackage="org.ofbiz.product.category" applEnumId="ESIA_INCLUDE"/>
+    <!-- org.ofbiz.party.party may be needed for certain promotions -->
+    <EntityGroupEntry entityGroupId="5501" 
entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5501" 
entityOrPackage="org.ofbiz.specialpurpose.pos.PosTerminal" 
applEnumId="ESIA_INCLUDE"/>
+
+<!-- POS->PSS POS Terminal to Per Store Server -->
+    <EntityGroup entityGroupId="5505" entityGroupName="POS: POS Terminal to 
Per Store Server"/>
+    <!-- org.ofbiz.party.party may be needed for order related information, 
like party roles or contact info etc -->
+    <EntityGroupEntry entityGroupId="5505" 
entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" 
entityOrPackage="org.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
+    <!-- all order and related information, including payment, etc info -->
+    <EntityGroupEntry entityGroupId="5505" entityOrPackage="org.ofbiz.order" 
applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" 
entityOrPackage="org.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" 
entityOrPackage="org.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
+    <!-- NOTE: no inventory information will be on the POS terminal, so don't 
send any over -->
+    <EntityGroupEntry entityGroupId="5505" 
entityOrPackage="org.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5505" 
entityOrPackage="org.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
+
+<!-- PSS->MCS Per Store Server to Central Server -->
+    <EntityGroup entityGroupId="5506" entityGroupName="POS: Per Store Server 
to Central Server"/>
+    <!-- org.ofbiz.party.party may be needed for order related information, 
like party roles or contact info etc -->
+    <EntityGroupEntry entityGroupId="5506" 
entityOrPackage="org.ofbiz.party.party" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" 
entityOrPackage="org.ofbiz.party.contact" applEnumId="ESIA_INCLUDE"/>
+    <!-- all order and related information, including payment, etc info -->
+    <EntityGroupEntry entityGroupId="5506" entityOrPackage="org.ofbiz.order" 
applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" 
entityOrPackage="org.ofbiz.accounting.invoice" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" 
entityOrPackage="org.ofbiz.accounting.payment" applEnumId="ESIA_INCLUDE"/>
+    <!-- include inventory and issuance info -->
+    <EntityGroupEntry entityGroupId="5506" 
entityOrPackage="org.ofbiz.shipment.issuance" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" 
entityOrPackage="org.ofbiz.product.inventory" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" 
entityOrPackage="org.ofbiz.pos.PosTerminalLog" applEnumId="ESIA_INCLUDE"/>
+    <EntityGroupEntry entityGroupId="5506" 
entityOrPackage="org.ofbiz.pos.PosTerminalState" applEnumId="ESIA_INCLUDE"/>
+
+
+<!-- Some examples of EntitySync settings for pulling and pushing data around 
-->
+    <!-- POS example meant to be used for pulling data from MCS to PSS -->
+    <!-- NOTE: for pulling setup the EntitySync record lives on the server the 
data is pulled from and should ONLY BE USED FOR ONE CLIENT! -->
+    <EntitySync entitySyncId="5500" runStatusId="ESR_NOT_STARTED" 
syncSplitMillis="600000"
+            keepRemoveInfoHours="24" forPullOnly="Y"/>
+    <EntitySyncIncludeGroup entitySyncId="5500" entityGroupId="5500"/>
+    <!-- POS example meant to be used for pushing data from PSS to MCS -->
+    <EntitySync entitySyncId="5506" runStatusId="ESR_NOT_STARTED" 
syncSplitMillis="600000" targetServiceName="remoteStoreEntitySyncDataRmi"
+            keepRemoveInfoHours="24" forPushOnly="Y"/>
+    <EntitySyncIncludeGroup entitySyncId="5506" entityGroupId="5506"/>
+
+    <!-- POS example meant to be used for pushing data from POS to PSS -->
+    <EntitySync entitySyncId="5505" runStatusId="ESR_NOT_STARTED" 
syncSplitMillis="600000" targetServiceName="remoteStoreEntitySyncDataRmi"
+            keepRemoveInfoHours="24" forPushOnly="Y"/>
+    <EntitySyncIncludeGroup entitySyncId="5505" entityGroupId="5505"/>
+    <!-- POS example meant to be used for pulling data from PSS to POS -->
+    <!-- NOTE: for pulling setup the EntitySync record lives on the server the 
data is pulled from and should ONLY BE USED FOR ONE CLIENT! -->
+    <EntitySync entitySyncId="5501" runStatusId="ESR_NOT_STARTED" 
syncSplitMillis="600000"
+            keepRemoveInfoHours="24" forPullOnly="Y"/>
+    <EntitySyncIncludeGroup entitySyncId="5501" entityGroupId="5501"/>
+
+    <!-- POS Push Scheduled Service -->
+    <!--
+    <RecurrenceRule recurrenceRuleId="POSPUSH" untilDateTime="" 
frequency="MINUTELY" intervalNumber="5" countNumber="-1"/>
+    <RecurrenceInfo recurrenceInfoId="POSPUSH" startDateTime="2000-01-01 
00:00:00.000" recurrenceRuleId="POSPUSH" recurrenceCount="0"/>
+    <RuntimeData runtimeDataId="POSPUSH">
+        <runtimeInfo><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<ofbiz-ser>
+  <map-HashMap>
+    <map-Entry>
+      <map-Key>
+        <std-String value="entitySyncId"/>
+      </map-Key>
+      <map-Value>
+        <std-String value="5505"/>
+      </map-Value>
+    </map-Entry>
+  </map-HashMap>
+</ofbiz-ser>
+        ]]></runtimeInfo>
+    </RuntimeData>
+    <JobSandbox jobId="POSPUSH" jobName="Push POS Orders" 
runtimeDataId="POSPUSH" runTime="2000-01-01 00:00:00.000" 
serviceName="runEntitySync" poolId="pool" runAsUser="system" 
recurrenceInfoId="POSPUSH"/>
+    -->
+
+    <!-- POS-1 PULL Scheduled Service -->
+    <!--
+    <RecurrenceRule recurrenceRuleId="POS1PULL" untilDateTime="" 
frequency="HOURLY" intervalNumber="2" countNumber="-1"/>
+    <RecurrenceInfo recurrenceInfoId="POS1PULL" startDateTime="2000-01-01 
00:15:00.000" recurrenceRuleId="POS1PULL" recurrenceCount="0"/>
+    <RuntimeData runtimeDataId="POS1PULL">
+        <runtimeInfo><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<ofbiz-ser>
+  <map-HashMap>
+    <map-Entry>
+      <map-Key>
+        <std-String value="entitySyncId"/>
+      </map-Key>
+      <map-Value>
+        <std-String value="5501"/>
+      </map-Value>
+    </map-Entry>
+    <map-Entry>
+      <map-Key>
+        <std-String value="remotePullAndReportEntitySyncDataName"/>
+      </map-Key>
+      <map-Value>
+        <std-String value="remotePullAndReportEntitySyncDataRmi"/>
+      </map-Value>
+    </map-Entry>
+  </map-HashMap>
+</ofbiz-ser>
+        ]]></runtimeInfo>
+    </RuntimeData>
+    <JobSandbox jobId="POS1PULL" jobName="Pull POS Catalog" 
runtimeDataId="POS1PULL" runTime="2000-01-01 00:00:00.000" 
serviceName="runPullEntitySync" poolId="pool" runAsUser="system" 
recurrenceInfoId="POS1PULL"/>
+    -->
+
+</entity-engine-xml>
+

Propchange: ofbiz/trunk/specialpurpose/webpos/data/PosSyncSettings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/webpos/data/PosSyncSettings.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/webpos/data/PosSyncSettings.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/specialpurpose/webpos/data/PosTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/data/PosTypeData.xml?rev=1754432&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/data/PosTypeData.xml (added)
+++ ofbiz/trunk/specialpurpose/webpos/data/PosTypeData.xml Thu Jul 28 16:36:25 
2016
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<entity-engine-xml>
+    <StatusType description="Pos Transaction" hasTable="N" parentTypeId="" 
statusTypeId="POSTX_STATUS"/>
+    <StatusItem description="Active" sequenceId="01" statusCode="ACTIVE" 
statusId="POSTX_ACTIVE" statusTypeId="POSTX_STATUS"/>
+    <StatusItem description="Sold" sequenceId="10" statusCode="SOLD" 
statusId="POSTX_SOLD" statusTypeId="POSTX_STATUS"/>
+    <StatusItem description="Returned" sequenceId="15" statusCode="RETURNED" 
statusId="POSTX_RETURNED" statusTypeId="POSTX_STATUS"/>
+    <StatusItem description="Voided" sequenceId="20" statusCode="VOIDED" 
statusId="POSTX_VOIDED" statusTypeId="POSTX_STATUS"/>
+    <StatusItem description="PaidIn" sequenceId="30" statusCode="PAID_IN" 
statusId="POSTX_PAID_IN" statusTypeId="POSTX_STATUS"/>
+    <StatusItem description="PaidOut" sequenceId="40" statusCode="PAID_OUT" 
statusId="POSTX_PAID_OUT" statusTypeId="POSTX_STATUS"/>
+    <StatusItem description="Closed" sequenceId="50" statusCode="CLOSED" 
statusId="POSTX_CLOSED" statusTypeId="POSTX_STATUS"/>
+</entity-engine-xml>

Propchange: ofbiz/trunk/specialpurpose/webpos/data/PosTypeData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/webpos/data/PosTypeData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/webpos/data/PosTypeData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/specialpurpose/webpos/entitydef/entitymodel.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/entitydef/entitymodel.xml?rev=1754432&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/entitydef/entitymodel.xml (added)
+++ ofbiz/trunk/specialpurpose/webpos/entitydef/entitymodel.xml Thu Jul 28 
16:36:25 2016
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd";>
+  <!-- ========================================================= -->
+  <!-- ======================== Defaults ======================= -->
+  <!-- ========================================================= -->
+    <title>Entity of an Apache OFBiz Component</title>
+    <description>None</description>
+    <version>1.0</version>
+
+  <!-- ========================================================= -->
+  <!-- ======================== Data Model ===================== -->
+  <!-- The modules in this file are as follows:                  -->
+  <!--  - org.ofbiz.specialpurpose.pos -->
+  <!-- ========================================================= -->
+
+
+  <!-- ========================================================= -->
+  <!-- org.ofbiz.specialpurpose.pos -->
+  <!-- ========================================================= -->
+    <entity entity-name="PosTerminal"
+            package-name="org.ofbiz.specialpurpose.pos"
+            title="Pos Terminal">
+      <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"
+            package-name="org.ofbiz.specialpurpose.pos"
+            title="Pos Terminal Log">
+      <field name="posTerminalLogId" type="id-ne"></field>
+      <field name="posTerminalId" type="id-ne"></field>
+      <field name="transactionId" type="id"></field>
+      <field name="itemCount" type="numeric"></field>
+      <field name="orderId" type="id"></field>
+      <field name="returnId" type="id"></field>
+      <field name="userLoginId" type="id-vlong"/>
+      <field name="statusId" type="id"></field>
+      <field name="logStartDateTime" type="date-time"/>
+      <field name="logEndDateTime" type="date-time"/>
+      <prim-key field="posTerminalLogId"/>
+      <relation type="one" fk-name="POS_LOG_POS" rel-entity-name="PosTerminal">
+          <key-map field-name="posTerminalId"/>
+      </relation>
+      <relation type="one" fk-name="POS_LOG_ORDER" 
rel-entity-name="OrderHeader">
+          <key-map field-name="orderId"/>
+      </relation>
+      <relation type="one" fk-name="POS_LOG_RETURN" 
rel-entity-name="ReturnHeader">
+          <key-map field-name="returnId"/>
+      </relation>
+      <relation type="one" fk-name="POS_LOG_STTS" rel-entity-name="StatusItem">
+          <key-map field-name="statusId"/>
+      </relation>
+    </entity>
+    <entity entity-name="PosTerminalState"
+            package-name="org.ofbiz.specialpurpose.pos"
+            title="Pos Terminal State">
+      <field name="posTerminalId" type="id-ne"></field>
+      <field name="openedDate" type="date-time"></field>
+      <field name="closedDate" type="date-time"></field>
+      <field name="startingTxId" type="id-long"></field>
+      <field name="endingTxId" type="id-long"></field>
+      <field name="openedByUserLoginId" type="id-vlong"></field>
+      <field name="closedByUserLoginId" type="id-vlong"></field>
+      <field name="startingDrawerAmount" type="currency-amount"></field>
+      <field name="actualEndingCash" type="currency-amount"></field>
+      <field name="actualEndingCheck" type="currency-amount"></field>
+      <field name="actualEndingCc" type="currency-amount"></field>
+      <field name="actualEndingGc" type="currency-amount"></field>
+      <field name="actualEndingOther" type="currency-amount"></field>
+      <prim-key field="posTerminalId"/>
+      <prim-key field="openedDate"/>
+      <relation type="one" fk-name="POS_STATE_POS" 
rel-entity-name="PosTerminal">
+          <key-map field-name="posTerminalId"/>
+      </relation>
+    </entity>
+    <entity entity-name="PosTerminalInternTx"
+            package-name="org.ofbiz.specialpurpose.pos"
+            title="Pos Terminal Internal Transaction">
+      <field name="posTerminalLogId" type="id-ne"></field>
+      <field name="paidAmount" type="currency-amount"></field>
+      <field name="reasonComment" type="comment"/>
+      <field name="reasonEnumId" type="id"/>
+      <prim-key field="posTerminalLogId"/>
+      <relation type="one" fk-name="POS_TRA_POS" 
rel-entity-name="PosTerminalLog">
+          <key-map field-name="posTerminalLogId"/>
+      </relation>
+      <relation type="one" fk-name="POS_TRA_PAYENUM" 
rel-entity-name="Enumeration">
+          <key-map field-name="reasonEnumId" rel-field-name="enumId"/>
+      </relation>
+    </entity>
+</entitymodel>

Propchange: ofbiz/trunk/specialpurpose/webpos/entitydef/entitymodel.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/webpos/entitydef/entitymodel.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/webpos/entitydef/entitymodel.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/specialpurpose/webpos/ofbiz-component.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/ofbiz-component.xml?rev=1754432&r1=1754431&r2=1754432&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/ofbiz-component.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/ofbiz-component.xml Thu Jul 28 16:36:25 
2016
@@ -28,6 +28,14 @@ under the License.
     <entity-resource type="data" reader-name="demo" loader="main" 
location="data/DemoPosData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" 
location="data/WebPosSecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" 
location="data/WebPosSecurityGroupDemoData.xml"/>
+
+    <!-- Not sure all the POS gone data are needed here, adding them all for 
now, we will prune later -->    
+    <entity-resource type="data" reader-name="seed" loader="main" 
location="data/PosSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" 
location="data/PosTypeData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" 
location="data/DemoRetail.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" 
location="data/PosSyncSettings.xml"/>
+    
+    <entity-resource type="model" reader-name="main" loader="main" 
location="entitydef/entitymodel.xml"/>
     
     <service-resource type="model" loader="main" 
location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" 
location="servicedef/services_cart.xml"/>



Reply via email to