Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono

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

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`payMethod` ADD hasVerified TINYINT(1) DEFAULT 0 NULL;

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

@@ -0,0 +1,3 @@
+UPDATE `vn`.`department`
+	SET `notificationEmail` = 'finanzas@verdnatura.es'
+	WHERE `name` = 'FINANZAS';

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

@@ -0,0 +1,2 @@
+UPDATE `vn`.`supplier`
+	SET isPayMethodChecked = TRUE;

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

@@ -0,0 +1,33 @@
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`payment_afterInsert` AFTER INSERT ON `payment` FOR EACH ROW
+BEGIN
+	DECLARE vIsPayMethodChecked BOOLEAN;
+	DECLARE vEmail VARCHAR(150);
+		
+	SELECT isPayMethodChecked INTO vIsPayMethodChecked
+			FROM supplier
+			WHERE id = NEW.supplierFk;
+			
+	
+	IF vIsPayMethodChecked = FALSE THEN
+
+		SELECT notificationEmail INTO vEmail
+			FROM department
+				WHERE name = 'FINANZAS';
+
+        CALL mail_insert(
+			vEmail,
+       		NULL,
+       		'Pago con método sin verificar',
+       		CONCAT(
+				'Se ha realizado el pago ',
+				NEW.id,
+       			' al proveedor ',
+       			NEW.supplierFk,
+       			' con el método de pago sin verificar.'
+       		)
+       	);
+    END IF;
+END$$
+DELIMITER ;

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

@@ -0,0 +1,26 @@
+DROP TRIGGER IF EXISTS `vn`.`supplier_beforeUpdate`;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`supplier_beforeUpdate`
+	BEFORE UPDATE ON `vn`.`supplier` FOR EACH ROW
+BEGIN
+	DECLARE vHasChange BOOL DEFAULT FALSE;
+	DECLARE vPayMethodHasVerified BOOL;
+
+	SELECT hasVerified INTO vPayMethodHasVerified
+		FROM payMethod
+			WHERE id = NEW.payMethodFk;
+
+	SET vHasChange =  (NEW.payDemFk <> OLD.payDemFk) OR (NEW.payDay <> OLD.payDay);
+
+	IF vPayMethodHasVerified AND !vHasChange THEN
+		SET vHasChange = (NEW.payMethodFk <> OLD.payMethodFk);
+	END IF;
+	
+	IF vHasChange THEN
+		SET NEW.isPayMethodChecked = FALSE;
+	END IF;
+
+END$$
+DELIMITER ;

db/changes/10400-christmas/delete.keep

@@ -1 +0,0 @@
-Delete me!

db/dump/fixtures.sql

@@ -217,14 +217,14 @@ UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com'
 
 UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
 
-INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`)
+INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt`, `isIbanRequiredForClients`, `isIbanRequiredForSuppliers`, `hasVerified`)
     VALUES 
-        (1, NULL,           'PayMethod one',            0,  001,    0, 0),
+        (1, NULL,           'PayMethod one',            0,  001,    0, 0, 0),
-        (2, NULL,           'PayMethod two',            10, 001,    0, 0),
+        (2, NULL,           'PayMethod two',            10, 001,    0, 0, 1),
-        (3, 'compensation', 'PayMethod three',          0,  001,    0, 0),
+        (3, 'compensation', 'PayMethod three',          0,  001,    0, 0, 0),
-        (4, NULL,           'PayMethod with IBAN',      0,  001,    1, 0),
+        (4, NULL,           'PayMethod with IBAN',      0,  001,    1, 0, 0),
-        (5, NULL,           'PayMethod five',           10, 001,    0, 0),
+        (5, NULL,           'PayMethod five',           10, 001,    0, 0, 0),
-        (8,'wireTransfer',  'WireTransfer',             5,  001,    1, 1);
+        (8,'wireTransfer',  'WireTransfer',             5,  001,    1, 1, 0);
 
 INSERT INTO `vn`.`payDem`(`id`, `payDem`)
     VALUES 

e2e/helpers/selectors.js

@@ -524,7 +524,7 @@ export default {
         saturdayButton: '.vn-popup.shown vn-tool-bar > vn-button:nth-child(6)',
         acceptDialog: '.vn-dialog.shown button[response="accept"]',
         acceptChangeHourButton: '.vn-dialog.shown button[response="accept"]',
-        descriptorDeliveryDate: 'vn-ticket-descriptor slot-body > .attributes > vn-label-value:nth-child(3) > section > span',
+        descriptorDeliveryDate: 'vn-ticket-descriptor slot-body > .attributes > vn-label-value:nth-child(4) > section > span',
         acceptInvoiceOutButton: '.vn-confirm.shown button[response="accept"]',
         acceptDeleteStowawayButton: '.vn-dialog.shown button[response="accept"]'
     },

