OFBiz › OFBiz - Commits

svn commit: r1153560 [14/15] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounti...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

sascharodekamp

svn commit: r1153560 [14/15] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/invoice/ applications/accounti...

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPurchasing.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPurchasing.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPurchasing.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoPurchasing.xml Wed Aug 3 16:12:58 2011
@@ -253,6 +253,12 @@ under the License.
<DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="orderWhenSold-ALT" localeString="en"/>
<DataResource dataResourceTypeId="ELECTRONIC_TEXT" dataResourceId="DRorderWhenSold-ALT" localeString="en_US"/>

+ <ElectronicText dataResourceId="dropShip-ALT" textData="dropship"/>
+ <ElectronicText dataResourceId="dropShip1-ALT" textData="dropship1"/>
+ <ElectronicText dataResourceId="dropShip2-ALT" textData="dropship2"/>
+ <ElectronicText dataResourceId="dropShip3-ALT" textData="dropship3"/>
+ <ElectronicText dataResourceId="orderWhenSold-ALT" textData="order-when-sold"/>
+
<ElectronicText dataResourceId="DRdropShip-ALTEN" textData="dropship"/>
<ElectronicText dataResourceId="DRdropShip1-ALTEN" textData="dropship1"/>
<ElectronicText dataResourceId="DRdropShip2-ALTEN" textData="dropship2"/>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/ofbiz-component.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/ofbiz-component.xml Wed Aug 3 16:12:58 2011
@@ -53,6 +53,7 @@ under the License.
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoTestSurveyData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProductAdditionalViewData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoPopularCategoriesData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoContentAltUrl.xml"/>

<webapp name="ecommerce"
title="eCommerce"

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml Wed Aug 3 16:12:58 2011
@@ -124,9 +124,12 @@ under the License.
processor-name="newAffil" in-map-name="parameters" out-map-name="af_context"/>
<check-errors/>
<call-service service-name="createAffiliate" in-map-name="af_context">
- <default-message>Affiliate record successfully created.</default-message>
+ <default-message resource="EcommerceUiLabels" property="EcommerceAffiliateCreatedSuccessfully"/>
</call-service>

</simple-method>
-
+ <simple-method method-name="addCheckValue" short-description="Add field to request for investigation purpose" login-required="false">
+ <set field="checkValue" value="check" type="PlainString"/>
+ <field-to-request field="checkValue" request-name="checkValue"/>
+ </simple-method>
</simple-methods>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl Wed Aug 3 16:12:58 2011
@@ -20,17 +20,12 @@ under the License.
<body>
<p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p>
<p class="tabletext">Successfully subscribed from ${contactList.contactListName} contact list.</p>
- <#assign verifyUrl = baseEcommerceSecureUrl + "updateContactListPartyNoUserLogin" />
- <form method="post" id="contactListOptOut" action="${verifyUrl}">
- <fieldset>
- <input type="hidden" name="contactListId" value="${contactListParty.contactListId}" />
- <input type="hidden" name="partyId" value="${contactListParty.partyId}" />
- <input type="hidden" name="preferredContactMechId" value="${contactListParty.preferredContactMechId?if_exists}" />
- <input type="hidden" name="fromDate" value="${contactListParty.fromDate}" />
- <input type="hidden" name="statusId" value="CLPT_UNSUBS_PENDING" />
- <input type="hidden" name="optInVerifyCode" value="${contactListPartyStatus.optInVerifyCode?if_exists}" />
- <input type="submit" name="submitButton" value="Click here to unsubscribe your newsletter subscription." />
- </fieldset>
- </form>
+
+ <#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists>
+ <#if (contactListParty.preferredContactMechId)?exists>
+ <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId>
+ </#if>
+ <a href="${verifyUrl}">If this was by mistake, click here to unsubscribe your subscription again.</a>
+
</body>
</html>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl Wed Aug 3 16:12:58 2011
@@ -20,5 +20,14 @@ under the License.
<body>
<p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p>
<p class="tabletext">Successfully unsubscribed from ${contactList.contactListName} contact list.</p>
+
+ <#--assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_SUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists>
+ <#if (contactListParty.preferredContactMechId)?exists>
+ <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId>
+ </#if>
+ <a href="${verifyUrl}">If this was by mistake, click here subscribe again.</a-->
+
+
+
</body>
</html>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl Wed Aug 3 16:12:58 2011
@@ -32,21 +32,12 @@ under the License.

<p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p>
<p class="tabletext">We have received a request for unsubscription to the ${contactList.contactListName} contact list.</p>
- <p class="tabletext">To complete your unsubscription use the verify form in your <a href="${baseEcommerceSecureUrl}viewprofile">online profile</a>, or use the following link:</p>
- <#if (contactListPartyStatus.optInVerifyCode)?has_content><p class="tabletext">Your verify code is: ${contactListPartyStatus.optInVerifyCode}</p></#if>
+ <p class="tabletext">To complete your unsubscription click the on the following link:</p>

