Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
-
+- (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
 
 
 ### Changed
@@ -39,10 +39,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - (Usuarios -> Histórico) Nueva sección
 - (Roles -> Histórico) Nueva sección
-- (General -> Traducciones) Correo de bienvenida a clientes al portugués y al francés
+- (Trabajadores -> Dar de alta) Permite elegir el método de pago
 
 ### Changed
 - (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
+- (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban
 
 ### Fixed
 - (Ticket -> Boxing) Arreglado selección de horas

db/changes/232201/00-workerConfigPayMethod.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `vn`.`workerConfig` ADD payMethodFk tinyint(3) unsigned NULL;
+ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK FOREIGN KEY (roleFk) REFERENCES account.`role`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK_1 FOREIGN KEY (payMethodFk) REFERENCES `vn`.`payMethod`(id) ON DELETE SET NULL ON UPDATE CASCADE;
+-- Cuando se apruebe el PR quitar y poner en redmine para hacerse manualmente
+UPDATE `vn`.`workerConfig`
+    SET payMethodFk = 4
+    WHERE id=1;

db/dump/fixtures.sql

@@ -2824,9 +2824,9 @@ INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
     VALUES
         (1, 1);
 
-INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `businessTypeFk`)
+INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `payMethodFk`, `businessTypeFk`)
     VALUES
-        (1, NULL, 1, 'worker');
+        (1, NULL, 1, 4, 'worker');
 
 INSERT INTO `vn`.`ticketRefund`(`refundTicketFk`, `originalTicketFk`)
     VALUES

db/dump/structure.sql

@@ -61943,141 +61943,205 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getBalance`(IN vItemId int, IN vWarehouse int)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getBalance`(vItemFk int, vWarehouseFk int, vDate DATETIME)
 BEGIN
-    DECLARE vDateInventory DATETIME;
-    DECLARE vCurdate DATE DEFAULT util.VN_CURDATE();
-    DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
+/**
+ * @vItemFk item a buscar
+ * @vWarehouseFk almacen donde buscar
+ * @vDate Si la fecha es null, muestra el histórico desde el inventario. Si la fecha no es null, muestra histórico desde la fecha pasada.
+ */
 
-    SELECT inventoried INTO vDateInventory FROM config;
-    SET @a = 0;
-    SET @currentLineFk = 0;
-    SET @shipped = '';
+	DECLARE vDateInventory DATETIME;
+	DECLARE vInvCalculated INT;
 
-    SELECT DATE(@shipped:= shipped) shipped,
-        alertLevel,
-        stateName,
-        origin,
-        reference,
-        clientFk,
-        name,
-        `in` AS invalue,
-        `out`,
-        @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
-        @currentLineFk := IF (@shipped < util.VN_CURDATE()
-                            OR (@shipped = util.VN_CURDATE() AND (isPicked OR alertLevel >= 2)),
-                        lineFk,@currentLineFk) lastPreparedLineFk,
-        isTicket,
-        lineFk,
-        isPicked,
-        clientType,
-        claimFk
-        FROM
-            ( SELECT  tr.landed AS shipped,
-                    b.quantity AS `in`,
-                    NULL AS `out`,
-                    al.id AS alertLevel,
-                    st.name AS stateName,
-                    s.name AS name,
-                    e.invoiceNumber AS reference,
-                    e.id AS origin,
-                    s.id AS clientFk,
-                    IF(al.id = 3, TRUE, FALSE) isPicked,
-                    FALSE AS isTicket,
-                    b.id lineFk,
-                    NULL `order`,
-                    NULL AS clientType,
-                    NULL AS claimFk
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN supplier s ON s.id = e.supplierFk
-                    JOIN alertLevel al ON al.id =
-                        CASE
-                            WHEN tr.landed < util.VN_CURDATE() THEN 3
-                            WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-                        END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.landed >= vDateInventory
-                    AND vWarehouse = tr.warehouseInFk
-                    AND b.itemFk = vItemId
-                    AND e.isExcludedFromAvailable = FALSE
-                    AND e.isRaid = FALSE
-            UNION ALL
+	IF vDate IS NULL THEN
+		SELECT inventoried INTO vDateInventory
+			FROM config;
+	ELSE
+		SELECT mockUtcTime INTO vDateInventory
+			FROM util.config;
+	END IF;
 
-            SELECT tr.shipped,
-                    NULL,
-                    b.quantity,
-                    al.id,
-                    st.name,
-                    s.name,
-                    e.invoiceNumber,
-                    e.id,
-                    s.id,
-                    IF(al.id = 3, TRUE, FALSE),
-                    FALSE,
-                    b.id,
-                    NULL,
-                    NULL,
-                    NULL
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN warehouse w ON w.id = tr.warehouseOutFk
-                    JOIN supplier s ON s.id = e.supplierFk
-                    JOIN alertLevel al ON al.id =
-                        CASE
-                            WHEN tr.shipped < util.VN_CURDATE() THEN 3
-                            WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-                        END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.shipped >= vDateInventory
-                    AND vWarehouse =tr.warehouseOutFk
-                    AND s.id <> 4
-                    AND b.itemFk = vItemId
-                    AND e.isExcludedFromAvailable = FALSE
-                    AND w.isFeedStock = FALSE
-                    AND e.isRaid = FALSE
-            UNION ALL
+	CREATE OR REPLACE TEMPORARY TABLE itemDiary(
+		shipped DATE,
+		`in` INT(11),
+		`out` INT(11),
+		alertLevel INT(11),
+		stateName VARCHAR(20),
+		`name` VARCHAR(50),
+		reference VARCHAR(50),
+		origin INT(11),
+		clientFk INT(11),
+		isPicked INT(11),
+		isTicket TINYINT(1),
+		lineFk INT(11),
+		`order` TINYINT(3) UNSIGNED,
+		clientType VARCHAR(20),
+		claimFk INT(10) UNSIGNED
+	);
 
-            SELECT DATE(t.shipped),
-                NULL,
-                s.quantity,
-                al.id,
-                st.name,
-                t.nickname,
-                t.refFk,
-                t.id,
-                t.clientFk,
-                stk.id,
-                TRUE,
-                s.id,
-                st.`order`,
-                ct.code,
-                cb.claimFk
-                FROM sale s
-                    JOIN ticket t ON t.id = s.ticketFk
-                    LEFT JOIN ticketState ts ON ts.ticket = t.id
-                    LEFT JOIN state st ON st.code = ts.code
-                    JOIN client c ON c.id = t.clientFk
-                    JOIN clientType ct ON ct.id = c.clientTypeFk
-                    JOIN alertLevel al ON al.id =
-                        CASE
-                            WHEN t.shipped < util.VN_CURDATE() THEN 3
-                            WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN 0
-                            ELSE IFNULL(ts.alertLevel, 0)
-                        END
-                    LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
-                    LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
-                    LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
-                WHERE t.shipped >= vDateInventory
-                    AND s.itemFk = vItemId
-                    AND vWarehouse =t.warehouseFk
-                ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC
-            ) AS itemDiary;
+	INSERT INTO itemDiary
+	SELECT tr.landed shipped,
+					b.quantity `in`,
+					NULL `out`,
+					al.id alertLevel,
+					st.name stateName,
+					s.name `name`,
+					e.invoiceNumber reference,
+					e.id origin,
+					s.id clientFk,
+					IF(al.code = 'DELIVERED', TRUE, FALSE) isPicked,
+					FALSE isTicket,
+					b.id lineFk,
+					NULL `order`,
+					NULL clientType,
+					NULL claimFk
+				FROM buy b
+					JOIN entry e ON e.id = b.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+					JOIN supplier s ON s.id = e.supplierFk
+					JOIN alertLevel al ON al.code =
+						CASE
+							WHEN tr.landed < util.VN_CURDATE() THEN 'DELIVERED'
+							WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 'DELIVERED'
+							ELSE 'FREE'
+						END
+					JOIN state st ON st.code = al.code
+				WHERE tr.landed >= vDateInventory
+					AND vWarehouseFk = tr.warehouseInFk
+					AND b.itemFk = vItemFk
+					AND e.isExcludedFromAvailable = FALSE
+					AND e.isRaid = FALSE
+			UNION ALL
+			SELECT tr.shipped,
+					NULL,
+					b.quantity,
+					al.id,
+					st.name,
+					s.name,
+					e.invoiceNumber,
+					e.id,
+					s.id,
+					IF(al.code = 'DELIVERED', TRUE, FALSE),
+					FALSE,
+					b.id,
+					NULL,
+					NULL,
+					NULL
+				FROM buy b
+					JOIN entry e ON e.id = b.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+					JOIN warehouse w ON w.id = tr.warehouseOutFk
+					JOIN supplier s ON s.id = e.supplierFk
+					JOIN alertLevel al ON al.code =
+						CASE
+							WHEN tr.shipped < util.VN_CURDATE() THEN 'DELIVERED'
+							WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 'DELIVERED'
+							ELSE 'FREE'
+						END
+					JOIN state st ON st.code = al.code
+					JOIN entryConfig ec
+				WHERE tr.shipped >= vDateInventory
+					AND vWarehouseFk =tr.warehouseOutFk
+					AND s.id <> ec.inventorySupplierFk
+					AND b.itemFk = vItemFk
+					AND e.isExcludedFromAvailable = FALSE
+					AND w.isFeedStock = FALSE
+					AND e.isRaid = FALSE
+			UNION ALL
+			SELECT DATE(t.shipped),
+				NULL,
+				s.quantity,
+				al3.id,
+				st.name,
+				t.nickname,
+				t.refFk,
+				t.id,
+				t.clientFk,
+				stk.id,
+				TRUE,
+				s.id,
+				st.`order`,
+				ct.code,
+				cb.claimFk
+			FROM sale s
+				JOIN ticket t ON t.id = s.ticketFk
+				LEFT JOIN ticketState ts ON ts.ticket = t.id
+				LEFT JOIN state st ON st.code = ts.code
+				JOIN client c ON c.id = t.clientFk
+				JOIN clientType ct ON ct.id = c.clientTypeFk
+                JOIN alertLevel al  ON al.code = 'DELIVERED'
+				JOIN alertLevel al2  ON al2.code = 'FREE'
+                JOIN alertLevel al3 ON al3.id =
+                    CASE
+                        WHEN t.shipped < util.VN_CURDATE() THEN al.code
+                        WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN al2.code
+                        ELSE IFNULL(ts.alertLevel, al2.code)
+                    END
+				LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
+				LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
+				LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
+			WHERE t.shipped >= vDateInventory
+				AND s.itemFk = vItemFk
+				AND vWarehouseFk =t.warehouseFk
+			ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC;
 
+	IF vDate IS NULL THEN
+		SET @a = 0;
+		SET @currentLineFk = 0;
+		SET @shipped = '';
+
+		SELECT DATE(@shipped:= shipped) shipped,
+			alertLevel,
+			stateName,
+			origin,
+			reference,
+			clientFk,
+			name,
+			`in` AS invalue,
+			`out`,
+			@a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
+			@currentLineFk := IF (@shipped < util.VN_CURDATE()
+								OR (@shipped = util.VN_CURDATE() AND (isPicked OR a.code >= 'ON_PREPARATION')),
+									lineFk, @currentLineFk) lastPreparedLineFk,
+			isTicket,
+			lineFk,
+			isPicked,
+			clientType,
+			claimFk
+			FROM itemDiary
+				JOIN alertLevel a ON a.id = itemDiary.alertLevel;
+	ELSE
+		SELECT sum(`in`) - sum(`out`) INTO vInvCalculated
+			FROM itemDiary
+			WHERE shipped < vDate;
+
+		SELECT p1.*
+			FROM(
+				SELECT vDate shipped,
+						0 alertLevel,
+						0 stateName,
+						0 origin,
+						'' reference,
+						0 clientFk,
+						'Inventario calculado',
+						vInvCalculated invalue,
+						NULL `out`,
+						0 balance,
+						0 lastPreparedLineFk,
+						0 isTicket,
+						0 lineFk,
+						0 isPicked,
+						0 clientType,
+						0 claimFk
+				UNION ALL
+				SELECT shipped, alertlevel, stateName, origin, reference, clientFk, name, `in`, `out`, 0,0, isTicket, lineFk, isPicked, clientType, claimFk
+					FROM itemDiary
+					WHERE shipped >= vDate
+				)as p1;
+	END IF;
+
+	DROP TEMPORARY TABLE itemDiary;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;

e2e/paths/13-supplier/03_fiscal_data.spec.js

@@ -1,5 +1,20 @@
 import getBrowser from '../../helpers/puppeteer';
 
+const $ = {
+    saveButton: 'vn-supplier-fiscal-data button[type="submit"]',
+};
+const $inputs = {
+    province: 'vn-supplier-fiscal-data [name="province"]',
+    country: 'vn-supplier-fiscal-data [name="country"]',
+    postcode: 'vn-supplier-fiscal-data [name="postcode"]',
+    city: 'vn-supplier-fiscal-data [name="city"]',
+    socialName: 'vn-supplier-fiscal-data [name="socialName"]',
+    taxNumber: 'vn-supplier-fiscal-data [name="taxNumber"]',
+    account: 'vn-supplier-fiscal-data [name="account"]',
+    sageWithholding: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageWithholdingFk"]',
+    sageTaxType: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageTaxTypeFk"]'
+};
+
 describe('Supplier fiscal data path', () => {
     let browser;
     let page;

loopback/locale/es.json

@@ -291,5 +291,7 @@
 	"isTaxDataChecked": "Datos comprobados",
 	"comercialId": "Id comercial",
 	"comercialName": "Comercial",
-	"Invalid NIF for VIES": "Invalid NIF for VIES"
+	"Invalid NIF for VIES": "Invalid NIF for VIES",
+	"Ticket does not exist": "Este ticket no existe",
+    "Ticket is already signed": "Este ticket ya ha sido firmado"
 }

modules/item/back/methods/item/getBalance.js

@@ -26,8 +26,8 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const where = filter.where;
-        const query = 'CALL vn.item_getBalance(?, ?)';
-        const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk], myOptions);
+        const query = 'CALL vn.item_getBalance(?, ?, ?)';
+        const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, where.date], myOptions);
 
         for (const entry of diary)
             if (entry.clientType === 'loses') entry.highlighted = true;

