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

Recuperando cambios peridos en el merge?

Browse Source
This commit is contained in:
imnavajas
2023-05-16 14:13:42 +02:00
parent 224ea78c3c
commit dd9686d966
9 changed files with 66 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/deployment.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="PublishConfigData" autoUpload="Always" serverName="SK-IMN" remoteFilesAllowedToDisappearOnAutoupload="false"> <component name="PublishConfigData" autoUpload="Always" serverName="SK-MAIN" remoteFilesAllowedToDisappearOnAutoupload="false">
<serverData> <serverData>
<paths name="SK-IMN"> <paths name="SK-IMN">
<serverdata> <serverdata>
@ -9,6 +9,13 @@
</mappings> </mappings>
</serverdata> </serverdata>
</paths> </paths>
<paths name="SK-MAIN">
<serverdata>
<mappings>
<mapping deploy="/" local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
</serverData> </serverData>
<option name="myAutoUpload" value="ALWAYS" /> <option name="myAutoUpload" value="ALWAYS" />
</component> </component>

7
.idea/webServers.xml generated
View File

@ -9,6 +9,13 @@
</advancedOptions> </advancedOptions>
</fileTransfer> </fileTransfer>
</webServer> </webServer>
<webServer id="b340ea2c-6cfa-4862-a020-5d4f6e482cc1" name="SK-MAIN" url="http://sk-main.imnavajas.es">
<fileTransfer host="sk-main.imnavajas.es" port="21">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
</advancedOptions>
</fileTransfer>
</webServer>
</option> </option>
</component> </component>
</project> </project>

39
.idea/workspace.xml generated
View File

@ -5,11 +5,15 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7c8f7059-cd40-417c-936e-48dbc0507d86" name="Changes" comment="Add static Vuexy files"> <list default="true" id="7c8f7059-cd40-417c-936e-48dbc0507d86" name="Changes" comment="Add static Vuexy files">
<change afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/demo_view.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Controllers/Clientes/Cliente.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Controllers/Clientes/Cliente.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ci4/app/Config/Basics.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Config/Basics.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Controllers/Clientes/Tarifacliente.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Controllers/Clientes/Tarifacliente.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ci4/app/Controllers/Integration.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Controllers/Integration.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Controllers/Serviciosdigitalizacion/Digitalizacion.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Controllers/Serviciosdigitalizacion/Digitalizacion.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ci4/app/Controllers/Pedidos/Pedido.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Controllers/Pedidos/Pedido.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Filters/LoginAuthFilter.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Filters/LoginAuthFilter.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/_commonPartialsBs/datatables.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/_commonPartialsBs/datatables.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -31,20 +35,20 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"RunOnceActivity.OpenProjectViewOnStart": "true", &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"WebServerToolWindowFactoryState": "false", &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
"last_opened_file_path": "C:/temp-sk/safekat/ci4/app/Views/themes/backend/vuexy/main", &quot;last_opened_file_path&quot;: &quot;C:/temp-sk/safekat/ci4/app/Views/themes/backend/vuexy/main&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"nodejs_package_manager_path": "npm", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"vue.rearranger.settings.migration": "true" &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
} }
}]]></component> }</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="C:\temp-sk\safekat\ci4\app\Views\themes\backend\vuexy\main" /> <recent name="C:\temp-sk\safekat\ci4\app\Views\themes\backend\vuexy\main" />
@ -79,6 +83,7 @@
<workItem from="1684147458134" duration="7379000" /> <workItem from="1684147458134" duration="7379000" />
<workItem from="1684221025785" duration="2261000" /> <workItem from="1684221025785" duration="2261000" />
<workItem from="1684226343116" duration="4598000" /> <workItem from="1684226343116" duration="4598000" />
<workItem from="1684236911941" duration="2213000" />
</task> </task>
<task id="LOCAL-00001" summary="Starting Vuexy Theme creation"> <task id="LOCAL-00001" summary="Starting Vuexy Theme creation">
<created>1682339938559</created> <created>1682339938559</created>

2
ci4/app/Config/Basics.php
View File