- <#assign verifyUrl = baseEcommerceSecureUrl + "contactListOptOut" />
- <form method="post" id="contactListOptOut" action="${verifyUrl}">
- <fieldset>
- <input type="hidden" name="communicationEventId" value="${communicationEventId}" />
- <input type="hidden" name="contactListId" value="${contactListParty.contactListId}" />
- <input type="hidden" name="partyId" value="${contactListParty.partyId}" />
- <input type="hidden" name="preferredContactMechId" value="${contactListParty.preferredContactMechId?if_exists}" />
- <input type="hidden" name="fromDate" value="${contactListParty.fromDate}" />
- <input type="hidden" name="statusId" value="CLPT_UNSUBSCRIBED" />
- <input type="hidden" name="optInVerifyCode" value="${contactListPartyStatus.optInVerifyCode?if_exists}" />
- <input type="submit" name="submitButton" value="Please click here to verify your newsletter unsubscription." />
- </fieldset>
- </form>
+ <#assign verifyUrl = baseEcommerceSecureUrl+'contactListOptOut?contactListId='+contactListParty.contactListId+'&communicationEventId='+communicationEventId?if_exists+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBSCRIBED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode>
+ <#if (contactListParty.preferredContactMechId)?exists>
+ <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId>
+ </#if>
+ <a href="${verifyUrl}">Please click here to verify your unsubscription.</a>
</body>
</html>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl Wed Aug 3 16:12:58 2011
@@ -32,20 +32,13 @@ under the License.

<p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p>
<p class="tabletext">We have received a request for subscription to the ${contactList.contactListName} contact list.</p>
-<p class="tabletext">To complete your subscription use the verify form in your <a href="${baseEcommerceSecureUrl}viewprofile">online profile</a>, or use the following link:</p>
-<#if (contactListPartyStatus.optInVerifyCode)?has_content><p class="tabletext">Your verify code is: ${contactListPartyStatus.optInVerifyCode}</p></#if>
+<p class="tabletext">To complete your subscription click the on the following link:</p>
+
+<#assign verifyUrl = baseEcommerceSecureUrl+'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_ACCEPTED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists>
+<#if (contactListParty.preferredContactMechId)?exists>
+ <#assign verifyUrl= verifyUrl+"&preferredContactMechId="+contactListParty.preferredContactMechId>
+</#if>
+<a href="${verifyUrl}">Please click here to verify your subscription.</a>

-<#assign verifyUrl = baseEcommerceSecureUrl + "updateContactListPartyNoUserLogin" />
-<form method="post" id="updateContactListPartyNoUserLogin" action="${verifyUrl}">
- <fieldset>
- <input type="hidden" name="contactListId" value="${contactListParty.contactListId}" />
- <input type="hidden" name="partyId" value="${contactListParty.partyId}" />
- <input type="hidden" name="preferredContactMechId" value="${contactListParty.preferredContactMechId?if_exists}" />
- <input type="hidden" name="fromDate" value="${contactListParty.fromDate}" />
- <input type="hidden" name="statusId" value="CLPT_ACCEPTED" />
- <input type="hidden" name="optInVerifyCode" value="${contactListPartyStatus.optInVerifyCode?if_exists}" />
- <input type="submit" name="submitButton" value="Please click here to verify your newsletter subscription." />
- </fieldset>
-</form>
</body>
</html>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Wed Aug 3 16:12:58 2011
@@ -48,6 +48,7 @@ under the License.
<event name="autoLoginCheck" type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="autoLoginCheck"/>
<event name="checkTrackingCodeCookies" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeCookies"/>
<event name="setDefaultStoreSettings" type="java" path="org.ofbiz.product.product.ProductEvents" invoke="setDefaultStoreSettings"/>
+ <event name="restoreAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/>
</firstvisit>


@@ -58,7 +59,6 @@ under the License.
<event name="checkTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkTrackingCodeUrlParam"/>
<event name="checkPartnerTrackingCodeUrlParam" type="java" path="org.ofbiz.marketing.tracking.TrackingCodeEvents" invoke="checkPartnerTrackingCodeUrlParam"/>
<event name="keepCartUpdated" type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="keepCartUpdated"/>
- <event name="restoreAutoSaveList" type="java" path="org.ofbiz.order.shoppinglist.ShoppingListEvents" invoke="restoreAutoSaveList"/>
</preprocessor>


@@ -136,7 +136,7 @@ under the License.
<request-map uri="setSessionLocale">
<security https="false" auth="false"/>
<event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/>
- <response name="success" type="view-last" value="main"/>
+ <response name="success" type="request-redirect" value="checkValue"/>
<response name="error" type="view" value="main"/>
</request-map>

@@ -859,7 +859,7 @@ under the License.
</request-map>
<request-map uri="product">
<security https="false" auth="false"/>
- <response name="success" type="view" value="product"/>
+ <response name="success" type="view" value="product" save-current-view="true"/>
</request-map>
<request-map uri="detailImage">
<security https="false" auth="false"/>
@@ -1337,8 +1337,14 @@ under the License.
<response name="success" type="view" value="main"/>
<response name="error" type="view" value="main"/>
</request-map>
+ <request-map uri="unsubscribeContactListPartyContachMech">
+ <security https="false" auth="false"/>
+ <event type="service" invoke="unsubscribeContactListPartyContachMech"/>
+ <response name="success" type="view" value="main"/>
+ <response name="error" type="view" value="main"/>
+ </request-map>
<request-map uri="contactListOptOut" track-serverhit="false" track-visit="false">
- <security https="true" auth="false"/>
+ <security https="false" auth="false"/>
<event type="service" invoke="updateContactListPartyNoUserLogin"/>
<response name="success" type="view" value="ContactListOptOut"/>
</request-map>
@@ -1593,7 +1599,7 @@ under the License.
<response name="error" type="view" value="viewprofile"/>
</request-map>
<request-map uri="updateContactListPartyNoUserLogin">
- <security https="true" auth="false"/>
+ <security https="false" auth="false"/>
<event type="service" invoke="updateContactListPartyNoUserLogin"/>
<response name="success" type="view" value="main"/>
<response name="error" type="view" value="main"/>
@@ -1949,6 +1955,33 @@ under the License.
<response name="success" type="view" value="reloadCaptchaCode"/>
</request-map>

