Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7

.eslintrc.yml

@@ -1,6 +1,6 @@
 extends: [eslint:recommended, google, plugin:jasmine/recommended]
 parserOptions:
-    ecmaVersion: 2018
+    ecmaVersion: 2020
     sourceType: "module"
 plugins:
     - jasmine
@@ -35,4 +35,4 @@ rules:
     space-in-parens: ["error", "never"]
     jasmine/no-focused-tests: 0
     jasmine/prefer-toHaveBeenCalledWith: 0
-    arrow-spacing: ["error", { "before": true, "after": true }]
+    arrow-spacing: ["error", { "before": true, "after": true }]

CHANGELOG.md

@@ -19,9 +19,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - (Tickets -> Abono) Al abonar permite crear el ticket abono con almacén o sin almmacén
 - (General -> Desplegables) Mejorada eficiencia de carga de datos
+- (General -> Históricos) Ahora, ademas de los ids, se muestra la descripión de los atributos
+- (General -> Históricos) Botón para hacer más ágil mostrar sólo los cambios en un registro
+- (General -> Históricos) Filtro por cambios
 
 ### Changed
 - (General -> Permisos) Mejorada seguridad
+- (General -> Históricos) Elementos de la interfaz reorganizados para hacerla más ágil e intuitiva
 
 ### Fixed
 -

db/dump/fixtures.sql

@@ -2786,7 +2786,9 @@ INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldIns
         (7,   18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL),
         (7,   18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL),
         (7,   18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL),
-        (7,   18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'");
+        (7,   18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'"),
+        (16,   9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 5689, 'Shield');
+
 
 INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedModel, changedModelId, changedModelValue, oldInstance, newInstance, description)
     VALUES
@@ -2800,7 +2802,6 @@ INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedM
         (1,   18, 'select', '2000-12-27 03:40:30', 'Ticket',    45, NULL         , NULL, NULL, NULL),
         (1,   18, 'insert', '2000-04-10 09:40:15', 'Sale',    5689, 'Shield'     , NULL, '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', NULL),
         (1,   18, 'insert', '1999-05-09 10:00:00', 'Ticket',    45, 'Super Man'  , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL);
-
 INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
     VALUES
         (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');

front/salix/components/log/index.html

@@ -110,6 +110,25 @@
     <form vn-vertical
         ng-model-options="{updateOn: 'change blur'}"
         class="vn-pa-md filter">
+        <vn-textfield
+            label="Search"
+            ng-model="filter.search">
+            <append>
+                <vn-icon
+                    icon="info_outline"
+                    vn-tooltip="Search by id or concept"
+                    pointer>
+                </vn-icon>
+            </append>
+        </vn-textfield>
+        <vn-autocomplete
+            label="Entity"
+            ng-model="filter.changedModel"
+            value-field="changedModel"
+            show-field="changedModelI18n"
+            data="$ctrl.models"
+            class="changed-model">
+        </vn-autocomplete>
         <vn-vertical>
             <vn-radio
                 label="All"
@@ -154,25 +173,6 @@
                 </div>
             </tpl-item>
         </vn-autocomplete>
-        <vn-textfield
-            label="Search"
-            ng-model="filter.search">
-            <append>
-                <vn-icon
-                    icon="info_outline"
-                    vn-tooltip="Search by id or concept"
-                    pointer>
-                </vn-icon>
-            </append>
-        </vn-textfield>
-        <vn-autocomplete
-            label="Entity"
-            ng-model="filter.changedModel"
-            value-field="changedModel"
-            show-field="changedModelI18n"
-            data="$ctrl.models"
-            class="changed-model">
-        </vn-autocomplete>
         <vn-textfield
             label="Changes"
             ng-model="filter.changes">

modules/client/front/credit-management/index.html

@@ -68,7 +68,7 @@
                     </span>
                 </vn-td>
                 <vn-td number>{{::clientInforma.rating}}</vn-td>
-                <vn-td number>{{::clientInforma.recommendedCredit}}</vn-td>
+                <vn-td>{{::clientInforma.recommendedCredit | currency: 'EUR': 2}}</vn-td>
             </vn-tr>
         </vn-tbody>
     </vn-table>

modules/ticket/back/methods/ticket-log/getChanges.js

@@ -61,15 +61,15 @@ module.exports = Self => {
             const oldQuantity = log.oldInstance.quantity;
             const newQuantity = log.newInstance?.quantity || 0;
 
-            if (oldQuantity || newQuantity) {
+            if (oldQuantity > newQuantity) {
-              const changeMessage = $t('Change quantity', {
+                const changeMessage = $t('Change quantity', {
-                concept: log.changedModelValue,
+                    concept: log.changedModelValue,
-                oldQuantity: oldQuantity || 0,
+                    oldQuantity: oldQuantity || 0,
-                newQuantity: newQuantity || 0,
+                    newQuantity: newQuantity || 0,
-              });
+                });
-              changes.push(changeMessage);
+                changes.push(changeMessage);
             }
-          }
+        }
 
         return changes.join('\n');
     };

modules/ticket/back/methods/ticket-log/specs/getChanges.spec.js

@@ -7,7 +7,7 @@ describe('ticketLog getChanges()', () => {
         return value;
     };
     it('should return the changes in the sales of a ticket', async() => {
-        const ticketId = 7;
+        const ticketId = 16;
 
         const changues = await models.TicketLog.getChanges(ctx, ticketId);
 

modules/ticket/front/descriptor/locale/es.yml

@@ -23,4 +23,4 @@ Restore ticket: Restaurar ticket
 You are going to restore this ticket: Vas a restaurar este ticket
 Are you sure you want to restore this ticket?: ¿Seguro que quieres restaurar el ticket?
 Are you sure you want to refund all?: ¿Seguro que quieres abonar todo?
-Send changes: "Verdnatura le recuerda:\rPedido {{ticketId}} día {{created | date: 'dd/MM/yyyy'}}\r{{changes}}"
+Send changes: "Verdnatura:\rPedido {{ticketId}}\r{{changes}}"