Skip to content

Commit 142da99

Browse files
authored
Merge pull request #1762 from daniel89fg/3990-tipo-producto-rental-business
3990 tipo producto rental business
2 parents e15a8dc + 8ba33e3 commit 142da99

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

Core/Lib/ProductType.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* This file is part of FacturaScripts
4-
* Copyright (C) 2023 Carlos Garcia Gomez <carlos@facturascripts.com>
4+
* Copyright (C) 2023-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
55
*
66
* This program is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU Lesser General Public License as
@@ -27,6 +27,7 @@
2727
*/
2828
class ProductType
2929
{
30+
const LOCAL_BUSINESS_RENTAL = 'Arrendamiento local negocio';
3031
const NORMAL = 'Normal';
3132
const SECOND_HAND = 'Segunda mano';
3233
const SERVICE = 'Servicio';
@@ -47,7 +48,8 @@ public static function all(): array
4748
self::NORMAL => 'normal',
4849
self::SECOND_HAND => 'second-hand',
4950
self::SERVICE => 'service',
50-
self::TRAVEL => 'travel'
51+
self::LOCAL_BUSINESS_RENTAL => 'local-business-rental',
52+
self::TRAVEL => 'travel',
5153
];
5254

5355
return array_merge($defaultTypes, self::$all);

Core/Table/productos.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</column>
9898
<column>
9999
<name>tipo</name>
100-
<type>character varying(20)</type>
100+
<type>character varying(50)</type>
101101
</column>
102102
<column>
103103
<name>ventasinstock</name>

Core/View/Master/MenuTemplate.html.twig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{#
22
/**
33
* This file is part of FacturaScripts
4-
* Copyright (C) 2017-2024 Carlos Garcia Gomez <carlos@facturascripts.com>
4+
* Copyright (C) 2017-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
55
*
66
* This program is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU Lesser General Public License as
@@ -43,8 +43,8 @@
4343
{% include includeView['path'] %}
4444
{% endfor %}
4545
{% block css %}
46-
<link rel="stylesheet" href="{{ asset('node_modules/bootstrap/dist/css/bootstrap.min.css') }}"/>
47-
<link rel="stylesheet" href="{{ asset('node_modules/@fortawesome/fontawesome-free/css/all.min.css') }}"/>
46+
<link rel="stylesheet" href="{{ asset('node_modules/bootstrap/dist/css/bootstrap.min.css') }}?v=5"/>
47+
<link rel="stylesheet" href="{{ asset('node_modules/@fortawesome/fontawesome-free/css/all.min.css') }}?v=6"/>
4848
<link rel="stylesheet" href="{{ asset('Dinamic/Assets/CSS/custom.css') }}?v=6"/>
4949
{% endblock %}
5050
{# Adds custom CSS assets #}
@@ -61,7 +61,7 @@
6161
<script src="{{ asset('node_modules/jquery/dist/jquery.min.js') }}"></script>
6262
<script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.bundle.min.js') }}"></script>
6363
<script src="{{ asset('node_modules/pace-js/pace.min.js') }}"></script>
64-
<script src="{{ asset('node_modules/@fortawesome/fontawesome-free/js/all.min.js') }}"></script>
64+
<script src="{{ asset('node_modules/@fortawesome/fontawesome-free/js/all.min.js') }}?v=6"></script>
6565
<script src="{{ asset('Dinamic/Assets/JS/Custom.js') }}?v=6"></script>
6666
{% endblock %}
6767
{# Adds custom JS assets #}

Core/View/Master/MicroTemplate.html.twig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{#
22
/**
33
* This file is part of FacturaScripts
4-
* Copyright (C) 2017-2023 Carlos Garcia Gomez <carlos@facturascripts.com>
4+
* Copyright (C) 2017-2025 Carlos Garcia Gomez <carlos@facturascripts.com>
55
*
66
* This program is free software: you can redistribute it and/or modify
77
* it under the terms of the GNU Lesser General Public License as
@@ -36,8 +36,8 @@
3636
<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('Dinamic/Assets/Images/apple-icon-180x180.png') }}" />
3737
{% endblock %}
3838
{% block css %}
39-
<link rel="stylesheet" href="{{ asset('node_modules/bootstrap/dist/css/bootstrap.min.css') }}" />
40-
<link rel="stylesheet" href="{{ asset('node_modules/@fortawesome/fontawesome-free/css/all.min.css') }}"/>
39+
<link rel="stylesheet" href="{{ asset('node_modules/bootstrap/dist/css/bootstrap.min.css') }}?v=5" />
40+
<link rel="stylesheet" href="{{ asset('node_modules/@fortawesome/fontawesome-free/css/all.min.css') }}?v=6"/>
4141
<style>
4242
.btn-link {
4343
text-decoration: none;
@@ -50,8 +50,8 @@
5050
{% endfor %}
5151
{% block javascripts %}
5252
<script src="{{ asset('node_modules/jquery/dist/jquery.min.js') }}"></script>
53-
<script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.bundle.min.js') }}"></script>
54-
<script src="{{ asset('node_modules/@fortawesome/fontawesome-free/js/all.min.js') }}"></script>
53+
<script src="{{ asset('node_modules/bootstrap/dist/js/bootstrap.bundle.min.js') }}?v=5"></script>
54+
<script src="{{ asset('node_modules/@fortawesome/fontawesome-free/js/all.min.js') }}?v=6"></script>
5555
{% endblock %}
5656
{# Adds custom JS assets #}
5757
{% for js in assetManager.get('js') %}

0 commit comments

Comments
 (0)