Skip to content

Tarea 3990 - Nuevo tipo producto #3

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

Closed
daniel89fg wants to merge 3 commits into from
Closed

Tarea 3990 - Nuevo tipo producto #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed92eaf
Actualiza versiones de Bootstrap y FontAwesome en MenuTemplate.html.twig
Jun 27, 2025
f84bb1c
Actualiza versiones de Bootstrap y FontAwesome en MicroTemplate.html.…
Jun 27, 2025
144a0ba
Aumenta el tamaño del tipo de producto a 50 caracteres y añade 'Arren…
Jun 27, 2025
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
6 changes: 4 additions & 2 deletions Core/Lib/ProductType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* This file is part of FacturaScripts
* Copyright (C) 2023 Carlos Garcia Gomez <carlos@facturascripts.com>
* Copyright (C) 2023-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
Expand All @@ -27,6 +27,7 @@
*/
class ProductType
{
const LOCAL_BUSINESS_RENTAL = 'Arrendamiento local negocio';
const NORMAL = 'Normal';
const SECOND_HAND = 'Segunda mano';
const SERVICE = 'Servicio';
Expand All @@ -47,7 +48,8 @@ public static function all(): array
self::NORMAL => 'normal',
self::SECOND_HAND => 'second-hand',
self::SERVICE => 'service',
self::TRAVEL => 'travel'
self::TRAVEL => 'travel',
self::LOCAL_BUSINESS_RENTAL => 'local-business-rental',
];

return array_merge($defaultTypes, self::$all);
Expand Down
2 changes: 1 addition & 1 deletion Core/Table/productos.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</column>
<column>
<name>tipo</name>
<type>character varying(20)</type>
<type>character varying(50)</type>
</column>
<column>
<name>ventasinstock</name>
Expand Down
10 changes: 5 additions & 5 deletions Core/View/Master/MenuTemplate.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{#
/**
* This file is part of FacturaScripts
* Copyright (C) 2017-2024 Carlos Garcia Gomez <carlos@facturascripts.com>
* Copyright (C) 2017-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
Expand Down Expand Up @@ -43,8 +43,8 @@
{% include includeView['path'] %}
{% endfor %}
{% block css %}
<link rel="stylesheet" href="{{ asset('node_modules/bootstrap/dist/css/bootstrap.min.css') }}"/>
<link rel="stylesheet" href="{{ asset('node_modules/@fortawesome/fontawesome-free/css/all.min.css') }}"/>
<link rel="stylesheet" href="{{ asset('node_modules/bootstrap/dist/css/bootstrap.min.css') }}?v=5"/>
<link rel="stylesheet" href="{{ asset('node_modules/@fortawesome/fontawesome-free/css/all.min.css') }}?v=6"/>
<link rel="stylesheet" href="{{ asset('Dinamic/Assets/CSS/custom.css') }}?v=6"/>
{% endblock %}
{# Adds custom CSS assets #}
Expand All @@ -59,11 +59,11 @@
{% endfor %}
{% block javascripts %}
<script src="{{ asset('node_modules/jquery/dist/jquery.min.js') }}"></script>
<script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.bundle.min.js') }}?v=5"></script>
<script src="{{ asset('node_modules/bootbox/dist/bootbox.min.js') }}"></script>
<script src="{{ asset('node_modules/bootbox/dist/bootbox.locales.min.js') }}"></script>
<script src="{{ asset('node_modules/pace-js/pace.min.js') }}"></script>
<script src="{{ asset('node_modules/@fortawesome/fontawesome-free/js/all.min.js') }}"></script>
<script src="{{ asset('node_modules/@fortawesome/fontawesome-free/js/all.min.js') }}?v=6"></script>
<script src="{{ asset('Dinamic/Assets/JS/Custom.js') }}?v=6"></script>
{% endblock %}
{# Adds custom JS assets #}
Expand Down
10 changes: 5 additions & 5 deletions Core/View/Master/MicroTemplate.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{#
/**
* This file is part of FacturaScripts
* Copyright (C) 2017-2023 Carlos Garcia Gomez <carlos@facturascripts.com>
* Copyright (C) 2017-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
Expand Down Expand Up @@ -36,8 +36,8 @@
<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('Dinamic/Assets/Images/apple-icon-180x180.png') }}" />
{% endblock %}
{% block css %}
<link rel="stylesheet" href="{{ asset('node_modules/bootstrap/dist/css/bootstrap.min.css') }}" />
<link rel="stylesheet" href="{{ asset('node_modules/@fortawesome/fontawesome-free/css/all.min.css') }}"/>
<link rel="stylesheet" href="{{ asset('node_modules/bootstrap/dist/css/bootstrap.min.css') }}?v=5" />
<link rel="stylesheet" href="{{ asset('node_modules/@fortawesome/fontawesome-free/css/all.min.css') }}?v=6"/>
<style>
.btn-link {
text-decoration: none;
Expand All @@ -50,8 +50,8 @@
{% endfor %}
{% block javascripts %}
<script src="{{ asset('node_modules/jquery/dist/jquery.min.js') }}"></script>
<script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('node_modules/@fortawesome/fontawesome-free/js/all.min.js') }}"></script>
<script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.bundle.min.js') }}?v=5"></script>
<script src="{{ asset('node_modules/@fortawesome/fontawesome-free/js/all.min.js') }}?v=6"></script>
{% endblock %}
{# Adds custom JS assets #}
{% for js in assetManager.get('js') %}
Expand Down
Loading