+ <request-map uri="productCategoryList">
+ <security https="false" auth="false"/>
+ <response name="success" type="view" value="productCategoryList" save-current-view="true"/>
+ </request-map>
+ <request-map uri="productCategoryListSecure">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="productCategoryList" save-current-view="true"/>
+ </request-map>
+ <request-map uri="categoryAjaxFired">
+ <security https="false" auth="false"/>
+ <response name="success" type="view" value="productCategoryList" save-current-view="true"/>
+ </request-map>
+ <request-map uri="categoryAjaxFiredSecure">
+ <security https="true" auth="false"/>
+ <response name="success" type="view" value="productCategoryList" save-current-view="true"/>
+ </request-map>
+ <request-map uri="checkValue">
+ <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml" invoke="addCheckValue"/>
+ <response name="success" type="view-last" value="main"/>
+ <response name="error" type="view" value="main"/>
+ </request-map>
+ <request-map uri="stream">
+ <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="serveObjectData"/>
+ <response name="success" type="none"/>
+ <response name="error" type="view" value="error"/>
+ </request-map>
+



@@ -2101,5 +2134,9 @@ under the License.

<view-map name="reloadCaptchaImage" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaImage"/>
<view-map name="reloadCaptchaCode" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaCode"/>
+
+ 
+ <view-map name="productCategoryList" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#productCategoryList"/>
+

</site-conf>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Wed Aug 3 16:12:58 2011
@@ -65,6 +65,17 @@ under the License.
<init-param><param-name>defaultLocaleString</param-name><param-value>en_US</param-value></init-param>
<init-param><param-name>redirectUrl</param-name><param-value>/control/main</param-value></init-param>
</filter>
+ <filter>
+ <filter-name>ContentUrlFilter</filter-name>
+ <display-name>ContentUrlFilter</display-name>
+ <filter-class>org.ofbiz.content.content.ContentUrlFilter</filter-class>
+ <init-param>
+ <param-name>defaultLocaleString</param-name>
+ <param-value>en_US</param-value>
+ </init-param>
+ <init-param><param-name>redirectUrl</param-name><param-value>/control/main</param-value></init-param>
+ <init-param><param-name>viewRequest</param-name><param-value>ViewBlogArticle</param-value></init-param>
+ </filter>
<filter>
<filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
@@ -91,6 +102,10 @@ under the License.
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
+ <filter-name>ContentUrlFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
<filter-name>ContextFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Wed Aug 3 16:12:58 2011
@@ -34,6 +34,12 @@ under the License.
document.getElementById("statusId").value = "CLPT_UNSUBS_PENDING";
form.submit();
}
+ function unsubscribeByContactMech() {
+ var form = document.getElementById("signUpForContactListForm");
+ form.action = "<@ofbizUrl>unsubscribeContactListPartyContachMech</@ofbizUrl>"
+ document.getElementById("statusId").value = "CLPT_UNSUBS_PENDING";
+ form.submit();
+ }
</script>

<div id="miniSignUpForContactList" class="screenlet">
@@ -50,6 +56,8 @@ under the License.
<#-- They are logged in so lets present the form to sign up with their email address -->
<form method="post" action="<@ofbizUrl>createContactListParty</@ofbizUrl>" name="signUpForContactListForm" id="signUpForContactListForm">
<fieldset>
+ <#assign contextPath = request.getContextPath()>
+ <input type="hidden" name="baseLocation" value="${contextPath}"/>
<input type="hidden" name="partyId" value="${partyId}"/>
<input type="hidden" id="statusId" name="statusId" value="CLPT_PENDING"/>
<p>${uiLabelMap.EcommerceSignUpForContactListComments}</p>
@@ -65,7 +73,7 @@ under the License.
</div>
<div>
<input type="submit" value="${uiLabelMap.EcommerceSubscribe}"/>
- <input type="button" value="${uiLabelMap.EcommerceUnsubscribe}" onclick="javascript:unsubscribe();"/>
+ <input type="button" value="${uiLabelMap.EcommerceUnsubscribe}" onclick="javascript:unsubscribeByContactMech();"/>
</div>
</fieldset>
</form>
@@ -79,6 +87,8 @@ under the License.
<#-- There is no party info so just offer an anonymous (non-partyId) related newsletter sign up -->
<form method="post" action="<@ofbizUrl>signUpForContactList</@ofbizUrl>" name="signUpForContactListForm" id="signUpForContactListForm">
<fieldset>
+ <#assign contextPath = request.getContextPath()>
+ <input type="hidden" name="baseLocation" value="${contextPath}"/>
<input type="hidden" id="statusId" name="statusId"/>
<div>
<label>${uiLabelMap.EcommerceSignUpForContactListComments}</label>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CartScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CartScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CartScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CartScreens.xml Wed Aug 3 16:12:58 2011
@@ -65,7 +65,8 @@ under the License.
<section>
<actions>
<set field="leftbarScreenName" value="leftbar"/>
- <set field="MainColumnStyle" value="leftonly"/>
+ <set field="MainColumnStyle" value="center"/>
+ 

