Merge pull request #262 from hotwax/sync-oms

Updated data and entity as per oms

data/BProductSeedData.xml

@@ -209,6 +209,7 @@
     <moqui.basic.Enumeration enumId="VAR_INTEGR" enumTypeId="IID_REASON" enumCode="VAR_INTEGR" description="Integration" enumName="Integration"/>
     <moqui.basic.Enumeration enumId="VAR_LOST" enumTypeId="IID_REASON" enumCode="VAR_LOST" description="Adjustment" enumName="Adjustment"/>
     <moqui.basic.Enumeration enumId="VAR_MANUAL" enumTypeId="IID_REASON" enumCode="VAR_MANUAL" description="Variance recorded manually" enumName="Variance recorded manually"/>
+    <moqui.basic.Enumeration enumId="VAR_EQUAL_QOH_ATP" enumTypeId="IID_REASON" enumCode="VAR_EQUAL_QOH_ATP" description="Equal ATP And QoH" enumName="Equal ATP And QoH"/>
     <moqui.basic.Enumeration enumId="VAR_MISSHIP_ORDERED" enumTypeId="IID_REASON" enumCode="VAR_MISSHIP_ORDERED" description="Mis-shipped Item Ordered (+)" enumName="Mis-shipped Item Ordered"/>
     <moqui.basic.Enumeration enumId="VAR_MISSHIP_SHIPPED" enumTypeId="IID_REASON" enumCode="VAR_MISSHIP_SHIPPED" description="Mis-shipped Item Shipped (-)" enumName="Mis-shipped Item Shipped"/>
     <moqui.basic.Enumeration enumId="VAR_SAMPLE" enumTypeId="IID_REASON" enumCode="VAR_SAMPLE" description="Sample (Giveaway)" enumName="Sample (Giveaway)"/>

data/BSeedExtCommerceTypeData.xml

@@ -96,7 +96,8 @@
     <moqui.basic.Enumeration enumId="MISMATCH" enumTypeId="REPORT_VAR" enumCode="MISMATCH" description="Mismatch"/>
     <moqui.basic.Enumeration enumId="INACTIVE_STORE" enumTypeId="REPORT_NO_VAR" enumCode="INACTIVE_STORE" description="Inactive store"/>
     <moqui.basic.Enumeration enumId="NO_VARIANCE_LOG" enumTypeId="REPORT_NO_VAR" enumCode="NO_VARIANCE_LOG" description="No variance"/>
-    <moqui.basic.Enumeration enumId="REJECT_ENTIRE_ORDER" enumTypeId="REPORT_NO_VAR" enumCode="REJECT_ENTIRE_ORDER" description="Reject entire order"/>
+    <moqui.basic.Enumeration enumId="SYS_REJ_IDLE_ORD" enumTypeId="REPORT_NO_VAR" enumCode="SYS_REJ_IDLE_ORD" description="Idle Time Exceeded At Facility" enumName="Order remained idle at facility past threshold set in Product Store setting (AUTO_REJ_IDLE_ORD)"/>
+    <moqui.basic.Enumeration enumId="REJ_AVOID_ORD_SPLIT" enumTypeId="REPORT_NO_VAR" enumCode="REJ_AVOID_ORD_SPLIT" description="Reject to avoid order split (no variance)"/>
     <moqui.basic.EnumerationType enumTypeId="RETURN_CHANNEL" description="Return Channel"/>
     <moqui.basic.Enumeration enumId="ECOM_RTN_CHANNEL" enumTypeId="RETURN_CHANNEL" enumCode="ECOM_RTN_CHANNEL" description="Ecom Return Channel"/>
     <moqui.basic.Enumeration enumId="POS_RTN_CHANNEL" enumTypeId="RETURN_CHANNEL" enumCode="POS_RTN_CHANNEL" description="Pos Return Channel"/>
@@ -279,6 +280,7 @@
     <org.apache.ofbiz.party.contact.ContactMechPurposeType contactMechPurposeTypeId="TAG_LOCATION" description="Tagging" hasTable="N"/>
     <org.apache.ofbiz.party.contact.ContactMechPurposeType contactMechPurposeTypeId="HOME_LOCATION" description="Home" parentTypeId="TAG_LOCATION" hasTable="N"/>
     <org.apache.ofbiz.party.contact.ContactMechPurposeType contactMechPurposeTypeId="WORK_LOCATION" description="Work" parentTypeId="TAG_LOCATION" hasTable="N"/>
