Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix

2023-10-18 12:05:04 +02:00 · 2023-10-18 12:05:04 +02:00 · a84f6fe1da
parent dbb2372cd3 002329b0a1
commit a84f6fe1da
18 changed files with 273 additions and 97 deletions
--- a/back/methods/collection/spec/setSaleQuantity.spec.js
+++ b/back/methods/collection/spec/setSaleQuantity.spec.js
@ -18,6 +18,7 @@ describe('setSaleQuantity()', () => {

    it('should change quantity sale', async() => {
        const tx = await models.Ticket.beginTransaction({});
+        spyOn(models.Item, 'getVisibleAvailable').and.returnValue((new Promise(resolve => resolve({available: 100}))));

        try {
            const options = {transaction: tx};
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@ -30434,6 +30434,7 @@ CREATE TABLE `item` (
  `editorFk` int(10) unsigned DEFAULT NULL,
  `recycledPlastic` int(11) DEFAULT NULL,
  `nonRecycledPlastic` int(11) DEFAULT NULL,
+  `minQuantity` int(10) unsigned DEFAULT NULL COMMENT 'Cantidad mínima para una línea de venta',
  PRIMARY KEY (`id`),
  UNIQUE KEY `item_supplyResponseFk_idx` (`supplyResponseFk`),
  KEY `Color` (`inkFk`),
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -189,5 +189,6 @@
 	"The sales do not exists": "The sales do not exists",
 	"Ticket without Route": "Ticket without route",
 	"Booking completed": "Booking complete",
-    "The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation"
-}
+	"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
+	"You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets"
+}
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -319,5 +319,7 @@
 	"The response is not a PDF": "La respuesta no es un PDF",
 	"Ticket without Route": "Ticket sin ruta",
 	"Booking completed": "Reserva completada",
-	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación"
+	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
+	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mímina",
+	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mímina"
 }
--- a/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
+++ b/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
@ -64,7 +64,7 @@ describe('claim regularizeClaim()', () => {

            claimEnds = await importTicket(ticketId, claimId, userId, options);

-            for (claimEnd of claimEnds)
+            for (const claimEnd of claimEnds)
                await claimEnd.updateAttributes({claimDestinationFk: trashDestination}, options);

            let claimBefore = await models.Claim.findById(claimId, null, options);
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@ -131,6 +131,9 @@
        "nonRecycledPlastic": {
            "type": "number"
        },
+        "minQuantity": {
+            "type": "number"
+        },
        "packingOut": {
            "type": "number"
        },
@ -154,6 +157,10 @@
            "mysql":{
                "columnName": "doPhoto"
            }
+        },
+        "minQuantity": {
+            "type": "number",
+            "description": "Min quantity"
        }
    },
    "relations": {
--- a/modules/item/front/basic-data/index.html
+++ b/modules/item/front/basic-data/index.html
@ -33,6 +33,8 @@
                rule
                info="Full name calculates based on tags 1-3. Is not recommended to change it manually">
            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
            <vn-autocomplete
                url="ItemTypes"
                label="Type"
@ -50,6 +52,30 @@
                    </div>
                </tpl-item>
            </vn-autocomplete>
+            <vn-autocomplete
+                label="Generic"
+                url="Items/withName"
+                ng-model="$ctrl.item.genericFk"
+                vn-name="generic"
+                show-field="name"
+                value-field="id"
+                search-function="$ctrl.itemSearchFunc($search)"
+                order="id DESC"
+                tabindex="1">
+                <tpl-item>
+                    <div>{{::name}}</div>
+                    <div class="text-caption text-secondary">
+                        #{{::id}}
+                    </div>
+                </tpl-item>
+                <append>
+                    <vn-icon-button
+                        icon="filter_alt"
+                        vn-click-stop="$ctrl.showFilterDialog($ctrl.item)"
+                        vn-tooltip="Filter...">
+                    </vn-icon-button>
+                </append>
+            </vn-autocomplete>
        </vn-horizontal>
        <vn-horizontal>
            <vn-autocomplete
@ -128,30 +154,13 @@
                ng-model="$ctrl.item.stemMultiplier"
                vn-name="stemMultiplier">
            </vn-input-number>
-            <vn-autocomplete
-                label="Generic"
-                url="Items/withName"
-                ng-model="$ctrl.item.genericFk"
-                vn-name="generic"
-                show-field="name"
-                value-field="id"
-                search-function="$ctrl.itemSearchFunc($search)"
-                order="id DESC"
-                tabindex="1">
-                <tpl-item>
-                    <div>{{::name}}</div>
-                    <div class="text-caption text-secondary">
-                        #{{::id}}
-                    </div>
-                </tpl-item>
-                <append>
-                    <vn-icon-button
-                        icon="filter_alt"
-                        vn-click-stop="$ctrl.showFilterDialog($ctrl.item)"
-                        vn-tooltip="Filter...">
-                    </vn-icon-button>
-                </append>
-            </vn-autocomplete>
+            <vn-input-number
+                min="1"
+                label="Minimum sales quantity"
+                ng-model="$ctrl.item.minQuantity"
+                vn-name="minQuantity"
+                rule>
+            </vn-input-number>
        </vn-horizontal>
        <vn-horizontal>
            <vn-input-number
--- a/modules/item/front/basic-data/locale/es.yml
+++ b/modules/item/front/basic-data/locale/es.yml
@ -16,3 +16,4 @@ This item does need a photo: Este artículo necesita una foto
 Do photo: Hacer foto
 Recycled Plastic: Plástico reciclado
 Non recycled plastic: Plástico no reciclado
+Minimum sales quantity: Cantidad mínima de venta
--- a/modules/item/front/summary/index.html
+++ b/modules/item/front/summary/index.html
@ -128,6 +128,9 @@
            <vn-label-value label="Non recycled plastic"
                value="{{$ctrl.summary.item.nonRecycledPlastic}}">
            </vn-label-value>
+            <vn-label-value label="Minimum sales quantity"
+                value="{{$ctrl.summary.item.minQuantity}}">
+            </vn-label-value>
        </vn-one>
        <vn-one name="tags">
            <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
--- a/modules/item/front/summary/locale/es.yml
+++ b/modules/item/front/summary/locale/es.yml
@ -2,3 +2,4 @@ Barcode: Códigos de barras
 Other data: Otros datos
 Go to the item: Ir al artículo
 WarehouseFk: Calculado sobre el almacén de {{ warehouseName }}
+Minimum sales quantity: Cantidad mínima de venta
--- a/modules/order/back/methods/order/catalogFilter.js
+++ b/modules/order/back/methods/order/catalogFilter.js
@ -100,31 +100,32 @@ module.exports = Self => {
        ));

        stmt = new ParameterizedSQL(`
-            SELECT 
-                i.id,
-                i.name,
-                i.subName,
-                i.image,
-                i.tag5,
-                i.value5,
-                i.tag6,
-                i.value6,
-                i.tag7,
-                i.value7,
-                i.tag8,
-                i.value8,
-                i.stars,
-                tci.price,
-                tci.available,
-                w.lastName AS lastName,
-                w.firstName,
-                tci.priceKg,
-                ink.hex
+            SELECT i.id,
+                    i.name,
+                    i.subName,
+                    i.image,
+                    i.tag5,
+                    i.value5,
+                    i.tag6,
+                    i.value6,
+                    i.tag7,
+                    i.value7,
+                    i.tag8,
+                    i.value8,
+                    i.stars,
+                    tci.price,
+                    tci.available,
+                    w.lastName,
+                    w.firstName,
+                    tci.priceKg,
+                    ink.hex,
+                    i.minQuantity
            FROM tmp.ticketCalculateItem tci
                JOIN vn.item i ON i.id = tci.itemFk
                JOIN vn.itemType it ON it.id = i.typeFk
                JOIN vn.worker w on w.id = it.workerFk
-                LEFT JOIN vn.ink ON ink.id = i.inkFk`);
+                LEFT JOIN vn.ink ON ink.id = i.inkFk
+        `);

        // Apply order by tag
        if (orderBy.isTag) {
--- a/modules/order/front/catalog-view/index.html
+++ b/modules/order/front/catalog-view/index.html
@ -8,12 +8,12 @@
                    <div class="item-color" ng-style="{'background-color': '#' + item.hex}"></div>
                </div>
                <img
-                    ng-src="{{::$root.imagePath('catalog', '200x200', item.id)}}" 
+                    ng-src="{{::$root.imagePath('catalog', '200x200', item.id)}}"
                    zoom-image="{{::$root.imagePath('catalog', '1600x900', item.id)}}"
                    on-error-src/>
            </div>
            <div class="description">
-                <h3 class="link" 
+                <h3 class="link"
                ng-click="itemDescriptor.show($event, item.id)">
                    {{::item.name}}
                </h3>
@ -37,13 +37,28 @@
                        value="{{::item.value7}}">
                    </vn-label-value>
                </div>
-                <vn-rating ng-if="::item.stars" 
-                    ng-model="::item.stars">
-                </vn-rating>
+                <vn-horizontal>
+                    <vn-one>
+                        <vn-rating ng-if="::item.stars"
+                            ng-model="::item.stars"/>
+                    </vn-one>
+                    <vn-horizontal
+                        class="text-right text-caption alert vn-mr-xs"
+                        ng-if="::item.minQuantity">
+                        <vn-one>
+                            <vn-icon
+                                icon="production_quantity_limits"
+                                translate-attr="{title: 'Minimal quantity'}"
+                                class="text-subtitle1">
+                            </vn-icon>
+                        </vn-one>
+                        {{::item.minQuantity}}
+                    </vn-horizontal>
+                </vn-horizontal>
                <div class="footer">
                    <div class="price">
                        <vn-one>
-                            <span>{{::item.available}}</span> 
+                            <span>{{::item.available}}</span>
                            <span translate>to</span>
                            <span>{{::item.price | currency:'EUR':2}}</span>
                        </vn-one>
@ -54,7 +69,7 @@
                        </vn-icon-button>
                    </div>
                    <div class="priceKg" ng-show="::item.priceKg">
-                        <span>Precio por kilo {{::item.priceKg | currency: 'EUR'}}</span> 
+                        <span>Precio por kilo {{::item.priceKg | currency: 'EUR'}}</span>
                    </div>
                </div>
            </div>
@ -69,4 +84,4 @@
 <vn-item-descriptor-popover
    vn-id="item-descriptor"
    warehouse-fk="$ctrl.vnConfig.warehouseFk">
-</vn-item-descriptor-popover>
+</vn-item-descriptor-popover>
--- a/modules/order/front/catalog-view/locale/es.yml
+++ b/modules/order/front/catalog-view/locale/es.yml
@ -1 +1,2 @@
 Order created: Orden creada
+Minimal quantity: Cantidad mínima
--- a/modules/order/front/catalog-view/style.scss
+++ b/modules/order/front/catalog-view/style.scss
@ -44,4 +44,7 @@ vn-order-catalog {
        height: 30px;
        position: relative;
    }
-}
+    .alert {
+        color: $color-alert;
+    }
+}
--- a/modules/ticket/back/methods/sale/specs/updateQuantity.spec.js
+++ b/modules/ticket/back/methods/sale/specs/updateQuantity.spec.js
@ -1,21 +1,9 @@
+/* eslint max-len: ["error", { "code": 150 }]*/
+
 const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');

 describe('sale updateQuantity()', () => {
-    beforeAll(async() => {
-        const activeCtx = {
-            accessToken: {userId: 9},
-            http: {
-                req: {
-                    headers: {origin: 'http://localhost'}
-                }
-            }
-        };
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
-        });
-    });
-
    const ctx = {
        req: {
            accessToken: {userId: 9},
@ -23,6 +11,18 @@ describe('sale updateQuantity()', () => {
            __: () => {}
        }
    };
+    function getActiveCtx(userId) {
+        return {
+            active: {
+                accessToken: {userId},
+                http: {
+                    req: {
+                        headers: {origin: 'http://localhost'}
+                    }
+                }
+            }
+        };
+    }

    it('should throw an error if the quantity is greater than it should be', async() => {
        const ctx = {
@ -32,13 +32,16 @@ describe('sale updateQuantity()', () => {
                __: () => {}
            }
        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+        spyOn(models.Item, 'getVisibleAvailable').and.returnValue((new Promise(resolve => resolve({available: 100}))));
+
        const tx = await models.Sale.beginTransaction({});

        let error;
        try {
            const options = {transaction: tx};

-            await models.Sale.updateQuantity(ctx, 17, 99, options);
+            await models.Sale.updateQuantity(ctx, 17, 31, options);

            await tx.rollback();
        } catch (e) {
@ -50,7 +53,6 @@ describe('sale updateQuantity()', () => {
    });

    it('should add quantity if the quantity is greater than it should be and is role advanced', async() => {
-        const tx = await models.Sale.beginTransaction({});
        const saleId = 17;
        const buyerId = 35;
        const ctx = {
@ -60,6 +62,9 @@ describe('sale updateQuantity()', () => {
                __: () => {}
            }
        };
+        const tx = await models.Sale.beginTransaction({});
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(buyerId));
+        spyOn(models.Item, 'getVisibleAvailable').and.returnValue((new Promise(resolve => resolve({available: 100}))));

        try {
            const options = {transaction: tx};
@ -87,6 +92,8 @@ describe('sale updateQuantity()', () => {
    });

    it('should update the quantity of a given sale current line', async() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(9));
+
        const tx = await models.Sale.beginTransaction({});
        const saleId = 25;
        const newQuantity = 4;
@ -119,6 +126,8 @@ describe('sale updateQuantity()', () => {
                __: () => {}
            }
        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+
        const saleId = 17;
        const newQuantity = -10;

@ -140,6 +149,8 @@ describe('sale updateQuantity()', () => {
    });

    it('should update a negative quantity when is a ticket refund', async() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(9));
+
        const tx = await models.Sale.beginTransaction({});
        const saleId = 13;
        const newQuantity = -10;
@ -159,4 +170,70 @@ describe('sale updateQuantity()', () => {
            throw e;
        }
    });
+
+    it('should throw an error if the quantity is less than the minimum quantity of the item', async() => {
+        const ctx = {
+            req: {
+                accessToken: {userId: 1},
+                headers: {origin: 'localhost:5000'},
+                __: () => {}
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+
+        const tx = await models.Sale.beginTransaction({});
+        const itemId = 2;
+        const saleId = 17;
+        const minQuantity = 30;
+        const newQuantity = minQuantity - 1;
+
+        let error;
+        try {
+            const options = {transaction: tx};
+
+            const item = await models.Item.findById(itemId, null, options);
+            await item.updateAttribute('minQuantity', minQuantity, options);
+
+            await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error).toEqual(new Error('The amount cannot be less than the minimum'));
+    });
+
+    it('should change quantity if has minimum quantity and new quantity is equal than item available', async() => {
+        const ctx = {
+            req: {
+                accessToken: {userId: 1},
+                headers: {origin: 'localhost:5000'},
+                __: () => {}
+            }
+        };
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue(getActiveCtx(1));
+
+        const tx = await models.Sale.beginTransaction({});
+        const itemId = 2;
+        const saleId = 17;
+        const minQuantity = 30;
+        const newQuantity = minQuantity - 1;
+
+        try {
+            const options = {transaction: tx};
+
+            const item = await models.Item.findById(itemId, null, options);
+            await item.updateAttribute('minQuantity', minQuantity, options);
+            spyOn(models.Item, 'getVisibleAvailable').and.returnValue((new Promise(resolve => resolve({available: newQuantity}))));
+
+            await models.Sale.updateQuantity(ctx, saleId, newQuantity, options);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });
--- a/modules/ticket/back/methods/sale/updateQuantity.js
+++ b/modules/ticket/back/methods/sale/updateQuantity.js
@ -1,4 +1,3 @@
-let UserError = require('vn-loopback/util/user-error');

 module.exports = Self => {
    Self.remoteMethodCtx('updateQuantity', {
@ -64,17 +63,6 @@ module.exports = Self => {

            const sale = await models.Sale.findById(id, filter, myOptions);

-            const isRoleAdvanced = await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*');
-            if (newQuantity > sale.quantity && !isRoleAdvanced)
-                throw new UserError('The new quantity should be smaller than the old one');
-
-            const ticketRefund = await models.TicketRefund.findOne({
-                where: {refundTicketFk: sale.ticketFk},
-                fields: ['id']}
-            , myOptions);
-            if (newQuantity < 0 && !ticketRefund)
-                throw new UserError('You can only add negative amounts in refund tickets');
-
            const oldQuantity = sale.quantity;
            const result = await sale.updateAttributes({quantity: newQuantity}, myOptions);

--- a/modules/ticket/back/methods/ticket/addSale.js
+++ b/modules/ticket/back/methods/ticket/addSale.js
@ -63,17 +63,6 @@ module.exports = Self => {
                }
            }, myOptions);

-            const itemInfo = await models.Item.getVisibleAvailable(
-                itemId,
-                ticket.warehouseFk,
-                ticket.shipped,
-                myOptions
-            );
-
-            const isPackaging = item.family == 'EMB';
-            if (!isPackaging && itemInfo.available < quantity)
-                throw new UserError(`This item is not available`);
-
            const newSale = await models.Sale.create({
                ticketFk: id,
                itemFk: item.id,
--- a/modules/ticket/back/models/sale.js
+++ b/modules/ticket/back/models/sale.js
@ -1,3 +1,6 @@
+const UserError = require('vn-loopback/util/user-error');
+const LoopBackContext = require('loopback-context');
+
 module.exports = Self => {
    require('../methods/sale/getClaimableFromTicket')(Self);
    require('../methods/sale/reserve')(Self);
@ -13,4 +16,77 @@ module.exports = Self => {
    Self.validatesPresenceOf('concept', {
        message: `Concept cannot be blank`
    });
+
+    Self.observe('before save', async ctx => {
+        const models = Self.app.models;
+        const changes = ctx.data || ctx.instance;
+        const instance = ctx.currentInstance;
+
+        const newQuantity = changes?.quantity;
+        if (newQuantity == null) return;
+
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        ctx.req = loopBackContext.active;
+        if (await models.ACL.checkAccessAcl(ctx, 'Sale', 'canForceQuantity', 'WRITE')) return;
+
+        const ticketId = changes?.ticketFk || instance?.ticketFk;
+        const itemId = changes?.itemFk || instance?.itemFk;
+
+        const ticket = await models.Ticket.findById(
+            ticketId,
+            {
+                fields: ['id', 'clientFk', 'warehouseFk', 'shipped'],
+                include: {
+                    relation: 'client',
+                    scope: {
+                        fields: ['id', 'clientTypeFk'],
+                        include: {
+                            relation: 'type',
+                            scope: {
+                                fields: ['code', 'description']
+                            }
+                        }
+                    }
+                }
+            },
+            ctx.options);
+        if (ticket?.client()?.type()?.code === 'loses') return;
+
+        const isRefund = await models.TicketRefund.findOne({
+            fields: ['id'],
+            where: {refundTicketFk: ticketId}
+        }, ctx.options);
+        if (isRefund) return;
+
+        if (newQuantity < 0)
+            throw new UserError('You can only add negative amounts in refund tickets');
+
+        const item = await models.Item.findOne({
+            fields: ['family', 'minQuantity'],
+            where: {id: itemId},
+        }, ctx.options);
+
+        if (item.family == 'EMB') return;
+
+        const itemInfo = await models.Item.getVisibleAvailable(
+            itemId,
+            ticket.warehouseFk,
+            ticket.shipped,
+            ctx.options
+        );
+
+        const oldQuantity = instance?.quantity ?? null;
+        const quantityAdded = newQuantity - oldQuantity;
+        if (itemInfo.available < quantityAdded)
+            throw new UserError(`This item is not available`);
+
+        if (await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*')) return;
+
+        if (newQuantity < item.minQuantity && itemInfo.available != newQuantity)
+            throw new UserError('The amount cannot be less than the minimum');
+
+        if (!ctx.isNewInstance && newQuantity > oldQuantity)
+            throw new UserError('The new quantity should be smaller than the old one');
+    });
 };
+