Merge branch 'main' into 'dev/views'

# Conflicts:
#   ci4/.env
#   ci4/app/Controllers/Test.php
This commit is contained in:
Ignacio Martinez Navajas
2023-06-20 13:30:37 +00:00
17 changed files with 1220 additions and 357 deletions

View File

@ -361,10 +361,10 @@
</li>
<?php endif; ?>
<?php endif; ?>
<?php if (count($temp = getArrayItem($menus, 'name', 'Tarifamanipulado')) > 0): ?>
<?php if (count($temp = getArrayItem($menus, 'name', 'Tarifasmanipulado')) > 0): ?>
<?php if (count(getArrayItem($temp, 'methods', 'index', true)) > 0): ?>
<li class="menu-item">
<a href="<?= site_url("tarifas/tarifamanipulado") ?>" class="menu-link">
<a href="<?= site_url("tarifas/tarifasmanipulado") ?>" class="menu-link">
<div data-i18n="<?= lang("App.menu_tarifamanipulado") ?>"><?= lang("App.menu_tarifamanipulado") ?></div>
</a>
</li>