From 21455bfd1004c4a3153050ac5995b8dc680c2042 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Wed, 27 Jul 2016 16:48:53 +0200 Subject: Class names start with a capital --- include/about.php | 4 ++-- include/assignments-edit.php | 4 ++-- include/assignments-new.php | 4 ++-- include/assignments-overview.php | 20 ++++++++++---------- include/assignments-view.php | 14 +++++++------- include/assignments.php | 6 +++--- include/clients-edit.php | 4 ++-- include/clients-new.php | 2 +- include/clients-overview.php | 4 ++-- include/clients-view.php | 20 ++++++++++---------- include/clients.php | 6 +++--- include/contacts-edit.php | 4 ++-- include/contacts-new.php | 4 ++-- include/contacts-overview.php | 18 +++++++++--------- include/contacts.php | 6 +++--- include/discounts-edit.php | 4 ++-- include/discounts-new.php | 4 ++-- include/discounts-overview.php | 18 +++++++++--------- include/discounts.php | 6 +++--- include/home.php | 16 ++++++++-------- include/offers-edit.php | 4 ++-- include/offers-new.php | 4 ++-- include/offers-overview.php | 20 ++++++++++---------- include/offers-view.php | 28 ++++++++++++++-------------- include/offers.php | 12 ++++++------ include/settings.php | 4 ++-- include/users-new.php | 2 +- 27 files changed, 121 insertions(+), 121 deletions(-) (limited to 'include') diff --git a/include/about.php b/include/about.php index e7ab3d4..c2eb179 100644 --- a/include/about.php +++ b/include/about.php @@ -40,8 +40,8 @@ require('./header.php');
About
-

BusinessAdmin is open source software under the GPL 3.0 license.

-

A full version of the license is available here. An excerpt is shown below:

+

BusinessAdmin is open source software under the GPL 3.0 license.

+

A full version of the license is available here. An excerpt is shown below:

BusinessAdmin: administrative software for small companies
 Copyright (C) 2015 Camil Staps (ViviSoft)
 
diff --git a/include/assignments-edit.php b/include/assignments-edit.php
index 7c63680..d2f5a6c 100644
--- a/include/assignments-edit.php
+++ b/include/assignments-edit.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$assignment = new assignment($_pdo, $_REQUEST['pk']);
+	$assignment = new Assignment($_pdo, $_REQUEST['pk']);
 
 	$name = explode('-', $_REQUEST['name']);
 	$what_to_edit = $name[count($name) - 1];
