svn commit: r557960 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml

[ja...@apache.org]

Author: jacopoc
Date: Fri Jul 20 03:43:06 2007
New Revision: 557960

URL: http://svn.apache.org/viewvc?view=rev&rev=557960
Log:
Checkboxes to import eBay orders are now available only if the order has not error messages and was not already imported.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml?view=diff&rev=557960&r1=557959&r2=557960
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml Fri Jul 20 03:43:06 2007
@@ -130,14 +130,16 @@
         <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.OrderImportOrdersSearchFromEbay}"><submit button-type="button"/></field>
     </form>
-    <form name="ListOrdersFromEbay" type="multi" list-name="orderList" target="ImportOrderFromEbay">
-        <field name="orderSelected" title="${uiLabelMap.CommonSelect}"><check/></field>
+    <form name="ListOrdersFromEbay" type="multi" use-row-submit="true" list-name="orderList" target="ImportOrderFromEbay">
+        <row-actions>
+            <set field="canImportOrder" value="${bsh: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) &amp;&amp; org.ofbiz.base.util.UtilValidate.isEmpty(errorMessage)}" type="Boolean"/>
+        </row-actions>
         <field name="productStoreId"><hidden/></field>
         <field name="externalId" title="${uiLabelMap.OrderImportEbayItem}"><display/></field>
-        <field name="orderId" use-when="orderId == null"><display/></field>
-        <field name="orderId" use-when="orderId != null"><hyperlink target="orderview?orderId=${orderId}" description="${orderId}"/></field>
+        <field name="orderId"><hyperlink target="orderview?orderId=${orderId}" description="${orderId}"/></field>
         <field name="createdDate"><display/></field>
         <field name="productId"><display/></field>
+        <field name="productName" entry-name="productId"><display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/></field>
         <field name="title"><display/></field>
         <field name="quantityPurchased" title="${uiLabelMap.OrderQuantitySold}"><display/></field>
         <field name="transactionPrice" title="${uiLabelMap.OrderUnitPrice}"><display/></field>
@@ -146,7 +148,6 @@
         <field name="amountPaid"><display/></field>
         <field name="paidTime"><display/></field>
         <field name="shippedTime"><display/></field>
-        <field name="errorMessage"><display/></field>
         <field name="paymentMethodUsed"><display/></field>
         <field name="listingStatus"><display/></field>
         <field name="eBayPaymentStatus"><display/></field>
@@ -159,6 +160,9 @@
         <field name="shippingAddressPostalCode"><hidden/></field>
         <field name="shippingAddressCountry"><hidden/></field>
         <field name="shippingAddressStateOrProvince"><hidden/></field>
-        <field name="shippingAddressCityName"><hidden/></field><field name="submitButton" title="${uiLabelMap.OrderImportOrdersFromEbay}" widget-style="smallSubmit"><submit/></field>
+        <field name="shippingAddressCityName"><hidden/></field>
+        <field name="errorMessage"><display/></field>
+        <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}" use-when="${canImportOrder}"><check/></field>
+        <field name="submitButton" title="${uiLabelMap.OrderImportOrdersFromEbay}" widget-style="smallSubmit"><submit/></field>
     </form>
 </forms>