Author: jacopoc
Date: Sat Feb 24 03:07:08 2007
New Revision: 511250
URL: http://svn.apache.org/viewvc?view=rev&rev=511250
Log:
Pretty important change to data model to allow more flexible shipping rules per
store:
the primary key of the entity ProductStoreShipmentMeth is no more composed by:
productStoreId
shipmentMethodTypeId
partyId
roleTypeId
but by one (new) pk field :
productStoreShipMethId
Also modified existing business rules and demo data to reflect this change.
OFBIZ-735
Modified:
ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml
ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml
ofbiz/trunk/applications/order/entitydef/entitymodel.xml
ofbiz/trunk/applications/product/entitydef/entitymodel.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
Modified: ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml?view=diff&rev=511250&r1=511249&r2=511250
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoRentalShipping.xml Sat Feb 24
03:07:08 2007
@@ -47,12 +47,12 @@
<CarrierShipmentMethod partyId="_NA_" roleTypeId="CARRIER"
shipmentMethodTypeId="STANDARD" sequenceNumber="5"/>
<CarrierShipmentMethod partyId="_NA_" roleTypeId="CARRIER"
shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="8"/>
- <ProductStoreShipmentMeth productStoreId="RentalStore" partyId="_NA_"
includeNoChargeItems="Y" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="6"/>
- <ProductStoreShipmentMeth productStoreId="RentalStore" partyId="UPS"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="3"/>
- <ProductStoreShipmentMeth productStoreId="RentalStore" partyId="UPS"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="AIR" sequenceNumber="2"/>
- <ProductStoreShipmentMeth productStoreId="RentalStore" partyId="UPS"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="1"/>
- <ProductStoreShipmentMeth productStoreId="RentalStore" partyId="USPS"
includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD"
serviceName="uspsRateInquire" sequenceNumber="5"/>
- <ProductStoreShipmentMeth productStoreId="RentalStore" partyId="USPS"
includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS"
serviceName="uspsRateInquire" sequenceNumber="4"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9017"
productStoreId="RentalStore" partyId="_NA_" includeNoChargeItems="Y"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="6"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9018"
productStoreId="RentalStore" partyId="UPS" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND" sequenceNumber="3"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9019"
productStoreId="RentalStore" partyId="UPS" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="AIR" sequenceNumber="2"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9020"
productStoreId="RentalStore" partyId="UPS" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_DAY" sequenceNumber="1"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9021"
productStoreId="RentalStore" partyId="USPS" includeNoChargeItems="N"
allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="STANDARD" serviceName="uspsRateInquire"
sequenceNumber="5"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9022"
productStoreId="RentalStore" partyId="USPS" includeNoChargeItems="N"
allowUspsAddr="Y" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="EXPRESS" serviceName="uspsRateInquire"
sequenceNumber="4"/>
<QuantityBreak fromQuantity="0.0" quantityBreakId="RentalStore"
quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/>
<QuantityBreak fromQuantity="0.0" quantityBreakId="9003"
quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/>
Modified: ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml?view=diff&rev=511250&r1=511249&r2=511250
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoShipping.xml Sat Feb 24
03:07:08 2007
@@ -69,23 +69,23 @@
<CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND" sequenceNumber="18"
carrierServiceCode="FEDEXGROUND"/>
<CarrierShipmentMethod partyId="FEDEX" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND_HOME" sequenceNumber="19"
carrierServiceCode="GROUNDHOMEDELIVERY"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="_NA_"
includeNoChargeItems="Y" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="6"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="UPS"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="3"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="UPS"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="AIR" sequenceNumber="2"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="UPS"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="1"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="USPS"
includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD"
serviceName="uspsRateInquire" sequenceNumber="5"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="USPS"
includeNoChargeItems="N" allowUspsAddr="Y" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS"
serviceName="uspsRateInquire" sequenceNumber="4"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="DHL"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="7"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="DHL"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM" sequenceNumber="8"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="DHL"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="9"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="DHL"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="10"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="FEDEX"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_AM" sequenceNumber="11"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="FEDEX"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY" sequenceNumber="12"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="FEDEX"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM" sequenceNumber="13"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="FEDEX"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY" sequenceNumber="14"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="FEDEX"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS" sequenceNumber="15"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="FEDEX"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="16"/>
- <ProductStoreShipmentMeth productStoreId="9000" partyId="FEDEX"
includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N"
roleTypeId="CARRIER" shipmentMethodTypeId="GROUND_HOME" sequenceNumber="17"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9000"
productStoreId="9000" partyId="_NA_" includeNoChargeItems="Y" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING"
sequenceNumber="6"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9001"
productStoreId="9000" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND"
sequenceNumber="3"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9002"
productStoreId="9000" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="AIR"
sequenceNumber="2"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9003"
productStoreId="9000" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_DAY"
sequenceNumber="1"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9004"
productStoreId="9000" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="STANDARD"
serviceName="uspsRateInquire" sequenceNumber="5"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9005"
productStoreId="9000" partyId="USPS" includeNoChargeItems="N" allowUspsAddr="Y"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS"
serviceName="uspsRateInquire" sequenceNumber="4"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9006"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="EXPRESS"
sequenceNumber="7"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9007"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NEXT_PM"
sequenceNumber="8"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9008"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="SECOND_DAY"
sequenceNumber="9"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9009"
productStoreId="9000" partyId="DHL" includeNoChargeItems="N" allowUspsAddr="N"
requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND"
sequenceNumber="10"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9010"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_AM" sequenceNumber="11"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9011"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_DAY" sequenceNumber="12"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9012"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="NEXT_PM" sequenceNumber="13"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9013"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="SECOND_DAY" sequenceNumber="14"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9014"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="EXPRESS" sequenceNumber="15"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9015"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND" sequenceNumber="16"/>
+ <ProductStoreShipmentMeth productStoreShipmentMethId="9016"
productStoreId="9000" partyId="FEDEX" includeNoChargeItems="N"
allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER"
shipmentMethodTypeId="GROUND_HOME" sequenceNumber="17"/>
<QuantityBreak fromQuantity="0.0" quantityBreakId="9000"
quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/>
<QuantityBreak fromQuantity="0.0" quantityBreakId="9001"
quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/>
Modified: ofbiz/trunk/applications/order/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?view=diff&rev=511250&r1=511249&r2=511250
==============================================================================
--- ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/order/entitydef/entitymodel.xml Sat Feb 24
03:07:08 2007
@@ -2505,7 +2505,7 @@
<relation type="one" fk-name="SHLIST_VSTR" rel-entity-name="Visitor">
<key-map field-name="visitorId"/>
</relation>
- <relation type="one" fk-name="SHLIST_PSSM"
rel-entity-name="ProductStoreShipmentMeth">
+ <relation type="many" fk-name="SHLIST_PSSM"
rel-entity-name="ProductStoreShipmentMeth">
<key-map field-name="productStoreId"/>
<key-map field-name="shipmentMethodTypeId"/>
<key-map field-name="carrierPartyId" rel-field-name="partyId"/>
Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=511250&r1=511249&r2=511250
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Sat Feb 24
03:07:08 2007
@@ -3521,6 +3521,7 @@
<entity entity-name="ProductStoreShipmentMeth"
package-name="org.ofbiz.product.store"
title="Product Store Carrier Shipment Method Entity">
+ <field name="productStoreShipMethId" type="id-ne"></field>
<field name="productStoreId" type="id-ne"></field>
<field name="shipmentMethodTypeId" type="id-ne"></field>
<field name="partyId" type="id-ne"></field>
@@ -3544,10 +3545,7 @@
<field name="serviceName" type="long-varchar"></field>
<field name="configProps" type="long-varchar"></field>
<field name="sequenceNumber" type="numeric"></field>
- <prim-key field="productStoreId"/>
- <prim-key field="shipmentMethodTypeId"/>
- <prim-key field="partyId"/>
- <prim-key field="roleTypeId"/>
+ <prim-key field="productStoreShipMethId"/>
<relation type="one-nofk" rel-entity-name="Party">
<key-map field-name="companyPartyId" rel-field-name="partyId"/>
</relation>
@@ -3563,6 +3561,7 @@
title="Product Store Carrier And Shipment Method Type View Entity">
<member-entity entity-alias="PSSM"
entity-name="ProductStoreShipmentMeth"/>
<member-entity entity-alias="SM" entity-name="ShipmentMethodType"/>
+ <alias entity-alias="PSSM" name="productStoreShipMethId"/>
<alias entity-alias="PSSM" name="productStoreId"/>
<alias entity-alias="PSSM" name="shipmentMethodTypeId"/>
<alias entity-alias="PSSM" name="partyId"/>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?view=diff&rev=511250&r1=511249&r2=511250
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
Sat Feb 24 03:07:08 2007
@@ -210,7 +210,7 @@
<make-value value-name="newEntity"
entity-name="ProductStoreShipmentMeth"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <sequenced-id-to-env sequence-name="ProductStoreShipmentMeth"
env-name="newEntity.productStoreShipMethId"/>
<create-value value-name="newEntity"/>
</simple-method>
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?view=diff&rev=511250&r1=511249&r2=511250
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
Sat Feb 24 03:07:08 2007
@@ -170,20 +170,27 @@
return storePayment;
}
- public static GenericValue getProductStoreShipmentMethod(GenericDelegator
delegator, String productStoreId,
+ public static List getProductStoreShipmentMethods(GenericDelegator
delegator, String productStoreId,
String
shipmentMethodTypeId, String carrierPartyId, String carrierRoleTypeId) {
// check for an external service call
Map storeFields = UtilMisc.toMap("productStoreId", productStoreId,
"shipmentMethodTypeId", shipmentMethodTypeId,
"partyId", carrierPartyId, "roleTypeId", carrierRoleTypeId);
- GenericValue storeShipMeth = null;
+ List storeShipMethods = null;
try {
- storeShipMeth =
delegator.findByPrimaryKeyCache("ProductStoreShipmentMeth", storeFields);
+ storeShipMethods =
delegator.findByAndCache("ProductStoreShipmentMeth", storeFields);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
- return storeShipMeth;
+ return storeShipMethods;
+ }
+
+ public static GenericValue getProductStoreShipmentMethod(GenericDelegator
delegator, String productStoreId,
+ String
shipmentMethodTypeId, String carrierPartyId, String carrierRoleTypeId) {
+ // TODO: selecting the first record is a far from optimal solution
but, since the productStoreShipmentMethod
+ // is currently used to get the service name to get the online
estimate, this should not be a huge deal for now.
+ return EntityUtil.getFirst(getProductStoreShipmentMethods(delegator,
productStoreId, shipmentMethodTypeId, carrierPartyId, carrierRoleTypeId));
}
public static List getAvailableStoreShippingMethods(GenericDelegator
delegator, String productStoreId, GenericValue shippingAddress, List itemSizes,
Map featureIdMap, double weight, double orderTotal) {
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=511250&r1=511249&r2=511250
==============================================================================
---
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
Sat Feb 24 03:07:08 2007
@@ -501,6 +501,7 @@
<#list storeShipMethods as meth>
<#assign idx = idx + 1>
<form name="methUpdate${idx}" method="post"
action="<@ofbizUrl>storeUpdateShipMeth</@ofbizUrl>">
+ <input type="hidden" name="productStoreShipMethId"
value="${meth.productStoreShipMethId}">
<input type="hidden" name="shipmentMethodTypeId"
value="${meth.shipmentMethodTypeId}">
<input type="hidden" name="partyId" value="${meth.partyId}">
<input type="hidden" name="roleTypeId" value="${meth.roleTypeId}">
@@ -529,7 +530,7 @@
<td width='1' align="right">
<span style="white-space: nowrap;">
<a href="javascript:document.methUpdate${idx}.submit();"
class="buttontext">[${uiLabelMap.CommonUpdate}]</a>
- <a
href="<@ofbizUrl>storeRemoveShipMeth?viewProductStoreId=${productStoreId}&productStoreId=${meth.productStoreId}&newShipMethod=Y&shipmentMethodTypeId=${meth.shipmentMethodTypeId}&partyId=${meth.partyId}&roleTypeId=${meth.roleTypeId}</@ofbizUrl>"
class="buttontext">[${uiLabelMap.CommonRemove}]</a>
+ <a
href="<@ofbizUrl>storeRemoveShipMeth?viewProductStoreId=${productStoreId}&productStoreId=${meth.productStoreId}&newShipMethod=Y&productStoreShipMethId=${meth.productStoreShipMethId}</@ofbizUrl>"
class="buttontext">[${uiLabelMap.CommonRemove}]</a>
</span>
</td>
</tr>