<set field="titleProperty" value="PageTitleShoppingCart"/>
<set field="headerItem" value="Shopping Cart"/>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml Wed Aug 3 16:12:58 2011
@@ -168,6 +168,7 @@ under the License.
<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy"/>
<set field="detailScreen" value="LayeredCategoryDetail"/>
-->
+ <set field="tabButtonItem" value="LookupProductCategories"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -488,4 +489,73 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="productCatagories">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="LookupProductCategories"/>
+
+ <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy"/>
+ </actions>
+ <widgets>
+ <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="productCategoryList">
+ <section>
+ <condition>
+ <if-empty field="parameters.mainSubmited"/>
+ </condition>
+ <actions>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+ <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy"/>
+ <set field="check" type="PlainString" value="${groovy: return request.getAttribute('checkValue');}"/>
+ </actions>
+ <widgets>
+ <section>
+ <condition>
+ <if-compare operator="equals" value="check" field="check" type="PlainString"/>
+ </condition>
+ <widgets>
+ <include-screen name="category"/>
+ </widgets>
+ <fail-widgets>
+ <section>
+ <condition>
+ <if-empty field="category_id"/>
+ </condition>
+ <widgets>
+ <include-screen name="newbreadcrumbs" share-scope="true"/>
+ </widgets>
+ <fail-widgets>
+ <include-screen name="breadcrumbs" share-scope="true"/>
+ </fail-widgets>
+ </section>
+ <include-screen name="category-include" share-scope="true"/>
+ </fail-widgets>
+ </section>
+ </widgets>
+ <fail-widgets>
+ <section>
+ <widgets>
+ <include-screen name="category"/>
+ </widgets>
+ </section>
+ </fail-widgets>
+ </section>
+ </screen>
+ <screen name="newbreadcrumbs">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy"/>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
</screens>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml Wed Aug 3 16:12:58 2011
@@ -103,7 +103,8 @@ under the License.
<widgets>
<include-screen name="choosecatalog" location="component://ecommerce/widget/CatalogScreens.xml"/>
<include-screen name="keywordsearchbox" location="component://ecommerce/widget/CatalogScreens.xml"/>
- <include-screen name="sidedeepcategory" location="component://ecommerce/widget/CatalogScreens.xml"/>
+ 
+ <include-screen name="productCatagories" location="component://ecommerce/widget/CatalogScreens.xml"/>
<include-screen name="LayeredNavBar" location="component://ecommerce/widget/CatalogScreens.xml"/>
<include-screen name="minireorderprods" location="component://ecommerce/widget/CatalogScreens.xml"/>
<include-screen name="signupforcontactlist" location="component://ecommerce/widget/EmailContactListScreens.xml"/>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ContentForms.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ContentForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ContentForms.xml Wed Aug 3 16:12:58 2011
@@ -41,3 +41,4 @@ under the License.
<field name="contentName"><display/></field>
</form>
</forms>
+

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailContactListScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailContactListScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailContactListScreens.xml Wed Aug 3 16:12:58 2011
@@ -25,8 +25,8 @@ under the License.
<section>
<actions>
<set field="titleProperty" value="EcommerceSubscriptionVerifyEmail"/>
- <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>
-
+ 
+ <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
<entity-one entity-name="PartyNameView" value-field="partyName" auto-field-map="false">
<field-map field-name="partyId" from-field="contactListParty.partyId"/>
</entity-one>
@@ -67,7 +67,8 @@ under the License.
<actions>
<entity-one entity-name="ContactList" value-field="contactList"/>
<entity-one entity-name="PartyNameView" value-field="partyName"/>
- <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>
+ 
+ <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListSubscribeEmail.ftl"/></html></platform-specific>
@@ -80,7 +81,8 @@ under the License.
<actions>
<entity-one entity-name="ContactList" value-field="contactList"/>
<entity-one entity-name="PartyNameView" value-field="partyName"/>
- <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>
+ 
+ <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl"/></html></platform-specific>
@@ -93,7 +95,8 @@ under the License.
<actions>
<entity-one entity-name="ContactList" value-field="contactList"/>
<entity-one entity-name="PartyNameView" value-field="partyName"/>
- <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>
+ 
+ <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListUnsubscribeEmail.ftl"/></html></platform-specific>
@@ -106,7 +109,8 @@ under the License.
<actions>
<entity-one entity-name="ContactList" value-field="contactList"/>
<entity-one entity-name="PartyNameView" value-field="partyName"/>
- <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>
+ 
+ <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListEmailTemplate.ftl"/></html></platform-specific>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/blog/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/blog/BlogScreens.xml?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/blog/BlogScreens.xml Wed Aug 3 16:12:58 2011
@@ -116,10 +116,11 @@
<widgets>
<container style="blogwrapper">
<include-menu name="view_edit" location="component://ecommerce/widget/blog/BlogMenus.xml"/>
- <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
+ <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl"/></html></platform-specific>
+ 

