From 78b79b6fde4826a048db6b8061f3073f8c8329e4 Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 18 Apr 2018 13:40:09 +0200 Subject: [PATCH 1/2] update fixtures and refactor ticketVolume and backend test --- services/db/04-fixtures.sql | 9 +++++- services/db/changes/1.0.3/01-ticketVolume.sql | 29 +++++++++++++++++++ .../client/specs/getAverageInvoiced.spec.js | 2 +- .../methods/client/specs/getMana.spec.js | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 services/db/changes/1.0.3/01-ticketVolume.sql diff --git a/services/db/04-fixtures.sql b/services/db/04-fixtures.sql index 039b879bb6..83662e7d09 100644 --- a/services/db/04-fixtures.sql +++ b/services/db/04-fixtures.sql @@ -151,6 +151,13 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city (109, 'Bruce Banner', '16104829E', 'Hulk', 'Black widow', 'Somewhere in New York', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'BruceBanner@verdnatura.es', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1,'0000-00-00', 1, NULL, 1, 1, 0, 1, NULL, 0, 0, 19, 0, 1), (110, 'Jessica Jones', '58282869H', 'Jessica Jones', 'Luke Cage', 'NYCC 2015 Poster', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'JessicaJones@verdnatura.es', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1,'0000-00-00', 1, NULL, 1, 1, 0, 1, NULL, 0, 0, NULL, 0, 1); +INSERT INTO `vn`.`clientManaCache`(`clientFk`, `mana`, `dated`) + VALUES + ( 101, 50, CURDATE()), + ( 102, 100, CURDATE()), + ( 103, 0, CURDATE()), + ( 104, -30, CURDATE()); + INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `isDefaultAddress`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`) VALUES (101, '01', 'Somewhere in Thailand', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0), @@ -537,7 +544,7 @@ INSERT INTO `bi`.`rotacion`(`Id_Article`, `warehouse_id`, `total`, `rotacion`, ` INSERT INTO `vn`.`annualAverageInvoiced`(`clientFk`, `invoiced`) VALUES - ( 101, 0), + ( 101, 1500), ( 102, 100), ( 103, 1000), ( 104, 500), diff --git a/services/db/changes/1.0.3/01-ticketVolume.sql b/services/db/changes/1.0.3/01-ticketVolume.sql new file mode 100644 index 0000000000..89cebb67e6 --- /dev/null +++ b/services/db/changes/1.0.3/01-ticketVolume.sql @@ -0,0 +1,29 @@ +USE `vn`; +DROP procedure IF EXISTS `ticketVolume`; + +DELIMITER $$ +USE `vn`$$ +CREATE DEFINER=`root`@`%` PROCEDURE `ticketVolume`(IN vTicketId INT) +BEGIN + DECLARE vWarehouseId INTEGER; + DECLARE vShippedDate DATE; + + DROP TEMPORARY TABLE IF EXISTS ticketVolume; + SELECT warehouseFk, shipped INTO vWarehouseId,vShippedDate FROM vn.ticket WHERE id = vTicketId; + + CREATE TEMPORARY TABLE IF NOT EXISTS ticketVolume ENGINE MEMORY + + SELECT itemFk, saleFk, quantity, concept, VolUd as m3_uni, volume as m3, volume * quantity as volumeTimesQuantity, @m3:= @m3 + ifnull(volume,0) as m3_total + FROM + ( + SELECT round(r.cm3 / 1000000,3) as VolUd ,s.quantity, round(r.cm3 * s.quantity / 1000000,3) as volume, + s.itemFk, s.id AS saleFk, s.concept, @m3:= 0, @vol:=0, t.agencyModeFk + FROM sale s + JOIN vn.ticket t on t.id = s.ticketFk + JOIN bi.rotacion r ON r.Id_Article = s.itemFk AND r.warehouse_id = t.warehouseFk + WHERE s.ticketFk = vTicketId + ) sub; +END$$ + +DELIMITER ; + diff --git a/services/loopback/common/methods/client/specs/getAverageInvoiced.spec.js b/services/loopback/common/methods/client/specs/getAverageInvoiced.spec.js index 0775423e00..a27e9a8488 100644 --- a/services/loopback/common/methods/client/specs/getAverageInvoiced.spec.js +++ b/services/loopback/common/methods/client/specs/getAverageInvoiced.spec.js @@ -11,7 +11,7 @@ describe('client getAverageInvoiced()', () => { it('should call the getAverageInvoiced method', done => { model.getAverageInvoiced(101) .then(response => { - expect(response.invoiced).toEqual(0); + expect(response.invoiced).toEqual(1500); done(); }); }); diff --git a/services/loopback/common/methods/client/specs/getMana.spec.js b/services/loopback/common/methods/client/specs/getMana.spec.js index 942eaaca08..731c7a021d 100644 --- a/services/loopback/common/methods/client/specs/getMana.spec.js +++ b/services/loopback/common/methods/client/specs/getMana.spec.js @@ -11,7 +11,7 @@ describe('client getMana()', () => { it('should call the getMana method', done => { model.getMana(101) .then(response => { - expect(response.mana).toEqual(0); + expect(response.mana).toEqual(30.02); done(); }); }); From f5014b7824bf48df3c70b853c50cdf6d13635a81 Mon Sep 17 00:00:00 2001 From: jgallego Date: Wed, 18 Apr 2018 13:47:45 +0200 Subject: [PATCH 2/2] # 186 CANCEL button en secciones pertinentes CR juan --- .../src/components/main-menu/main-menu.html | 8 + .../salix/src/components/main-menu/style.scss | 2 +- client/salix/src/locale/es.yml | 45 ++--- services/salix/client/version-notes.html | 160 ++++++++++++++++++ 4 files changed, 192 insertions(+), 23 deletions(-) create mode 100644 services/salix/client/version-notes.html diff --git a/client/salix/src/components/main-menu/main-menu.html b/client/salix/src/components/main-menu/main-menu.html index 33703f3716..0a79477059 100644 --- a/client/salix/src/components/main-menu/main-menu.html +++ b/client/salix/src/components/main-menu/main-menu.html @@ -3,6 +3,14 @@ id="user">
{{currentUserName}}
+ + + + div > vn-icon { + & > div > vn-icon, & > div > a > vn-icon { font-size: 2.2em; cursor: pointer; diff --git a/client/salix/src/locale/es.yml b/client/salix/src/locale/es.yml index e1ba19aa95..f5767b4a29 100644 --- a/client/salix/src/locale/es.yml +++ b/client/salix/src/locale/es.yml @@ -1,26 +1,27 @@ Applications: Aplicaciones -Home: Inicio -Notifications: Notificaciones -Logout: Cerrar sesión -Change language: Cambiar idioma -Profile: Perfil -Data saved!: ¡Datos guardados! Can't contact with server: No se pudo contactar con el servidor -Push on applications menu: Para abrir un módulo pulsa en el menú de aplicaciones -Clients: Clientes -Routes : Rutas -Production : Producción -Modules access : Acceso a módulos -Locator: Localizador -Items: Artículos -name: Nombre -credit: Crédito -phone: Teléfono -creditInsurance: Crédito Asegurado -Return to module index: Volver a la página principal del módulo -Preview: Vista previa -Client has debt: Cliente con riesgo -Web Account inactive: Sin acceso Web +Change language: Cambiar idioma Client Frozen: Cliente congelado +Client has debt: Cliente con riesgo Client inactive: Cliente inactivo -Client not checked: Cliente no comprobado \ No newline at end of file +Client not checked: Cliente no comprobado +Clients: Clientes +credit: Crédito +creditInsurance: Crédito Asegurado +Data saved!: ¡Datos guardados! +Home: Inicio +Items: Artículos +Locator: Localizador +Logout: Cerrar sesión +Modules access : Acceso a módulos +Notifications: Notificaciones +name: Nombre +phone: Teléfono +Preview: Vista previa +Production : Producción +Profile: Perfil +Push on applications menu: Para abrir un módulo pulsa en el menú de aplicaciones +Return to module index: Volver a la página principal del módulo +Routes: Rutas +What is new: Novedades de la versión +Web Account inactive: Sin acceso Web diff --git a/services/salix/client/version-notes.html b/services/salix/client/version-notes.html new file mode 100644 index 0000000000..3e0cbb7742 --- /dev/null +++ b/services/salix/client/version-notes.html @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#EstadoAsunto
166In Progressrefactorizar buscador avanzado de articulos
171In ProgressAñadir revision
211In ProgressForzar a ciertos tags
213In ProgressSumario Tickets
216In ProgressSeccion Configuracion paso 2
124Resolvedaddress observations validations
199ResolvedAñadir manejador de cliente que no existe
138ResolvedRefactorización Popover
172ResolvedE2E revision
175ResolvedE2E embalajes
177ResolvedListar modelo saleChecked
182ResolvedListar volumen del ticket
196ResolvedE2E listar lineas ticket
198Resolvedrefactorizar tag con nuevo + -
201ResolvedListar Mana del cliente
202ResolvedAñadir a Sumario Cliente una seccion financia
209ResolvedContratos de credito
210Resolveditem tags
212ResolvedMostrar solo las agencias con el campo isActive(tpv) en TRUE
215ResolvedSeccion Configuracion paso 1
220ResolvedAl crear un consignatario mirar RE
222Resolvednuevo dni españa
223ResolvedManejador de errores global
227Resolvedtraducciones pendientes
219FeedbackPair programming
+ + + +