modules/item/back/methods/item/specs/getBalance.spec.js

@@ -21,7 +21,8 @@ describe('item getBalance()', () => {
             const filter = {
                 where: {
                     itemFk: 1,
-                    warehouseFk: 1
+                    warehouseFk: 1,
+                    date: null
                 }
             };
             const results = await models.Item.getBalance(filter, options);
@@ -45,14 +46,16 @@ describe('item getBalance()', () => {
             const firstFilter = {
                 where: {
                     itemFk: 1,
-                    warehouseFk: 1
+                    warehouseFk: 1,
+                    date: null
                 }
             };
 
             const secondFilter = {
                 where: {
                     itemFk: 2,
-                    warehouseFk: 1
+                    warehouseFk: 1,
+                    date: null
                 }
             };
 

modules/item/front/diary/index.html

@@ -25,6 +25,16 @@
                 ng-model="$ctrl.warehouseFk"
                 label="Select warehouse">
             </vn-autocomplete>
+            <vn-check
+                ng-class="{'table-check':$ctrl.showOld}"
+                label="Show what's before the inventory"
+                ng-model="$ctrl.showOld">
+            </vn-check>
+            <vn-date-picker
+                label="Since"
+                ng-model="$ctrl.date"
+                ng-show="$ctrl.showOld">
+            </vn-date-picker>
         </vn-horizontal>
         <vn-table model="model">
             <vn-thead>
@@ -44,7 +54,7 @@
                 <vn-tr
                     ng-class="::{
                         'isIn': sale.invalue,
-                        'balanceNegative': sale.balance < 0}" 
+                        'balanceNegative': sale.balance < 0}"
                     ng-repeat="sale in sales"
                     vn-repeat-last
                     on-last="$ctrl.scrollToLine(sale.lastPreparedLineFk)"
@@ -58,7 +68,7 @@
                         </a>
                     </vn-td>
                     <vn-td expand>
-                        <span class="chip" 
+                        <span class="chip"
                             ng-class="::{warning: $ctrl.today == sale.shipped}">
                             {{::sale.shipped | date:'dd/MM/yyyy' }}
                         </span>
@@ -99,13 +109,13 @@
     </vn-vertical>
     </vn-card>
 </vn-vertical>
-<vn-ticket-descriptor-popover 
+<vn-ticket-descriptor-popover
     vn-id="ticket-descriptor">
 </vn-ticket-descriptor-popover>
-<vn-client-descriptor-popover 
+<vn-client-descriptor-popover
     vn-id="clientDescriptor">
 </vn-client-descriptor-popover>
-<vn-entry-descriptor-popover 
+<vn-entry-descriptor-popover
     vn-id="entryDescriptor">
 </vn-entry-descriptor-popover>
 

modules/item/front/diary/index.js

@@ -38,12 +38,8 @@ class Controller extends Section {
         if (value && value != this._warehouseFk) {
             this._warehouseFk = value;
             this.card.warehouseFk = value;
+            this.filter.where.warehouseFk = this.warehouseFk;
 
-            this.$state.go(this.$state.current.name, {
-                warehouseFk: value
-            });
-
-            this.filter.where.warehouseFk = value;
             this.$.model.refresh();
         }
     }
@@ -52,6 +48,28 @@ class Controller extends Section {
         return this._warehouseFk;
     }
 
+    set date(value) {
+        this._date = value;
+        this.filter.where.date = value;
+        this.filter.where.warehouseFk = this.warehouseFk;
+
+        this.$.model.refresh();
+    }
+
+    get date() {
+        return this._date;
+    }
+
+    set showOld(value) {
+        this._showOld = value;
+        if (!this._showOld) this.date = null;
+        else this.date = new Date();
+    }
+
+    get showOld() {
+        return this._showOld;
+    }
+
     scrollToLine(lineFk) {
         this.$.$applyAsync(() => {
             const hashFk = this.lineFk || lineFk;

modules/item/front/diary/locale/es.yml

@@ -1,4 +1,5 @@
 In: Entrada
 Out: Salida
 Visible quantity: Cantidad visible
-Ticket/Entry: Ticket/Entrada
+Ticket/Entry: Ticket/Entrada
+Show what's before the inventory: Mostrar lo anterior al inventario

modules/item/front/diary/style.scss

@@ -27,4 +27,7 @@ vn-item-diary {
         overflow: hidden;
         text-overflow: ellipsis;
     }
-}
+    .table-check{
+        justify-content: center;
+    }
+}

modules/ticket/back/methods/ticket/saveSign.js

@@ -29,8 +29,7 @@ module.exports = Self => {
         }
     });
 
-    Self.saveSign = async(ctx, options) => {
-        const args = Object.assign({}, ctx.args);
+    Self.saveSign = async(ctx, tickets, location, signedTime, options) => {
         const models = Self.app.models;
         const myOptions = {};
         let tx;
@@ -48,9 +47,9 @@ module.exports = Self => {
         async function setLocation(ticketId) {
             await models.Delivery.create({
                 ticketFk: ticketId,
-                longitude: args.location.Longitude,
-                latitude: args.location.Latitude,
-                dated: args.signedTime || new Date()
+                longitude: location.Longitude,
+                latitude: location.Latitude,
+                dated: signedTime || new Date()
             }, myOptions);
         }
 
@@ -107,9 +106,9 @@ module.exports = Self => {
         }
 
         try {
-            for (let i = 0; i < args.tickets.length; i++) {
+            for (const ticketId of tickets) {
                 const ticketState = await models.TicketState.findOne(
-                    {where: {ticketFk: args.tickets[i]},
+                    {where: {ticketFk: ticketId},
                         fields: ['alertLevel']
                     }, myOptions);
 
@@ -117,16 +116,19 @@ module.exports = Self => {
                     fields: ['id']
                 }, myOptions);
 
+                if (!ticketState)
+                    throw new UserError('Ticket does not exist');
                 if (ticketState.alertLevel < packedAlertLevel.id)
                     throw new UserError('This ticket cannot be signed because it has not been boxed');
-                else if (!await gestDocExists(args.tickets[i])) {
-                    if (args.location) setLocation(args.tickets[i]);
-                    if (!gestDocCreated) await createGestDoc(args.tickets[i]);
-                    await models.TicketDms.create({ticketFk: args.tickets[i], dmsFk: dms[0].id}, myOptions);
-                    const ticket = await models.Ticket.findById(args.tickets[i], null, myOptions);
-                    await ticket.updateAttribute('isSigned', true, myOptions);
-                    await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [args.tickets[i], 'DELIVERED'], myOptions);
-                }
+                if (await gestDocExists(ticketId))
+                    throw new UserError('Ticket is already signed');
+
+                if (location) setLocation(ticketId);
+                if (!gestDocCreated) await createGestDoc(ticketId);
+                await models.TicketDms.create({ticketFk: ticketId, dmsFk: dms[0].id}, myOptions);
+                const ticket = await models.Ticket.findById(ticketId, null, myOptions);
+                await ticket.updateAttribute('isSigned', true, myOptions);
+                await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketId, 'DELIVERED'], myOptions);
             }
 
             if (tx) await tx.commit();

modules/worker/back/methods/worker/new.js

@@ -54,18 +54,6 @@ module.exports = Self => {
                 description: `The worker province`,
                 required: true,
             },
-            {
-                arg: 'iban',
-                type: 'string',
-                description: `The worker iban`,
-                required: true,
-            },
-            {
-                arg: 'bankEntityFk',
-                type: 'number',
-                description: `The worker bank entity`,
-                required: true,
-            },
             {
                 arg: 'companyFk',
                 type: 'number',
@@ -101,6 +89,22 @@ module.exports = Self => {
                 type: 'date',
                 description: `The worker birth`,
                 required: true,
+            },
+            {
+                arg: 'payMethodFk',
+                type: 'number',
+                description: `The client payMethod`,
+                required: true,
+            },
+            {
+                arg: 'iban',
+                type: 'string',
+                description: `The client iban`,
+            },
+            {
+                arg: 'bankEntityFk',
+                type: 'number',
+                description: `The client bank entity`,
             }
         ],
         returns: {
@@ -162,6 +166,10 @@ module.exports = Self => {
                     myOptions
                 );
 
+                const payMethod = await models.PayMethod.findById(args.payMethodFk, {fields: ['isIbanRequiredForClients']});
+                if (payMethod.isIbanRequiredForClients && !args.iban)
+                    throw new UserError(`That payment method requires an IBAN`);
+
                 await models.Worker.rawSql(
                     'CALL vn.clientCreate(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
                     [
@@ -202,6 +210,7 @@ module.exports = Self => {
 
                 await client.updateAttributes(
                     {
+                        payMethod: args.payMethod,
                         iban: args.iban,
                         bankEntityFk: args.bankEntityFk,
                         defaultAddressFk: address.id,

modules/worker/back/methods/worker/specs/new.spec.js

@@ -27,14 +27,14 @@ describe('Worker new', () => {
         street: 'S/ defaultWorkerStreet',
         city: 'defaultWorkerCity',
         provinceFk: 1,
-        iban: 'ES8304879798578129532677',
-        bankEntityFk: 128,
         companyFk: 442,
         postcode: '46680',
         phone: '123456789',
         code: 'DWW',
         bossFk: 9,
-        birth: '2022-12-11T23:00:00.000Z'
+        birth: '2022-12-11T23:00:00.000Z',
+        payMethodFk: 1,
+        roleFk: 1
     };
 
     it('should return error if personal mail already exists', async() => {
@@ -105,6 +105,33 @@ describe('Worker new', () => {
         expect(error.message).toEqual('This worker already exists');
     });
 
+    it('should return error if payMethod require iban', async() => {
+        const payMethodIbanRequired = await models.PayMethod.findOne({
+            where: {
+                isIbanRequiredForClients: true
+            },
+            fields: ['id']
+        });
+
+        const tx = await models.Worker.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const ctx = {
+                args: Object.assign({}, defaultWorker, {payMethodFk: payMethodIbanRequired.id})
+            };
+            await models.Worker.new(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('That payment method requires an IBAN');
+    });
+
     it('should create a new worker', async() => {
         const newWorker = await models.Worker.new({args: defaultWorker});
 

modules/worker/back/models/worker-config.json

@@ -15,6 +15,9 @@
         "roleFk": {
             "type": "number"
         },
+        "payMethodFk": {
+            "type": "number"
+        },
         "businessTypeFk": {
             "type": "string"
         }

modules/worker/front/create/index.html

@@ -142,12 +142,19 @@
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
+            <vn-autocomplete
+                vn-one
+                label="Pay method"
+                url="Paymethods"
+                ng-model="$ctrl.worker.payMethodFk"
+                initial-data="$ctrl.workerConfig.payMethodFk">
+            </vn-autocomplete>
             <vn-textfield
                 vn-one
                 label="IBAN"
                 ng-model="$ctrl.worker.iban"
-                rule
-                on-change="$ctrl.autofillBic()">
+                on-change="$ctrl.autofillBic()"
+                rule>
             </vn-textfield>
             <vn-autocomplete
                 vn-one

modules/worker/front/create/index.js

@@ -5,9 +5,17 @@ export default class Controller extends Section {
     constructor($element, $) {
         super($element, $);
         this.worker = {companyFk: this.vnConfig.user.companyFk};
+        this.$http.get(`WorkerConfigs/findOne`, {field: ['payMethodFk']}).then(res => {
+            if (res.data) this.worker.payMethodFk = res.data.payMethodFk;
+        });
     }
 
     onSubmit() {
+        if (!this.worker.iban && !this.worker.bankEntityFk) {
+            delete this.worker.iban;
+            delete this.worker.bankEntityFk;
+        }
+
         return this.$.watcher.submit().then(json => {
             this.$state.go('worker.card.basicData', {id: json.data.id});
         });

modules/worker/front/create/locale/es.yml

@@ -10,3 +10,4 @@ Street: Dirección
 Postcode: Código postal
 Web user: Usuario Web
 Access permission: Permiso de acceso
+Pay method: Método de pago