- <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
+ <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl"/></html></platform-specific>
+ 
<!--
<link text="Latest" target="LatestResponses" >
<parameter param-name="ownerContentId" from-field="blog.ownerContentId"/>
@@ -674,6 +676,7 @@
<entity-condition entity-name="ContentAssocViewTo" list="blogs" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="contentIdStart" operator="equals" value="BLOGROOT"/>
+ <condition-expr field-name="caContentAssocTypeId" operator="equals" value="SUB_CONTENT"/>
<condition-list combine="or">
<condition-expr field-name="caFromDate" operator="equals" from-field="null"/>
<condition-expr field-name="caFromDate" operator="less-equals" from-field="nowTimestamp"/>

Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 3 16:12:58 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1128853
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1153542

Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 3 16:12:58 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1128853
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1153542

Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 3 16:12:58 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1128853
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1153542

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Wed Aug 3 16:12:58 2011
@@ -155,7 +155,7 @@ public class OagisInventoryServices {
GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
if (product == null) {
String errMsg = "Product with ID [" + productId + "] not found (invalid Product ID).";
- errorMapList.add(UtilMisc.toMap("reasonCode", "ProductIdNotValid", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ProductIdNotValid", "description", errMsg));
Debug.logError(errMsg, module);
continue;
}
@@ -208,7 +208,7 @@ public class OagisInventoryServices {
}
} catch (Throwable t) {
String errMsg = "Error processing Sync Inventory message: " + t.toString();
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "Exception"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "Exception"));
Debug.logInfo(t, errMsg, module);
}
}
@@ -228,7 +228,7 @@ public class OagisInventoryServices {
facilityContactMechs = delegator.findByAnd("FacilityContactMech", UtilMisc.toMap("facilityId", facilityId));
} catch (GenericEntityException e) {
String errMsg = "Error Getting FacilityContactMech: " + e.toString();
- errorMapList.add(UtilMisc.toMap("reasonCode", "GenericEntityException", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "GenericEntityException", "description", errMsg));
Debug.logError(e, errMsg, module);
}

