This is an automated email from the ASF dual-hosted git repository.
holivier pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new af335df Documented: Order online Documentation and help (OFBIZ-12224)
af335df is described below
commit af335df8d177ab054fb6b050f23790b3d725b17c
Author: holivier <[email protected]>
AuthorDate: Tue May 11 17:37:54 2021 +0200
Documented: Order online Documentation and help (OFBIZ-12224)
Correction on helpAnchor in OrderScreens to put value directly not as
default-value.
---
.../order/widget/ordermgr/OrderEntryCartScreens.xml | 2 +-
.../order/widget/ordermgr/OrderEntryOrderScreens.xml | 16 ++++++++--------
applications/order/widget/ordermgr/OrderEntryScreens.xml | 4 ++--
applications/order/widget/ordermgr/OrderViewScreens.xml | 8 ++++----
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
b/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
index b80b5d4..ef446d0 100644
--- a/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
+++ b/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
@@ -76,7 +76,7 @@ under the License.
</condition-list>
<order-by field-name="productPromoId"/>
</entity-condition>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_add_items_to_cart"/>
+ <set field="helpAnchor" value="_add_items_to_cart"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderEntryDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
diff --git a/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
b/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
index a2ed643..20f4be7 100644
--- a/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
+++ b/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
@@ -50,7 +50,7 @@ under the License.
<actions>
<set field="headerItem" value="orderentry"/>
<set field="titleProperty" value="PageTitleCheckoutOptions"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_quick_finalize_order"/>
+ <set field="helpAnchor" value="_quick_finalize_order"/>
<script
location="component://order/groovyScripts/entry/CheckoutPayment.groovy"/>
<script
location="component://order/groovyScripts/entry/CheckoutOptions.groovy"/>
<script
location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/>
@@ -92,7 +92,7 @@ under the License.
<set field="stepTitleId"
value="OrderOrderEntryShipToSettings"/>
<set field="stepLabelId" value="FacilityShipping"/>
<script
location="component://order/groovyScripts/entry/ShipSettings.groovy"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_set_shipping_address_and_group"/>
+ <set field="helpAnchor"
value="_set_shipping_address_and_group"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderCheckoutDecorator">
@@ -139,7 +139,7 @@ under the License.
<set field="stepTitleId" value="SetItemShipGroups"/>
<set field="stepLabelId" value="OrderShipGroups"/>
<script
location="component://order/groovyScripts/entry/SetShoppingCart.groovy"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_set_item_to_shipgroup"/>
+ <set field="helpAnchor" value="_set_item_to_shipgroup"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderCheckoutDecorator">
@@ -159,7 +159,7 @@ under the License.
<set field="stepLabelId" value="CommonOptions"/>
<script
location="component://order/groovyScripts/entry/OptionSettings.groovy"/>
<property-to-field resource="order"
property="orderPreference.giftEnable" field="giftEnable" default="Y"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_order_option_settings"/>
+ <set field="helpAnchor" value="_order_option_settings"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderCheckoutDecorator">
@@ -188,7 +188,7 @@ under the License.
<set field="stepLabelId" value="AccountingPayment"/>
<script
location="component://order/groovyScripts/entry/BillSettings.groovy"/>
<script
location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_payment_setting"/>
+ <set field="helpAnchor" value="_payment_setting"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderCheckoutDecorator">
@@ -209,7 +209,7 @@ under the License.
<set field="stepLabelId" value="PartyParties"/>
<script
location="component://order/groovyScripts/entry/SetAdditionalParty.groovy"/>
<script
location="component://order/groovyScripts/entry/AdditionalPartyListing.groovy"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_additional_party_entry"/>
+ <set field="helpAnchor" value="_additional_party_entry"/>
<!-- asmselect parameters, must be prefixed by asm_ for
SetMultipleSelectJs.ftl -->
<!--set field="asm_multipleSelectForm"
value="addAdditionalPartyForm"/>
@@ -241,7 +241,7 @@ under the License.
<set field="stepTitleId" value="OrderOrderEntryOrderTerms"/>
<set field="stepLabelId" value="OrderOrderTerms"/>
<script
location="component://order/groovyScripts/entry/OrderTerms.groovy"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_order_term"/>
+ <set field="helpAnchor" value="_order_term"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderCheckoutDecorator">
@@ -261,7 +261,7 @@ under the License.
<set field="stepLabelId" value="OrderReviewOrder"/>
<property-to-field resource="order"
property="orderPreference.giftEnable" field="giftEnable" default="Y"/>
<script
location="component://order/groovyScripts/entry/CheckoutReview.groovy"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_order_confirmation"/>
+ <set field="helpAnchor" value="_order_confirmation"/>
</actions>
<widgets>
<decorator-screen name="CommonOrderCheckoutDecorator">
diff --git a/applications/order/widget/ordermgr/OrderEntryScreens.xml
b/applications/order/widget/ordermgr/OrderEntryScreens.xml
index 19c45f6..5312cf6 100644
--- a/applications/order/widget/ordermgr/OrderEntryScreens.xml
+++ b/applications/order/widget/ordermgr/OrderEntryScreens.xml
@@ -23,7 +23,7 @@ under the License.
<actions>
<set field="titleProperty" value="PageTitleOrderInits"/>
<set field="headerItem" value="orderentry"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_order_entry"/>
+ <set field="helpAnchor" value="_order_entry"/>
<script
location="component://order/groovyScripts/entry/CheckInits.groovy"/>
</actions>
<widgets>
@@ -40,7 +40,7 @@ under the License.
<actions>
<set field="titleProperty" value="PageTitleOrderAgreements"/>
<set field="headerItem" value="orderentry"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_order_currency_agreements_and_ship_dates"/>
+ <set field="helpAnchor"
value="_order_currency_agreements_and_ship_dates"/>
<script
location="component://order/groovyScripts/entry/OrderAgreements.groovy"/>
</actions>
<widgets>
diff --git a/applications/order/widget/ordermgr/OrderViewScreens.xml
b/applications/order/widget/ordermgr/OrderViewScreens.xml
index 3c5e2fb..42561e6 100644
--- a/applications/order/widget/ordermgr/OrderViewScreens.xml
+++ b/applications/order/widget/ordermgr/OrderViewScreens.xml
@@ -40,7 +40,7 @@ under the License.
</condition>
<actions>
<set field="headerItem" value="main"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_orders_of_the_day"/>
+ <set field="helpAnchor" value="_orders_of_the_day"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -56,7 +56,7 @@ under the License.
<actions>
<set field="titleProperty" value="OrderViewOrder"/>
<set field="headerItem" value="findorders"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_order_view"/>
+ <set field="helpAnchor" value="_order_view"/>
<set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/order.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/OrderShippingInfo.js" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
@@ -207,7 +207,7 @@ under the License.
<actions>
<set field="titleProperty" value="OrderLookupOrder"/>
<set field="headerItem" value="orderlist"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_list_orders"/>
+ <set field="helpAnchor" value="_list_orders"/>
<set field="filterDate" type="Timestamp"
from-field="parameters.filterDate"/>
<script
location="component://order/groovyScripts/order/OrderList.groovy"/>
<script
location="component://order/groovyScripts/order/FilterOrderList.groovy"/>
@@ -252,7 +252,7 @@ under the License.
<actions>
<set field="titleProperty" value="OrderFindOrder"/>
<set field="headerItem" value="findorders"/>
- <set field="helpAnchor" from-field="helpAnchor"
default-value="_find_orders"/>
+ <set field="helpAnchor" value="_find_orders"/>
<script
location="component://order/groovyScripts/order/FindOrders.groovy"/>
<script
location="component://content/groovyScripts/print/FindPrinters.groovy"/>