+    <org.apache.ofbiz.party.contact.ContactMechPurposeType contactMechPurposeTypeId="PICKUP_LOCATION" description="Pickup" parentTypeId="TAG_LOCATION" hasTable="N"/>
     <org.apache.ofbiz.party.contact.ContactMechPurposeType contactMechPurposeTypeId="SPCL_PRPS_SHIPTO_LOC" description="Special Purpose Ship To Location" hasTable="N"/>
     <org.apache.ofbiz.party.contact.ContactMechTypePurpose contactMechTypeId="EMAIL_ADDRESS" contactMechPurposeTypeId="SHIPPING_EMAIL"/>
     <org.apache.ofbiz.party.contact.ContactMechTypePurpose contactMechTypeId="TELECOM_NUMBER" contactMechPurposeTypeId="PHONE_TOLL_FREE"/>
@@ -438,6 +440,7 @@
     <org.apache.ofbiz.product.facility.FacilityGroupType facilityGroupTypeId="SAME_DAY" description="Same Day Shipping"/>
     <org.apache.ofbiz.product.facility.FacilityGroupType facilityGroupTypeId="AUTO_CANCEL_CONFIG" description="Auto Cancel Order Items Facility Group"/>
     <org.apache.ofbiz.product.facility.FacilityGroupType facilityGroupTypeId="ALLOW_NEGATIVE_RES" description="Allow Negative Reservations Group"/>
+    <org.apache.ofbiz.product.facility.FacilityGroupType facilityGroupTypeId="ORD_CANCEL_CONFIG" description="Cancel Order Or Items Facility Group"/>
     <org.apache.ofbiz.product.facility.FacilityGroup facilityGroupId="SAMEDAY" facilityGroupTypeId="SAME_DAY" facilityGroupName="Same Day Shipping" description="Facilities which support Same Day Shipping"/>
     <org.apache.ofbiz.product.facility.FacilityGroup facilityGroupId="FAC_GRP" facilityGroupTypeId="CHANNEL_FAC_GROUP" facilityGroupName="Online Facility Group" description="Online Facility Group"/>
     <org.apache.ofbiz.product.facility.FacilityGroup facilityGroupId="AUTO_SHIPPING_LABEL" facilityGroupTypeId="SHIPPING_LABEL" facilityGroupName="Genarate Shipping Label" description="Generating the shipping label on Picklist Print"/>
@@ -446,6 +449,7 @@
     <org.apache.ofbiz.product.facility.FacilityGroup facilityGroupId="PICKUP" facilityGroupTypeId="PICKUP" facilityGroupName="Pickup" description="Facilities which Supports Pickup"/>
     <org.apache.ofbiz.product.facility.FacilityGroup facilityGroupId="AUTO_CNCL_ODR_ITM" facilityGroupTypeId="AUTO_CANCEL_CONFIG" facilityGroupName="Auto Cancel Order Items" description="Facilities which Supports Auto Cancelling of items"/>
     <org.apache.ofbiz.product.facility.FacilityGroup facilityGroupId="FAC_ALOW_NEG_INV_RES" facilityGroupTypeId="ALLOW_NEGATIVE_RES" facilityGroupName="Allow Negative Reservation" description="Facilities Which Allow Negative Reservations"/>
+    <org.apache.ofbiz.product.facility.FacilityGroup facilityGroupId="EX_FAC_RSTCK_ON_CAN" facilityGroupTypeId="ORD_CANCEL_CONFIG" facilityGroupName="Facilities Excluded from Restocking Inventory to Shopify on Cancellation" description="Facilities Excluded from Restocking Inventory to Shopify on Cancellation"/>
     <org.apache.ofbiz.common.property.SystemProperty systemResourceId="general" systemPropertyId="quantity.uom.id.default" systemPropertyValue="QTY_pc" description="The default quantity uom."/>
     <org.apache.ofbiz.product.facility.FacilityType facilityTypeId="VIRTUAL_FACILITY" hasTable="N" description="Virtual Facility"/>
     <org.apache.ofbiz.product.facility.FacilityType facilityTypeId="NA" parentTypeId="VIRTUAL_FACILITY" hasTable="N" description="Not Available"/>
