From 9714f3d8cc311f3b75a4727156de2ab33cf3895e Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Wed, 27 Jul 2016 16:28:19 +0200 Subject: Removed redundant whitespace & retab --- include/404.php | 36 ++--- include/about.php | 112 +++++++-------- include/ajax-collapse.php | 4 +- include/assignments-edit.php | 6 +- include/assignments-new.php | 6 +- include/assignments-overview.php | 288 +++++++++++++++++++------------------- include/assignments-view.php | 10 +- include/assignments.php | 6 +- include/clients-edit.php | 6 +- include/clients-new.php | 6 +- include/clients-overview.php | 190 ++++++++++++------------- include/clients-view.php | 6 +- include/clients.php | 6 +- include/contacts-edit.php | 6 +- include/contacts-new.php | 6 +- include/contacts.php | 6 +- include/discounts-edit.php | 6 +- include/discounts-new.php | 6 +- include/discounts-overview.php | 28 ++-- include/discounts.php | 6 +- include/home.php | 2 +- include/offers-edit.php | 6 +- include/offers-new.php | 6 +- include/offers-overview.php | 8 +- include/offers-view.php | 292 +++++++++++++++++++-------------------- include/offers.php | 6 +- include/users-new.php | 6 +- 27 files changed, 536 insertions(+), 536 deletions(-) (limited to 'include') diff --git a/include/404.php b/include/404.php index 335ebf7..dc0cff0 100644 --- a/include/404.php +++ b/include/404.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -23,23 +23,23 @@ require('./header.php');
- - - -
-
-
-

404

-

The page you requested could not be found.

-
- -
- -
- + + + +
+
+
+

404

+

The page you requested could not be found.

+
+ +
+ +
+
\ No newline at end of file +?> diff --git a/include/about.php b/include/about.php index 554a80f..e7ab3d4 100644 --- a/include/about.php +++ b/include/about.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -24,25 +24,25 @@ require('./header.php');
- - - -
-
-
-

About

-
- -
+ -
-
-
-
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: administrative software for small companies
+	
+	

+		

+			

+				
About

+			

+			
+		

+
+		

+			

+				

+					
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: administrative software for small companies
 Copyright (C) 2015 Camil Staps (ViviSoft)
 
 This program is free software: you can redistribute it and/or modify
@@ -63,43 +63,43 @@ You can contact me, Camil Staps, here:
 Camil Staps
 www.camilstaps.nl
 info@camilstaps.nl

-                    

-                

-            

-            
+					

+				

+
+ -
-
-
Contact
-
- -

For things related to BusinessAdmin, please use GitHub: camilstaps/BusinessAdmin

-

The BusinessAdmin system was developed by Camil Staps. See my website for contact details.

-
-
-
+
+
+
Contact
+
+ +

For things related to BusinessAdmin, please use GitHub: camilstaps/BusinessAdmin

+

The BusinessAdmin system was developed by Camil Staps. See my website for contact details.

+
+
+
-
-
-
Thanks
-
-

BusinessAdmin was created using:

- -

Many thanks go to the creators and developers of these software packages.

-
-
-
-
- -
- +
+
+
Thanks
+
+

BusinessAdmin was created using:

+ +

Many thanks go to the creators and developers of these software packages.

+
+
+
+
+ +
+
diff --git a/include/ajax-collapse.php b/include/ajax-collapse.php index e49c6fd..402d057 100644 --- a/include/ajax-collapse.php +++ b/include/ajax-collapse.php @@ -1,8 +1,8 @@ . */ diff --git a/include/assignments-new.php b/include/assignments-new.php index 7898a42..405c5fa 100644 --- a/include/assignments-new.php +++ b/include/assignments-new.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/assignments-overview.php b/include/assignments-overview.php index ee46928..0e364d1 100644 --- a/include/assignments-overview.php +++ b/include/assignments-overview.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -21,151 +21,151 @@ require_once('./login.php'); ?>
-
-
Overview
-
- - - - - - - - - - - - - getId()}' - data-mixer-order-offer='{$assignment->getOffer()->getId()}' - data-mixer-order-time='{$assignment->getHours()}' - data-mixer-order-price='{$assignment->getPricePerHour()}'> - - - - - - "; - } - if (count($assignments) == 0) { - echo ""; - } - ?> - -
#OfferBriefingTimePriceTools
{$assignment->getId()} - #{$assignment->getOffer()->getId()} to - {$assignment->getOffer()->getContact()->getName()} - ({$assignment->getOffer()->getContact()->getClient()->name}) - - {$assignment->getTitle()}
-

