Skip to content

new Role() y new RoleAccess() añadidos antes de abrir la transacción … #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EstebanSM85 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

new Role() y new RoleAccess() añadidos antes de abrir la transacción … #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Controller/AdminServicios.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ protected function loadData($viewName, $view)
{
switch ($viewName) {
case self::VIEW_CONFIG:
$view->loadData('servicios');
$view->model->name = 'servicios';
$view->loadData('Servicios');
$view->model->name = 'Servicios';
break;

case self::VIEW_LIST_CATEGORIES:
Expand Down
2 changes: 1 addition & 1 deletion Extension/Controller/Randomizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Randomizer
protected function loadButtons(): Closure
{
return function () {
$this->addButton('plugins', 'servicios', 'generated-services', 'services', 'fa-solid fa-headset', 'Random\\Servicios', 'ServicioAT');
$this->addButton('plugins', 'Servicios', 'generated-services', 'services', 'fa-solid fa-headset', 'Random\\Servicios', 'ServicioAT');
};
}
}
5 changes: 4 additions & 1 deletion Init.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ public function update(): void

private function createRoleForPlugin(): void
{
new Role();
new RoleAccess();

$dataBase = new DataBase();
$dataBase->beginTransaction();

Expand Down Expand Up @@ -196,7 +199,7 @@ private function setupSettings(): void
];

foreach ($defaults as $key => $value) {
Tools::settings('servicios', $key, $value);
Tools::settings('Servicios', $key, $value);
}
Tools::settingsSave();
}
Expand Down
26 changes: 13 additions & 13 deletions Lib/Export/PDFserviciosExport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,32 +40,32 @@ public function addModelPage($model, $columns, $title = ''): bool
$this->pdf->ezText('');