@@ -478,12 +482,15 @@
     <moqui.basic.Enumeration enumId="VAR_LOST" enumTypeId="IID_REASON" enumCode="VAR_LOST" description="Adjustment"/>
     <moqui.basic.Enumeration enumId="NEG_VAR_ITEM_CANCEL" enumTypeId="IID_REASON" enumCode="NEG_VAR_ITEM_CANCEL" description="Variance On Item Cancellation" enumName="Variance On Item Cancellation"/>
     <moqui.basic.Enumeration enumId="VAR_MANUAL" enumTypeId="IID_REASON" enumCode="VAR_MANUAL" description="Variance recorded manually"/>
+    <moqui.basic.Enumeration enumId="INV_ROLLOVER" enumCode="INV_ROLLOVER" description="Inventory rollover"/>
     <org.apache.ofbiz.product.inventory.VarianceReason varianceReasonId="VAR_MANUAL" description="Variance recorded manually"/>
     <org.apache.ofbiz.product.catalog.ProdCatalogCategoryType prodCatalogCategoryTypeId="PCCT_PREORDR_NOT" description="Preorder Not Allow (One)"/>
     <org.apache.ofbiz.product.catalog.ProdCatalogCategoryType prodCatalogCategoryTypeId="PCCT_PREORDR" description="Preorder (One)"/>
     <moqui.basic.StatusItem statusId="PICKUP_SCHEDULED" statusTypeId="SHIPMENT_STATUS" statusCode="PICKUP" description="Pickup Scheduled"/>
     <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="SHIPMENT_PACKED" toStatusId="PICKUP_SCHEDULED" transitionName="Schedule Pickup" conditionExpression="directStatusChange == false"/>
     <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="PICKUP_SCHEDULED" toStatusId="SHIPMENT_SHIPPED" transitionName="Ship"/>
+    <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="SHIPMENT_SHIPPED" toStatusId="PICKUP_SCHEDULED" transitionName="Schedule Pickup" conditionExpression="directStatusChange == true"/>
+    <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="PICKUP_SCHEDULED" toStatusId="SHIPMENT_DELIVERED" transitionName="Deliver" conditionExpression="directStatusChange == true"/>
     <org.apache.ofbiz.order.order.OrderAdjustmentType orderAdjustmentTypeId="EXT_SHIP_ADJUSTMENT" hasTable="N" description="External shipping adjustment"/>
     <org.apache.ofbiz.order.return.ReturnItemTypeMap returnItemMapKey="EXT_SHIP_ADJUSTMENT" returnHeaderTypeId="CUSTOMER_RETURN" returnItemTypeId="RET_EXT_PRM_ADJ"/>
     <org.apache.ofbiz.order.order.OrderAdjustmentType orderAdjustmentTypeId="APPEASEMENT" hasTable="N" description="Appeasement"/>

data/CommonSystemPropertyData.xml

@@ -118,8 +118,5 @@
     <org.apache.ofbiz.common.property.SystemProperty systemResourceId="Report" systemPropertyId="updated.backorder.report.ftp.export.folder.name" systemPropertyValue="" description="FTP folder name in the export path"/>
     <org.apache.ofbiz.common.property.SystemProperty systemResourceId="googleChat" systemPropertyId="google.chat.webhook.file.missing.uri" systemPropertyValue=""/>
     <org.apache.ofbiz.common.property.SystemProperty systemResourceId="general" systemPropertyId="buynow.productStore.productStoreName" systemPropertyValue=""/>
-    <org.apache.ofbiz.common.property.SystemProperty systemResourceId="order" systemPropertyId="order.brokered.email.trigger.last.sync.time" systemPropertyValue="" description="Record last sync time for broker order email."/>
-    <org.apache.ofbiz.common.property.SystemProperty systemResourceId="order" systemPropertyId="order.packed.email.trigger.last.sync.time" systemPropertyValue="" description="Record last sync time for packed order email."/>
-    <org.apache.ofbiz.common.property.SystemProperty systemResourceId="order" systemPropertyId="order.completed.email.trigger.last.sync.time" systemPropertyValue="" description="Record last sync time for completed order email."/>
 </entity-facade-xml>
 

