You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/01/26 16:43:18 UTC
svn commit: r1726828 - in /ofbiz/trunk:
applications/order/webapp/ordermgr/WEB-INF/
applications/order/webapp/ordermgr/entry/ applications/order/widget/ordermgr/
specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/
specialpurpose/ecommerce/webapp/ecommer...
Author: jleroux
Date: Tue Jan 26 15:43:17 2016
New Revision: 1726828
URL: http://svn.apache.org/viewvc?rev=1726828&view=rev
Log:
Fixes "Error on the Split Payment button from the Quick Finalize Order screen" https://issues.apache.org/jira/browse/OFBIZ-6743
Error in trunk:
ERROR rendering error page [/error/error.jsp], but here is the error text: org.ofbiz.webapp.control.RequestHandlerException: No definition found for view with name [checkoutpayment]
Error in stable and old:
org.ofbiz.webapp.control.RequestHandlerException: No definition found for view with name [checkoutpayment]
Vyom Jain added a comment - 22/Nov/15 07:50
This is an issue even in 09.04 and 10.04 code, so it has been there for sometime now.
Scott Gray added a comment - 03/Jan/16 05:43
The view-map was moved to ecommerce in r544053. Probably because the view-map wasn't referenced in the controller.xml for ordermgr. It is actually used though as a view override in component://order/webapp/ordermgr/entry/checkoutoptions.ftl
Just needs to be restored in the controller and have the screen moved back.
jleroux: So I moved back from ecommerce to order (with few adaptations)
* the checkoutpayment.ftl file
* the order controller view-map
* the screen name checkoutpayment
I tested in both order and ecommerce, works! I will try to backport, let's see...
Added:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutpayment.ftl
- copied unchanged from r1726493, ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
Removed:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1726828&r1=1726827&r2=1726828&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Tue Jan 26 15:43:17 2016
@@ -1954,6 +1954,7 @@ under the License.
<view-map name="editcontactmech" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#editcontactmech"/>
<view-map name="editcreditcard" type="screen" page="component://party/widget/partymgr/PaymentMethodScreens.xml#editcreditcard"/>
<view-map name="editeftaccount" type="screen" page="component://party/widget/partymgr/PaymentMethodScreens.xml#editeftaccount"/>
+ <view-map name="checkoutpayment" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#checkoutpayment"/>
<view-map name="category" type="screen" page="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#category"/>
<view-map name="product" type="screen" page="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#product"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1726828&r1=1726827&r2=1726828&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Tue Jan 26 15:43:17 2016
@@ -272,6 +272,25 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="checkoutpayment">
+ <section>
+ <actions>
+ <set field="rightbarScreenName" value="rightbar"/>
+ <set field="MainColumnStyle" value="rightonly"/>
+
+ <set field="titleProperty" value="PageTitleCheckoutOptions"/>
+ <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy"/>
+ <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/checkoutpayment.ftl"/></html></platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="customertaxinfo">
<!-- meant to be included, generally through a screens.render type of thing -->
<section>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1726828&r1=1726827&r2=1726828&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Tue Jan 26 15:43:17 2016
@@ -2058,7 +2058,7 @@ under the License.
<view-map name="quickcheckout" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutoptions"/>
<view-map name="checkoutshippingaddress" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutshippingaddress"/>
<view-map name="checkoutshippingoptions" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutshippingoptions"/>
- <view-map name="checkoutpayment" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutpayment"/>
+ <view-map name="checkoutpayment" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#checkoutpayment"/>
<view-map name="splitship" type="screen" page="component://ecommerce/widget/OrderScreens.xml#splitship"/>
<view-map name="checkoutreview" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutreview"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1726828&r1=1726827&r2=1726828&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml Tue Jan 26 15:43:17 2016
@@ -287,26 +287,6 @@ under the License.
</section>
</screen>
- <screen name="checkoutpayment">
- <section>
- <actions>
- <set field="rightbarScreenName" value="rightbar"/>
- <set field="MainColumnStyle" value="rightonly"/>
-
- <set field="titleProperty" value="PageTitleCheckoutOptions"/>
- <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy"/>
- <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutpayment.ftl"/></html></platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="splitship">
<section>
<actions>