@ -28,7 +28,7 @@ class Basics extends BaseConfig {
public $appName = 'Safekat'; public $appName = 'Safekat';
public $i18n = 'Spanish'; public $i18n = 'es-ES';
public $languages = [ public $languages = [
'en' => 'English', 'en' => 'English',

10
ci4/app/Controllers/Integration.php
View File

@ -131,23 +131,23 @@ class Integration extends BaseController
foreach (keywordEmail()??[] as $item){ foreach (keywordEmail()??[] as $item){
$field = str_replace(['[','user_',']'],'',$item); $field = str_replace(['[','user_',']'],'',$item);
$template = str_replace('['.$item.']',$user[$field],$template); $template = str_replace('['.$item.']',$user->$field ?? "",$template);
} }
$token = random_string("alnum", 50); $token = random_string("alnum", 50);
$url = base_url().'/login/recovery/'.$token; $url = base_url().'login/recovery/'.$token;
$this->pass_recovery_model->save([ $this->pass_recovery_model->save([
'user' => $user['token'], 'user' => $user->token,
'token' => $token 'token' => $token
]); ]);
$title = $template['subject']??''; $title = $template['subject']??'';
$msg = $template['body']??''; $msg = $template['body']??'';
$msg = str_replace('[recovery_password]',$url,$msg); $msg = str_replace('[recovery_password]',$url,$msg);
$email = $user['email']; $email = $user->email;
$this->setLog('recovery','recovery-password',$user['token']); $this->setLog('recovery','recovery-password',$user->token);
$send = $this->sendMail($title,$msg,$email); $send = $this->sendMail($title,$msg,$email);
if($send){ if($send){
$session->setFlashdata('toast', ['success',lang("App.login_alert_send"),lang("App.login_alert_send_pass")]); $session->setFlashdata('toast', ['success',lang("App.login_alert_send"),lang("App.login_alert_send_pass")]);

28
ci4/app/Controllers/Pedidos/Pedido.php
View File

@ -16,20 +16,20 @@ class Pedido extends BaseController
echo 'Pedido'; echo 'Pedido';
} }
public function delete_files() // public function delete_files()
{ // {
//
} // }
//
public function pedidos_maquetacion() // public function pedidos_maquetacion()
{ // {
//
} // }
//
public function pedidos_prestashop() // public function pedidos_prestashop()
{ // {
//
} // }
} }

3
ci4/app/Filters/LoginAuthFilter.php
View File

@ -140,7 +140,8 @@ class LoginAuthFilter implements FilterInterface
'Migrate', 'Migrate',
'Test', 'Test',
'GoBaseController', 'GoBaseController',
'GoBaseResourceController' 'GoBaseResourceController',
'Settings', 'My', 'Activity', 'Notification' // PARA LA DEMO
]; ];
} }

2
ci4/app/Views/themes/_commonPartialsBs/datatables.php
View File

@ -160,7 +160,7 @@
"scrollX": true, "scrollX": true,
"stateSave": true, "stateSave": true,
"language": { "language": {
//url: "//cdn.datatables.net/plug-ins/1.10.25/i18n/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/<?= config('Basics')->i18n ?>.json"
}, },
"columnDefs": [ "columnDefs": [
{ {

9
ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php
View File

@ -78,7 +78,6 @@
<!-- </td>--> <!-- </td>-->
<!-- </tr>--> <!-- </tr>-->
<?php foreach (getAllFolder() as $folder): ?> <?php foreach (getAllFolder() as $folder): ?>
<?php foreach (getAllClass() as $item): ?> <?php foreach (getAllClass() as $item): ?>
<?php if (str_contains($item['path'], $folder)): ?> <?php if (str_contains($item['path'], $folder)): ?>
<tr> <tr>
@ -90,7 +89,9 @@
<input type="checkbox" <input type="checkbox"
id="<?= $item['name'] . '_' . $subitem ?>" id="<?= $item['name'] . '_' . $subitem ?>"
name="<?= $item['name'] . '_' . $subitem ?>" name="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-input"> class="form-check-input"
<?=ruleIsChecked($group->rules, $item['name'], $subitem)?'checked':''?>
>
<label for="<?= $item['name'] . '_' . $subitem ?>" <label for="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-label"><?= getDictionary($subitem) ?></label> class="form-check-label"><?= getDictionary($subitem) ?></label>
</div> </div>
@ -113,7 +114,9 @@
<input type="checkbox" <input type="checkbox"
id="<?= $item['name'] . '_' . $subitem ?>" id="<?= $item['name'] . '_' . $subitem ?>"
name="<?= $item['name'] . '_' . $subitem ?>" name="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-input"> class="form-check-input"
<?=ruleIsChecked($group->rules, $item['name'], $subitem)?'checked':''?>
>
<label for="<?= $item['name'] . '_' . $subitem ?>" <label for="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-label"><?= getDictionary($subitem) ?></label> class="form-check-label"><?= getDictionary($subitem) ?></label>
</div> </div>