data/EnumerationStoreSettingsData.xml

@@ -8,6 +8,7 @@
     <moqui.basic.Enumeration enumId="PRE_SLCTD_FAC_TAG" enumTypeId="PROD_STR_STNG" description="Orders imported with this tag will have their line items checked for pre-selected facilities to fulfill them from." enumName="Pre-selected facility tag"/>
     <moqui.basic.Enumeration enumId="ORD_ITM_PICKUP_FAC" enumTypeId="PROD_STR_STNG" enumName="Preselected Facility for Store Pickup orders"/>
     <moqui.basic.Enumeration enumId="ORD_ITM_SHIP_FAC" enumTypeId="PROD_STR_STNG" enumName="Preselected Facility for Same day shipping orders"/>
+    <moqui.basic.Enumeration enumId="ORD_ITM_SHIP_METH" enumTypeId="PROD_STR_STNG" enumName="Shipment Method at order line item"/>
     <moqui.basic.Enumeration enumId="RTN_RSTCK_FAC" enumTypeId="PROD_STR_STNG" enumName="Restock returns facility"/>
     <moqui.basic.Enumeration enumId="HOLD_PRORD_PHYCL_INV" enumTypeId="PROD_STR_STNG" description="If preorder queue exists physical inventory will be considered as 0, default is true" enumName="Hold Pre-order physical inventory"/>
     <moqui.basic.Enumeration enumId="INV_CNT_VIEW_QOH" enumTypeId="PROD_STR_STNG" description="Allows the user to see current QOH from HotWax OMS on the product detail page of the Inventory Count app to help users during the periodic cycle count" enumName="View QOH while inventory counting"/>
@@ -40,5 +41,10 @@
     <moqui.basic.Enumeration enumId="EX_INV_BY_PRD_TYPE" enumTypeId="PROD_STR_STNG" enumCode="EX_INV_BY_PRD_TYPE" description="Configuration to exclude reset inventory by product type"/>
     <moqui.basic.Enumeration enumId="BARCODE_IDEN_PREF" enumTypeId="PROD_STR_STNG" enumCode="BARCODE_IDEN_PREF" description="Identification preference to be used for scanning items" enumName="Barcode Identification Preference"/>
     <moqui.basic.Enumeration enumId="DISABLE_UNPACK" enumTypeId="PROD_STR_STNG" description="Disable the Unpack button" enumName="Disable Unpack Button"/>
+    <moqui.basic.Enumeration enumId="AFFECT_QOH_ON_REJ" enumTypeId="PROD_STR_STNG" enumCode="AFFECT_QOH_ON_REJ" enumName="Allow impacting QOH on order rejection."/>
+    <moqui.basic.Enumeration enumId="FF_COLLATERAL_REJ" enumTypeId="PROD_STR_STNG" enumCode="FF_COLLATERAL_REJ" description="Fulfillment Collateral Rejection" enumName="Fulfillment Collateral Rejection"/>
+    <moqui.basic.Enumeration enumId="FF_USE_NEW_REJ_API" enumTypeId="PROD_STR_STNG" enumCode="FF_USE_NEW_REJ_API" description="Fulfillment Use New Rejection API" enumName="Fulfillment Use New Rejection API"/>
+    <moqui.basic.Enumeration enumId="FULFILL_PART_ODR_REJ" enumTypeId="PROD_STR_STNG" enumCode="FULFILL_PART_ODR_REJ" description="Fulfillment Partial Order Rejection" enumName="Fulfillment Partial Order Rejection"/>
+    <moqui.basic.Enumeration enumId="AUTO_REJ_IDLE_ORD" enumTypeId="PROD_STR_STNG" enumName="Auto Reject Idle Orders"/>
 </entity-facade-xml>
 

data/ExtCommerceData.xml

