Author: jacopoc
Date: Sat Nov 4 01:51:09 2006
New Revision: 471156
URL: http://svn.apache.org/viewvc?view=rev&rev=471156
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/entry/customertaxinfo.ftl
- copied unchanged from r471141,
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/customertaxinfo.ftl
Removed:
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/customertaxinfo.ftl
Modified:
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
Modified:
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?view=diff&rev=471156&r1=471155&r2=471156
==============================================================================
---
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
(original)
+++
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
Sat Nov 4 01:51:09 2006
@@ -343,7 +343,7 @@
<div class="screenlet-body">
<form method="post"
action="<@ofbizUrl>createCustomerTaxAuthInfo</@ofbizUrl>"
name="createCustTaxAuthInfoForm">
<input type="hidden" name="partyId" value="${party.partyId}"/>
-
${screens.render("component://ecommerce/widget/CustomerScreens.xml#customertaxinfo")}
+
${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")}
<input type="submit" value="${uiLabelMap.CommonAdd}"
class="smallSubmit"/>
</form>
</div>
Modified:
incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml?view=diff&rev=471156&r1=471155&r2=471156
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
(original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml Sat
Nov 4 01:51:09 2006
@@ -53,27 +53,6 @@
</widgets>
</section>
</screen>
-
- <screen name="customertaxinfo">
- <!-- meant to be included, generally through a screens.render type of
thing -->
- <section>
- <actions>
- <set field="partyId" from-field="userLogin.partyId"/>
- <entity-condition entity-name="PartyTaxAuthInfoAndDetail"
list-name="partyTaxAuthInfoAndDetailList">
- <condition-expr field-name="partyId" env-name="partyId"/>
- <order-by field-name="geoCode"/>
- <order-by field-name="groupName"/>
- </entity-condition>
- <entity-condition entity-name="TaxAuthorityAndDetail"
list-name="taxAuthorityAndDetailList">
- <order-by field-name="geoCode"/>
- <order-by field-name="groupName"/>
- </entity-condition>
- </actions>
- <widgets>
- <platform-specific><html><html-template
location="component://ecommerce/webapp/ecommerce/customer/customertaxinfo.ftl"/></html></platform-specific>
- </widgets>
- </section>
- </screen>
<screen name="viewprofile">
<section>
<actions>
Modified:
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?view=diff&rev=471156&r1=471155&r2=471156
==============================================================================
---
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
(original)
+++
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
Sat Nov 4 01:51:09 2006
@@ -144,7 +144,7 @@
<#-- commented out by default because the TaxAuthority
drop-down is just too wide...
<hr class="sepbar"/>
<div
class="tableheadtext"> ${uiLabelMap.PartyTaxIdentification}</div>
-
${screens.render("component://ecommerce/widget/CustomerScreens.xml#customertaxinfo")}
+
${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")}
-->
</div>
</div>
Modified:
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?view=diff&rev=471156&r1=471155&r2=471156
==============================================================================
---
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
(original)
+++
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
Sat Nov 4 01:51:09 2006
@@ -99,7 +99,7 @@
</table>
<#-- Party Tax Info -->
<div
class="tableheadtext"> ${uiLabelMap.PartyTaxIdentification}</div>
-
${screens.render("component://ecommerce/widget/CustomerScreens.xml#customertaxinfo")}
+
${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")}
</div>
</div>
</form>
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=471156&r1=471155&r2=471156
==============================================================================
---
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
Sat Nov 4 01:51:09 2006
@@ -301,4 +301,24 @@
</widgets>
</section>
</screen>
+ <screen name="customertaxinfo">
+ <!-- meant to be included, generally through a screens.render type of
thing -->
+ <section>
+ <actions>
+ <set field="partyId" from-field="userLogin.partyId"/>
+ <entity-condition entity-name="PartyTaxAuthInfoAndDetail"
list-name="partyTaxAuthInfoAndDetailList">
+ <condition-expr field-name="partyId" env-name="partyId"/>
+ <order-by field-name="geoCode"/>
+ <order-by field-name="groupName"/>
+ </entity-condition>
+ <entity-condition entity-name="TaxAuthorityAndDetail"
list-name="taxAuthorityAndDetailList">
+ <order-by field-name="geoCode"/>
+ <order-by field-name="groupName"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <platform-specific><html><html-template
location="component://order/webapp/ordermgr/entry/customertaxinfo.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </screen>
</screens>
