From c36fcd215d757f92a5af3d14eb73452bffcaf22e Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 11 Mar 2015 10:58:44 +0100
Subject: Prices on active offers

---
 nav.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'nav.php')

diff --git a/nav.php b/nav.php
index f5b9fd0..257c9f2 100644
--- a/nav.php
+++ b/nav.php
@@ -39,7 +39,7 @@
             </a>
             <ul class="dropdown-menu dropdown-tasks">
                 <?php
-                $offers = BusinessAdmin::getOffers($_pdo, array("`accepted`=1", "`start_date` <= CURDATE()", "`end_date` >= CURDATE()", "`invoice_date` IS NULL OR `invoice_date` = '1970-01-01'"));
+                $offers = BusinessAdmin::getOffers($_pdo, array("`accepted`=1", "`start_date` <= CURDATE()", "`end_date` >= CURDATE()"));
                 $list = array();
                 foreach ($offers as $offer) {
                     $start = BusinessAdmin::formatDate($offer->getStartDate(), false);
@@ -54,7 +54,8 @@
                         'end' => $end,
                         'id' => $offer->getId(),
                         'contactClientName' => $offer->getContact()->getClient()->getName(),
-                        'percentage' => $percentage
+                        'percentage' => $percentage,
+                        'price' => constants::invoice_valuta . $offer->calculate(offer::SUBTOTAL)
                     );
                 }
                 krsort($list, SORT_STRING);
@@ -63,7 +64,7 @@
                             <a href='".constants::url_internal."/offers?id={$item['id']}'>
                                 <div>
                                     <p>
-                                        <strong>{$item['contactClientName']}</strong> ({$item['start']} - {$item['end']})
+                                        <strong>{$item['contactClientName']}</strong> ({$item['start']} - {$item['end']}; {$item['price']})
                                     </p>
                                     <div class='progress progress-striped active' title='{$item['percentage']}% complete'>
                                         <div class='progress-bar progress-bar-".($item['percentage'] < 60 ? 'info' : ($item['percentage'] < 80 ? 'warning' : 'danger'))."' style='width:{$item['percentage']}%;' aria-valuemax='100' aria-valuemin='0' aria-valuenow='{$item['percentage']}' role='progressbar'></div>
-- 
cgit v1.2.3