@@ -240,7 +240,7 @@ public class OagisInventoryServices {
contactMech = delegator.findByPrimaryKey("ContactMech", UtilMisc.toMap("contactMechId", contactMechId));
} catch (GenericEntityException e) {
String errMsg = "Error Getting ContactMech: " + e.toString();
- errorMapList.add(UtilMisc.toMap("reasonCode", "GenericEntityException", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "GenericEntityException", "description", errMsg));
Debug.logError(e, errMsg, module);
}
String contactMechTypeId = contactMech.getString("contactMechTypeId");
@@ -342,7 +342,7 @@ public class OagisInventoryServices {
dispatcher.runSync("updateOagisMessageInfo", comiCtx, 60, true);
} catch (GenericServiceException e) {
String errMsg = "Error updating OagisMessageInfo for the Incoming Message: " + e.toString();
- // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
}
@@ -470,7 +470,7 @@ public class OagisInventoryServices {
GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
if (product == null) {
String errMsg = "Product with ID [" + productId + "] not found (invalid Product ID).";
- errorMapList.add(UtilMisc.toMap("reasonCode", "ProductIdNotValid", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ProductIdNotValid", "description", errMsg));
Debug.logError(errMsg, module);
continue;
}
@@ -543,12 +543,12 @@ public class OagisInventoryServices {
Map<String, Object> ripResult = dispatcher.runSync("receiveInventoryProduct", ripCtx);
if (ServiceUtil.isError(ripResult)) {
String errMsg = ServiceUtil.getErrorMessage(ripResult);
- errorMapList.add(UtilMisc.toMap("reasonCode", "ReceiveInventoryServiceError", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ReceiveInventoryServiceError", "description", errMsg));
}
}
} catch (Throwable t) {
String errMsg = UtilProperties.getMessage(resource, "OagisErrorDeliveryMessagePO", UtilMisc.toMap("omiPkMap", omiPkMap), locale) + t.toString();
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SystemError"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SystemError"));

try {
comiCtx.put("processingStatusId", "OAGMP_SYS_ERROR");
@@ -632,7 +632,7 @@ public class OagisInventoryServices {
dispatcher.runSync("updateOagisMessageInfo", comiCtx, 60, true);
} catch (GenericServiceException e) {
String errMsg = "Error updating OagisMessageInfo for the Incoming Message: " + e.toString();
- // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
}
@@ -768,14 +768,14 @@ public class OagisInventoryServices {
String productId = UtilXml.childElementValue(receiptLnElement, "of:ITEM");
if (UtilValidate.isEmpty(productId)) {
String errMsg = "Product ID Missing";
- errorMapList.add(UtilMisc.toMap("reasonCode", "ProductIdMissing", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ProductIdMissing", "description", errMsg));
Debug.logError(errMsg, module);
}
// make sure productId is valid
GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
if (product == null) {
String errMsg = "Product with ID [" + productId + "] not found (invalid Product ID).";
- errorMapList.add(UtilMisc.toMap("reasonCode", "ProductIdNotValid", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ProductIdNotValid", "description", errMsg));
Debug.logError(errMsg, module);
continue;
}
@@ -796,13 +796,13 @@ public class OagisInventoryServices {
GenericValue returnItem = delegator.findByPrimaryKeyCache("ReturnItem", UtilMisc.toMap("returnId", returnId, "returnItemSeqId", returnItemSeqId));
if (returnItem == null) {
String errMsg = "Return Item with ID [" + returnId + ":" + returnItemSeqId + "] not found (invalid Return/Item ID Combination).";
- errorMapList.add(UtilMisc.toMap("reasonCode", "ReturnAndItemIdNotValid", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ReturnAndItemIdNotValid", "description", errMsg));
Debug.logError(errMsg, module);
continue;
}
} else {
String errMsg = "No Return Item ID (LINENUM) found in DOCUMNTREF for Return [" + returnId + "]; this is a required field.";
- errorMapList.add(UtilMisc.toMap("reasonCode", "ReturnItemIdLinenumMissing", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ReturnItemIdLinenumMissing", "description", errMsg));
Debug.logError(errMsg, module);
continue;
}
@@ -817,7 +817,7 @@ public class OagisInventoryServices {
} else if ("NotAvailableTOAvailable".equals(disposition) || "AvailableTONotAvailable".equals(disposition)) {
// for RMA we should only get the ReceivedTO* DISPOSITN values; if we get something else we should return an error
String errMsg = "Got DISPOSITN value [" + disposition + "] that is not valid for RMA, only for status change.";
- errorMapList.add(UtilMisc.toMap("reasonCode", "DispositnNotValidForRMA", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "DispositnNotValidForRMA", "description", errMsg));
continue;
}
ripCtx.put("statusId", invItemStatusId);
@@ -869,7 +869,7 @@ public class OagisInventoryServices {
if (UtilValidate.isNotEmpty(serialNumsList)) {
if (messageQuantity.intValue() != serialNumsList.size()) {
String errMsg = "Not enough serial numbers [" + serialNumsList.size() + "] for the quantity [" + messageQuantity.intValue() + "].";
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumbersMissing"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SerialNumbersMissing"));
Debug.logInfo(errMsg, module);
continue;
}
@@ -906,13 +906,13 @@ public class OagisInventoryServices {
if (OagisServices.requireSerialNumberExist.booleanValue()) {
if (inventoryItemsBySerialNumber.size() == 0) {
String errMsg = "Referenced serial numbers must already exist, but serial number [" + serialNum + "] was not found.";
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumberRequiredButNotFound"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SerialNumberRequiredButNotFound"));
continue;
}
} else {
if (inventoryItemsBySerialNumber.size() > 0) {
String errMsg = "Referenced serial numbers must NOT already exist, but serial number [" + serialNum + "] already exists.";
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumberRequiredNotExistButFound"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SerialNumberRequiredNotExistButFound"));
continue;
}
}
@@ -938,7 +938,7 @@ public class OagisInventoryServices {
Map<String, Object> ripResult = dispatcher.runSync("receiveInventoryProduct", localRipCtx);
if (ServiceUtil.isError(ripResult)) {
String errMsg = ServiceUtil.getErrorMessage(ripResult);
- errorMapList.add(UtilMisc.toMap("reasonCode", "ReceiveInventoryServiceError", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ReceiveInventoryServiceError", "description", errMsg));
} else {
invItemIds.add((String) ripResult.get("inventoryItemId"));
}
@@ -961,7 +961,7 @@ public class OagisInventoryServices {
Map<String, Object> ripResult = dispatcher.runSync("receiveInventoryProduct", localRipCtx);
if (ServiceUtil.isError(ripResult)) {
String errMsg = ServiceUtil.getErrorMessage(ripResult);
- errorMapList.add(UtilMisc.toMap("reasonCode", "ReceiveInventoryServiceError", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ReceiveInventoryServiceError", "description", errMsg));
}
inventoryItemId = (String) ripResult.get("inventoryItemId");

@@ -980,7 +980,7 @@ public class OagisInventoryServices {
Map<String, Object> cpivResult = dispatcher.runSync("createPhysicalInventoryAndVariance", createPhysicalInvAndVarCtx);
if (ServiceUtil.isError(cpivResult)) {
String errMsg = ServiceUtil.getErrorMessage(cpivResult);
- errorMapList.add(UtilMisc.toMap("reasonCode", "CreatePhysicalInventoryAndVarianceServiceError", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "CreatePhysicalInventoryAndVarianceServiceError", "description", errMsg));
}
}
}
@@ -991,7 +991,7 @@ public class OagisInventoryServices {
} else {
String errMsg = "Return ID [" + returnId + "] Not Found";
Debug.logError(errMsg, module);
- errorMapList.add(UtilMisc.toMap("reasonCode", "ReturnIdNotFound", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ReturnIdNotFound", "description", errMsg));
}
}

@@ -1061,7 +1061,7 @@ public class OagisInventoryServices {
}
} catch (Throwable t) {
String errMsg = "System Error processing Acknowledge Delivery RMA message for message [" + omiPkMap + "]: " + t.toString();
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SystemError"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SystemError"));

try {
comiCtx.put("processingStatusId", "OAGMP_SYS_ERROR");
@@ -1146,7 +1146,7 @@ public class OagisInventoryServices {
dispatcher.runSync("updateOagisMessageInfo", comiCtx, 60, true);
} catch (GenericServiceException e) {
String errMsg = "Error updating OagisMessageInfo for the Incoming Message: " + e.toString();
- // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
}
@@ -1274,14 +1274,14 @@ public class OagisInventoryServices {
String productId = UtilXml.childElementValue(receiptLnElement, "of:ITEM");
if (UtilValidate.isEmpty(productId)) {
String errMsg = "Product ID Missing";
- errorMapList.add(UtilMisc.toMap("reasonCode", "ProductIdMissing", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ProductIdMissing", "description", errMsg));
Debug.logError(errMsg, module);
}
// make sure productId is valid
GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
if (product == null) {
String errMsg = "Product with ID [" + productId + "] not found (invalid Product ID).";
- errorMapList.add(UtilMisc.toMap("reasonCode", "ProductIdNotValid", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ProductIdNotValid", "description", errMsg));
Debug.logError(errMsg, module);
continue;
}
@@ -1303,7 +1303,7 @@ public class OagisInventoryServices {
reqFromItemStatusId = "INV_AVAILABLE";
} else if ("ReceivedTOAvailable".equals(disposition) || "ReceivedTONotAvailable".equals(disposition)) {
String errMsg = "Got DISPOSITN value [" + disposition + "] that is not valid for Status Change, only for RMA/return.";
- errorMapList.add(UtilMisc.toMap("reasonCode", "DispositnNotValidForStatusChange", "description", errMsg));
+ errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "DispositnNotValidForStatusChange", "description", errMsg));
continue;
}

@@ -1326,7 +1326,7 @@ public class OagisInventoryServices {
if (UtilValidate.isNotEmpty(serialNumsList)) {
if (messageQuantity.intValue() != serialNumsList.size()) {
String errMsg = "Not enough serial numbers [" + serialNumsList.size() + "] for the quantity [" + messageQuantity.intValue() + "].";
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumbersMissing"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SerialNumbersMissing"));
Debug.logInfo(errMsg, module);
continue;
}
@@ -1339,7 +1339,7 @@ public class OagisInventoryServices {
// sign handling for items
if (!"+".equals(sign)) {
String errMsg = "Got a sign [" + sign + "] that was not plus (+), this is not valid for a Status Change operation.";
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SignNotPlusForStatusChange"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SignNotPlusForStatusChange"));
continue;
}

@@ -1360,14 +1360,14 @@ public class OagisInventoryServices {
// this is a status update, so referenced serial number MUST already exist
if (inventoryItemsBySerialNumber.size() == 0) {
String errMsg = "Referenced serial numbers must already exist, but serial number [" + serialNum + "] was not found.";
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumberRequiredButNotFound"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SerialNumberRequiredButNotFound"));
continue;
}

GenericValue inventoryItem = EntityUtil.getFirst(inventoryItemsBySerialNumber);
if (UtilValidate.isNotEmpty(reqFromItemStatusId) && !reqFromItemStatusId.equals(inventoryItem.getString("statusId"))) {
String errMsg = "Referenced serial number [" + serialNum + "] has status [" + inventoryItem.getString("statusId") + "] but we were expecting [" + reqFromItemStatusId + "]; this may mean the Acknowledge Delivery RMA message has not yet come in for this item.";
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SerialNumberRequiredButNotFound"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SerialNumberRequiredButNotFound"));
continue;
}

@@ -1391,12 +1391,12 @@ public class OagisInventoryServices {

// for now just return an error message
String errMsg = "No serial numbers were included in the message and right now this is not supported";
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "NoSerialNumbersInMessage"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "NoSerialNumbersInMessage"));
}
}
} catch (Throwable t) {
String errMsg = "System Error processing Acknowledge Delivery Status message for message [" + omiPkMap + "]: " + t.toString();
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SystemError"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SystemError"));

try {
comiCtx.put("processingStatusId", "OAGMP_SYS_ERROR");
@@ -1473,7 +1473,7 @@ public class OagisInventoryServices {
dispatcher.runSync("updateOagisMessageInfo", comiCtx, 60, true);
} catch (GenericServiceException e) {
String errMsg = "Error updating OagisMessageInfo for the Incoming Message: " + e.toString();
- // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
}

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java?rev=1153560&r1=1153559&r2=1153560&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java Wed Aug 3 16:12:58 2011
@@ -311,7 +311,7 @@ public class OagisServices {
/* running async for better error handling
if (ServiceUtil.isError(oagisMsgInfoResult)) {
String errMsg = "Error creating OagisMessageInfo for the Incoming Message: "+ServiceUtil.getErrorMessage(oagisMsgInfoResult);
- errorMapList.add(UtilMisc.toMap("description", (Object) errMsg, "reasonCode", "CreateOagisMessageInfoServiceError"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", (Object) errMsg, "reasonCode", "CreateOagisMessageInfoServiceError"));
Debug.logError(errMsg, module);
}
*/
@@ -320,7 +320,7 @@ public class OagisServices {
if (UtilValidate.isEmpty(dataAreaConfirmMsgList)) {
String errMsg = "No CONFIRMMSG elements found in Confirm BOD message: " + omiPkMap;
Debug.logWarning(errMsg, module);
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "NoCONFIRMMSGElements"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "NoCONFIRMMSGElements"));
} else {
Map<String, Object> originalOmiPkMap = UtilMisc.toMap("logicalId", (Object) dataAreaLogicalId, "component", dataAreaComponent,
"task", dataAreaTask, "referenceId", dataAreaReferenceId);
@@ -340,14 +340,14 @@ public class OagisServices {
Map<String, Object> oagisMsgErrorInfoResult = dispatcher.runSync("createOagisMessageErrorInfo", createOagisMessageErrorInfoForOriginal);
if (ServiceUtil.isError(oagisMsgErrorInfoResult)) {
String errMsg = "Error creating OagisMessageErrorInfo: " + ServiceUtil.getErrorMessage(oagisMsgErrorInfoResult);
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "CreateOagisMessageErrorInfoServiceError"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "CreateOagisMessageErrorInfoServiceError"));
Debug.logError(errMsg, module);
}
}
} else {
String errMsg = "No such message with an error was found; Not creating OagisMessageErrorInfo record(s) for original message, but saving info for this message anyway; ID info: " + omiPkMap;
Debug.logWarning(errMsg, module);
- errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "OriginalOagisMessageInfoNotFoundError"));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "OriginalOagisMessageInfoNotFoundError"));
}

// now attach all of the messages to the CBOD OagisMessageInfo record
@@ -420,7 +420,7 @@ public class OagisServices {
dispatcher.runSync("updateOagisMessageInfo", oagisMsgInfoCtx, 60, true);
} catch (GenericServiceException e) {
String errMsg = "Error updating OagisMessageInfo for the Incoming Message: " + e.toString();
- // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ // don't pass this back, nothing they can do about it: errorMapList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
}
@@ -511,15 +511,15 @@ public class OagisServices {
doc = UtilXml.readXmlDocument(bis, true, "OagisMessage");
} catch (SAXException e) {
String errMsg = "XML Error parsing the Received Message [" + e.toString() + "]; The text received we could not parse is: [" + xmlText + "]";
- errorList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "SAXException"));
+ errorList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SAXException"));
Debug.logError(e, errMsg, module);
} catch (ParserConfigurationException e) {
String errMsg = "Parser Configuration Error parsing the Received Message: " + e.toString();
- errorList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "ParserConfigurationException"));
+ errorList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "ParserConfigurationException"));
Debug.logError(e, errMsg, module);
} catch (IOException e) {
String errMsg = "IO Error parsing the Received Message: " + e.toString();
- errorList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "IOException"));
+ errorList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "IOException"));
Debug.logError(e, errMsg, module);
}

