jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Arreglo login y configuracion modal borrado

Browse Source
This commit is contained in:
imnavajas
2023-06-27 22:28:30 +02:00
parent 743c05c717
commit c10500cbd7
7 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ci4/.env
View File

@ -41,22 +41,22 @@ app.baseURL = 'https://sk-imn.imnavajas.es'
# DATABASE
#--------------------------------------------------------------------
database.default.hostname = localhost
database.default.database = sk_jjo
database.default.username = sk_jjo
database.default.password = 61tv&G1Zf^XY
database.default.DBDriver = MySQLi
database.default.DBPrefix =
database.default.dump =
# database.default.hostname = localhost
# database.default.database = sk_imn
# database.default.username = sk_imn
# database.default.password = Uyia19_87
# database.default.database = sk_jjo
# database.default.username = sk_jjo
# database.default.password = 61tv&G1Zf^XY
# database.default.DBDriver = MySQLi
# database.default.DBPrefix =
# database.default.dump =
database.default.hostname = localhost
database.default.database = sk_imn
database.default.username = sk_imn
database.default.password = Uyia19_87
database.default.DBDriver = MySQLi
database.default.DBPrefix =
database.default.dump =
# database.tests.hostname = localhost
# database.tests.database = ci4
# database.tests.username = root

2
ci4/app/Controllers/Login.php
View File

