Author: lektran
Date: Thu Mar 29 02:09:44 2007
New Revision: 523639
URL: http://svn.apache.org/viewvc?view=rev&rev=523639
Log:
Fixed problem with correspondingPoId not being set during ecommerce checkout,
Reported by Chris Howe
Also renamed all instances of corresponding_po_id to correspondingPoId
Modified:
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
Modified:
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?view=diff&rev=523639&r1=523638&r2=523639
==============================================================================
---
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
(original)
+++
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
Thu Mar 29 02:09:44 2007
@@ -820,7 +820,7 @@
</call-object-method>
</if-not-empty>
- <set field="correspondingPoId"
from-field="parameters.corresponding_po_id"/>
+ <set field="correspondingPoId"
from-field="parameters.correspondingPoId"/>
<if-not-empty field-name="correspondingPoId">
<call-object-method obj-field-name="cart"
method-name="setPoNumber">
<field field-name="correspondingPoId" type="String"/>
Modified:
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?view=diff&rev=523639&r1=523638&r2=523639
==============================================================================
---
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
(original)
+++
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
Thu Mar 29 02:09:44 2007
@@ -603,7 +603,7 @@
</call-object-method>
</if-not-empty>
- <set field="correspondingPoId"
from-field="parameters.corresponding_po_id" type="String"/>
+ <set field="correspondingPoId"
from-field="parameters.correspondingPoId" type="String"/>
<if-not-empty field-name="correspondingPoId">
<call-object-method obj-field-name="cart" method-name="setPoNumber">
<field field-name="correspondingPoId" type="String"/>
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?view=diff&rev=523639&r1=523638&r2=523639
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
Thu Mar 29 02:09:44 2007
@@ -559,10 +559,15 @@
<event type="java" path="org.ofbiz.order.shoppingcart.CheckOutEvents"
invoke="setCheckOutPages"/>
<response name="shippingaddress" type="view"
value="checkoutshippingaddress"/>
<response name="shippingoptions" type="view"
value="checkoutshippingoptions"/>
- <response name="payment" type="request"
value="calcShippingBeforePayment"/>
+ <response name="payment" type="request" value="setPoNumber"/>
<response name="confirm" type="request" value="calcShipping"/>
<response name="success" type="view" value="checkoutshippingaddress"/>
<response name="error" type="request" value="checkouterror"/>
+ </request-map>
+ <request-map uri="setPoNumber">
+ <security direct-request="false"/>
+ <event type="java"
path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="setPoNumber"/>
+ <response name="success" type="request"
value="calcShippingBeforePayment"/>
</request-map>
<request-map uri="checkouterror">
<security https="true" auth="true"/>
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?view=diff&rev=523639&r1=523638&r2=523639
==============================================================================
---
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
(original)
+++
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
Thu Mar 29 02:09:44 2007
@@ -146,7 +146,7 @@
<#if shoppingCart.getPoNumber()?exists &&
shoppingCart.getPoNumber() != "(none)">
<#assign currentPoNumber = shoppingCart.getPoNumber()>
</#if>
- <input type="text" class="inputBox"
name="corresponding_po_id" size="15" value="${currentPoNumber?if_exists}"/>
+ <input type="text" class="inputBox" name="correspondingPoId"
size="15" value="${currentPoNumber?if_exists}"/>
</td>
</tr>
<#if productStore.showCheckoutGiftOptions?if_exists != "N">
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl?view=diff&rev=523639&r1=523638&r2=523639
==============================================================================
---
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl
(original)
+++
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl
Thu Mar 29 02:09:44 2007
@@ -89,7 +89,7 @@
<tr>
<td colspan="2">
<span
class="head2"><b>${uiLabelMap.OrderPoNumber}</b></span>
- <input type="text" class='inputBox' name="corresponding_po_id"
size="15" value='${shoppingCart.getPoNumber()?if_exists}'/>
+ <input type="text" class='inputBox' name="correspondingPoId"
size="15" value='${shoppingCart.getPoNumber()?if_exists}'/>
</td>
</tr>
<#if productStore.showCheckoutGiftOptions?if_exists != "N">
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?view=diff&rev=523639&r1=523638&r2=523639
==============================================================================
---
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
(original)
+++
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
Thu Mar 29 02:09:44 2007
@@ -116,7 +116,7 @@
<tr>
<td colspan="2">
<span
class="head2"><b>${uiLabelMap.OrderPoNumber}</b></span>
- <input type="text" class='inputBox' name="corresponding_po_id"
size="15" value='${shoppingCart.getPoNumber()?if_exists}'/>
+ <input type="text" class='inputBox' name="correspondingPoId"
size="15" value='${shoppingCart.getPoNumber()?if_exists}'/>
</td>
</tr>
<#if productStore.showCheckoutGiftOptions?if_exists != "N">
