Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added: orderSalesChannel, orderSalesChannelenumId and shopId in the ReturnItemView #263

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions entity/OmsOrderViewEntities.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@ under the License.
<member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader" join-from-alias="RI">
<key-map field-name="orderId"/>
</member-entity>
<member-entity entity-alias="SSO" entity-name="co.hotwax.shopify.ShopifyShopOrder" join-from-alias="OH" join-optional="true">
<key-map field-name="orderId"/>
</member-entity>
<member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem" join-from-alias="RI" join-optional="true">
<key-map field-name="orderId"/>
<key-map field-name="orderItemSeqId"/>
Expand All @@ -164,6 +167,9 @@ under the License.
<member-entity entity-alias="UOM" entity-name="moqui.basic.Uom" join-from-alias="RH" join-optional="true">
<key-map field-name="currencyUomId" related="uomId"/>
</member-entity>
<member-entity entity-alias="SCENM" entity-name="moqui.basic.Enumeration" join-from-alias="OH" join-optional="true">
<key-map field-name="salesChannelEnumId" related="enumId"/>
</member-entity>
<alias entity-alias="RI" name="returnId"/>
<alias entity-alias="RI" name="returnItemSeqId"/>
<alias entity-alias="RI" name="orderId"/>
Expand All @@ -179,6 +185,8 @@ under the License.
<alias entity-alias="OI" field="externalId" name="orderItemExternalId"/>

<alias entity-alias="OH" name="orderName"/>
<alias entity-alias="OH" field="salesChannelEnumId" name="orderSalesChannelEnumId"/>
<alias entity-alias="SCENM" field="enumCode" name="orderSalesChannel"/>

<alias entity-alias="F" field="externalId" name="facilityExternalId"/>
<alias entity-alias="F" name="facilityId"/>
Expand All @@ -193,6 +201,7 @@ under the License.
<alias entity-alias="RH" field="externalId" name="returnExternalId"/>
<alias entity-alias="RI" name="returnTypeId"/>
<alias entity-alias="RI" name="receivedQuantity"/>
<alias entity-alias="SSO" name="shopId"/>
</view-entity>

<view-entity entity-name="OrderItemAndHistory" package="co.hotwax.oms">
Expand Down