feat(ticket_basic-data_step-two): adapted for available and transfer sales in back

db/changes/10400-christmas/00-ticket_getVisibleAvailable.sql

@@ -2,7 +2,7 @@ DROP PROCEDURE IF EXISTS `vn`.`ticket_getVisibleAvailable`;
 
 DELIMITER $$
 $$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticket_getVisibleAvailable`(vTicket INT, vDate DATE)
+CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticket_getVisibleAvailable`(`vTicket` INT, `vDate` DATE)
 BEGIN
 	DECLARE vVisibleCalc INT;
     DECLARE vAvailableCalc INT;

db/changes/10400-christmas/01-ticketGetVisibleAvailable.sql

@@ -1,9 +1,10 @@
-DROP PROCEDURE IF EXISTS vn.ticketGetVisibleAvailable;
+DROP PROCEDURE IF EXISTS `vn`.`ticketGetVisibleAvailable`;
 
 DELIMITER $$
 $$
-CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticketGetVisibleAvailable`(vTicket INT)
+CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticketGetVisibleAvailable`(`vTicket` INT)
 BEGIN
     CALL `ticket_getVisibleAvailable`(vTicket, null);
 END$$
 DELIMITER ;
+ 

loopback/locale/es.json

@@ -216,5 +216,6 @@
 	"The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
 	"You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
 	"The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
-	"The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día"
+	"The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
+	"isWithoutNegatives": "Tiene Negativos"
 }

modules/ticket/back/methods/ticket/componentUpdate.js

@@ -77,6 +77,12 @@ module.exports = Self => {
                 type: 'number',
                 description: 'Action id',
                 required: true
+            },
+            {
+                arg: 'isWithoutNegatives',
+                type: 'boolean',
+                description: 'Is whithout negatives',
+                required: true
             }],
         returns: {
             type: ['object'],
@@ -112,11 +118,28 @@ module.exports = Self => {
 
             const isProductionBoss = await models.Account.hasRole(userId, 'productionBoss', myOptions);
             if (!isProductionBoss) {
-                const zoneShipped = await models.Agency.getShipped(args.landed, args.addressFk, args.agencyModeFk, args.warehouseFk, myOptions);
+                const params = [args.landed, args.addressFk, args.agencyModeFk, args.warehouseFk];
+                const zoneShipped = await models.Agency.getShipped(params, myOptions);
 
                 if (!zoneShipped || zoneShipped.zoneFk != args.zoneFk)
                     throw new UserError(`You don't have privileges to change the zone`);
             }
+            if (args.isWithoutNegatives) {
+                let query = `CALL ticket_getVisibleAvailable(?,?)`;
+                let params = [args.id, args.shipped];
+                const [salesAvailable] = await Self.rawSql(query, params, myOptions);
+
+                let salesNewTicket = [];
+                salesAvailable.forEach(sale => {
+                    if (sale.available >= sale.quantity)
+                        salesNewTicket.push(sale);
+                });
+
+                if (salesNewTicket.length) {
+                    const newTicket = await models.Ticket.transferSales(ctx, args.id, null, salesNewTicket, myOptions);
+                    args.id = newTicket.id;
+                }
+            }
 
             const originalTicket = await models.Ticket.findOne({
                 where: {id: args.id},

modules/ticket/back/methods/ticket/priceDifference.js

@@ -106,18 +106,18 @@ module.exports = Self => {
                 totalDifference: 0.00,
             };
 
-            // Get items visible
+            // Get items available
             let query = `CALL ticket_getVisibleAvailable(?,?)`;
             let params = [args.id, args.shipped];
-            const [salesVisible] = await Self.rawSql(query, params, myOptions);
+            const [salesAvailable] = await Self.rawSql(query, params, myOptions);
 
-            const itemVisible = new Map();
+            const itemAvailable = new Map();
-            for (sale of salesVisible) {
+            for (sale of salesAvailable) {
-                let visible = sale.available;
+                let available = sale.available;
-                if (visible == null)
+                if (available == null)
-                    visible = 0;
+                    available = 0;
 
-                itemVisible.set(sale.id, visible);
+                itemAvailable.set(sale.id, available);
             }
 
             // Sale price component, one per sale
@@ -143,7 +143,7 @@ module.exports = Self => {
 
                 salesObj.totalUnitPrice += sale.price;
                 salesObj.totalUnitPrice = round(salesObj.totalUnitPrice);
-                sale.visible = itemVisible.get(sale.id);
+                sale.available = itemAvailable.get(sale.id);
             }
 
             if (tx) await tx.commit();

modules/ticket/front/basic-data/step-two/index.html

@@ -9,7 +9,7 @@
             <vn-tr>
                 <vn-th number>Item</vn-th>
                 <vn-th class="align-center">Description</vn-th>
-                <vn-th number>Visible</vn-th>
+                <vn-th number>Available</vn-th>
                 <vn-th number>Quantity</vn-th>
                 <vn-th number>Price (PPU)</vn-th>
                 <vn-th number>New (PPU)</vn-th>
@@ -35,8 +35,8 @@
                 <vn-td number>
                     <span 
                         class="chip"
-                        ng-class="{'alert': sale.quantity>sale.visible}">
+                        ng-class="{'alert': sale.quantity>sale.available}">
-                        {{::sale.visible}}
+                        {{::sale.available}}
                     </span>
                 </vn-td>
                 <vn-td number>{{::sale.quantity}}</vn-td>

modules/ticket/front/basic-data/step-two/index.js

@@ -66,11 +66,16 @@ class Controller extends Component {
 
     ticketHaveNegatives() {
         let haveNegatives = false;
+        let haveNotNegatives = false;
+
         this.ticket.sale.items.forEach(item => {
-            if (item.quantity > item.visible)
+            if (item.quantity > item.available)
                 haveNegatives = true;
+            else
+                haveNotNegatives = true;
         });
-        this.haveNegatives = haveNegatives;
+
+        this.haveNegatives = (haveNegatives && haveNotNegatives);
     }
 
     onSubmit() {
@@ -80,21 +85,6 @@ class Controller extends Component {
             );
         }
 
-        if (this.ticket.withoutNegatives) {
-            let salesNewTicket = [];
-            this.ticket.sale.items.forEach(item => {
-                if (item.visible >= item.quantity)
-                    salesNewTicket.push(item);
-            });
-
-            const params = {
-                sales: salesNewTicket
-            };
-
-            const query = `tickets/${this.ticket.id}/transferSales`;
-            this.$http.post(query, params);
-        }
-
         const query = `tickets/${this.ticket.id}/componentUpdate`;
         const params = {
             clientFk: this.ticket.clientFk,
@@ -107,7 +97,8 @@ class Controller extends Component {
             shipped: this.ticket.shipped,
             landed: this.ticket.landed,
             isDeleted: this.ticket.isDeleted,
-            option: parseInt(this.ticket.option)
+            option: parseInt(this.ticket.option),
+            isWithoutNegatives: this.ticket.withoutNegatives
         };
 
         this.$http.post(query, params).then(res => {