@@ -11,6 +11,10 @@
     <org.apache.ofbiz.product.facility.Facility facilityId="RELEASED_ORD_PARKING" facilityTypeId="RELEASED_ORD" defaultInventoryItemTypeId="NON_SERIAL_INV_ITEM" facilityName="Released Order Parking" description="Released Order Parking" externalId="RELEASED_ORD_PARKING"/>
     <org.apache.ofbiz.product.facility.FacilityGroupMember facilityId="_NA_" facilityGroupId="AUTO_CNCL_ODR_ITM" fromDate="2024-08-27 13:06:07.0"/>
     <org.apache.ofbiz.product.facility.FacilityGroupMember facilityId="UNFILLABLE_PARKING" facilityGroupId="AUTO_CNCL_ODR_ITM" fromDate="2024-08-27 13:06:07.0"/>
+    <org.apache.ofbiz.product.facility.FacilityGroupMember facilityId="UNFILLABLE_PARKING" facilityGroupId="EX_FAC_RSTCK_ON_CAN" fromDate="2025-01-01 00:00:00.0"/>
+    <org.apache.ofbiz.product.facility.FacilityGroupMember facilityId="PRE_ORDER_PARKING" facilityGroupId="EX_FAC_RSTCK_ON_CAN" fromDate="2025-01-01 00:00:00.0"/>
+    <org.apache.ofbiz.product.facility.FacilityGroupMember facilityId="BACKORDER_PARKING" facilityGroupId="EX_FAC_RSTCK_ON_CAN" fromDate="2025-01-01 00:00:00.0"/>
+    <org.apache.ofbiz.product.facility.FacilityGroupMember facilityId="UNF_HOLD_PARKING" facilityGroupId="EX_FAC_RSTCK_ON_CAN" fromDate="2025-01-01 00:00:00.0"/>
     <moqui.basic.StatusItem statusId="PICKLIST_COMPLETED" statusTypeId="PICKLIST_STATUS" statusCode="COMPLETED" description="Completed" statusAge="100"/>
     <moqui.basic.StatusItem statusId="INV_COUNT_CREATED" statusTypeId="INV_CNT_IMPORT_STTS" statusCode="CREATED" description="Created" statusAge="0"/>
     <moqui.basic.StatusItem statusId="INV_COUNT_ASSIGNED" statusTypeId="INV_CNT_IMPORT_STTS" statusCode="ASSIGNED" description="Assigned" statusAge="30"/>
@@ -120,6 +124,7 @@
     <co.hotwax.datamanager.DataManagerConfig configId="IMP_ORDER_ITM_ATTR" importServiceName="createUpdateOrderItemAttribute" description="Add or update order item attribute" scriptTitle="Add or update order item attribute" importPath="/home/{SFTP-USER}/{FOLDER}"/>
     <co.hotwax.datamanager.DataManagerConfig configId="IMP_ODR_ITM_FLFLMNT" importServiceName="processOrderCompleteRequest" description="Complete order item using Json file in MDM" scriptTitle="Complete order item using Json file in MDM" importPath="/home/{SFTP-USER}/{FOLDER}"/>
     <co.hotwax.datamanager.DataManagerConfig configId="IMP_APR_SALES_ORD" importServiceName="approveSalesOrder" description="Approve Sales Order" scriptTitle="Approve Sales Order" importPath="/home/{SFTP-USER}/{FOLDER}"/>
+    <co.hotwax.datamanager.DataManagerConfig configId="CRT_SHOP_APPE_RETURN" importServiceName="createAndReceiveShopifyReturnAppeasement" scriptTitle="Create Shopify Appeasement Return"/>
     <co.hotwax.datamanager.DataManagerConfig configId="MDM_PACKED_SHIPMENT" exportServiceName="exportPackedShipment" description="Packed Shipment" scriptTitle="Packed Shipment Data" fileNamePattern="packed_shipment_${sequence}"/>
     <co.hotwax.datamanager.DataManagerConfig configId="MDM_RST_FULFD_ORD" importServiceName="refreshExportedFulfillment" description="Reset order fulfillment history to resend order on external system for fulfillment." scriptTitle="Reset order fulfillment history to resend order on external system for fulfillment." importPath="/home/{SFTP-USER}/{FOLDER}"/>
     <co.hotwax.datamanager.DataManagerConfig configId="IMP_INCOMING_SHPMNT" importServiceName="createIncomingShipment" description="Create incoming shipment" scriptTitle="Create incoming shipment" fileNamePattern="CREAT_INCOMING_SHIPMNT_${sequence}" importPath="/home/{SFTP-USER}/{FOLDER}"/>