$machinesData = $this->machinesData($model);
if ($machinesData && Tools::settings('servicios', 'print_pdf_machine_info', false)) {
if ($machinesData && Tools::settings('Servicios', 'print_pdf_machine_info', false)) {
$this->printTableSection('machines', $machinesData);
}

if (!empty($model->descripcion) && (bool)Tools::settings('servicios', 'print_pdf_description', false)) {
if (!empty($model->descripcion) && (bool)Tools::settings('Servicios', 'print_pdf_description', false)) {
$this->printTextSection('description', $model->descripcion);
}

if (!empty($model->material) && (bool)Tools::settings('servicios', 'print_pdf_material', false)) {
if (!empty($model->material) && (bool)Tools::settings('Servicios', 'print_pdf_material', false)) {
$this->printTextSection('material', $model->material);
}

if (!empty($model->solucion) && (bool)Tools::settings('servicios', 'print_pdf_solution', false)) {
if (!empty($model->solucion) && (bool)Tools::settings('Servicios', 'print_pdf_solution', false)) {
$this->printTextSection('solution', $model->solucion);
}

if (!empty($model->observaciones) && (bool)Tools::settings('servicios', 'print_pdf_observations', false)) {
if (!empty($model->observaciones) && (bool)Tools::settings('Servicios', 'print_pdf_observations', false)) {
$this->printTextSection('observations', $model->observaciones);
}

$worksData = $this->worksData($model);
if ($worksData && Tools::settings('servicios', 'print_pdf_works', false)) {
if ($worksData && Tools::settings('Servicios', 'print_pdf_works', false)) {
$this->printTableSection('work', $worksData);
}

$footer = Tools::settings('servicios', 'print_pdf_footer_text', '');
$footer = Tools::settings('Servicios', 'print_pdf_footer_text', '');
$this->printTextSection("", $footer, false);

return false;
Expand Down Expand Up @@ -131,12 +131,12 @@ protected function serviceData(ServicioAT $model): array
['key' => $this->i18n->trans('phone2'), 'value' => ($model->telefono2 ?? $subject->telefono2)],
];

if (Tools::settings('servicios', 'print_pdf_agent', false)) {
if (Tools::settings('Servicios', 'print_pdf_agent', false)) {
$agent = $model->getAgent();
$data[] = ['key' => $this->i18n->trans('agent'), 'value' => $agent->nombre];
}

if (Tools::settings('servicios', 'print_pdf_assigned', false)) {
if (Tools::settings('Servicios', 'print_pdf_assigned', false)) {
$data[] = ['key' => $this->i18n->trans('assigned'), 'value' => $model->asignado];
}

Expand All @@ -155,19 +155,19 @@ protected function worksData(ServicioAT &$model): array
$this->i18n->trans('observations') => $work->observaciones
];

if (Tools::settings('servicios', 'print_pdf_work_reference', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_reference', false)) {
$data[$this->i18n->trans('reference') ] = $work->referencia;
}

if (Tools::settings('servicios', 'print_pdf_work_description', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_description', false)) {
$data[$this->i18n->trans('description')] = $work->descripcion;
}

if (Tools::settings('servicios', 'print_pdf_work_quantity', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_quantity', false)) {
$data[$this->i18n->trans('quantity')] = $work->cantidad;
}

if (Tools::settings('servicios', 'print_pdf_work_price', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_price', false)) {
$data[$this->i18n->trans('price')] = Tools::money($work->precio);
}

Expand Down
34 changes: 17 additions & 17 deletions Lib/Export/PlantillasPDFserviciosExport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function addModelPage($model, $columns, $title = ''): bool
protected function descriptionData(ServicioAT $model): void
{
if (empty($model->descripcion)
|| false === (bool)Tools::settings('servicios', 'print_pdf_description', false)) {
|| false === (bool)Tools::settings('Servicios', 'print_pdf_description', false)) {
return;
}

Expand All @@ -71,13 +71,13 @@ protected function descriptionData(ServicioAT $model): void

protected function footerData(ServicioAT $model): void
{
$this->template->writeHTML(nl2br(Tools::settings('servicios', 'print_pdf_footer_text', '')));
$this->template->writeHTML(nl2br(Tools::settings('Servicios', 'print_pdf_footer_text', '')));
}

protected function machineData(ServicioAT $model): void
{
$machines = $model->getMachines();
if (empty($machines) || false === Tools::settings('servicios', 'print_pdf_machine_info', false)) {
if (empty($machines) || false === Tools::settings('Servicios', 'print_pdf_machine_info', false)) {
return;
}

Expand All @@ -102,7 +102,7 @@ protected function machineData(ServicioAT $model): void
protected function materialData(ServicioAT $model): void
{
if (empty($model->material)
|| false === (bool)Tools::settings('servicios', 'print_pdf_material', false)) {
|| false === (bool)Tools::settings('Servicios', 'print_pdf_material', false)) {
return;
}

Expand All @@ -114,7 +114,7 @@ protected function materialData(ServicioAT $model): void
protected function observationData(ServicioAT $model): void
{
if (empty($model->observaciones)
|| false === (bool)Tools::settings('servicios', 'print_pdf_observations', false)) {
|| false === (bool)Tools::settings('Servicios', 'print_pdf_observations', false)) {
return;
}

Expand All @@ -127,11 +127,11 @@ protected function serviceData(ServicioAT $model, array $columns): void
{
$excludeFields = ['idmaquina', 'idtipo', 'neto', 'codalmacen', 'idprioridad', 'material', 'descripcion', 'solucion', 'observaciones'];

if (false === Tools::settings('servicios', 'print_pdf_agent', false)) {
if (false === Tools::settings('Servicios', 'print_pdf_agent', false)) {
$excludeFields[] = 'codagente';
}

if (false === Tools::settings('servicios', 'print_pdf_assigned', false)) {
if (false === Tools::settings('Servicios', 'print_pdf_assigned', false)) {
$excludeFields[] = 'asignado';
}

Expand Down Expand Up @@ -160,7 +160,7 @@ protected function serviceData(ServicioAT $model, array $columns): void
protected function solutionData(ServicioAT $model): void
{
if (empty($model->solucion)
|| false === (bool)Tools::settings('servicios', 'print_pdf_solution', false)) {
|| false === (bool)Tools::settings('Servicios', 'print_pdf_solution', false)) {
return;
}

Expand All @@ -171,7 +171,7 @@ protected function solutionData(ServicioAT $model): void

protected function workData(ServicioAT $model): void
{
if (false === Tools::settings('servicios', 'print_pdf_works', false)) {
if (false === Tools::settings('Servicios', 'print_pdf_works', false)) {
return;
}

Expand All @@ -183,19 +183,19 @@ protected function workData(ServicioAT $model): void
Tools::trans('observations'),
];

if (Tools::settings('servicios', 'print_pdf_work_reference', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_reference', false)) {
$headers[] = Tools::trans('reference');
}

if (Tools::settings('servicios', 'print_pdf_work_description', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_description', false)) {
$headers[] = Tools::trans('description');
}

if (Tools::settings('servicios', 'print_pdf_work_quantity', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_quantity', false)) {
$headers[] = Tools::trans('quantity');
}

if (Tools::settings('servicios', 'print_pdf_work_price', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_price', false)) {
$headers[] = Tools::trans('price');
}

Expand All @@ -209,19 +209,19 @@ protected function workData(ServicioAT $model): void
nl2br($work->observaciones)
];

if (Tools::settings('servicios', 'print_pdf_work_reference', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_reference', false)) {
$dataWork[] = $work->referencia;
}

if (Tools::settings('servicios', 'print_pdf_work_description', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_description', false)) {
$dataWork[] = $work->descripcion;
}

if (Tools::settings('servicios', 'print_pdf_work_quantity', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_quantity', false)) {
$dataWork[] = $work->cantidad;
}

if (Tools::settings('servicios', 'print_pdf_work_price', false)) {
if (Tools::settings('Servicios', 'print_pdf_work_price', false)) {
$dataWork[] = Tools::money($work->precio);
}

Expand Down
14 changes: 7 additions & 7 deletions Lib/ServiceToInvoice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ protected static function addLineService(SalesDocument &$doc, ServicioAT $servic
$newLine->codimpuesto = null;
$newLine->iva = 0;

if (Tools::settings('servicios', 'document_machine')) {
if (Tools::settings('Servicios', 'document_machine')) {
foreach ($service->getMachines() as $machine) {
$newLine->descripcion .= "\n"
. Tools::trans('machine') . ': ' . $machine->nombre;
Expand All @@ -262,7 +262,7 @@ protected static function addLineService(SalesDocument &$doc, ServicioAT $servic
}
}

if (Tools::settings('servicios', 'document_start_date')) {
if (Tools::settings('Servicios', 'document_start_date')) {
$startDate = $service->fecha;
foreach ($service->getTrabajos() as $work) {
if (strtotime($work->fechainicio) < strtotime($startDate)) {
Expand All @@ -276,7 +276,7 @@ protected static function addLineService(SalesDocument &$doc, ServicioAT $servic
$saveLine = true;
}

if (Tools::settings('servicios', 'document_end_date')) {
if (Tools::settings('Servicios', 'document_end_date')) {
$endDate = $service->fecha;
foreach ($service->getTrabajos() as $work) {
if (strtotime($work->fechafin) > strtotime($endDate)) {
Expand All @@ -290,30 +290,30 @@ protected static function addLineService(SalesDocument &$doc, ServicioAT $servic
$saveLine = true;
}

if (Tools::settings('servicios', 'document_description') && $service->descripcion) {
if (Tools::settings('Servicios', 'document_description') && $service->descripcion) {
$newLine->descripcion .= "\n\n"
. Tools::trans('description') . "\n" . $service->descripcion;

$saveLine = true;
}

if (Tools::settings('servicios', 'document_material') && $service->material) {
if (Tools::settings('Servicios', 'document_material') && $service->material) {
$newLine->descripcion .= "\n\n"
. Tools::trans('material')
. "\n" . $service->material;

$saveLine = true;
}

if (Tools::settings('servicios', 'document_solution') && $service->solucion) {
if (Tools::settings('Servicios', 'document_solution') && $service->solucion) {
$newLine->descripcion .= "\n\n"
. Tools::trans('solution')
. "\n" . $service->solucion;

$saveLine = true;
}

if (Tools::settings('servicios', 'document_observations') && $service->observaciones) {
if (Tools::settings('Servicios', 'document_observations') && $service->observaciones) {
$newLine->descripcion .= "\n\n"
. Tools::trans('observations')
. "\n" . $service->observaciones;
Expand Down
28 changes: 14 additions & 14 deletions Lib/Tickets/Service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ protected static function setBody(ModelClass $model, TicketPrinter $printer): vo

static::$escpos->text(static::sanitize(Tools::trans('date') . ': ' . $model->fecha . ' ' . $model->hora) . "\n");

if (Tools::settings('servicios', 'print_ticket_agent', false)) {
if (Tools::settings('Servicios', 'print_ticket_agent', false)) {
static::$escpos->text(static::sanitize(Tools::trans('agent') . ': ' . $model->getAgent()->nombre) . "\n");
}

if (Tools::settings('servicios', 'print_ticket_assigned', false)) {
if (Tools::settings('Servicios', 'print_ticket_assigned', false)) {
static::$escpos->text(static::sanitize(Tools::trans('assigned') . ': ' . $model->getAsignado()->nick) . "\n");
}

Expand All @@ -69,22 +69,22 @@ protected static function setBody(ModelClass $model, TicketPrinter $printer): vo
static::$escpos->text(static::sanitize(Tools::trans('phone2') . ': ' . ($model->telefono2 ?? $customer->telefono2)));
}

if ($model->descripcion && (bool)Tools::settings('servicios', 'print_ticket_description', false)) {
if ($model->descripcion && (bool)Tools::settings('Servicios', 'print_ticket_description', false)) {
static::$escpos->text("\n\n" . static::sanitize(Tools::trans('description')));
static::$escpos->text("\n" . static::sanitize($model->descripcion));
}

if ($model->material && (bool)Tools::settings('servicios', 'print_ticket_material', false)) {
if ($model->material && (bool)Tools::settings('Servicios', 'print_ticket_material', false)) {
static::$escpos->text("\n\n" . static::sanitize(Tools::trans('material')));
static::$escpos->text("\n" . static::sanitize($model->material));
}

if ($model->solucion && (bool)Tools::settings('servicios', 'print_ticket_solution', false)) {
if ($model->solucion && (bool)Tools::settings('Servicios', 'print_ticket_solution', false)) {
static::$escpos->text("\n\n" . static::sanitize(Tools::trans('solution')));
static::$escpos->text("\n" . static::sanitize($model->solucion));
}

if ($model->observaciones && (bool)Tools::settings('servicios', 'print_ticket_observations', false)) {
if ($model->observaciones && (bool)Tools::settings('Servicios', 'print_ticket_observations', false)) {
static::$escpos->text("\n\n" . static::sanitize(Tools::trans('observations')));
static::$escpos->text("\n" . static::sanitize($model->observaciones));
}
Expand All @@ -96,7 +96,7 @@ protected static function setBody(ModelClass $model, TicketPrinter $printer): vo
protected static function setMachines(ModelClass $model, TicketPrinter $printer): void
{
$machines = $model->getMachines();
if (empty($machines) || false === Tools::settings('servicios', 'print_ticket_machine_info', false)) {
if (empty($machines) || false === Tools::settings('Servicios', 'print_ticket_machine_info', false)) {
return;
}

Expand All @@ -111,15 +111,15 @@ protected static function setFooter(ModelClass $model, TicketPrinter $printer):
parent::setFooter($model, $printer);

// si hay un texto personalizado de pie de ticket, lo añadimos
if (false === empty(Tools::settings('servicios', 'print_ticket_footer_text'))) {
static::$escpos->text("\n" . static::sanitize(Tools::settings('servicios', 'print_ticket_footer_text')) . "\n");
if (false === empty(Tools::settings('Servicios', 'print_ticket_footer_text'))) {
static::$escpos->text("\n" . static::sanitize(Tools::settings('Servicios', 'print_ticket_footer_text')) . "\n");
}
}

protected static function setWorks(ModelClass $model, TicketPrinter $printer): void
{
$works = $model->getTrabajos();
if (empty($works) || false === Tools::settings('servicios', 'print_ticket_works', false)) {
if (empty($works) || false === Tools::settings('Servicios', 'print_ticket_works', false)) {
return;
}

Expand All @@ -132,19 +132,19 @@ protected static function setWorks(ModelClass $model, TicketPrinter $printer): v
static::$escpos->text(static::sanitize(Tools::trans('until-hour') . ': ' . $work->horafin) . "\n");
static::$escpos->text(static::sanitize(Tools::trans('observations') . ': ' . $work->observaciones) . "\n");

if (Tools::settings('servicios', 'print_ticket_work_reference', false)) {
if (Tools::settings('Servicios', 'print_ticket_work_reference', false)) {
static::$escpos->text(static::sanitize(Tools::trans('reference') . ': ' . $work->referencia) . "\n");
}

if (Tools::settings('servicios', 'print_ticket_work_description', false)) {
if (Tools::settings('Servicios', 'print_ticket_work_description', false)) {
static::$escpos->text(static::sanitize(Tools::trans('description') . ': ' . $work->descripcion) . "\n");
}

if (Tools::settings('servicios', 'print_ticket_work_quantity', false)) {
if (Tools::settings('Servicios', 'print_ticket_work_quantity', false)) {
static::$escpos->text(static::sanitize(Tools::trans('quantity') . ': ' . $work->cantidad) . "\n");
}

if (Tools::settings('servicios', 'print_ticket_work_price', false)) {
if (Tools::settings('Servicios', 'print_ticket_work_price', false)) {
static::$escpos->text(static::sanitize(Tools::trans('price') . ': ' . Tools::money($work->precio)) . "\n");
}

Expand Down
Loading
Loading