You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Jacques Le Roux <ja...@les7arts.com> on 2007/06/10 10:22:25 UTC
Release 4
Hi commiters,
What about this two commits, should they go to release, even partly ?
Thanks
Jacques
De : "Jacques Le Roux" <ja...@les7arts.com>
> Scott, Jacopo,
>
> I noticed 2 other related trunk commits about that point (if I'm not
> wrong, really in a hurry)
> 544091 and 543271
>
> Thanks to both of you !
>
> Jacques
>
> ----- Message d'origine -----
> De : "Jacopo Cappellato" <ti...@sastau.it>
> À : <de...@ofbiz.apache.org>
> Envoyé : mercredi 6 juin 2007 10:10
> Objet : Re: svn commit: r541349 -
>
/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/Shoppin
> gCart.java
>
>
> > Scott,
> >
> > that is part of the refactoring of the processes related to billing
> > accounts, that I have completed in the weekend (but needs more
tests).
> > That was a refactoring and a bug fix in the same time (that resolved
> > several bugs reported in Jira); in fact the previous implementation
of
> > the billing account process was incomplete.
> > If we commit this we should commit all the other revisions as well
(I
> > can provide a list, of course), but before we do this it would be
> great
> > to have some feedback from others about this subject.
> > However, I noticed that in rev. 544442 you already committed part of
> > that work: I didn't look at the details of that commit but we should
> > consider to revert it if we don't put in the other stuff of the
> billing
> > accounts I did recently.
> >
> > Thanks for your great work,
> >
> > Jacopo
> >
> >
> > Scott Gray wrote:
> > > Hi Jacopo
> > >
> > > Do you know if this commit needs to be applied to the release
> branch? I
> > > can't tell if it's an improvement or a bug fix, but when I merged
it
> I
> > > noticed it also relies on another commit which changed the
> > > CheckOutHelper.availableAccountBalance method signature.
> > >
> > > Any info would be appreciated.
> > >
> > > Thanks
> > > Scott
> > >
> > > On 25/05/07, jacopoc@apache.org <ja...@apache.org> wrote:
> > >>
> > >> Author: jacopoc
> > >> Date: Thu May 24 09:26:42 2007
> > >> New Revision: 541349
> > >>
> > >> URL: http://svn.apache.org/viewvc?view=rev&rev=541349
> > >> Log:
> > >> Added code to always set the maxAmount in the
> OrderPaymentPreference.
> > >>
> > >> Modified:
> > >>
> > >>
> > >>
>
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/Shopping
> Cart.java
> > >>
> > >>
> > >> Modified:
> > >>
>
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/Shopping
> Cart.java
> > >>
> > >> URL:
> > >>
>
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?view=diff&rev=541349&r1=541348&r2=541349
> > >>
> > >>
> > >>
>
========================================================================
> ======
> > >>
> > >> ---
> > >>
>
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/Shopping
> Cart.java
> > >>
> > >> (original)
> > >> +++
> > >>
>
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/Shopping
> Cart.java
> > >>
> > >> Thu May 24 09:26:42 2007
> > >> @@ -3385,14 +3385,17 @@
> > >> }
> > >>
> > >> /** make a list of all OrderPaymentPreferences and Billing
> info
> > >> including all payment methods and types */
> > >> - public List makeAllOrderPaymentInfos() {
> > >> + public List makeAllOrderPaymentInfos(LocalDispatcher
> dispatcher) {
> > >> List allOpPrefs = new LinkedList();
> > >> - Iterator i = paymentInfo.iterator();
> > >> - while (i.hasNext()) {
> > >> - CartPaymentInfo inf = (CartPaymentInfo) i.next();
> > >> -
> > >> allOpPrefs.addAll(inf.makeOrderPaymentInfos(this.getDelegator
> > >> ()));
> > >> - }
> > >> + double remainingAmount = this.getGrandTotal() -
> > >> this.getPaymentTotal();
> > >> if (getBillingAccountId() != null) {
> > >> + double billingAccountAvailableAmount =
> > >> billingAccountAvailableAmount =
> > >> CheckOutHelper.availableAccountBalance(getBillingAccountId(),
> > >> dispatcher);
> > >> + if (remainingAmount < getBillingAccountAmount()) {
> > >> + this.billingAccountAmt = remainingAmount;
> > >> + }
> > >> + if (billingAccountAvailableAmount <
> > >> getBillingAccountAmount()) {
> > >> + this.billingAccountAmt =
> billingAccountAvailableAmount;
> > >> + }
> > >> GenericValue opp =
> > >> delegator.makeValue("OrderPaymentPreference",
> > >> new HashMap());
> > >> opp.set("paymentMethodTypeId", "EXT_BILLACT");
> > >> opp.set("presentFlag", "N");
> > >> @@ -3400,6 +3403,19 @@
> > >> opp.set("maxAmount", new
> Double(getBillingAccountAmount()));
> > >> opp.set("statusId", "PAYMENT_NOT_RECEIVED");
> > >> allOpPrefs.add(opp);
> > >> + remainingAmount = remainingAmount -
> > >> getBillingAccountAmount();
> > >> + if (remainingAmount < 0) {
> > >> + remainingAmount = 0;
> > >> + }
> > >> + }
> > >> + Iterator i = paymentInfo.iterator();
> > >> + while (i.hasNext()) {
> > >> + CartPaymentInfo inf = (CartPaymentInfo) i.next();
> > >> + if (inf.amount == null) {
> > >> + inf.amount = new Double(remainingAmount);
> > >> + remainingAmount = 0;
> > >> + }
> > >> +
> > >> allOpPrefs.addAll(inf.makeOrderPaymentInfos(this.getDelegator
> > >> ()));
> > >> }
> > >> return allOpPrefs;
> > >> }
> > >> @@ -3636,7 +3652,7 @@
> > >> result.put("orderItemAttributes",
> > >> this.makeAllOrderItemAttributes
> > >> ());
> > >> result.put("orderContactMechs",
> > >> this.makeAllOrderContactMechs());
> > >> result.put("orderItemContactMechs",
> > >> this.makeAllOrderItemContactMechs());
> > >> - result.put("orderPaymentInfo",
> this.makeAllOrderPaymentInfos());
> > >> + result.put("orderPaymentInfo",
> this.makeAllOrderPaymentInfos
> > >> (dispatcher));
> > >> result.put("orderItemShipGroupInfo",
> this.makeAllShipGroupInfos
> > >> ());
> > >> result.put("orderItemSurveyResponses",
> > >> this.makeAllOrderItemSurveyResponses());
> > >> result.put("orderAdditionalPartyRoleMap",
> > >> this.getAdditionalPartyRoleMap());
> > >>
> > >>
> > >>
> > >
> >
>