@@ -254,7 +259,6 @@
     <co.hotwax.datamanager.DataManagerConfig configId="IMP_CRT_EXCHG_ORD" importServiceName="createSalesOrder" description="Create Exchange Order" scriptTitle="Create Exchange Order" importPath="/home/{SFTP-USER}/hotwax/oms/CreateExhangeOrder"/>
     <co.hotwax.common.enum.EnumerationGroupType enumerationGroupTypeId="SYS_REJ" description="System rejection reasons"/>
     <co.hotwax.common.enum.EnumerationGroup enumerationGroupId="SYS_REJ_RES" enumerationGroupTypeId="SYS_REJ" enumerationGroupName="System rejection reasons" description="System rejection reasons"/>
-    <co.hotwax.common.enum.EnumerationGroupMember enumerationId="REJECT_ENTIRE_ORDER" enumerationGroupId="SYS_REJ_RES" fromDate="2024-09-03 00:00:00"/>
     <co.hotwax.common.enum.EnumerationGroupMember enumerationId="INACTIVE_STORE" enumerationGroupId="SYS_REJ_RES" fromDate="2024-09-03 00:00:00"/>
     <co.hotwax.common.enum.EnumerationGroupType enumerationGroupTypeId="BOPIS_REJ" description="BOPIS rejection reasons"/>
     <co.hotwax.common.enum.EnumerationGroup enumerationGroupId="BOPIS_REJ_RES" enumerationGroupTypeId="BOPIS_REJ" enumerationGroupName="BOPIS rejection reasons" description="BOPIS rejection reasons"/>
@@ -277,5 +281,7 @@
     <co.hotwax.common.enum.EnumerationGroup enumerationGroupId="FF_REJ_RSN_GRP" enumerationGroupTypeId="REJ_RSN_GRP" enumerationGroupName="Fulfillment rejection reasons" description="Fulfillment rejection reasons"/>
     <co.hotwax.common.enum.EnumerationGroup enumerationGroupId="BOPIS_REJ_RSN_GRP" enumerationGroupTypeId="REJ_RSN_GRP" enumerationGroupName="BOPIS rejection reasons" description="BOPIS rejection reasons"/>
     <co.hotwax.common.enum.EnumerationGroup enumerationGroupId="CSR_REJ_RSN_GRP" enumerationGroupTypeId="REJ_RSN_GRP" enumerationGroupName="BOPIS rejection reasons" description="CSR rejection reasons"/>
+    <co.hotwax.common.enum.EnumerationGroup enumerationGroupId="TO_REJ_RSN_GRP" enumerationGroupTypeId="REJ_RSN_GRP" enumerationGroupName="Transfer Order rejection reasons" description="Fulfillment rejection reasons"/>
+    <co.hotwax.common.enum.EnumerationGroupMember enumerationId="REJ_RSN_DAMAGED" enumerationGroupId="TO_REJ_RSN_GRP" fromDate="2025-02-01 00:00:00.000"/>
 </entity-facade-xml>
 

data/OrderSystemPropertyData.xml

@@ -4,5 +4,7 @@
     <org.apache.ofbiz.common.property.SystemProperty systemResourceId="order" systemPropertyId="autosave.max.age" systemPropertyValue="14" description="Maximum age of auto-save shopping list for anonymous users (in days)."/>
     <org.apache.ofbiz.common.property.SystemProperty systemResourceId="order" systemPropertyId="order.item.attr.prefix" systemPropertyValue="order_item_attr_" description="Prefix for Order Item Attribute."/>
     <org.apache.ofbiz.common.property.SystemProperty systemResourceId="order" systemPropertyId="order.item.comment.enable" systemPropertyValue="Y" description="Allow comment on Order Item. Choices are: Y or N."/>
+    <org.apache.ofbiz.common.property.SystemProperty systemResourceId="order" systemPropertyId="order.payment.exchange.credit.prefix" systemPropertyValue="EPRA-" description="Prefix for exchange credit payment."/>
+    <org.apache.ofbiz.common.property.SystemProperty systemResourceId="order" systemPropertyId="exchange.order.name.prefix" systemPropertyValue="EXC-" description="Prefix for Exchange Order."/>
 </entity-facade-xml>