@@ -563,7 +563,7 @@ public class OagisServices {
String responseMsg = "Message already received with ID: " + oagisMessageInfoKey;
Debug.logError(responseMsg, module);

- List<Map<String, String>> errorMapList = UtilMisc.toList(UtilMisc.toMap("reasonCode", "MessageAlreadyReceived", "description", responseMsg));
+ List<Map<String, String>> errorMapList = UtilMisc.toList(UtilMisc.<String, String>toMap("reasonCode", "MessageAlreadyReceived", "description", responseMsg));

Map<String, Object> sendConfirmBodCtx = FastMap.newInstance();
sendConfirmBodCtx.put("logicalId", logicalId);
@@ -593,7 +593,7 @@ public class OagisServices {
dispatcher.runAsync("oagisReceiveConfirmBod", messageProcessContext, true);
} catch (GenericServiceException e) {
String errMsg = "Error running service oagisReceiveConfirmBod: " + e.toString();
- errorList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ errorList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
} else if (bsrVerb.equalsIgnoreCase("SHOW") && bsrNoun.equalsIgnoreCase("SHIPMENT")) {
@@ -603,7 +603,7 @@ public class OagisServices {
dispatcher.runAsync("oagisReceiveShowShipment", messageProcessContext, true);
} catch (GenericServiceException e) {
String errMsg = "Error running service oagisReceiveShowShipment: " + e.toString();
- errorList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ errorList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
} else if (bsrVerb.equalsIgnoreCase("SYNC") && bsrNoun.equalsIgnoreCase("INVENTORY")) {
@@ -613,7 +613,7 @@ public class OagisServices {
dispatcher.runAsync("oagisReceiveSyncInventory", messageProcessContext, true);
} catch (GenericServiceException e) {
String errMsg = "Error running service oagisReceiveSyncInventory: " + e.toString();
- errorList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ errorList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
} else if (bsrVerb.equalsIgnoreCase("ACKNOWLEDGE") && bsrNoun.equalsIgnoreCase("DELIVERY")) {
@@ -630,7 +630,7 @@ public class OagisServices {
dispatcher.runAsync("oagisReceiveAcknowledgeDeliveryPo", messageProcessContext, true);
} catch (GenericServiceException e) {
String errMsg = "Error running service oagisReceiveAcknowledgeDeliveryPo: " + e.toString();
- errorList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ errorList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
} else if ("RMA".equals(docType)) {
@@ -639,7 +639,7 @@ public class OagisServices {
dispatcher.runAsync("oagisReceiveAcknowledgeDeliveryRma", messageProcessContext, true);
} catch (GenericServiceException e) {
String errMsg = "Error running service oagisReceiveAcknowledgeDeliveryRma: " + e.toString();
- errorList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ errorList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
} else if (UtilValidate.isEmpty(docType) && ("NotAvailableTOAvailable".equals(disposition) || "AvailableTONotAvailable".equals(disposition))) {
@@ -647,7 +647,7 @@ public class OagisServices {
dispatcher.runAsync("oagisReceiveAcknowledgeDeliveryStatus", messageProcessContext, true);
} catch (GenericServiceException e) {
String errMsg = "Error running service oagisReceiveAcknowledgeDeliveryStatus: " + e.toString();
- errorList.add(UtilMisc.toMap("description", errMsg, "reasonCode", "GenericServiceException"));
+ errorList.add(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "GenericServiceException"));
Debug.logError(e, errMsg, module);
}
} else {
@@ -668,7 +668,7 @@ public class OagisServices {
Iterator errListItr = errorList.iterator();
while (errListItr.hasNext()) {
Map errorMap = (Map) errListItr.next();
- errorMapList.add(UtilMisc.toMap("description", errorMap.get("description"), "reasonCode", errorMap.get("reasonCode")));
+ errorMapList.add(UtilMisc.<String, String>toMap("description", errorMap.get("description"), "reasonCode", errorMap.get("reasonCode")));
}
result.put("errorMapList", errorMapList);
}
@@ -744,7 +744,7 @@ public class OagisServices {
dateTimeInvReceived = isoDateFormatNoTzValue.parse(dateString);
} catch (ParseException e1) {
String errMsg = "Error parsing Date: " + e1.toString();
- if (errorMapList != null) errorMapList.add(UtilMisc.toMap("reasonCode", "ParseException", "description", errMsg));
+ if (errorMapList != null) errorMapList.add(UtilMisc.<String, String>toMap("reasonCode", "ParseException", "description", errMsg));
Debug.logError(e, errMsg, module);
}
}