You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2007/10/09 10:49:46 UTC
svn commit: r583076 - in /ofbiz/trunk/applications:
accounting/data/AccountingTypeData.xml order/entitydef/entitymodel.xml
product/entitydef/entitygroup.xml product/entitydef/entitymodel.xml
Author: jonesde
Date: Tue Oct 9 01:49:46 2007
New Revision: 583076
URL: http://svn.apache.org/viewvc?rev=583076&view=rev
Log:
Added new data model elements and seed data for modeling vendor-specific store settings and order with ship group per vendor
Modified:
ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
ofbiz/trunk/applications/order/entitydef/entitymodel.xml
ofbiz/trunk/applications/product/entitydef/entitygroup.xml
ofbiz/trunk/applications/product/entitydef/entitymodel.xml
Modified: ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml?rev=583076&r1=583075&r2=583076&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/AccountingTypeData.xml Tue Oct 9 01:49:46 2007
@@ -483,6 +483,21 @@
<PaymentType description="POS Paid Out" hasTable="N" parentTypeId="DISBURSEMENT" paymentTypeId="POS_PAID_OUT"/>
<PaymentType description="POS Paid In" hasTable="N" parentTypeId="RECEIPT" paymentTypeId="POS_PAID_IN"/>
+ <!-- Credit Cart Types -->
+ <EnumerationType description="Credit Card Type" enumTypeId="CREDIT_CARD_TYPE" hasTable="N" parentTypeId=""/>
+ <Enumeration description="Visa" enumCode="Visa" enumId="CCT_VISA" sequenceId="01" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="Master Card" enumCode="MasterCard" enumId="CCT_MASTERCARD" sequenceId="02" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="American Express" enumCode="AmericanExpress" enumId="CCT_AMERICANEXPRESS" sequenceId="03" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="Diners Club" enumCode="DinersClub" enumId="CCT_DINERSCLUB" sequenceId="04" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="Discover" enumCode="Discover" enumId="CCT_DISCOVER" sequenceId="05" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="EnRoute" enumCode="EnRoute" enumId="CCT_ENROUTE" sequenceId="06" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="Carte Blanche" enumCode="CarteBlanche" enumId="CCT_CARTEBLANCHE" sequenceId="07" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="JCB" enumCode="JCB" enumId="CCT_JCB" sequenceId="08" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="Solo" enumCode="Solo" enumId="CCT_SOLO" sequenceId="09" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="Switch" enumCode="Switch" enumId="CCT_SWITCH" sequenceId="10" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="Visa Electron" enumCode="VisaElectron" enumId="CCT_VISAELECTRON" sequenceId="11" enumTypeId="CREDIT_CARD_TYPE"/>
+ <Enumeration description="Universal Air Travel Plan" enumCode="UATP" enumId="CCT_UATP" sequenceId="12" enumTypeId="CREDIT_CARD_TYPE"/>
+
<StatusType description="Budget" hasTable="N" parentTypeId="" statusTypeId="BUDGET_STATUS"/>
<StatusType description="Party Asset" hasTable="N" parentTypeId="" statusTypeId="PARTY_ASSET_STATUS"/>
Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?rev=583076&r1=583075&r2=583076&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Tue Oct 9 01:49:46 2007
@@ -752,6 +752,7 @@
<field name="shipGroupSeqId" type="id-ne"></field>
<field name="shipmentMethodTypeId" type="id"></field>
<field name="supplierPartyId" type="id"></field>
+ <field name="vendorPartyId" type="id"><description>For use with multi-vendor stores, order will be split so that each ship group is associated with only one vendor (only if applicable)</description></field>
<field name="carrierPartyId" type="id"></field>
<field name="carrierRoleTypeId" type="id"></field>
<field name="contactMechId" type="id"></field>
@@ -770,6 +771,9 @@
</relation>
<relation type="one" fk-name="ORDER_ITSG_SPRTY" title="Supplier" rel-entity-name="Party">
<key-map field-name="supplierPartyId" rel-field-name="partyId"/>
+ </relation>
+ <relation type="one" fk-name="ORDER_ITSG_VPRTY" title="Vendor" rel-entity-name="Party">
+ <key-map field-name="vendorPartyId" rel-field-name="partyId"/>
</relation>
<relation type="one" fk-name="ORDER_ITSG_CSHM" rel-entity-name="CarrierShipmentMethod">
<key-map field-name="shipmentMethodTypeId"/>
Modified: ofbiz/trunk/applications/product/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup.xml?rev=583076&r1=583075&r2=583076&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup.xml Tue Oct 9 01:49:46 2007
@@ -247,7 +247,9 @@
<entity-group group="org.ofbiz" entity="ProductStoreShipmentMeth" />
<entity-group group="org.ofbiz" entity="ProductStoreShipmentMethView" />
<entity-group group="org.ofbiz" entity="ProductStoreSurveyAppl" />
-
+ <entity-group group="org.ofbiz" entity="ProductStoreVendorPayment" />
+ <entity-group group="org.ofbiz" entity="ProductStoreVendorShipment" />
+
<!-- ========================================================= -->
<!-- org.ofbiz.content.subscription -->
<!-- ========================================================= -->
Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=583076&r1=583075&r2=583076&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Tue Oct 9 01:49:46 2007
@@ -3870,6 +3870,52 @@
<key-map field-name="productCategoryId"/>
</relation>
</entity>
+ <entity entity-name="ProductStoreVendorPayment" package-name="org.ofbiz.product.store" title="Product Store Vendor Payment Entity">
+ <description>Used to define payments that a vendor related to the store will accept (for multi-vendor stores)</description>
+ <field name="productStoreId" type="id-ne"/>
+ <field name="vendorPartyId" type="id-ne"/>
+ <field name="paymentMethodTypeId" type="id-ne"/>
+ <field name="creditCardEnumId" type="id-ne"><description>If not applicable for the paymentMethodTypeId, use "_NA_"</description></field>
+ <prim-key field="productStoreId"/>
+ <prim-key field="vendorPartyId"/>
+ <prim-key field="paymentMethodTypeId"/>
+ <prim-key field="creditCardEnumId"/>
+ <relation type="one" fk-name="PRDSTRVPM_PRDS" rel-entity-name="ProductStore">
+ <key-map field-name="productStoreId"/>
+ </relation>
+ <relation type="one" fk-name="PRDSTRVPM_VPTY" title="Vendor" rel-entity-name="Party">
+ <key-map field-name="vendorPartyId" rel-field-name="partyId"/>
+ </relation>
+ <relation type="one" fk-name="PRDSTRVPM_PMMT" rel-entity-name="PaymentMethodType">
+ <key-map field-name="paymentMethodTypeId"/>
+ </relation>
+ <relation type="one" fk-name="PRDSTRVPM_CCEN" title="CreditCard" rel-entity-name="Enumeration">
+ <key-map field-name="creditCardEnumId" rel-field-name="enumId"/>
+ </relation>
+ </entity>
+ <entity entity-name="ProductStoreVendorShipment" package-name="org.ofbiz.product.store" title="Product Store Vendor Shipment Entity">
+ <description>Used to define Carrier-ShipmentMethod combinations that a vendor related to the store will accept (for multi-vendor stores)</description>
+ <field name="productStoreId" type="id-ne"/>
+ <field name="vendorPartyId" type="id-ne"/>
+ <field name="shipmentMethodTypeId" type="id-ne"/>
+ <field name="carrierPartyId" type="id-ne"/>
+ <prim-key field="productStoreId"/>
+ <prim-key field="vendorPartyId"/>
+ <prim-key field="shipmentMethodTypeId"/>
+ <prim-key field="carrierPartyId"/>
+ <relation type="one" fk-name="PRDSTRVSH_PRDS" rel-entity-name="ProductStore">
+ <key-map field-name="productStoreId"/>
+ </relation>
+ <relation type="one" fk-name="PRDSTRVSH_VPTY" title="Vendor" rel-entity-name="Party">
+ <key-map field-name="vendorPartyId" rel-field-name="partyId"/>
+ </relation>
+ <relation type="one" fk-name="PRDSTRVSH_SHMT" rel-entity-name="ShipmentMethodType">
+ <key-map field-name="shipmentMethodTypeId"/>
+ </relation>
+ <relation type="one" fk-name="PRDSTRVSH_CPTY" title="Carrier" rel-entity-name="Party">
+ <key-map field-name="carrierPartyId" rel-field-name="partyId"/>
+ </relation>
+ </entity>
<extend-entity entity-name="WebSite">
<field name="productStoreId" type="id"></field>
<relation type="one" fk-name="WEB_SITE_PRDS" rel-entity-name="ProductStore">