svn commit: r529149 - in /ofbiz/trunk/applications/product: webapp/catalog/store/EditProductStoreShipSetup.ftl webapp/catalog/store/ProductStoreTabBar.ftl widget/catalog/StoreScreens.xml

[jacopoc]

Author: jacopoc
Date: Mon Apr 16 00:08:42 2007
New Revision: 529149

URL: http://svn.apache.org/viewvc?view=rev&rev=529149
Log:
Fixed wrong selection for drop down options of carrier ship methods in stor ship settings.

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl
    ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl?view=diff&rev=529149&r1=529148&r2=529149
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl Mon Apr 16 00:08:42 2007
@@ -18,7 +18,6 @@
 -->
 
 <form name="addscarr" method="post" action="<@ofbizUrl>prepareCreateShipMeth</@ofbizUrl>">
-<input type="hidden" name="viewProductStoreId" value="${productStoreId}"/>
 <input type="hidden" name="newShipMethod" value="Y"/>
 <input type="hidden" name="productStoreId" value="${productStoreId}"/>
 <table cellspacing="2" cellpadding="2">
@@ -27,8 +26,8 @@
       <td>
         <select name="carrierShipmentString">
           <option>${uiLabelMap.ProductSelectOne}</option>
-          <#list storeShipMethods as shipmentMethod>
-            <option value="${shipmentMethod.partyId}|${shipmentMethod.roleTypeId}|${shipmentMethod.shipmentMethodTypeId}">${shipmentMethod.description} (${shipmentMethod.partyId}/${shipmentMethod.roleTypeId})</option>
+          <#list carrierShipmentMethods as shipmentMethod>
+            <option value="${shipmentMethod.partyId}|${shipmentMethod.roleTypeId}|${shipmentMethod.shipmentMethodTypeId}">${shipmentMethod.shipmentMethodTypeId} (${shipmentMethod.partyId}/${shipmentMethod.roleTypeId})</option>
           </#list>
         </select>
       </td>

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl?view=diff&rev=529149&r1=529148&r2=529149
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl Mon Apr 16 00:08:42 2007
@@ -26,7 +26,7 @@
       <a href="<@ofbizUrl>EditProductStoreCatalogs?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreCatalogs?default(unselectedClassName)}">${uiLabelMap.ProductCatalogs}</a>
       <a href="<@ofbizUrl>EditProductStoreWebSites?viewProductStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreWebSites?default(unselectedClassName)}">${uiLabelMap.ProductWebSites}</a>
       <!-- The tax stuff is in the Tax Authority area of the accounting manager, need to re-do this screen to list current tax entries and link to the accmgr screens <a href="<@ofbizUrl>EditProductStoreTaxSetup?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreTaxSetup?default(unselectedClassName)}">${uiLabelMap.ProductSalesTax}</a> -->
-      <a href="<@ofbizUrl>EditProductStoreShipSetup?viewProductStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreShipSetup?default(unselectedClassName)}">${uiLabelMap.OrderShipping}</a>
+      <a href="<@ofbizUrl>EditProductStoreShipSetup?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreShipSetup?default(unselectedClassName)}">${uiLabelMap.OrderShipping}</a>
       <a href="<@ofbizUrl>EditProductStoreShipmentCostEstimates?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreShipmentCostEstimates?default(unselectedClassName)}">${uiLabelMap.ProductViewEstimates}</a>
       <a href="<@ofbizUrl>EditProductStorePaySetup?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStorePaySetup?default(unselectedClassName)}">${uiLabelMap.AccountingPayments}</a>
       <a href="<@ofbizUrl>EditProductStoreEmails?productStoreId=${productStoreId}</@ofbizUrl>" class="${selectedClassMap.EditProductStoreEmails?default(unselectedClassName)}">${uiLabelMap.CommonEmails}</a>

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?view=diff&rev=529149&r1=529148&r2=529149
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Mon Apr 16 00:08:42 2007
@@ -207,14 +207,16 @@
                 <set field="tabButtonItem" value="EditProductStoreShipSetup"/>
                 <set field="labelTitleProperty" value="ProductProductStoreShipmentSettings"/>
 
-                <set field="productStoreId" from-field="parameters.viewProductStoreId"/>
-                <set field="productStoreId" from-field="parameters.productStoreId" default-value="${productStoreId}"/>
+                <set field="productStoreId" from-field="parameters.productStoreId"/>
                 <entity-one entity-name="ProductStore" value-name="productStore" auto-field-map="true"/>
                 <entity-condition entity-name="ProductStoreShipmentMethView" list-name="storeShipMethods">
                     <condition-expr field-name="productStoreId" env-name="productStoreId"/>
                     <order-by field-name="sequenceNumber"/>
                 </entity-condition>
                 <entity-one entity-name="ProductStoreShipmentMeth" value-name="productStoreShipmentMeth" auto-field-map="true"/>
+                <entity-condition entity-name="CarrierShipmentMethod" list-name="carrierShipmentMethods">
+                    <order-by field-name="sequenceNumber"/>
+                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">