@ -568,7 +568,7 @@ class login extends BaseController
if($user != null){
$phpass = new PasswordHash(8, true);
$this->user_model->save([
'id_user' => $user['id_user'],
'id_user' => $user->id_user,
'password' => $phpass->HashPassword($listPost['password'])
]);
$this->pass_recovery_model->save([

2
ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php
View File

@ -343,7 +343,7 @@ class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController {
return $this->respond(Collection::datatable(
$resourceData,
$this->model->getResource()->countAllResults(),
$this->model->getResource($search)->countAllResults()
$this->model->getResource($search, $id_TM)->countAllResults()
));
} else {
return $this->failUnauthorized('Invalid request', 403);

16
ci4/app/Views/themes/_commonPartialsBs/_confirm2delete.php
View File

@ -4,15 +4,15 @@
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="confirm2deleteLabel">Confirm to delete record</h5>
<h5 class="modal-title" id="confirm2deleteLabel"><?= lang('Basic.global.deleteConfirmation') ?></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
Are you sure you want to delete this record?
<?= lang('Basic.global.deleteConfirmationQuestion') ?>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
<a class="btn btn-danger btn-confirm"> Yes, Delete It! </a>
<button type="button" class="btn btn-default" data-bs-dismiss="modal"><?= lang('Basic.global.deleteConfirmationCancel') ?></button>
<a class="btn btn-danger btn-confirm"><?= lang('Basic.global.deleteConfirmationButton') ?></a>
</div><!--//.modal-footer -->
</div><!--//.modal-content -->
</div><!--//.modal-dialog -->
@ -24,17 +24,17 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="confirm2deleteLabel">Confirm to delete record</h4>
<h4 class="modal-title" id="confirm2deleteLabel"><?= lang('Basic.global.deleteConfirmation') ?></h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
Are you sure you want to delete this record?
<?= lang('Basic.global.deleteConfirmationQuestion') ?>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<a class="btn btn-danger btn-confirm"> Yes, Delete It! </a>
<button type="button" class="btn btn-default" data-dismiss="modal"><?= lang('Basic.global.deleteConfirmationCancel') ?></button>
<a class="btn btn-danger btn-confirm">><?= lang('Basic.global.deleteConfirmationButton') ?></a>
</div><!--//.modal-footer -->
</div><!--//.modal-content -->
</div><!--//.modal-dialog -->

2
ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php
View File

@ -12,7 +12,7 @@
<?= csrf_field() ?>
<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
<?= view("themes/backend/focus2/form/configuracion/paises/_paisFormItems") ?>
<?= view("themes/backend/vuexy/form/configuracion/paises/_paisFormItems") ?>
<div class="pt-4">
<input
type="submit"

12
ci4/app/Views/themes/backend/vuexy/form/settings/index.php
View File

@ -109,7 +109,7 @@
<div class="col-lg-12 mb-3">
<label class="form-label text-primary"><?=lang("App.settings_label_general_subtitle_1")?></label>
</div>
<div class="col-lg-9 mb-3">
<div class="col-lg-12 mb-3">
<label for="title" class="form-label"><?=lang("App.settings_field_title")?></label>
<input
type="text"
@ -120,6 +120,7 @@
value="<?= (isset($obj)) ? $obj['title'] : set_value('title');?>"
/>
</div>
<?php /*
<div class="col-lg-3 mb-3">
<label for="activate_frontend" class="form-label"><?=lang("App.settings_field_frontend")?></label>
<?php $id_select = (isset($obj)) ? $obj['activate_frontend'] : set_value('activate_frontend');?>
@ -128,6 +129,7 @@
<option value="1" <?= $id_select == "1" ? 'selected' : '' ?>><?=lang("App.notification_grid_yes")?></option>
</select>
</div>
*/ ?>
<div class="col-lg-6 mb-3">
<label class="form-label"><?=lang("App.settings_field_seo_description")?></label>
<textarea
@ -216,7 +218,7 @@
<option value="comma" <?= $id_select == "comma" ? 'selected' : '' ?>><?=lang("App.settings_field_default_currency_separation_coma")?></option>
</select>
</div>
<div class="col-lg-3 mb-3">
<div class="col-lg-4 mb-3">
<label for="default_currency_position" class="form-label"><?=lang("App.settings_field_default_currency_position")?></label>
<?php $id_select = (isset($obj)) ? $obj['default_currency_position'] : set_value('default_currency_position');?>
<select name="default_currency_position" id="default_currency_position" class="select2 form-control">
@ -224,7 +226,7 @@
<option value="right" <?= $id_select == "right" ? 'selected' : '' ?>><?=lang("App.settings_field_default_currency_position_right")?></option>
</select>
</div>
<div class="col-lg-3 mb-3">
<div class="col-lg-4 mb-3">
<label for="default_country" class="form-label"><?=lang("App.settings_field_default_country")?></label>
<?php $id_select = (isset($obj)) ? $obj['default_country'] : set_value('default_country');?>
<select name="default_country" id="default_country" class="select2 form-control">
@ -233,7 +235,7 @@
<?php endforeach; ?>
</select>
</div>
<div class="col-lg-3 mb-3">
<div class="col-lg-4 mb-3">
<label for="default_theme" class="form-label"><?=lang("App.settings_field_default_theme")?></label>
<?php $id_select = (isset($obj)) ? $obj['default_theme'] : set_value('default_theme');?>
<select name="default_theme" id="default_theme" class="select2 form-control">
@ -244,6 +246,7 @@
<?php endforeach; ?>
</select>
</div>
<?php /*
<div class="col-lg-3 mb-3">
<label for="default_theme_front" class="form-label"><?=lang("App.settings_field_default_theme_front")?></label>
<select name="default_theme_front" id="default_theme_front" class="select2 form-control">
@ -254,6 +257,7 @@
<?php endforeach; ?>
</select>
</div>
*/ ?>
</div>
</div>
</div>

20
ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php
View File

@ -40,12 +40,18 @@
const lastColNr = $('#tableOfTarifasacabado').find("tr:first th").length - 1;
const actionBtns = function(data) {
return `
<td class="text-right py-0 align-middle">
<div class="btn-group btn-group-sm">
<i class="ti ti-pencil ti-sm btn-edit mx-2" data-id="${data.id}"></i>
<i class="ti ti-trash ti-sm btn-delete mx-2" data-id="${data.id}"></i>
</div>
</td>`;
<td class="text-right py-0 align-middle">
<div class="btn-group btn-group-sm">
<a href="https://sk-imn.imnavajas.es/tarifas/tarifaacabado/edit/${data.id}" class="text-body" data-id="${data.id}">
<i class="ti ti-pencil ti-sm mx-2"></i>
</a>
<a href="https://sk-imn.imnavajas.es/#confirm2delete" class="text-body" data-href="/tarifas/tarifaacabado/${data.id}" data-bs-toggle="modal" data-bs-target="#confirm2delete">
<i class="ti ti-trash ti-sm mx-2"></i>
</a>
<i class="ti ti-pencil ti-sm btn-edit mx-2" data-id="${data.id}"></i>
<i class="ti ti-trash ti-sm btn-delete mx-2" data-id="${data.id}"></i>
</div>
</td>`;
};
theTable = $('#tableOfTarifasacabado').DataTable({
processing: true,
@ -96,7 +102,7 @@
$(document).on('click', '.btn-delete', function(e) {
Swal.fire({
title: '<?= lang('Basic.global.sweet.sureToDeleteTitle', [mb_strtolower(lang('Tarifaacabado.tarifa acabado'))]) ?>',
title: '<?= lang('Basic.global.sweet.sureToDeleteTitle', [mb_strtolower(lang('Tarifaacabado.tarifaacabado'))]) ?>',
text: '<?= lang('Basic.global.sweet.sureToDeleteText') ?>',
icon: 'warning',
showCancelButton: true,