{$assignment->getDescription(false)}

- 		{$assignment->getHours()}h - ".constants::invoice_valuta."{$assignment->getPricePerHour()} / hr
- {$assignment->getVAT()}% VAT - 		- - -
There are no assignments in the database. Why not start with creating one, below?
-
-
+
+
Overview
+
+ + + + + + + + + + + + + getId()}' + data-mixer-order-offer='{$assignment->getOffer()->getId()}' + data-mixer-order-time='{$assignment->getHours()}' + data-mixer-order-price='{$assignment->getPricePerHour()}'> + + + + + + "; + } + if (count($assignments) == 0) { + echo ""; + } + ?> + +
#OfferBriefingTimePriceTools
{$assignment->getId()} + #{$assignment->getOffer()->getId()} to + {$assignment->getOffer()->getContact()->getName()} + ({$assignment->getOffer()->getContact()->getClient()->name}) + + {$assignment->getTitle()}
+

{$assignment->getDescription(false)}

+ 		{$assignment->getHours()}h + ".constants::invoice_valuta."{$assignment->getPricePerHour()} / hr
+ {$assignment->getVAT()}% VAT + 		+ + +
There are no assignments in the database. Why not start with creating one, below?
+
+
-
-
Create new
-
-
-
-
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
- - -
-
-
- -
-
- -
-
+ $('#newAssignment input, #newAssignment button').prop('disabled', false); + $('#newAssignment').data('bootstrapValidator').resetForm(); + } + +
+ diff --git a/include/assignments-view.php b/include/assignments-view.php index f2717b0..0bac039 100644 --- a/include/assignments-view.php +++ b/include/assignments-view.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -36,8 +36,8 @@ $_assignment = new assignment($_pdo, $_id); getId()}' + echo " diff --git a/include/assignments.php b/include/assignments.php index eaa7163..14ed8da 100644 --- a/include/assignments.php +++ b/include/assignments.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/clients-edit.php b/include/clients-edit.php index 7d8d6fa..3d92d06 100644 --- a/include/clients-edit.php +++ b/include/clients-edit.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/clients-new.php b/include/clients-new.php index e87557e..fe66026 100644 --- a/include/clients-new.php +++ b/include/clients-new.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/clients-overview.php b/include/clients-overview.php index 58fad49..860e671 100644 --- a/include/clients-overview.php +++ b/include/clients-overview.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -21,102 +21,102 @@ require_once('./login.php'); ?>
-
-
Overview
-
- - - - - - - - - - id}' - data-mixer-order-name='{$client->name}'> - - - - "; - } - if (count($clients) == 0) { - echo ""; - } - ?> - -
#NameTools
{$client->id} - - {$client->name} - - - - -
There are no clients in the database. Why not start with creating one, on the right?
-
-
+
+
Overview
+
+ + + + + + + + + + id}' + data-mixer-order-name='{$client->name}'> + + + + "; + } + if (count($clients) == 0) { + echo ""; + } + ?> + +
#NameTools
{$client->id} + + {$client->name} + + + + +
There are no clients in the database. Why not start with creating one, on the right?
+
+
-
-
Create new
-
-
-
-
- - -
- -
- -
-
+ // Callback for when form submission encountered an error + function newClientError() { + $('#newClient .ajaxify-response') + .addClass('alert-danger') + .show() + .find('.ajaxify-response-text') + .html('An unknown error occurred. Please contact support.'); + + $('#newClient input, #newClient button').prop('disabled', false); + $('#newClient').data('bootstrapValidator').resetForm(); + } + +
+ diff --git a/include/clients-view.php b/include/clients-view.php index 514e4e4..007d94c 100644 --- a/include/clients-view.php +++ b/include/clients-view.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/clients.php b/include/clients.php index b07a7c8..f762859 100644 --- a/include/clients.php +++ b/include/clients.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/contacts-edit.php b/include/contacts-edit.php index a5b3bdd..ac924a9 100644 --- a/include/contacts-edit.php +++ b/include/contacts-edit.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/contacts-new.php b/include/contacts-new.php index 0a72afb..440e744 100644 --- a/include/contacts-new.php +++ b/include/contacts-new.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/contacts.php b/include/contacts.php index 4b35603..09a452f 100644 --- a/include/contacts.php +++ b/include/contacts.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/discounts-edit.php b/include/discounts-edit.php index a760e9c..2d64bd9 100644 --- a/include/discounts-edit.php +++ b/include/discounts-edit.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/discounts-new.php b/include/discounts-new.php index 8a5f527..b0cfa07 100644 --- a/include/discounts-new.php +++ b/include/discounts-new.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/discounts-overview.php b/include/discounts-overview.php index d4d8245..1bf55d6 100644 --- a/include/discounts-overview.php +++ b/include/discounts-overview.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -39,7 +39,7 @@ require_once('./login.php'); $discounts = BusinessAdmin::getDiscounts($_pdo); foreach ($discounts as $discount) { echo " {$discount->getId()} @@ -56,7 +56,7 @@ require_once('./login.php'); {$discount->getVAT()}% VAT - + "; @@ -74,7 +74,7 @@ require_once('./login.php');
Create new
-
@@ -90,30 +90,30 @@ require_once('./login.php');
-
-
-
-
diff --git a/include/discounts.php b/include/discounts.php index 8b160ab..ff2a69a 100644 --- a/include/discounts.php +++ b/include/discounts.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/home.php b/include/home.php index a9dca1e..6a25743 100644 --- a/include/home.php +++ b/include/home.php @@ -279,7 +279,7 @@ require('./header.php'); $sort_list = array(); foreach ($offers as $offer) { $temp = array( - 'id' => $offer->getId(), + 'id' => $offer->getId(), 'contact' => $offer->getContact()->getName(), 'assignments' => '', 'assignments_header' => '' diff --git a/include/offers-edit.php b/include/offers-edit.php index 225a18c..7f050c3 100644 --- a/include/offers-edit.php +++ b/include/offers-edit.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/offers-new.php b/include/offers-new.php index 0d86293..9c499a8 100644 --- a/include/offers-new.php +++ b/include/offers-new.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/offers-overview.php b/include/offers-overview.php index a246190..9eaf25d 100644 --- a/include/offers-overview.php +++ b/include/offers-overview.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -112,7 +112,7 @@ require_once('./login.php');
Create new
-
diff --git a/include/offers-view.php b/include/offers-view.php index 082af35..8f741c2 100644 --- a/include/offers-view.php +++ b/include/offers-view.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -22,152 +22,152 @@ require_once('./login.php'); $_offer = new offer($_pdo, $_id); ?>
-
-
- Timeline -
- -
-
    - $_offer->getId(), - 'contact' => $_offer->getContact()->getName(), - 'assignments' => '', - '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)
    "; - } - $list[] = array_merge($temp, array('type' => 'start', 'time' => $_offer->getStartDate(), 'description' => 'Offer started')); - $sort_list[] = $_offer->getStartDate() . $_offer->getId() . 0; - $list[] = array_merge($temp, array('type' => 'end', 'time' => $_offer->getEndDate(), 'description' => 'Offer ended')); - $sort_list[] = $_offer->getEndDate() . $_offer->getId() . 1; - if ($_offer->getInvoiceDate() > 0) { - $list[] = array_merge($temp, array('type' => 'invoice', 'time' => $_offer->getInvoiceDate(), 'description' => 'Invoice sent')); - $sort_list[] = $_offer->getInvoiceDate() . $_offer->getId() . 2; - if ($_offer->getPaymentReceived() > 0) { - $list[] = array_merge($temp, array('type' => 'payment_received', 'time' => $_offer->getPaymentReceived(), 'description' => 'Payment received')); - $sort_list[] = $_offer->getPaymentReceived() . $_offer->getId() . 3; - } - } +
    +
    + Timeline +
    + +
    +
      + time()) { - continue; - } - echo ""; - switch ($item['type']) { - case 'start': echo "
      "; break; - case 'end': echo "
      "; break; - case 'invoice': echo "
      "; break; - case 'payment_received': echo "
      "; break; - } - 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']}
      "; - } - echo "
      "; - echo ""; - } - ?> -
    -
    - -
    - + $temp = array( + 'id' => $_offer->getId(), + 'contact' => $_offer->getContact()->getName(), + 'assignments' => '', + '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)
    "; + } + $list[] = array_merge($temp, array('type' => 'start', 'time' => $_offer->getStartDate(), 'description' => 'Offer started')); + $sort_list[] = $_offer->getStartDate() . $_offer->getId() . 0; + $list[] = array_merge($temp, array('type' => 'end', 'time' => $_offer->getEndDate(), 'description' => 'Offer ended')); + $sort_list[] = $_offer->getEndDate() . $_offer->getId() . 1; + if ($_offer->getInvoiceDate() > 0) { + $list[] = array_merge($temp, array('type' => 'invoice', 'time' => $_offer->getInvoiceDate(), 'description' => 'Invoice sent')); + $sort_list[] = $_offer->getInvoiceDate() . $_offer->getId() . 2; + if ($_offer->getPaymentReceived() > 0) { + $list[] = array_merge($temp, array('type' => 'payment_received', 'time' => $_offer->getPaymentReceived(), 'description' => 'Payment received')); + $sort_list[] = $_offer->getPaymentReceived() . $_offer->getId() . 3; + } + } + + array_multisort($sort_list, SORT_DESC, $list); + $i = 0; + foreach ($list as $item) { + if ($item['time'] > time()) { + continue; + } + echo ""; + switch ($item['type']) { + case 'start': echo "
    "; break; + case 'end': echo "
    "; break; + case 'invoice': echo "
    "; break; + case 'payment_received': echo "
    "; break; + } + 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']}
    "; + } + echo "
    "; + echo ""; + } + ?> +
+
+ +
+
-
-
Assignments
-
- - - - - - - - - - - - getId()}")); - foreach ($assignments as $assignment) { - echo " - - - - - - "; - } - if (count($assignments) == 0) { - echo ""; - } - ?> - -
#BriefingTimePriceTools
{$assignment->getId()} - {$assignment->getTitle()}
-

{$assignment->getDescription()}

- 		{$assignment->getHours()}h - ".constants::invoice_valuta."{$assignment->getPricePerHour()} / hr
- {$assignment->getVAT()}% VAT - 		- - -
There are no assignments in the database. Why not start with creating one, below?
-
-
+
+
Assignments
+
+ + + + + + + + + + + + getId()}")); + foreach ($assignments as $assignment) { + echo " + + + + + + "; + } + if (count($assignments) == 0) { + echo ""; + } + ?> + +
#BriefingTimePriceTools
{$assignment->getId()} + {$assignment->getTitle()}
+

{$assignment->getDescription()}

+ 		{$assignment->getHours()}h + ".constants::invoice_valuta."{$assignment->getPricePerHour()} / hr
+ {$assignment->getVAT()}% VAT + 		+ + +
There are no assignments in the database. Why not start with creating one, below?
+
+
-
-
Discounts
-
- - - - - - - - - - - getId()}")); - foreach ($discounts as $discount) { - echo " - - - - - "; - } - if (count($discounts) == 0) { - echo ""; - } - ?> - -
#BriefingValueTools
{$discount->getId()} - {$discount->getTitle()}
-

{$discount->getDescription()}

- 		- ".constants::invoice_valuta."{$discount->getValue()} / hr
- {$discount->getVAT()}% VAT - 		- - -
There are no discounts in the database. Why not start with creating one, below?
-
-
+
+
Discounts
+
+ + + + + + + + + + + getId()}")); + foreach ($discounts as $discount) { + echo " + + + + + "; + } + if (count($discounts) == 0) { + echo ""; + } + ?> + +
#BriefingValueTools
{$discount->getId()} + {$discount->getTitle()}
+

{$discount->getDescription()}

+ 		+ ".constants::invoice_valuta."{$discount->getValue()} / hr
+ {$discount->getVAT()}% VAT + 		+ + +
There are no discounts in the database. Why not start with creating one, below?
+
+
diff --git a/include/offers.php b/include/offers.php index 1aa871a..81781ba 100644 --- a/include/offers.php +++ b/include/offers.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ diff --git a/include/users-new.php b/include/users-new.php index 5d86a83..d32e201 100644 --- a/include/users-new.php +++ b/include/users-new.php @@ -2,17 +2,17 @@ /** * BusinessAdmin: administrative software for small companies * Copyright (C) 2015 Camil Staps (ViviSoft) - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -- cgit v1.2.3