diff options
| -rw-r--r-- | include/home.php | 5 | ||||
| -rw-r--r-- | nav.php | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/home.php b/include/home.php index 75ecb6e..0f55ede 100644 --- a/include/home.php +++ b/include/home.php @@ -160,12 +160,13 @@ require('header.php'); '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); foreach ($list as $item) { - echo "<p>#{$item['id']} to {$item['contactClientName']} ({$item['start']} - {$item['end']})<span class='pull-right text-muted'>{$item['percentage']}% complete</span></p> + echo "<p>#{$item['id']} to {$item['contactClientName']} ({$item['start']} - {$item['end']}; {$item['price']})<span class='pull-right text-muted'>{$item['percentage']}% complete</span></p> <div class='progress progress-striped active' style='clear:both;'> <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> </div>"; @@ -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> |