Business/MachineManager
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Add client management

Browse Source
This commit is contained in:
Skylar Ittner 2019-10-02 16:33:53 -06:00
parent f175ef642a
commit 7528468505
14 changed files with 483 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
action.php
View File

@ -106,6 +106,34 @@ switch ($VARS['action']) {
);
returnToSender("event_added", $machine->getID());
case "editclient":
$user = new User($_SESSION['uid']);
if (!$user->hasPermission("MACHINEMANAGER_EDIT")) {
returnToSender("no_permission");
die();
}
if (!Clients::areLocal()) {
returnToSender("nonlocal_client");
}
if (Client::exists($VARS["id"])) {
$client = new Client($VARS["id"]);
} else {
$client = new Client();
}
$client->setName($VARS["name"]);
$client->setPhone($VARS["phone"]);
$client->setEmail($VARS["email"]);
$client->setBillingAddress($VARS["billingaddress"]);
$client->setMailingAddress($VARS["mailingaddress"]);
$client->setPublicNotes($VARS["publicnotes"]);
$client->setPrivateNotes($VARS["privatenotes"]);
$client->save();
returnToSender("client_edited", $client->getID());
case "signout":
session_destroy();
header('Location: index.php?logout=1');

BIN
database.mwb
View File

Binary file not shown.

3
langs/en/actions.json
View File

@ -4,5 +4,6 @@
"View Schedule": "View Schedule",
"View Machines": "View Machines",
"Add Event": "Add Event",
"Add Component": "Add Component"
"Add Component": "Add Component",
"Add Client": "Add Client"
}

7
langs/en/clients.json Normal file
View File

@ -0,0 +1,7 @@
{
"Name": "Name",
"Phone": "Phone",
"Email": "Email",
"Billing Address": "Billing Address",
"Mailing Address": "Mailing Address"
}

4
langs/en/labels.json Normal file
View File

@ -0,0 +1,4 @@
{
"Public Notes": "Public Notes",
"Private Notes": "Private Notes"
}

4
langs/en/messages.json
View File

@ -1,5 +1,7 @@
{
"Machine saved!": "Machine saved!",
"Component saved!": "Component saved!",
"Event logged!": "Event logged!"
"Event logged!": "Event logged!",
"Client saved!": "Client saved!",
"Client must be edited in Invoice Ninja.": "Client must be edited in Invoice Ninja."
}

1
langs/en/titles.json
View File

@ -2,5 +2,6 @@
"Home": "Home",
"Form": "Form",
"Machines": "Machines",
"Clients": "Clients",
"Machine Info": "Machine Info"
}

8
langs/messages.php
View File

