Bugzilla – Attachment 3350 Details for
Bug 5466
Allow currency to be set during order creation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Rebased patch
0002-Bug-5466-On-new-orders-get-currency-from-vendor.patch (text/plain), 2.63 KB, created by
Colin Campbell
on 2011-03-18 14:00:08 UTC
(
hide
)
Description:
Rebased patch
Filename:
MIME Type:
Creator:
Colin Campbell
Created:
2011-03-18 14:00:08 UTC
Size:
2.63 KB
patch
obsolete
>From a90ee35a30d2c4da052f9487f07d788abb565073 Mon Sep 17 00:00:00 2001 >From: Colin Campbell <colin.campbell@ptfs-europe.com> >Date: Thu, 9 Dec 2010 15:59:13 +0000 >Subject: [PATCH 2/2] Bug 5466 On new orders get currency from vendor >Content-Type: text/plain; charset="utf-8" > >Previous patch for this bug was ignoring vendor currency on >new orders. In most cases should be the default > >Changed variable name from cur to active_currency >Clarity is a virtue! >--- > acqui/neworderempty.pl | 37 ++++++++++++++++++++++++++----------- > 1 files changed, 26 insertions(+), 11 deletions(-) > >diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl >index 1e90b92..0ba7180 100755 >--- a/acqui/neworderempty.pl >+++ b/acqui/neworderempty.pl >@@ -173,7 +173,6 @@ if ( $ordernumber eq '' and defined $params->{'breedingid'}){ > } > > >-my $cur = GetCurrency(); > > if ( $ordernumber eq '' ) { # create order > $new = 'yes'; >@@ -201,18 +200,35 @@ else { #modify order > } > > # get currencies (for change rates calcs if needed) >+my $active_currency = GetCurrency(); >+my $default_currency; >+if (! $data->{currency} ) { # New order no currency set >+ if ( $bookseller->{listprice} ) { >+ $default_currency = $bookseller->{listprice}; >+ } >+ else { >+ $default_currency = $active_currency->{currency}; >+ } >+} >+ > my @rates = GetCurrencies(); >-my $count = scalar @rates; > > # ## @rates > > my @loop_currency = (); >-for ( my $i = 0 ; $i < $count ; $i++ ) { >- my %line; >- $line{currcode} = $rates[$i]->{'currency'}; >- $line{rate} = $rates[$i]->{'rate'}; >- $line{selected} = 1 if ($line{currcode} eq $data->{currency}); >- push @loop_currency, \%line; >+for my $curr ( @rates ) { >+ my $selected; >+ if ($data->{currency} ) { >+ $selected = $curr->{currency} eq $data->{currency}; >+ } >+ else { >+ $selected = $curr->{currency} eq $default_currency; >+ } >+ push @loop_currency, { >+ currcode => $curr->{currency}, >+ rate => $curr->{rate}, >+ selected => $selected, >+ } > } > > # build branches list >@@ -341,9 +357,8 @@ $template->param( > listincgst => $bookseller->{'listincgst'}, > invoiceincgst => $bookseller->{'invoiceincgst'}, > name => $bookseller->{'name'}, >- cur_active_sym => $cur->{'symbol'}, >- cur_active => $cur->{'currency'}, >-# currency => $bookseller->{'listprice'} || $cur->{'currency'}, # eg: 'EUR' >+ cur_active_sym => $active_currency->{'symbol'}, >+ cur_active => $active_currency->{'currency'}, > loop_currencies => \@loop_currency, > orderexists => ( $new eq 'yes' ) ? 0 : 1, > title => $data->{'title'}, >-- >1.7.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5466
:
2800
|
2826
|
3349
| 3350