diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/discounts-edit.php | 9 | ||||
| -rw-r--r-- | include/discounts-new.php | 2 | ||||
| -rw-r--r-- | include/discounts-overview.php | 18 | ||||
| -rw-r--r-- | include/discounts.php | 6 | ||||
| -rw-r--r-- | include/offers-overview.php | 2 | ||||
| -rw-r--r-- | include/offers-view.php | 14 |
6 files changed, 26 insertions, 25 deletions
diff --git a/include/discounts-edit.php b/include/discounts-edit.php index 797a95b..94f4c29 100644 --- a/include/discounts-edit.php +++ b/include/discounts-edit.php @@ -21,6 +21,7 @@ require_once('./conf.php'); require_once('./login-ajax.php'); $response = new Response(); +$response->success = true; try { $discount = new Discount($_pdo, $_REQUEST['pk']); @@ -29,16 +30,16 @@ try { $what_to_edit = $name[count($name) - 1]; switch ($what_to_edit) { case 'title': - $response->success = $discount->setTitle($_REQUEST['value']); + $discount->title = $_REQUEST['value']; break; case 'value': - $response->success = $discount->setValue($_REQUEST['value']); + $discount->value = $_REQUEST['value']; break; case 'vat': - $response->success = $discount->setVAT($_REQUEST['value']); + $discount->VAT_percentage = $_REQUEST['value']; break; case 'description': - $response->success = $discount->setDescription($_REQUEST['value']); + $discount->description = $_REQUEST['value']; break; default: $response->http_response_code(404); diff --git a/include/discounts-new.php b/include/discounts-new.php index 26452aa..2d7fca5 100644 --- a/include/discounts-new.php +++ b/include/discounts-new.php @@ -32,7 +32,7 @@ try { $_REQUEST['vat'] ); $response->success = true; - $response->message = "Assignment {$discount->getTitle()} has been succesfully created. <a class='alert-link' href='javascript:location.reload(true);'>Refresh the page</a>."; + $response->message = "Assignment {$discount->title} has been succesfully created. <a class='alert-link' href='javascript:location.reload(true);'>Refresh the page</a>."; } catch (PDOException $e) { $response->http_response_code(500); $response->success = false; diff --git a/include/discounts-overview.php b/include/discounts-overview.php index 60ddf13..0b0534d 100644 --- a/include/discounts-overview.php +++ b/include/discounts-overview.php @@ -39,25 +39,25 @@ require_once('./login.php'); $discounts = BusinessAdmin::getDiscounts($_pdo); foreach ($discounts as $discount) { echo "<tr class='mix' - data-mixer-order-id='{$discount->getId()}' + data-mixer-order-id='{$discount->id}' data-mixer-order-offer='{$discount->getOffer()->getId()}' - data-mixer-order-value='{$discount->getValue()}'> - <td class='col-min-width'>{$discount->getId()}</td> + data-mixer-order-value='{$discount->value}'> + <td class='col-min-width'>{$discount->id}</td> <td class='col-min-width'> <a href='".Constants::url_internal."/offers?id={$discount->getOffer()->getId()}'>#{$discount->getOffer()->getId()}</a> to <a href='".Constants::url_internal."/contacts?id={$discount->getOffer()->getContact()->getId()}'>{$discount->getOffer()->getContact()->getName()}</a> (<a href='".Constants::url_internal."/clients?id={$discount->getOffer()->getContact()->getClient()->id}'>{$discount->getOffer()->getContact()->getClient()->name}</a>) <td class='col-max-width'> - <b><a href='#' class='editable' id='editable-discount-{$discount->getId()}-title' data-type='text' data-pk='{$discount->getId()}' data-url='".Constants::url_external."discounts/edit'>{$discount->getTitle()}</a></b><br/> - <p><a href='#' class='editable editable-noshow' id='editable-discount-{$discount->getId()}-description' data-type='textarea' data-mode='inline' data-pk='{$discount->getId()}' data-url='".Constants::url_external."discounts/edit'>{$discount->getDescription(false)}</a></p> + <b><a href='#' class='editable' id='editable-discount-{$discount->id}-title' data-type='text' data-pk='{$discount->id}' data-url='".Constants::url_external."discounts/edit'>{$discount->title}</a></b><br/> + <p><a href='#' class='editable editable-noshow' id='editable-discount-{$discount->id}-description' data-type='textarea' data-mode='inline' data-pk='{$discount->id}' data-url='".Constants::url_external."discounts/edit'>{$discount->description}</a></p> </td> <td class='col-min-width'> - ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-discount-{$discount->getId()}-value' data-type='text' data-pk='{$discount->getId()}' data-url='".Constants::url_external."discounts/edit'>{$discount->getValue()}</a><br/> - <a href='#' class='editable' id='editable-discount-{$discount->getId()}-vat' data-type='text' data-pk='{$discount->getId()}' data-url='".Constants::url_external."discounts/edit'>{$discount->getVAT()}</a>% VAT + ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-discount-{$discount->id}-value' data-type='text' data-pk='{$discount->id}' data-url='".Constants::url_external."discounts/edit'>{$discount->value}</a><br/> + <a href='#' class='editable' id='editable-discount-{$discount->id}-vat' data-type='text' data-pk='{$discount->id}' data-url='".Constants::url_external."discounts/edit'>{$discount->VAT_percentage}</a>% VAT </td> <td class='col-min-width'> - <a title='View' href='?id={$discount->getId()}' class='btn btn-primary btn-circle fa fa-arrow-right'></a> - <a title='Delete' href='?delete={$discount->getId()}' class='btn btn-danger btn-circle fa fa-times'></a> + <a title='View' href='?id={$discount->id}' class='btn btn-primary btn-circle fa fa-arrow-right'></a> + <a title='Delete' href='?delete={$discount->id}' class='btn btn-danger btn-circle fa fa-times'></a> </td> </tr>"; } diff --git a/include/discounts.php b/include/discounts.php index a4d9df6..5da2dc4 100644 --- a/include/discounts.php +++ b/include/discounts.php @@ -46,7 +46,7 @@ require('./header.php'); $id = (int) $_GET['id']; try { $discount = new Discount($_pdo, $id); - $header = "<a href='".Constants::url_external."discounts'>Discounts</a> / {$discount->getTitle()}"; + $header = "<a href='".Constants::url_external."discounts'>Discounts</a> / {$discount->title}"; $show_individual = $id; } catch (PDOException $e) { $alert = "<div class='alert alert-danger alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The discount with id $id</i> could not be found.</div>"; @@ -66,9 +66,9 @@ require('./header.php'); try { $discount = new Discount($_pdo, $id); if ($discount->delete()) { - echo "<div class='alert alert-success alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The discount with title <i>{$discount->getTitle()}</i> has been removed.</div>"; + echo "<div class='alert alert-success alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The discount with title <i>{$discount->title}</i> has been removed.</div>"; } else { - echo "<div class='alert alert-warning alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The discount with title <i>{$discount->getTitle()}</i> could not be removed. Perhaps it's already removed?</div>"; + echo "<div class='alert alert-warning alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The discount with title <i>{$discount->title}</i> could not be removed. Perhaps it's already removed?</div>"; } } catch (PDOException $e) { echo "<div class='alert alert-danger alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The discount could not be removed due to a PDO error.</div>"; diff --git a/include/offers-overview.php b/include/offers-overview.php index 09c6e12..2c5b483 100644 --- a/include/offers-overview.php +++ b/include/offers-overview.php @@ -49,7 +49,7 @@ require_once('./login.php'); echo "<b>{$assignment->title}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/><p>{$assignment->getHTMLDescription()}</p>"; } foreach ($offer->getDiscounts() as $discount) { - echo "<b>{$discount->getTitle()}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$discount->calculate(discount::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$discount->calculate(discount::TOTAL)} incl. VAT)</span><br/><p>{$discount->getDescription()}</p>"; + echo "<b>{$discount->title}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$discount->calculate(discount::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$discount->calculate(discount::TOTAL)} incl. VAT)</span><br/><p>{$discount->description}</p>"; } echo "</td> <td class='col-min-width'> diff --git a/include/offers-view.php b/include/offers-view.php index 6b84e5c..9a2978f 100644 --- a/include/offers-view.php +++ b/include/offers-view.php @@ -147,18 +147,18 @@ $_offer = new Offer($_pdo, $_id); $discounts = BusinessAdmin::getDiscounts($_pdo, array("offerId = {$_offer->getId()}")); foreach ($discounts as $discount) { echo "<tr> - <td class='col-min-width'>{$discount->getId()}</td> + <td class='col-min-width'>{$discount->id}</td> <td class='col-max-width'> - <b><a href='#' class='editable' id='editable-discount-{$discount->getId()}-title' data-type='text' data-pk='{$discount->getId()}' data-url='".Constants::url_external."discounts/edit'>{$discount->getTitle()}</a></b><br/> - <p>{$discount->getDescription()}</p> + <b><a href='#' class='editable' id='editable-discount-{$discount->id}-title' data-type='text' data-pk='{$discount->id}' data-url='".Constants::url_external."discounts/edit'>{$discount->title}</a></b><br/> + <p>{$discount->description}</p> </td> <td class='col-min-width'> - ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-discount-{$discount->getId()}-value' data-type='text' data-pk='{$discount->getId()}' data-url='".Constants::url_external."discounts/edit'>{$discount->getValue()}</a> / hr<br/> - <a href='#' class='editable' id='editable-discount-{$discount->getId()}-vat' data-type='text' data-pk='{$discount->getId()}' data-url='".Constants::url_external."discounts/edit'>{$discount->getVAT()}</a>% VAT + ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-discount-{$discount->id}-value' data-type='text' data-pk='{$discount->id}' data-url='".Constants::url_external."discounts/edit'>{$discount->value}</a> / hr<br/> + <a href='#' class='editable' id='editable-discount-{$discount->id}-vat' data-type='text' data-pk='{$discount->id}' data-url='".Constants::url_external."discounts/edit'>{$discount->VAT_percentage}</a>% VAT </td> <td class='col-min-width'> - <a title='View' href='".Constants::url_internal."/discounts?id={$discount->getId()}' class='btn btn-primary btn-circle fa fa-arrow-right'></a> - <a title='Delete' href='".Constants::url_internal."/discounts?delete={$discount->getId()}' class='btn btn-danger btn-circle fa fa-times'></a> + <a title='View' href='".Constants::url_internal."/discounts?id={$discount->id}' class='btn btn-primary btn-circle fa fa-arrow-right'></a> + <a title='Delete' href='".Constants::url_internal."/discounts?delete={$discount->id}' class='btn btn-danger btn-circle fa fa-times'></a> </td> </tr>"; } |