@ -29,6 +29,14 @@ define("MESSAGES", [
"string" => "Event logged!",
"type" => "success"
],
"client_edited" => [
"string" => "Client saved!",
"type" => "success"
],
"nonlocal_client" => [
"string" => "Client must be edited in Invoice Ninja.",
"type" => "danger"
],
"404_error" => [
"string" => "page not found",
"type" => "info"

223
lib/Client.lib.php
View File

@ -7,22 +7,231 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
use InvoiceNinja\Config as NinjaConfig;
use InvoiceNinja\Models\Client as NinjaClient;
class Client {
public $id = null;
public $name = null;
private $local = true;
private $exists = false;
private $full = true;
private $id = "";
private $name = "";
private $phone = "";
private $email = "";
private $billingaddress = "";
private $mailingaddress = "";
private $publicnotes = "";
private $privatenotes = "";
public function __construct($id, $name) {
$this->id = $id;
$this->name = $name;
/**
*
* @param type $id
* @param type $local
* @param type $full
* @param type $name
*/
public function __construct($id = "", $local = true, $name = "") {
global $database;
if (!empty($id)) {
$this->id = $id;
$this->local = $local;
$this->exists = true;
if ($local) {
$this->full = true;
$data = $database->get("clients", ['name', 'phone', 'email', 'billingaddress', 'mailingaddress', 'publicnotes', 'privatenotes'], ["clientid" => $id]);
$this->setName($data['name'] . "");
$this->setPhone($data['phone'] . "");
$this->setEmail($data['email'] . "");
$this->setBillingAddress($data['billingaddress'] . "");
$this->setMailingAddress($data['mailingaddress'] . "");
$this->setPublicNotes($data['publicnotes'] . "");
$this->setPrivateNotes($data['privatenotes'] . "");
} else {
$this->full = false;
$this->name = $name;
}
}
}
/**
* Fill in all the client data from the InvoiceNinja API.
*/
private function fullerize() {
global $SETTINGS;
if (!$this->local && !$this->full && $this->exists) {
try {
$client = NinjaClient::find($this->id);
$this->full = true;
// Name
$this->setName($client->display_name);
// Phone
if (!empty($client->work_phone)) {
$this->setPhone($client->work_phone);
} else if (!empty($client->contacts[0]->phone)) {
$this->setPhone($client->contacts[0]->phone);
}
if (!empty($client->contacts[0]->email)) {
$this->setEmail($client->contacts[0]->email);
}
$billingaddress = [
$client->address1,
$client->address2,
implode(" ", array_filter([$client->city, $client->state, $client->postal_code]))
];
$this->setBillingAddress(implode("\n", array_filter($billingaddress)));
$mailingaddress = [
$client->shipping_address1,
$client->shipping_address2,
implode(" ", array_filter([$client->shipping_city, $client->shipping_state, $client->shipping_postal_code]))
];
$this->setMailingAddress(implode("\n", array_filter($mailingaddress)));
$this->setPublicNotes($client->public_notes);
$this->setPrivateNotes($client->private_notes);
} catch (Exception $ex) {
if ($SETTINGS['debug']) {
echo $ex->getTraceAsString();
}
sendError("Unable to query client from InvoiceNinja server:\n" . $ex->getMessage());
}
}
}
public static function exists($id, $local = true): bool {
global $database, $SETTINGS;
if ($local) {
return $database->has('clients', ['clientid' => $id]);
}
try {
$client = NinjaClient::find($id);
return true;
} catch (Exception $ex) {
if ($ex->getMessage() == "{\n \"message\": \"record does not exist\"\n}") {
return false;
}
if ($SETTINGS['debug']) {
echo $ex->getTraceAsString();
}
sendError("Unable to query client ID from InvoiceNinja server:\n" . $ex->getMessage());
}
}
/**
* Save the client.
*/
public function save() {
global $database;
if ($this->isLocal()) {
$data = [
"name" => $this->getName(),
"phone" => $this->getPhone(),
"email" => $this->getEmail(),
"billingaddress" => $this->getBillingAddress(),
"mailingaddress" => $this->getMailingAddress(),
"publicnotes" => $this->getPublicNotes(),
"privatenotes" => $this->getPrivateNotes()
];
if (!empty($this->id) && $database->has("clients", ["clientid" => $this->id])) {
$database->update("clients", $data, ["clientid" => $this->id]);
} else {
$database->insert("clients", $data);
$this->id = $database->id();
}
return;
}
if ($this->exists) {
$client = NinjaClient::find($id);
$client->name = $this->getName();
} else {
$client = new NinjaClient($this->getEmail(), '', '', $this->getName());
}
$client->work_phone = $this->getPhone();
$client->public_notes = $this->getPublicNotes();
$client->private_notes = $this->getPrivateNotes();
$client->save();
}
public function isLocal(): bool {
return $this->local;
}
public function getID() {
return $this->id;
}
public function getName() {
public function getName(): string {
if (empty($this->name)) {
$this->fullerize();
}
return $this->name;
}
}
public function getPhone(): string {
$this->fullerize();
return $this->phone;
}
public function getEmail(): string {
$this->fullerize();
return $this->email;
}
public function getBillingAddress(): string {
$this->fullerize();
return $this->billingaddress;
}
public function getMailingAddress(): string {
$this->fullerize();
return $this->mailingaddress;
}
public function getPublicNotes(): string {
$this->fullerize();
return $this->publicnotes;
}
public function getPrivateNotes(): string {
$this->fullerize();
return $this->privatenotes;
}
public function setName(string $name) {
$this->fullerize();
$this->name = $name;
}
public function setPhone(string $phone) {
$this->fullerize();
$this->phone = $phone;
}
public function setEmail(string $email) {
$this->fullerize();
$this->email = $email;
}
public function setBillingAddress(string $address) {
$this->fullerize();
$this->billingaddress = $address;
}
public function setMailingAddress(string $address) {
$this->fullerize();
$this->mailingaddress = $address;
}
public function setPublicNotes(string $notes) {
$this->fullerize();
$this->publicnotes = $notes;
}
public function setPrivateNotes(string $notes) {
$this->fullerize();
$this->privatenotes = $notes;
}
}

36
lib/Clients.lib.php
View File

@ -19,49 +19,59 @@ if (!empty($SETTINGS["apis"]["invoiceninja"]["token"])) {
if ($SETTINGS['debug']) {
echo $ex->getTraceAsString();
}
sendError("Unable to load client list from InvoiceNinja server:\n" . $ex->getMessage());
sendError("Unable to load InvoiceNinja API:\n" . $ex->getMessage());
}
class Clients {
public static function getAll(): array {
$clients = NinjaClient::all();
try {
$clients = NinjaClient::all();
} catch (Exception $ex) {
if ($SETTINGS['debug']) {
echo $ex->getTraceAsString();
}
sendError("Unable to get InvoiceNinja client list:\n" . $ex->getMessage());
}
$list = [];
foreach ($clients as $client) {
$name = $client->name;
if (empty($name)) {
$name = $client->contacts[0]->first_name . " " . $client->contacts[0]->last_name;
}
$list[] = new Client($client->id, $name);
$list[] = new Client($client->id, false, $client->display_name);
}
return $list;
}
public static function getClient($id): Client {
$client = NinjaClient::find($id);
return new Client($client->id, $client->name);
return new Client($client->id, false);
}
public static function areLocal(): bool {
return false;
}
}
} else {
// Use internal client table
class Clients {
public static function getAll(): array {
global $database;
$clients = $database->select("clients", ["clientid", "name"]);
$clients = $database->select("clients", ["clientid"]);
$list = [];
foreach ($clients as $client) {
$list[] = new Client($client['clientid'], $client['name']);
$list[] = new Client($client['clientid'], true);
}
return $list;
}
public static function getClient($id): Client {
global $database;
$client = $database->get("clients", ["clientid", "name"], ["clientid" => $id]);
return new Client($client['clientid'], $client['name']);
return new Client($id, true);
}
public static function areLocal(): bool {
return true;
}
}

18
pages.php
View File

@ -25,6 +25,19 @@ define("PAGES", [
"static/js/machines.js"
]
],
"clients" => [
"title" => "Clients",
"navbar" => (empty($SETTINGS['apis']['invoiceninja']['token']) ? true : false),
"icon" => "fas fa-users",
"styles" => [
"static/css/datatables.min.css",
"static/css/tables.css"
],
"scripts" => [
"static/js/datatables.min.js",
"static/js/clients.js"
]
],
"404" => [
"title" => "404 error"
],
@ -39,5 +52,8 @@ define("PAGES", [
],
"editcomponent" => [
"title" => "Edit Component"
]
],
"editclient" => [
"title" => "Edit Client"
],
]);

94
pages/clients.php Normal file
View File

@ -0,0 +1,94 @@
<?php
/*
* Copyright 2019 Netsyms Technologies.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
redirectIfNotLoggedIn();
$user = new User($_SESSION['uid']);
if (!$user->hasPermission("MACHINEMANAGER_VIEW")) {
header("Location: ./app.php?msg=no_permission");
die();
}
$writeaccess = $user->hasPermission("MACHINEMANAGER_EDIT");
$clients = Clients::getAll();
?>
<div class="btn-group">
<?php if ($writeaccess) { ?>
<a href="app.php?page=editclient" class="btn btn-success"><i class="fas fa-plus"></i> <?php $Strings->get("Add Client"); ?></a>
<?php } ?>
</div>
<table id="clienttable" class="table table-bordered table-hover">
<thead>
<tr>
<th data-priority="0"></th>
<th data-priority="1"><i class="fas fa-user hidden-sm"></i> <?php $Strings->get('Name'); ?></th>
<th data-priority="2"><i class="fas fa-phone hidden-sm"></i> <?php $Strings->get('Phone'); ?></th>
<th data-priority="2"><i class="fas fa-envelope hidden-sm"></i> <?php $Strings->get('Email'); ?></th>
<th data-priority="3"><i class="fas fa-file-invoice hidden-sm"></i> <?php $Strings->get('Billing Address'); ?></th>
<th data-priority="3"><i class="fas fa-mail-bulk hidden-sm"></i> <?php $Strings->get('Mailing Address'); ?></th>
<th data-priority="4"><i class="far fa-comment-dots hidden-sm"></i> <?php $Strings->get('Public Notes'); ?></th>
<th data-priority="4"><i class="fas fa-comment-dots hidden-sm"></i> <?php $Strings->get('Private Notes'); ?></th>
</tr>
</thead>
<tbody>
<?php
foreach ($clients as $c) {
?>
<tr>
<td></td>
<td>
<?php
if ($c->isLocal() && $writeaccess) {
?>
<a class="btn btn-primary btn-sm" href="app.php?page=editclient&arg=<?php echo $c->getID(); ?>"><i class="fas fa-edit"></i> <?php $Strings->get("Edit"); ?></a>
<a href="app.php?page=editclient&arg=<?php echo $c->getID(); ?>"><?php echo htmlspecialchars($c->getName()); ?></a>
<?php
} else {
?>
<?php echo htmlspecialchars($c->getName()); ?>
<?php
}
?>
</td>
<td>
<?php if (!empty($c->getPhone())) { ?>
<a href="tel:<?php echo htmlspecialchars(preg_replace("/[^0-9]/", "", $c->getPhone())); ?>">
<?php echo htmlspecialchars($c->getPhone()); ?>
</a>
<?php } ?>
</td>
<td>
<?php if (!empty($c->getEmail())) { ?>
<a href="mailto:<?php echo htmlspecialchars($c->getEmail()); ?>">
<?php echo htmlspecialchars($c->getEmail()); ?>
</a>
<?php } ?>
</td>
<td><?php echo implode("<br />", explode("\n", $c->getBillingAddress())); ?></td>
<td><?php echo implode("<br />", explode("\n", $c->getMailingAddress())); ?></td>
<td><?php echo htmlspecialchars($c->getPublicNotes()); ?></td>
<td><?php echo htmlspecialchars($c->getPrivateNotes()); ?></td>
</tr>
<?php
}
?>
</tbody>
<tfoot>
<tr>
<th data-priority="0"></th>
<th data-priority="1"><i class="fas fa-user hidden-sm"></i> <?php $Strings->get('Name'); ?></th>
<th data-priority="2"><i class="fas fa-phone hidden-sm"></i> <?php $Strings->get('Phone'); ?></th>
<th data-priority="2"><i class="fas fa-envelope hidden-sm"></i> <?php $Strings->get('Email'); ?></th>
<th data-priority="3"><i class="fas fa-file-invoice hidden-sm"></i> <?php $Strings->get('Billing Address'); ?></th>
<th data-priority="3"><i class="fas fa-mail-bulk hidden-sm"></i> <?php $Strings->get('Mailing Address'); ?></th>
<th data-priority="4"><i class="far fa-comment-dots hidden-sm"></i> <?php $Strings->get('Public Notes'); ?></th>
<th data-priority="4"><i class="fas fa-comment-dots hidden-sm"></i> <?php $Strings->get('Private Notes'); ?></th>
</tr>
</tfoot>
</table>

50
pages/editclient.php Normal file
View File

@ -0,0 +1,50 @@
<?php
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
redirectIfNotLoggedIn();
$user = new User($_SESSION['uid']);
if (!$user->hasPermission("MACHINEMANAGER_EDIT")) {
header("Location: ./app.php?msg=no_permission");
die();
}
$editing = false;
if (!empty($_GET['arg']) && Client::exists($_GET['arg'], Clients::areLocal())) {
$editing = true;
$client = new Client($_GET['arg'], Clients::areLocal());
} else {
$client = new Client();
}
if ($editing) {
$form = new FormBuilder("Edit " . htmlspecialchars($client->getName()), "fas fa-user", "action.php", "POST");
} else {
$form = new FormBuilder("Add Client", "fas fa-user", "action.php", "POST");
}
$form->setID("editclient");
$form->addHiddenInput("action", "editclient");
$form->addHiddenInput("source", "editclient");
if ($editing) {
$form->addHiddenInput("id", $client->getID());
}
$form->addInput("name", $client->getName(), "text", true, null, null, "Name", "fas fa-user");
$form->addInput("phone", $client->getPhone(), "tel", false, null, null, "Phone", "fas fa-phone");
$form->addInput("email", $client->getEmail(), "email", false, null, null, "Email", "fas fa-envelope");
$form->addInput("billingaddress", $client->getBillingAddress(), "textarea", false, null, null, "Billing Address", "fas fa-file-invoice", 6);
$form->addInput("mailingaddress", $client->getMailingAddress(), "textarea", false, null, null, "Mailing Address", "fas fa-mail-bulk", 6);
$form->addInput("privatenotes", $client->getPrivateNotes(), "textarea", false, null, null, "Private Notes", "fas fa-comment-dots", 6);
$form->addInput("publicnotes", $client->getPublicNotes(), "textarea", false, null, null, "Public Notes", "far fa-comment-dots", 6);
$form->addButton("Save", "fas fa-save", null, "submit", "savebtn");
$form->generate();

30
static/js/clients.js Normal file
View File

@ -0,0 +1,30 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
$('#clienttable').DataTable({
responsive: {
details: {
display: $.fn.dataTable.Responsive.display.modal({
header: function (row) {
var data = row.data();
return "<i class=\"fas fa-user fa-fw\"></i> " + data[2];
}
}),
renderer: $.fn.dataTable.Responsive.renderer.tableAll({
tableClass: 'table'
}),
type: "column"
}
},
columnDefs: [
{
targets: 0,
className: 'control',
orderable: false
}
],
order: [
[4, 'desc']
]
});