e2e/paths/13-supplier/02_basic_data.spec.js

@@ -8,7 +8,7 @@ describe('Supplier basic data path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('administrative', 'supplier');
+        await page.loginAndModule('financial', 'supplier');
         await page.accessToSearchResult('1');
         await page.accessToSection('supplier.card.basicData');
     });

front/core/components/smart-table/index.js

@@ -44,16 +44,10 @@ export default class SmartTable extends Component {
 
     set model(value) {
         this._model = value;
-        if (value)
+        if (value) {
             this.$.model = value;
-    }
+            this.defaultOrder();
-
+        }
-    get viewConfigId() {
-        return this._viewConfigId;
-    }
-
-    set viewConfigId(value) {
-        this._viewConfigId = value;
     }
 
     getDefaultViewConfig() {
@@ -163,6 +157,40 @@ export default class SmartTable extends Component {
         }
     }
 
+    defaultOrder() {
+        const order = this.model.order;
+        if (!order) return;
+
+        const orderFields = order.split(', ');
+
+        for (const fieldString of orderFields) {
+            const field = fieldString.split(' ');
+            const fieldName = field[0];
+
+            let sortType = 'ASC';
+            if (field.length === 2)
+                sortType = field[1];
+
+            const column = this.columns.find(column => column.field == fieldName);
+            if (column) {
+                this.sortCriteria.push({field: fieldName, sortType: sortType});
+
+                const isASC = sortType == 'ASC';
+                const isDESC = sortType == 'DESC';
+
+                if (isDESC) {
+                    column.element.classList.remove('asc');
+                    column.element.classList.add('desc');
+                }
+
+                if (isASC) {
+                    column.element.classList.remove('desc');
+                    column.element.classList.add('asc');
+                }
+            }
+        }
+    }
+
     registerColumns() {
         const header = this.element.querySelector('thead > tr');
         if (!header) return;
@@ -175,7 +203,7 @@ export default class SmartTable extends Component {
                 const columnElement = angular.element(column);
                 const caption = columnElement.text().trim();
 
-                this.columns.push({field, caption, index});
+                this.columns.push({field, caption, index, element: column});
 
                 column.addEventListener('click', () => this.orderHandler(column));
             }

front/core/components/smart-table/index.spec.js

@@ -80,6 +80,45 @@ describe('Component smartTable', () => {
         });
     });
 
