From e73a0078128cc3154c8c70d57fd3c9c8112087b9 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Wed, 27 Jul 2016 18:46:36 +0200 Subject: Assignment: use Model --- include/offers-view.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'include/offers-view.php') diff --git a/include/offers-view.php b/include/offers-view.php index 9b69dce..6b84e5c 100644 --- a/include/offers-view.php +++ b/include/offers-view.php @@ -40,8 +40,8 @@ $_offer = new Offer($_pdo, $_id); 'assignments_header' => '' ); foreach ($_offer->getAssignments() as $assignment) { - $temp['assignments'] .= "{$assignment->getTitle()}
(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)

{$assignment->getDescription()}

"; - $temp['assignments_header'] .= "{$assignment->getTitle()}
(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)
"; + $temp['assignments'] .= "{$assignment->title}
(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)

{$assignment->getHTMLDescription()}

"; + $temp['assignments_header'] .= "{$assignment->title}
(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)
"; } $list[] = array_merge($temp, array('type' => 'start', 'time' => $_offer->getStartDate(), 'description' => 'Offer started')); $sort_list[] = $_offer->getStartDate() . $_offer->getId() . 0; @@ -104,19 +104,19 @@ $_offer = new Offer($_pdo, $_id); $assignments = BusinessAdmin::getAssignments($_pdo, array("offerId = {$_offer->getId()}")); foreach ($assignments as $assignment) { echo " - {$assignment->getId()} + {$assignment->id} - {$assignment->getTitle()}
-

{$assignment->getDescription()}

+ {$assignment->title}
+

{$assignment->getHTMLDescription()}

- {$assignment->getHours()}h + {$assignment->hours}h - ".Constants::invoice_valuta."{$assignment->getPricePerHour()} / hr
- {$assignment->getVAT()}% VAT + ".Constants::invoice_valuta."{$assignment->price_per_hour} / hr
+ {$assignment->VAT_percentage}% VAT - - + + "; } -- cgit v1.2.3