diff --git a/include/assignments-new.php b/include/assignments-new.php
index 405c5fa..bcc545a 100644
--- a/include/assignments-new.php
+++ b/include/assignments-new.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$offer = new offer($_pdo, $_REQUEST['offerId']);
+	$offer = new Offer($_pdo, $_REQUEST['offerId']);
 
 	$assignment = $offer->createAssignment(
 		$_REQUEST['title'],
diff --git a/include/assignments-overview.php b/include/assignments-overview.php
index 0e364d1..d4b350e 100644
--- a/include/assignments-overview.php
+++ b/include/assignments-overview.php
@@ -46,17 +46,17 @@ require_once('./login.php');
 								data-mixer-order-price='{$assignment->getPricePerHour()}'>
 							{$assignment->getId()}
 							
-								#{$assignment->getOffer()->getId()} to
-								{$assignment->getOffer()->getContact()->getName()}
-								({$assignment->getOffer()->getContact()->getClient()->name})
+								#{$assignment->getOffer()->getId()} to
+								{$assignment->getOffer()->getContact()->getName()}
+								({$assignment->getOffer()->getContact()->getClient()->name})
 							
-								{$assignment->getTitle()}

-								
{$assignment->getDescription(false)}

+								{$assignment->getTitle()}

+								
{$assignment->getDescription(false)}

 							
-							{$assignment->getHours()}h
+							{$assignment->getHours()}h
 							
-							   ".constants::invoice_valuta."{$assignment->getPricePerHour()} / hr

-								{$assignment->getVAT()}% VAT
+							   ".Constants::invoice_valuta."{$assignment->getPricePerHour()} / hr

+								{$assignment->getVAT()}% VAT
 							
 							
 								
@@ -77,7 +77,7 @@ require_once('./login.php');
 	

 		
Create new

 		

-			

 				

 				

@@ -114,7 +114,7 @@ require_once('./login.php');
 							data-bv-integer="true" data-bv-integer-message="Please enter an integer" />
 					

 					

-						
+						
 						
 

 	

@@ -43,14 +43,14 @@ $_assignment = new assignment($_pdo, $_id);
 								data-mixer-order-price='{$_assignment->getPricePerHour()}'>
 							{$_assignment->getId()}
 							
-								#{$_assignment->getOffer()->getId()} to
-								{$_assignment->getOffer()->getContact()->getName()}
-								({$_assignment->getOffer()->getContact()->getClient()->name})
+								#{$_assignment->getOffer()->getId()} to
+								{$_assignment->getOffer()->getContact()->getName()}
+								({$_assignment->getOffer()->getContact()->getClient()->name})
 							
-							{$_assignment->getHours()}h
+							{$_assignment->getHours()}h
 							
-							   ".constants::invoice_valuta."{$_assignment->getPricePerHour()} / hr

-								{$_assignment->getVAT()}% VAT
+							   ".Constants::invoice_valuta."{$_assignment->getPricePerHour()} / hr

+								{$_assignment->getVAT()}% VAT
 							
 						";
 					?>
diff --git a/include/assignments.php b/include/assignments.php
index 14ed8da..7c3c79d 100644
--- a/include/assignments.php
+++ b/include/assignments.php
@@ -45,8 +45,8 @@ require('./header.php');
 			if (isset($_GET['id'])) {
 				$id = (int) $_GET['id'];
 				try {
-					$assignment = new assignment($_pdo, $id);
-					$header = "Assignments / {$assignment->getTitle()}";
+					$assignment = new Assignment($_pdo, $id);
+					$header = "Assignments / {$assignment->getTitle()}";
 					$show_individual = $id;
 				} catch (PDOException $e) {
 					$alert = "
The assignment with id $id could not be found.
";
@@ -64,7 +64,7 @@ require('./header.php');
 				echo "
";
 				$id = (int) $_GET['delete'];
 				try {
-					$assignment = new assignment($_pdo, $id);
+					$assignment = new Assignment($_pdo, $id);
 					if ($assignment->delete()) {
 						echo "
The assignment with title {$assignment->getTitle()} has been removed.
";
 					} else {
diff --git a/include/clients-edit.php b/include/clients-edit.php
index 3d92d06..00961aa 100644
--- a/include/clients-edit.php
+++ b/include/clients-edit.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$client = new client($_pdo, $_REQUEST['pk']);
+	$client = new Client($_pdo, $_REQUEST['pk']);
 	if ($client->setName($_REQUEST['value'])) {
 		$response->success = true;
 	} else {
diff --git a/include/clients-new.php b/include/clients-new.php
index fe66026..d1cf503 100644
--- a/include/clients-new.php
+++ b/include/clients-new.php
@@ -20,7 +20,7 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
 	$client = BusinessAdmin::createClient($_pdo, $_REQUEST['name']);
diff --git a/include/clients-overview.php b/include/clients-overview.php
index 860e671..cdced81 100644
--- a/include/clients-overview.php
+++ b/include/clients-overview.php
@@ -41,7 +41,7 @@ require_once('./login.php');
 								data-mixer-order-name='{$client->name}'>
 							{$client->id}
 							
-								
+								
 									{$client->name}
 								
 							
@@ -64,7 +64,7 @@ require_once('./login.php');
 	

 		
Create new

 		

-			
 				

 				

diff --git a/include/clients-view.php b/include/clients-view.php
index 007d94c..2472a80 100644
--- a/include/clients-view.php
+++ b/include/clients-view.php
@@ -19,7 +19,7 @@
 
 require_once('./login.php');
 
-$_client = new client($_pdo, $_id);
+$_client = new Client($_pdo, $_id);
 ?>
 

 	

@@ -41,22 +41,22 @@ $_client = new client($_pdo, $_id);
 					foreach ($contacts as $contact) {
 						echo "
 							{$contact->getId()}
-							{$contact->getName()}
+							{$contact->getName()}
 							
-								{$contact->getAddress()}

-								{$contact->getPostalCode()}
-								{$contact->getCity()}

-								{$contact->getCountry()}
+								{$contact->getAddress()}

+								{$contact->getPostalCode()}
+								{$contact->getCity()}

+								{$contact->getCountry()}
 							
-							{$contact->getLanguage()}
+							{$contact->getLanguage()}
 							
-								
-								
+								
+								
 							
 						";
 					}
 					if (count($contacts) == 0) {
-						echo "There are no contacts in the database. Why not create one?";
+						echo "There are no contacts in the database. Why not create one?";
 					}
 					?>
 				
diff --git a/include/clients.php b/include/clients.php
index f762859..1e7110b 100644
--- a/include/clients.php
+++ b/include/clients.php
@@ -45,8 +45,8 @@ require('./header.php');
 			if (isset($_GET['id'])) {
 				$id = (int) $_GET['id'];
 				try {
-					$client = new client($_pdo, $id);
-					$header = "Clients / {$client->name}";
+					$client = new Client($_pdo, $id);
+					$header = "Clients / {$client->name}";
 					$show_individual = $id;
 				} catch (PDOException $e) {
 					$alert = "
The client with id $id could not be found.
";
@@ -64,7 +64,7 @@ require('./header.php');
 				echo "
";
 				$id = (int) $_GET['delete'];
 				try {
-					$client = new client($_pdo, $id);
+					$client = new Client($_pdo, $id);
 					if ($client->delete()) {
 						echo "
The client with name {$client->name} has been removed.
";
 					} else {
diff --git a/include/contacts-edit.php b/include/contacts-edit.php
index ac924a9..ead27d9 100644
--- a/include/contacts-edit.php
+++ b/include/contacts-edit.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$contact = new contact($_pdo, $_REQUEST['pk']);
+	$contact = new Contact($_pdo, $_REQUEST['pk']);
 
 	$name = explode('-', $_REQUEST['name']);
 	$what_to_edit = $name[count($name) - 1];
diff --git a/include/contacts-new.php b/include/contacts-new.php
index 440e744..c75298c 100644
--- a/include/contacts-new.php
+++ b/include/contacts-new.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$client = new client($_pdo, $_REQUEST['clientId']);
+	$client = new Client($_pdo, $_REQUEST['clientId']);
 
 	$contact = $client->createContact(
 		$_REQUEST['name'],
diff --git a/include/contacts-overview.php b/include/contacts-overview.php
index 9cd71f3..4f2e6cf 100644
--- a/include/contacts-overview.php
+++ b/include/contacts-overview.php
@@ -43,20 +43,20 @@ require_once('./login.php');
 								data-mixer-order-name='{$contact->getName()}'>
 							{$contact->getId()}
 							
-								{$contact->getName()}

+								{$contact->getName()}

 								({$contact->getClient()->name})
 							
 							
-								{$contact->getEmail()}

+								{$contact->getEmail()}

 								

-								{$contact->getAddress()}

-								" . ($contact->getAddress_2() != '' ? "{$contact->getAddress_2()}
" : "") . "
-								{$contact->getPostalCode()}
-								{$contact->getCity()}

-								{$contact->getCountry()}
+								{$contact->getAddress()}

+								" . ($contact->getAddress_2() != '' ? "{$contact->getAddress_2()}
" : "") . "
+								{$contact->getPostalCode()}
+								{$contact->getCity()}

+								{$contact->getCountry()}
 							
 							
-								{$contact->getLanguage()}
+								{$contact->getLanguage()}
 							
 							
 								
@@ -77,7 +77,7 @@ require_once('./login.php');
 	

 		
Create new

 		

-			
 				

 				

diff --git a/include/contacts.php b/include/contacts.php
index 09a452f..1231e24 100644
--- a/include/contacts.php
+++ b/include/contacts.php
@@ -45,8 +45,8 @@ require('./header.php');
 			if (isset($_GET['id'])) {
 				$id = (int) $_GET['id'];
 				try {
-					$contact = new contact($_pdo, $id);
-					$header = "Contacts / {$contact->getName()}";
+					$contact = new Contact($_pdo, $id);
+					$header = "Contacts / {$contact->getName()}";
 					$show_individual = $id;
 				} catch (PDOException $e) {
 					$alert = "
The contact with id $id could not be found.
";
@@ -64,7 +64,7 @@ require('./header.php');
 				echo "
";
 				$id = (int) $_GET['delete'];
 				try {
-					$contact = new contact($_pdo, $id);
+					$contact = new Contact($_pdo, $id);
 					if ($contact->delete()) {
 						echo "
The contact with name {$contact->getName()} has been removed.
";
 					} else {
diff --git a/include/discounts-edit.php b/include/discounts-edit.php
index 2d64bd9..797a95b 100644
--- a/include/discounts-edit.php
+++ b/include/discounts-edit.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$discount = new discount($_pdo, $_REQUEST['pk']);
+	$discount = new Discount($_pdo, $_REQUEST['pk']);
 
 	$name = explode('-', $_REQUEST['name']);
 	$what_to_edit = $name[count($name) - 1];
diff --git a/include/discounts-new.php b/include/discounts-new.php
index b0cfa07..26452aa 100644
--- a/include/discounts-new.php
+++ b/include/discounts-new.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$offer = new offer($_pdo, $_REQUEST['offerId']);
+	$offer = new Offer($_pdo, $_REQUEST['offerId']);
 
 	$discount = $offer->createDiscount(
 		$_REQUEST['title'],
diff --git a/include/discounts-overview.php b/include/discounts-overview.php
index 1bf55d6..60ddf13 100644
--- a/include/discounts-overview.php
+++ b/include/discounts-overview.php
@@ -44,16 +44,16 @@ require_once('./login.php');
 								data-mixer-order-value='{$discount->getValue()}'>
 							{$discount->getId()}
 							
-								#{$discount->getOffer()->getId()} to
-								{$discount->getOffer()->getContact()->getName()}
-								({$discount->getOffer()->getContact()->getClient()->name})
+								#{$discount->getOffer()->getId()} to
+								{$discount->getOffer()->getContact()->getName()}
+								({$discount->getOffer()->getContact()->getClient()->name})
 							
-								{$discount->getTitle()}

-								
{$discount->getDescription(false)}

+								{$discount->getTitle()}

+								
{$discount->getDescription(false)}

 							
 							
-							   ".constants::invoice_valuta."{$discount->getValue()}

-								{$discount->getVAT()}% VAT
+							   ".Constants::invoice_valuta."{$discount->getValue()}

+								{$discount->getVAT()}% VAT
 							
 							
 								
@@ -74,7 +74,7 @@ require_once('./login.php');
 	

 		
Create new

 		

-			
 				

 				

@@ -104,7 +104,7 @@ require_once('./login.php');
 				

 				

 					

-						
+						
 						Discounts / {$discount->getTitle()}";
+					$discount = new Discount($_pdo, $id);
+					$header = "Discounts / {$discount->getTitle()}";
 					$show_individual = $id;
 				} catch (PDOException $e) {
 					$alert = "
The discount with id $id could not be found.
";
@@ -64,7 +64,7 @@ require('./header.php');
 				echo "
";
 				$id = (int) $_GET['delete'];
 				try {
-					$discount = new discount($_pdo, $id);
+					$discount = new Discount($_pdo, $id);
 					if ($discount->delete()) {
 						echo "
The discount with title {$discount->getTitle()} has been removed.
";
 					} else {
diff --git a/include/home.php b/include/home.php
index 6a25743..a15d2c4 100644
--- a/include/home.php
+++ b/include/home.php
@@ -51,7 +51,7 @@ require('./header.php');
 							

 						

 					

-					
+					
 						

 							Unaccepted offers
 							
@@ -115,7 +115,7 @@ require('./header.php');
 				$count = count(BusinessAdmin::getOfferIds($_pdo, array(
 					"`invoice_date` > '1970-01-01'",
 					"`invoice_date`<=CURDATE()",
-					"NOT EXISTS (SELECT * FROM `".constants::db_prefix."payment` WHERE `offerId`=`".constants::db_prefix."offer`.`id`)")));
+					"NOT EXISTS (SELECT * FROM `".Constants::db_prefix."payment` WHERE `offerId`=`".Constants::db_prefix."offer`.`id`)")));
 				?>
 				

 					

@@ -167,8 +167,8 @@ require('./header.php');
 								'id' => $offer->getId(),
 								'contactClientName' => $offer->getContact()->getClient()->name,
 								'percentage' => $percentage,
-								'price_excl' => constants::invoice_valuta . $offer->calculate(offer::SUBTOTAL),
-								'price_incl' => constants::invoice_valuta . $offer->calculate(offer::TOTAL)
+								'price_excl' => Constants::invoice_valuta . $offer->calculate(offer::SUBTOTAL),
+								'price_incl' => Constants::invoice_valuta . $offer->calculate(offer::TOTAL)
 							);
 						}
 						krsort($list, SORT_STRING);
@@ -242,7 +242,7 @@ require('./header.php');
 								$offers = BusinessAdmin::getOffers($_pdo, array(
 									"`invoice_date` > '1970-01-01'",
 									"`invoice_date`<=CURDATE()",
-									"NOT EXISTS (SELECT * FROM `".constants::db_prefix."payment` WHERE `offerId`=`".constants::db_prefix."offer`.`id`)"));
+									"NOT EXISTS (SELECT * FROM `".Constants::db_prefix."payment` WHERE `offerId`=`".Constants::db_prefix."offer`.`id`)"));
 								if (count($offers) == 0) {
 									echo "There are no currently open invoices.";
 								} else {
@@ -285,8 +285,8 @@ require('./header.php');
 									'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->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)
";
 								}
 								$list[] = array_merge($temp, array('type' => 'start', 'time' => $offer->getStartDate(), 'description' => 'Offer started'));
 								$sort_list[] = $offer->getStartDate() . $offer->getId() . 0;
@@ -311,7 +311,7 @@ require('./header.php');
 									case 'start':			 echo "
"; break;
 									case 'end':			   echo "
"; break;
 									case 'invoice':		   echo "
"; break;
-									case 'payment_received':  echo "
"; break;
+									case 'payment_received':  echo "
"; break;
 								}
 								echo "
";
 								echo "
#{$item['id']} to {$item['contact']}: {$item['description']}
 ".BusinessAdmin::formatDate($item['time'],false,true,true)."
";
diff --git a/include/offers-edit.php b/include/offers-edit.php
index 7f050c3..3954098 100644
--- a/include/offers-edit.php
+++ b/include/offers-edit.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$offer = new offer($_pdo, $_REQUEST['pk']);
+	$offer = new Offer($_pdo, $_REQUEST['pk']);
 
 	$name = explode('-', $_REQUEST['name']);
 	$what_to_edit = $name[count($name) - 1];
diff --git a/include/offers-new.php b/include/offers-new.php
index 9c499a8..ecd5674 100644
--- a/include/offers-new.php
+++ b/include/offers-new.php
@@ -20,10 +20,10 @@
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
-	$contact = new contact($_pdo, $_REQUEST['contactId']);
+	$contact = new Contact($_pdo, $_REQUEST['contactId']);
 
 	$offer = $contact->createOffer();
 	$response->success = true;
diff --git a/include/offers-overview.php b/include/offers-overview.php
index 9eaf25d..9c0a706 100644
--- a/include/offers-overview.php
+++ b/include/offers-overview.php
@@ -46,29 +46,29 @@ require_once('./login.php');
 							{$offer->getContact()->getName()}
 							";
 						foreach ($offer->getAssignments() as $assignment) {
-							echo "{$assignment->getTitle()}
(".constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)
{$assignment->getDescription()}
";
+							echo "{$assignment->getTitle()}
(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)
{$assignment->getDescription()}
";
 						}
 						foreach ($offer->getDiscounts() as $discount) {
-							echo "{$discount->getTitle()}
(".constants::invoice_valuta."{$discount->calculate(discount::SUBTOTAL)} excl. VAT, ".constants::invoice_valuta."{$discount->calculate(discount::TOTAL)} incl. VAT)
{$discount->getDescription()}
";
+							echo "{$discount->getTitle()}
(".Constants::invoice_valuta."{$discount->calculate(discount::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$discount->calculate(discount::TOTAL)} incl. VAT)
{$discount->getDescription()}
";
 						}
 						echo "
 							
 								
-										
+										
-										
+										
-										
+										
-										
+										

 									

 										From:".BusinessAdmin::formatDate($offer->getStartDate(),false,true)."".BusinessAdmin::formatDate($offer->getStartDate(),false,true)."
 									

 									

 										To:".BusinessAdmin::formatDate($offer->getEndDate(),false,true)."".BusinessAdmin::formatDate($offer->getEndDate(),false,true)."
 									

 									

 										Invoice:".BusinessAdmin::formatDate($offer->getInvoiceDate(),false,true)."".BusinessAdmin::formatDate($offer->getInvoiceDate(),false,true)."
 									

 									

 										Payment received:".BusinessAdmin::formatDate($offer->getPaymentReceived(),false,true)."".BusinessAdmin::formatDate($offer->getPaymentReceived(),false,true)."
 									

 								

 							
@@ -82,15 +82,15 @@ require_once('./login.php');
 								
-										
+										
-										
+										
-										
+										

 									

 										Subtotal:".constants::invoice_valuta."{$offer->calculate(offer::SUBTOTAL)}".Constants::invoice_valuta."{$offer->calculate(offer::SUBTOTAL)}
 									

 									

 										VAT:".constants::invoice_valuta."{$offer->calculate(offer::VAT)}".Constants::invoice_valuta."{$offer->calculate(offer::VAT)}
 									

 									

 										
Total:".constants::invoice_valuta."{$offer->calculate(offer::TOTAL)}".Constants::invoice_valuta."{$offer->calculate(offer::TOTAL)}
 									

 								

 							
@@ -112,7 +112,7 @@ require_once('./login.php');
 	

 		
Create new

 		

-			
 				

 				

diff --git a/include/offers-view.php b/include/offers-view.php
index 8f741c2..9b69dce 100644
--- a/include/offers-view.php
+++ b/include/offers-view.php
@@ -19,7 +19,7 @@
 
 require_once('./login.php');
 
-$_offer = new offer($_pdo, $_id);
+$_offer = new Offer($_pdo, $_id);
 ?>
 

 	

@@ -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->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)
";
 				}
 				$list[] = array_merge($temp, array('type' => 'start', 'time' => $_offer->getStartDate(), 'description' => 'Offer started'));
 				$sort_list[] = $_offer->getStartDate() . $_offer->getId() . 0;
@@ -106,17 +106,17 @@ $_offer = new offer($_pdo, $_id);
 						echo "
 							{$assignment->getId()}
 							
-								{$assignment->getTitle()}

+								{$assignment->getTitle()}

 								
{$assignment->getDescription()}

 							
-							{$assignment->getHours()}h
+							{$assignment->getHours()}h
 							
-							   ".constants::invoice_valuta."{$assignment->getPricePerHour()} / hr

-								{$assignment->getVAT()}% VAT
+							   ".Constants::invoice_valuta."{$assignment->getPricePerHour()} / hr

+								{$assignment->getVAT()}% VAT
 							
 							
-								
-								
+								
+								
 							
 						";
 					}
@@ -149,16 +149,16 @@ $_offer = new offer($_pdo, $_id);
 						echo "
 							{$discount->getId()}
 							
-								{$discount->getTitle()}

+								{$discount->getTitle()}

 								
{$discount->getDescription()}

 							
 							
-							   ".constants::invoice_valuta."{$discount->getValue()} / hr

-								{$discount->getVAT()}% VAT
+							   ".Constants::invoice_valuta."{$discount->getValue()} / hr

+								{$discount->getVAT()}% VAT
 							
 							
-								
-								
+								
+								
 							
 						";
 					}
diff --git a/include/offers.php b/include/offers.php
index 81781ba..7208ee6 100644
--- a/include/offers.php
+++ b/include/offers.php
@@ -48,8 +48,8 @@ require('./header.php');
 			if (isset($_GET['id'])) {
 				$id = (int) $_GET['id'];
 				try {
-					$offer = new offer($_pdo, $id);
-					$header = "Offers / #{$offer->getId()}";
+					$offer = new Offer($_pdo, $id);
+					$header = "Offers / #{$offer->getId()}";
 					$show_individual = $id;
 				} catch (PDOException $e) {
 					$alert = "
The offer with id $id could not be found.
";
@@ -67,7 +67,7 @@ require('./header.php');
 				echo "
";
 				$id = (int) $_GET['toggle_accept'];
 				try {
-					$offer = new offer($_pdo, $id);
+					$offer = new Offer($_pdo, $id);
 					if ($offer->toggleAccepted()) {
 						echo "
The status offer #{$offer->getId()} has been set to ".($offer->isAccepted() ? "accepted" : "unaccepted").".
";
 					} else {
@@ -87,7 +87,7 @@ require('./header.php');
 				echo "
";
 				$id = (int) $_GET['generate_invoice'];
 				try {
-					$offer = new offer($_pdo, $id);
+					$offer = new Offer($_pdo, $id);
 					$file = $offer->generateInvoice();
 					echo "
The invoice for offer #{$offer->getId()} is generated: {$file->getFilename()}
";
 				} catch (PDOException $e) {
@@ -103,7 +103,7 @@ require('./header.php');
 				echo "
";
 				$id = (int) $_GET['trash_invoice'];
 				try {
-					$offer = new offer($_pdo, $id);
+					$offer = new Offer($_pdo, $id);
 					$file = $offer->getInvoiceFile();
 					if ($file instanceof file && $file->delete()) {
 						echo "
The invoice for offer #{$offer->getId()} is trashed.
";
@@ -123,7 +123,7 @@ require('./header.php');
 				echo "
";
 				$id = (int) $_GET['delete'];
 				try {
-					$offer = new offer($_pdo, $id);
+					$offer = new Offer($_pdo, $id);
 					if ($offer->delete()) {
 						echo "
The offer #{$offer->getId()} has been removed.
";
 					} else {
diff --git a/include/settings.php b/include/settings.php
index 896152c..bd4c0d0 100644
--- a/include/settings.php
+++ b/include/settings.php
@@ -38,7 +38,7 @@ require('./header.php');
 		isAdmin()) {
 			try {
-				$user = new user($_pdo, $_GET['delete_user']);
+				$user = new User($_pdo, $_GET['delete_user']);
 				if ($user->delete()) {
 					echo "
The user with username {$user->getUsername()} has been removed.
";
 				} else {
@@ -135,7 +135,7 @@ require('./header.php');
 					

 						
Create new

 						

-							
 								

 								

diff --git a/include/users-new.php b/include/users-new.php
index d32e201..5b4bd7f 100644
--- a/include/users-new.php
+++ b/include/users-new.php
@@ -22,7 +22,7 @@ define('REQUIRE_ADMIN', true);
 require_once('./conf.php');
 require_once('./login-ajax.php');
 
-$response = new response();
+$response = new Response();
 
 try {
 	$pass = user::generateRandomPassword();
-- 
cgit v1.2.3