Author: jacopoc
Date: Sun Jun 3 22:16:07 2007
New Revision: 544053
URL:
http://svn.apache.org/viewvc?view=rev&rev=544053Log:
Moved an ftl template that was only used by the ecommerce application from order to ecommerce.
Added:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
- copied unchanged from r543945, ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutpayment.ftl
Removed:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutpayment.ftl
Modified:
ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
Modified: ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?view=diff&rev=544053&r1=544052&r2=544053==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Sun Jun 3 22:16:07 2007
@@ -299,14 +299,14 @@
<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>
+ <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">
+ <screen name="splitship">
<section>
<actions>
<set field="titleProperty" value="PageTitleSplitItemsForShipping"/>
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?view=diff&rev=544053&r1=544052&r2=544053==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sun Jun 3 22:16:07 2007
@@ -1539,7 +1539,6 @@
<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?view=diff&rev=544053&r1=544052&r2=544053==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sun Jun 3 22:16:07 2007
@@ -284,25 +284,6 @@
</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.bsh"/>
- <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
- </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>
Locked
