From 4036eddde27be47ad72e419f38a737c8ec2a819b Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Fri, 2 Sep 2016 20:21:06 +0200 Subject: more links, editable dates on offer view page --- include/assignments-view.php | 8 ++---- include/home.php | 25 ++---------------- include/offers-view.php | 62 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 29 deletions(-) diff --git a/include/assignments-view.php b/include/assignments-view.php index a155ef7..827aba5 100644 --- a/include/assignments-view.php +++ b/include/assignments-view.php @@ -25,7 +25,7 @@ $_assignment = new Assignment($_pdo, $_id);
Details
- +
@@ -36,11 +36,7 @@ $_assignment = new Assignment($_pdo, $_id); id}' - data-mixer-order-offer='{$_assignment->getOffer()->id}' - data-mixer-order-time='{$_assignment->hours}' - data-mixer-order-price='{$_assignment->price_per_hour}'> + echo "
#
{$_assignment->id} #{$_assignment->getOffer()->id} to diff --git a/include/home.php b/include/home.php index 05846cf..6b2e8a6 100644 --- a/include/home.php +++ b/include/home.php @@ -31,9 +31,7 @@ require('./header.php');

Welcome

- -
-
@@ -72,7 +69,6 @@ require('./header.php');
-
@@ -97,7 +93,6 @@ require('./header.php');
-
@@ -130,7 +125,6 @@ require('./header.php');
-
@@ -144,14 +138,12 @@ require('./header.php'); -
Currently active offers
-
= CURDATE()"]); @@ -188,16 +180,13 @@ require('./header.php'); } ?>
-
-
Finished offers
-
@@ -224,9 +213,7 @@ require('./header.php');
-
-
@@ -284,19 +271,15 @@ require('./header.php');
-
- -
Timeline
-
"; break; } echo "
"; - echo "

#{$item['id']} to {$item['contact']}: {$item['description']}

".BusinessAdmin::formatDate($item['time'],false,true,true)."

"; + echo "

#"; + echo "{$item['id']} to {$item['contact']}: {$item['description']}

".BusinessAdmin::formatDate($item['time'],false,true,true)."

"; switch ($item['type']) { case 'start': echo "
{$item['assignments']}
"; break; default: echo "
{$item['assignments_header']}
"; @@ -360,13 +344,8 @@ require('./header.php'); ?>
-
-
- - - diff --git a/include/offers-view.php b/include/offers-view.php index 908db94..930f112 100644 --- a/include/offers-view.php +++ b/include/offers-view.php @@ -21,6 +21,68 @@ require_once(__DIR__ . '/../login.php'); $_offer = new Offer($_pdo, $_id); ?> +
+
+
Details
+
+ + + + + + + + + + + + + + "; + ?> + +
ContactDatesPrice
+ {$_offer->getContact()->name} + ({$_offer->getContact()->getClient()->name}) + + + + + + + + + + + + + + + + + + +
From:".BusinessAdmin::formatDate($_offer->start_date,false,true)."
To:".BusinessAdmin::formatDate($_offer->end_date,false,true)."
Invoice:".BusinessAdmin::formatDate($_offer->invoice_date,false,true)."
Payment received:".BusinessAdmin::formatDate($_offer->getPaymentReceived(),false,true)."
+ 		+ + + + + + + + + + + + + +
Subtotal:".Constants::invoice_valuta."{$offer->calculate(Calculatable::SUBTOTAL)}
VAT:".Constants::invoice_valuta."{$offer->calculate(Calculatable::VAT)}
Total:".Constants::invoice_valuta."{$offer->calculate(Calculatable::TOTAL)}
+
+
+
+
Assignments
-- cgit v1.2.3