OFBiz - svn commit: r471155 - in /incubator/ofbiz/trunk/applications: ecommerce/webapp/ecommerce/WEB-INF/actions/order/ ecommerce/webapp/ecommerce/order/ ecommerce/widget/ order/webapp/ordermgr/WEB-INF/ order/webapp/ordermgr/WEB-INF/actions/entry/ order/webapp...

svn commit: r471155 - in /incubator/ofbiz/trunk/applications: ecommerce/webapp/ecommerce/WEB-INF/actions/order/ ecommerce/webapp/ecommerce/order/ ecommerce/widget/ order/webapp/ordermgr/WEB-INF/ order/webapp/ordermgr/WEB-INF/actions/entry/ order/webapp...

Posted by jacopoc on Nov 04, 2006; 9:43am
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r471155-in-incubator-ofbiz-trunk-applications-ecommerce-webapp-ecommerce-WEB-INF-actions--tp209567.html

Author: jacopoc
Date: Sat Nov 4 01:43:07 2006
New Revision: 471155

URL: http://svn.apache.org/viewvc?view=rev&rev=471155
Log:
Moved some more bsh/ftl files that were referenced by the order component from the ecommerce to the order component: the order component is at a lower level than the ecommerce one and so cannot use ecommerce's resources.
Part of OFBIZ-220, but the task is not complete: the order component still references the uilabel files of the ecommerce component.

Added:
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkoutshippingaddress.bsh
- copied unchanged from r471141, incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutshippingaddress.bsh
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutpayment.ftl
- copied unchanged from r471141, incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
- copied unchanged from r471141, incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingaddress.ftl
Removed:
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutshippingaddress.bsh
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingaddress.ftl
Modified:
incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml

Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?view=diff&rev=471155&r1=471154&r2=471155
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Sat Nov 4 01:43:07 2006
@@ -158,12 +158,12 @@
<set field="MainColumnStyle" value="rightonly"/>

<set field="titleProperty" value="PageTitleCheckoutOptions"/>
- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutshippingaddress.bsh"/>
+ <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/checkoutshippingaddress.bsh"/>
</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/checkoutshippingaddress.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/checkoutshippingaddress.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -200,7 +200,7 @@
<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>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/checkoutpayment.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=471155&r1=471154&r2=471155
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Nov 4 01:43:07 2006
@@ -1440,11 +1440,11 @@
<view-map name="advancedsearch" type="screen" page="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#advancedsearch"/>

<view-map name="quickcheckout" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#quickFinalizeOrder"/>
- <view-map name="checkoutshippingaddress" type="screen" page="component://ecommerce/widget/OrderScreens.xml#checkoutshippingaddress"/>
+ <view-map name="checkoutshippingaddress" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#checkoutshippingaddress"/>
<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://ecommerce/widget/OrderScreens.xml#checkoutpayment"/>
+ <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: incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?view=diff&rev=471155&r1=471154&r2=471155
==============================================================================
--- incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sat Nov 4 01:43:07 2006
@@ -264,4 +264,41 @@
</widgets>
</section>
</screen>
+ <screen name="checkoutshippingaddress">
+ <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/checkoutshippingaddress.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/checkoutshippingaddress.ftl"/></html></platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </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>
</screens>