Bugzilla – Attachment 93215 Details for
Bug 23522
Show "Actual price" in basket when available
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23522: Show actual price on in baskets
Bug-23522-Show-actual-price-on-in-baskets.patch (text/plain), 5.31 KB, created by
Bouzid Fergani
on 2019-09-27 20:02:03 UTC
(
hide
)
Description:
Bug 23522: Show actual price on in baskets
Filename:
MIME Type:
Creator:
Bouzid Fergani
Created:
2019-09-27 20:02:03 UTC
Size:
5.31 KB
patch
obsolete
>From 5a4c8de8f668dfcd0b273dcad1ebf5122dc4bc02 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Thu, 29 Aug 2019 14:51:16 +0000 >Subject: [PATCH] Bug 23522: Show actual price on in baskets > >To test: > 1 - Create a new basket in acq, mark it as 'standing' > 2 - Add an item, leave the RRP and Vendor price as 0 > 3 - Receive shipments for the vendor > 4 - Select the title from this basket > 5 - On receipt enter an actual cost > 6 - Finsih receiving > 7 - Go to the basket > 8 - Note the total for the order and the basket are 0, keep this browser tab open > 9 - Open a new browser tab and create a new non standing basket >10 - Add to basket, again with no RRP or vendor price >11 - Close the basket, receive the item >12 - Enter an actual cost on receipt >13 - Return to view the basket >14 - Total and order are $0 >15 - Apply patch >16 - Refresh the basket in both tabs >17 - You now see the actual price for the orders > >Signed-off-by: Rhonda Kuiper <rkuiper@roundrocktexas.gov> >Signed-off-by: Bouzid Fergani <bouzid.fergani@inlibro.com> >--- > acqui/basket.pl | 7 +++++-- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 8 ++++++++ > 2 files changed, 13 insertions(+), 2 deletions(-) > >diff --git a/acqui/basket.pl b/acqui/basket.pl >index e9bf7cd..4fa1931 100755 >--- a/acqui/basket.pl >+++ b/acqui/basket.pl >@@ -459,8 +459,11 @@ sub get_order_infos { > $line{basketno} = $basketno; > $line{budget_name} = $budget->{budget_name}; > >- $line{total_tax_included} = get_rounded_price($line{ecost_tax_included}) * $line{quantity}; >- $line{total_tax_excluded} = get_rounded_price($line{ecost_tax_excluded}) * $line{quantity}; >+ # If we have an actual cost tht should be the total, otherwise use the ecost >+ my $cost_tax_included = $line{unitprice_tax_included} || $line{ecost_tax_included}; >+ my $cost_tax_excluded = $line{unitprice_tax_excluded} || $line{ecost_tax_excluded}; >+ $line{total_tax_included} = get_rounded_price($cost_tax_included) * $line{quantity}; >+ $line{total_tax_excluded} = get_rounded_price($cost_tax_excluded) * $line{quantity}; > $line{tax_value} = $line{tax_value_on_ordering}; > $line{tax_rate} = $line{tax_rate_on_ordering}; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index ad70418..8764658 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -395,8 +395,10 @@ > <th>No.</th> > <th>Order</th> > <th>RRP tax exc.</th> >+ <th>Actual cost tax exc.</th> > <th>ecost tax exc.</th> > <th>RRP tax inc.</th> >+ <th>Actual cost tax inc.</th> > <th>ecost tax inc.</th> > <th>Replacement price</th> > <th>Qty.</th> >@@ -424,6 +426,8 @@ > <th> </th> > <th> </th> > <th> </th> >+ <th> </th> >+ <th> </th> > <th>[% foot_loo.quantity | html %]</th> > <th>[% foot_loo.total_tax_excluded | $Price %]</th> > <th>[% foot_loo.total_tax_included | $Price %]</th> >@@ -447,6 +451,8 @@ > <th> </th> > <th> </th> > <th> </th> >+ <th> </th> >+ <th> </th> > <th>[% total_quantity | html %]</th> > <th>[% total_tax_excluded | $Price %]</th> > <th>[% total_tax_included | $Price %]</th> >@@ -519,8 +525,10 @@ > [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %] > [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %] > <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %]</td> >+ <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_excluded | $Price %]</td> > <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td> > <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td> >+ <td class="number [% IF books_loo.unitprice_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_included | $Price %]</td> > <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td> > <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td> > <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td> >-- >2.7.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=93215">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23522
:
92499
|
93000
|
93215
|
95036
|
95037