+    describe('defaultOrder', () => {
+        it('should insert a new object to the controller sortCriteria with a sortType value of "ASC"', () => {
+            const element = document.createElement('div');
+            controller.model = {order: 'id'};
+            controller.columns = [
+                {field: 'id', element: element},
+                {field: 'test1', element: element},
+                {field: 'test2', element: element}
+            ];
+
+            controller.defaultOrder();
+
+            const firstSortCriteria = controller.sortCriteria[0];
+
+            expect(firstSortCriteria.field).toEqual('id');
+            expect(firstSortCriteria.sortType).toEqual('ASC');
+        });
+
+        it('should insert two new objects to the controller sortCriteria with a sortType values of "ASC" and "DESC"', () => {
+            const element = document.createElement('div');
+            controller.model = {order: 'test1, id DESC'};
+            controller.columns = [
+                {field: 'id', element: element},
+                {field: 'test1', element: element},
+                {field: 'test2', element: element}
+            ];
+
+            controller.defaultOrder();
+
+            const firstSortCriteria = controller.sortCriteria[0];
+            const secondSortCriteria = controller.sortCriteria[1];
+
+            expect(firstSortCriteria.field).toEqual('test1');
+            expect(firstSortCriteria.sortType).toEqual('ASC');
+            expect(secondSortCriteria.field).toEqual('id');
+            expect(secondSortCriteria.sortType).toEqual('DESC');
+        });
+    });
+
     describe('addFilter()', () => {
         it('should call the model addFilter() with a basic where filter if exprBuilder() was not received', () => {
             controller.model = {addFilter: jest.fn()};

loopback/locale/es.json

@@ -215,5 +215,5 @@
 	"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",
-	"There is no zone for these parameters": "There is no zone for these parameters"
+	"You can not modify is pay method checked": "No se puede modificar el campo método de pago validado"
 }

modules/entry/front/latest-buys/index.html

@@ -1,6 +1,7 @@
 <vn-crud-model
     vn-id="model"
     url="Buys/latestBuysFilter"
+    order="itemFk DESC"
     limit="20"
     data="$ctrl.buys"
     auto-load="true">
@@ -34,8 +35,8 @@
                             </vn-multi-check>
                         </th>
                         <th translate>Picture</th>
-                        <th field="id">
+                        <th field="itemFk">
-                            <span translate>Identifier</span>
+                            <span translate>Item ID</span>
                         </th>
                         <th field="packing" number>
                             <span translate>Packing</span>

modules/monitor/front/index/tickets/index.html

@@ -2,7 +2,7 @@
     vn-id="model"
     url="SalesMonitors/salesFilter"
     limit="20"
-    order="shippedDate DESC, theoreticalhour, id">
+    order="shipped DESC, theoreticalHour, id">
 </vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
@@ -27,11 +27,13 @@
         view-config-id="ticketsMonitor" 
         options="$ctrl.smartTableOptions" 
         expr-builder="$ctrl.exprBuilder(param, value)">
-        <slot-actions><vn-check
+        <slot-actions>
-            label="Auto-refresh"
+            <vn-check
-            vn-tooltip="Toggle auto-refresh every 2 minutes"
+                label="Auto-refresh"
-            on-change="$ctrl.autoRefresh(value)">
+                vn-tooltip="Toggle auto-refresh every 2 minutes"
-        </vn-check></slot-actions>
+                on-change="$ctrl.autoRefresh(value)">
+            </vn-check>
+        </slot-actions>
         <slot-table>
             <table>
                 <thead>

modules/monitor/front/index/tickets/style.scss

@@ -29,7 +29,7 @@ vn-monitor-sales-tickets {
         height: 736px
     }
 
-    vn-tbody a[ng-repeat].vn-tr:focus {
+    tbody tr[ng-repeat]:focus {
         background-color: $color-primary-light
     }
 

modules/supplier/back/models/specs/supplier.spec.js

@@ -8,6 +8,19 @@ describe('loopback model Supplier', () => {
     beforeAll(async() => {
         supplierOne = await models.Supplier.findById(1);
         supplierTwo = await models.Supplier.findById(442);
+
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
     });
 
     afterAll(async() => {
@@ -32,19 +45,6 @@ describe('loopback model Supplier', () => {
         });
 
         it('should not throw if the payMethod id is valid', async() => {
-            const activeCtx = {
-                accessToken: {userId: 9},
-                http: {
-                    req: {
-                        headers: {origin: 'http://localhost'}
-                    }
-                }
-            };
-
-            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-                active: activeCtx
-            });
-
             let error;
             const supplier = await models.Supplier.findById(442);
             await supplier.updateAttribute('payMethodFk', 4)
@@ -54,5 +54,40 @@ describe('loopback model Supplier', () => {
 
             expect(error).not.toBeDefined();
         });
+
+        it('should have checked isPayMethodChecked for payMethod hasVerfified is false', async() => {
+            const supplier = await models.Supplier.findById(442);
+            await supplier.updateAttribute('isPayMethodChecked', true);
+            await supplier.updateAttribute('payMethodFk', 5);
+
+            const result = await models.Supplier.findById(442);
+
+            expect(result.isPayMethodChecked).toEqual(true);
+        });
+
+        it('should have unchecked isPayMethodChecked for payMethod hasVerfified is true', async() => {
+            const supplier = await models.Supplier.findById(442);
+            await supplier.updateAttribute('isPayMethodChecked', true);
+            await supplier.updateAttribute('payMethodFk', 2);
+
+            const result = await models.Supplier.findById(442);
+
+            expect(result.isPayMethodChecked).toEqual(false);
+        });
+
+        it('should have unchecked isPayMethodChecked for payDay and peyDemFk', async() => {
+            const supplier = await models.Supplier.findById(442);
+
+            await supplier.updateAttribute('isPayMethodChecked', true);
+            await supplier.updateAttribute('payDay', 5);
+            const firstResult = await models.Supplier.findById(442);
+
+            await supplier.updateAttribute('isPayMethodChecked', true);
+            await supplier.updateAttribute('payDemFk', 1);
+            const secondResult = await models.Supplier.findById(442);
+
+            expect(firstResult.isPayMethodChecked).toEqual(false);
+            expect(secondResult.isPayMethodChecked).toEqual(false);
+        });
     });
 });

modules/supplier/back/models/supplier.js

@@ -1,5 +1,6 @@
 const UserError = require('vn-loopback/util/user-error');
 const validateTin = require('vn-loopback/util/validateTin');
+const LoopBackContext = require('loopback-context');
 
 module.exports = Self => {
     require('../methods/supplier/filter')(Self);
@@ -88,8 +89,24 @@ module.exports = Self => {
     }
 
     Self.observe('before save', async function(ctx) {
-        let changes = ctx.data || ctx.instance;
+        const loopbackContext = LoopBackContext.getCurrentContext();
-        let orgData = ctx.currentInstance;
+        const changes = ctx.data || ctx.instance;
+        const orgData = ctx.currentInstance;
+        const userId = loopbackContext.active.accessToken.userId;
+
+        const isNotFinancial = !await Self.app.models.Account.hasRole(userId, 'financial');
+        const isPayMethodChecked = changes.isPayMethodChecked || orgData.isPayMethodChecked;
+        const hasChanges = orgData && changes;
+        const isPayMethodCheckedChanged = hasChanges
+            && orgData.isPayMethodChecked != isPayMethodChecked;
+
+        if (isNotFinancial && isPayMethodCheckedChanged)
+            throw new UserError('You can not modify is pay method checked');
+    });
+
+    Self.observe('before save', async function(ctx) {
+        const changes = ctx.data || ctx.instance;
+        const orgData = ctx.currentInstance;
 
         const socialName = changes.name || orgData.name;
         const hasChanges = orgData && changes;

modules/supplier/front/basic-data/index.html

@@ -38,7 +38,8 @@
             </vn-check>
             <vn-check
                 label="PayMethodChecked" 
-                ng-model="$ctrl.supplier.isPayMethodChecked">
+                ng-model="$ctrl.supplier.isPayMethodChecked"
+                vn-acl="financial">
             </vn-check>
         </vn-horizontal>
         <vn-horizontal>

modules/supplier/front/billing-data/index.js

@@ -11,7 +11,8 @@ export default class Controller extends Section {
     }
 
     onSubmit() {
-        return this.$.watcher.submit();
+        this.$.watcher.submit()
+            .then(() => this.card.reload());
     }
 }
 
@@ -20,5 +21,8 @@ ngModule.vnComponent('vnSupplierBillingData', {
     controller: Controller,
     bindings: {
         supplier: '<'
+    },
+    require: {
+        card: '^vnSupplierCard'
     }
 });

modules/ticket/back/methods/ticket/filter.js

@@ -83,6 +83,11 @@ module.exports = Self => {
                 type: 'boolean',
                 description: `Whether to show only tickets with problems`
             },
+            {
+                arg: 'hasRoute',
+                type: 'boolean',
+                description: `Whether to show only tickets with route`
+            },
             {
                 arg: 'pending',
                 type: 'boolean',
@@ -188,6 +193,10 @@ module.exports = Self => {
 
             case 'alertLevel':
                 return {'ts.alertLevel': value};
+            case 'hasRoute':
+                if (value == true)
+                    return {'t.routeFk': {neq: null}};
+                return {'t.routeFk': null};
             case 'pending':
                 if (value) {
                     return {and: [
@@ -266,7 +275,8 @@ module.exports = Self => {
                         LEFT JOIN state st ON st.id = ts.stateFk
                         LEFT JOIN client c ON c.id = t.clientFk
                         LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                        LEFT JOIN account.user u ON u.id = wk.userFk`);
+                        LEFT JOIN account.user u ON u.id = wk.userFk
+                        LEFT JOIN route r ON r.id = t.routeFk`);
 
         if (args.orderFk) {
             stmt.merge({

modules/ticket/back/methods/ticket/specs/filter.spec.js

@@ -221,4 +221,61 @@ describe('ticket filter()', () => {
             throw e;
         }
     });
+
+    it('should return the tickets matching the route on true', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 9}}, args: {hasRoute: true}};
+            const filter = {};
+            const result = await models.Ticket.filter(ctx, filter, options);
+
+            expect(result.length).toEqual(22);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the tickets matching the route on false', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 9}}, args: {hasRoute: false}};
+            const filter = {};
+            const result = await models.Ticket.filter(ctx, filter, options);
+
+            expect(result.length).toEqual(5);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return the tickets matching the route on null', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {req: {accessToken: {userId: 9}}, args: {hasRoute: null}};
+            const filter = {};
+            const result = await models.Ticket.filter(ctx, filter, options);
+
+            expect(result.length).toEqual(27);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/ticket/front/search-panel/index.html

@@ -135,6 +135,12 @@
                 ng-model="filter.pending"
                 triple-state="true">
             </vn-check>
+            <vn-check
+                vn-one
+                label="Has route"
+                ng-model="filter.hasRoute"
+                triple-state="true">
+            </vn-check>
         </vn-horizontal>
         <vn-horizontal class="vn-px-lg vn-pb-lg vn-mt-lg">
             <vn-submit label="Search"></vn-submit>

modules/ticket/front/search-panel/locale/es.yml

@@ -12,6 +12,7 @@ Order id: Id cesta
 Grouped States: Estado agrupado
 Days onward: Días adelante
 With problems: Con problemas
+Has route: Con ruta
 Pending: Pendiente
 FREE: Libre
 DELIVERED: Servido