You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ra...@apache.org on 2007/04/24 17:19:10 UTC
svn commit: r531978 -
/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
Author: rayb
Date: Tue Apr 24 08:19:09 2007
New Revision: 531978
URL: http://svn.apache.org/viewvc?view=rev&rev=531978
Log:
Corrections to the HTML for the layout of the orders items table, so the columns should now be aligned properly.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl?view=diff&rev=531978&r1=531977&r2=531978
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderitems.ftl Tue Apr 24 08:19:09 2007
@@ -24,7 +24,9 @@
<div class="screenlet">
<div class="screenlet-header">
<div class="boxlink">
+ <#assign numColumns = 8>
<#if maySelectItems?default("N") == "Y">
+ <#assign numColumns = 11>
<a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.EcommerceAddAlltoCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.EcommerceAddCheckedToCart}</a><a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
</#if>
</div>
@@ -42,13 +44,14 @@
<#else>
<td width="10%" align="right"> </td>
<td width="10%" align="right"> </td>
+ <td width="10%" align="right"> </td>
<td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderQtyOrdered}</b></span></td>
</#if>
<td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.EcommerceUnitPrice}</b></span></td>
<td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderAdjustments}</b></span></td>
<td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.CommonSubtotal}</b></span></td>
<#if maySelectItems?default("N") == "Y">
- <td width="5%" align="right"> </td>
+ <td colspan="3" width="5%" align="right"> </td>
</#if>
</tr>
<#list orderItems as orderItem>
@@ -71,10 +74,10 @@
</#list>
</#if>
</#if>
- <tr><td colspan="10"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="${numColumns}"><hr class="sepbar"/></td></tr>
<tr>
<#if !orderItem.productId?exists || orderItem.productId == "_?_">
- <td colspan="1" valign="top">
+ <td valign="top">
<b><div class="tabletext"> >> ${orderItem.itemDescription}</div></b>
</td>
<#else>
@@ -130,6 +133,7 @@
<#if !(maySelectItems?default("N") == "Y")>
<td> </td>
<td> </td>
+ <td> </td>
</#if>
<td align="right" valign="top">
<div class="tabletext">${orderItem.quantity?string.number}</div>
@@ -160,7 +164,7 @@
<div class="tabletext"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemTotal(orderItem)*rentalQuantity isoCode=currencyUomId/></div>
<#else>
<div class="tabletext"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemTotal(orderItem) isoCode=currencyUomId/></div>
- </#if>
+ </#if>
</td>
<#if maySelectItems?default("N") == "Y">
<td> </td>
@@ -170,7 +174,7 @@
<td> </td>
</#if>
<td>
- <input name="item_id" value="${orderItem.orderItemSeqId}" type="checkbox">
+ <input name="item_id" value="${orderItem.orderItemSeqId}" type="checkbox"/>
</td>
</#if>
</#if>
@@ -178,7 +182,7 @@
<#-- show info from workeffort if it was a rental item -->
<#if orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM">
<#if workEffortSave?exists>
- <tr><td> </td><td colspan="8"><div class="tabletext">${uiLabelMap.CommonFrom}: ${workEffortSave.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonUntil} ${workEffortSave.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonFor} ${workEffortSave.reservPersons} ${uiLabelMap.CommonPerson}(s).</div></td></tr>
+ <tr><td> </td><td colspan="${numColumns}"><div class="tabletext">${uiLabelMap.CommonFrom}: ${workEffortSave.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonUntil} ${workEffortSave.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonFor} ${workEffortSave.reservPersons} ${uiLabelMap.CommonPerson}(s).</div></td></tr>
</#if>
</#if>
<#-- now show adjustment details per line item -->
@@ -207,14 +211,12 @@
</#if>
</div>
</td>
- <td> </td>
- <td> </td>
- <td> </td>
+ <td colspan="5"> </td>
<td align="right">
<div class="tabletext" style="font-size: xx-small;"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentTotal(orderItem, orderItemAdjustment) isoCode=currencyUomId/></div>
</td>
<td> </td>
- <#if maySelectItems?default("N") == "Y"><td> </td></#if>
+ <#if maySelectItems?default("N") == "Y"><td colspan="3"> </td></#if>
</tr>
</#list>
@@ -231,46 +233,55 @@
<td align="right">
<div class="tabletext" style="font-size: xx-small;">${shipGroupAssoc.quantity?string.number}</div>
</td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
+ <td colspan="${numColumns - 2}"> </td>
</tr>
</#list>
</#if>
</#list>
<#if orderItems?size == 0 || !orderItems?has_content>
- <tr><td><font color="red">${uiLabelMap.OrderSalesOrderLookupFailed}.</font></td></tr>
+ <tr><td colspan="${numColumns}"><font color="red">${uiLabelMap.OrderSalesOrderLookupFailed}</font></td></tr>
</#if>
- <tr><td colspan="10"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="${numColumns}"><hr class="sepbar"/></td></tr>
<tr>
- <td align="right" colspan="6"><div class="tabletext"><b>${uiLabelMap.CommonSubtotal}</b></div></td>
+ <td align="right" colspan="7"><div class="tabletext"><b>${uiLabelMap.CommonSubtotal}</b></div></td>
<td align="right"><div class="tabletext"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></div></td>
+ <#if maySelectItems?default("N") == "Y"><td colspan="3"> </td></#if>
</tr>
<#list headerAdjustmentsToShow as orderHeaderAdjustment>
<tr>
- <td align="right" colspan="6"><div class="tabletext"><b>${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}</b></div></td>
+ <td align="right" colspan="7"><div class="tabletext"><b>${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}</b></div></td>
<td align="right"><div class="tabletext"><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></div></td>
+ <#if maySelectItems?default("N") == "Y"><td colspan="3"> </td></#if>
</tr>
</#list>
<tr>
- <td align="right" colspan="6"><div class="tabletext"><b>${uiLabelMap.OrderShippingAndHandling}</b></div></td>
+ <td align="right" colspan="7"><div class="tabletext"><b>${uiLabelMap.OrderShippingAndHandling}</b></div></td>
<td align="right"><div class="tabletext"><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></div></td>
+ <#if maySelectItems?default("N") == "Y"><td colspan="3"> </td></#if>
</tr>
<tr>
- <td align="right" colspan="6"><div class="tabletext"><b>${uiLabelMap.OrderSalesTax}</b></div></td>
+ <td align="right" colspan="7"><div class="tabletext"><b>${uiLabelMap.OrderSalesTax}</b></div></td>
<td align="right"><div class="tabletext"><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></div></td>
+ <#if maySelectItems?default("N") == "Y"><td colspan="3"> </td></#if>
</tr>
- <tr><td colspan="2"></td><td colspan="9"><hr class="sepbar"/></td></tr>
<tr>
- <td align="right" colspan="6"><div class="tabletext"><b>${uiLabelMap.OrderGrandTotal}</b></div></td>
+ <td colspan="3"></td>
+ <#if maySelectItems?default("N") == "Y">
+ <td colspan="${numColumns - 6}"><hr class="sepbar"/></td>
+ <td colspan="3"> </td>
+ <#else>
+ <td colspan="${numColumns - 3}"><hr class="sepbar"/></td>
+ </#if>
+ </tr>
+ <tr>
+ <td align="right" colspan="7"><div class="tabletext"><b>${uiLabelMap.OrderGrandTotal}</b></div></td>
<td align="right">
<div class="tabletext"><@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/></div>
</td>
+ <#if maySelectItems?default("N") == "Y"><td colspan="3"> </td></#if>
</tr>
</table>
</div>
Re: committing to the branch...
Posted by Jonathon -- Improov <jo...@improov.com>.
Ray,
A bugfix is a bugfix, whether or not it fixes bugs more than it causes harm.
Commit the bugfix in the release branch, so those of us using the release branch can use your
bugfix and alert you if it does cause harm. A bad bugfix will be quickly corrected soon after.
As long as we're strictly applying only bugfixes, all bugfixes should go to the release branch.
The only exception is where the bug to be fixed in the trunk does not exist in the release branch.
Yes, you do have to confirm that the bug is not applied to a vacuum in the release branch.
Jonathon
Ray Barlow wrote:
> I have just applied this fix to the trunk, is the general process that I
> can apply it to the branch 4.0 release because it's a small bug fix or
> do we want a cool off period to allow others to review and test so as to
> reduce the risk of adverse effects getting it to the "stable" branch?
>
> Ray
>
>
> rayb@apache.org wrote:
>> Author: rayb
>> Date: Tue Apr 24 08:19:09 2007
>> New Revision: 531978
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=531978
>> Log:
>> Corrections to the HTML for the layout of the orders items table, so the columns should now be aligned properly.
>>
>>
>
>
Re: committing to the branch...
Posted by "David E. Jones" <jo...@hotwaxmedia.com>.
Ray,
You're absolutely correct that we should be applying patches as much
as we can and have time for to the release branch to fix bugs there
as well.
I just updated the permissions so you should now be able to do this.
-David
On Apr 24, 2007, at 12:52 PM, Ray Barlow wrote:
> Personally I was expecting to contribute fixes to the branch as well
> even if I generally work on and use the trunk.
>
> At this point in time merging the fix I've done into the branch
> requires
> little to no extra effort as I can safely say if it works in the trunk
> it will work in the branch as they are not that far apart at the
> moment!
> That will change as more time goes by and more testing will be
> required
> when transitioning changes in either direction.
>
> The more stabilising fixes applied to the branch the better for the
> project, community and users I think.
>
> Ray
>
>
> BJ Freeman wrote:
>> from http://docs.ofbiz.org/display/OFBADMIN/Release+Plan
>> Steps for applying a fix from the trunk to a branch as part of
>> maintenance:
>>
>> seems to put that responsibility on those that have checked out
>> the branch.
>>
>>
>> Ray Barlow sent the following on 4/24/2007 8:05 AM:
>>
>>> I have just applied this fix to the trunk, is the general process
>>> that I
>>> can apply it to the branch 4.0 release because it's a small bug
>>> fix or
>>> do we want a cool off period to allow others to review and test
>>> so as to
>>> reduce the risk of adverse effects getting it to the "stable"
>>> branch?
>>>
>>> Ray
>>>
>>>
Re: committing to the branch...
Posted by Ray Barlow <ra...@makeyour-point.com>.
Personally I was expecting to contribute fixes to the branch as well
even if I generally work on and use the trunk.
At this point in time merging the fix I've done into the branch requires
little to no extra effort as I can safely say if it works in the trunk
it will work in the branch as they are not that far apart at the moment!
That will change as more time goes by and more testing will be required
when transitioning changes in either direction.
The more stabilising fixes applied to the branch the better for the
project, community and users I think.
Ray
BJ Freeman wrote:
> from http://docs.ofbiz.org/display/OFBADMIN/Release+Plan
> Steps for applying a fix from the trunk to a branch as part of maintenance:
>
> seems to put that responsibility on those that have checked out the branch.
>
>
> Ray Barlow sent the following on 4/24/2007 8:05 AM:
>
>> I have just applied this fix to the trunk, is the general process that I
>> can apply it to the branch 4.0 release because it's a small bug fix or
>> do we want a cool off period to allow others to review and test so as to
>> reduce the risk of adverse effects getting it to the "stable" branch?
>>
>> Ray
>>
>>
Re: committing to the branch...
Posted by BJ Freeman <bj...@free-man.net>.
from http://docs.ofbiz.org/display/OFBADMIN/Release+Plan
Steps for applying a fix from the trunk to a branch as part of maintenance:
seems to put that responsibility on those that have checked out the branch.
Ray Barlow sent the following on 4/24/2007 8:05 AM:
> I have just applied this fix to the trunk, is the general process that I
> can apply it to the branch 4.0 release because it's a small bug fix or
> do we want a cool off period to allow others to review and test so as to
> reduce the risk of adverse effects getting it to the "stable" branch?
>
> Ray
>
>
> rayb@apache.org wrote:
>> Author: rayb
>> Date: Tue Apr 24 08:19:09 2007
>> New Revision: 531978
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=531978
>> Log:
>> Corrections to the HTML for the layout of the orders items table, so the columns should now be aligned properly.
>>
>>
>
>
>
committing to the branch...
Posted by Ray Barlow <ra...@makeyour-point.com>.
I have just applied this fix to the trunk, is the general process that I
can apply it to the branch 4.0 release because it's a small bug fix or
do we want a cool off period to allow others to review and test so as to
reduce the risk of adverse effects getting it to the "stable" branch?
Ray
rayb@apache.org wrote:
> Author: rayb
> Date: Tue Apr 24 08:19:09 2007
> New Revision: 531978
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=531978
> Log:
> Corrections to the HTML for the layout of the orders items table, so the columns should now be aligned properly.
>
>