verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Gerard 2018-11-15 08:59:25 +01:00
parent 575ea7fdea 2b7a561a35
commit 4eb3e3d4f8
3 changed files with 78 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
client/order/src/filter/index.js
View File

@ -11,19 +11,6 @@ class Controller {
this.$transitions = $transitions;
this.itemTypes = [];
this.tags = [];
/* $transitions.onSuccess({}, transition => {
let params = {};
if (this.category)
params.category = this.category;
if (this.type)
params.type = this.type;
$window.history.replaceState(params);
this.applyFilters();
}); */
}
get order() {
@ -42,15 +29,12 @@ class Controller {
if (this.$stateParams.category)
category = JSON.parse(this.$stateParams.category);
if (this.$stateParams.type)
type = JSON.parse(this.$stateParams.type);
if (category && category.id)
this.category = category;
if (type && type.id)
this.type = type;
});
@ -87,16 +71,15 @@ class Controller {
set type(value) {
if (value && this.type && this.type.id == value.id) return;
if (!value || !value.id) {
this._type = null;
this.updateStateParams();
return;
}
this._type = value;
if (!value || !value.id)
this._type = null;
this.updateStateParams();
this.applyFilters();
if ((value && value.id) || this.tags.length > 0)
this.applyFilters();
}
onSearch(event) {
@ -111,7 +94,7 @@ class Controller {
remove(index) {
this.tags.splice(index, 1);
if (this.tags.length > 0)
if (this.tags.length == 0 && this.category && this.type)
this.applyFilters();
}
@ -123,11 +106,9 @@ class Controller {
if (this.category)
newFilter.categoryFk = this.category.id;
if (this.type)
newFilter.typeFk = this.type.id;
newParams = {
orderFk: this.order.id,
orderBy: this.catalog.getOrderBy(),
@ -169,13 +150,11 @@ class Controller {
if (this.category)
params.category = JSON.stringify(this.category);
if (this.type)
params.type = JSON.stringify(this.type);
else
params.type = undefined;
this.$state.go(this.$state.current.name, params);
}
}

4
services/client/common/methods/receipt/filter.js
View File

@ -37,7 +37,7 @@ module.exports = Self => {
c.code AS company,
r.created,
'' description,
0 AS debit,
NULL AS debit,
r.amountPaid AS credit,
r.bankFk,
firstName,
@ -56,7 +56,7 @@ module.exports = Self => {
i.created,
CONCAT(' N/FRA ', i.ref),
i.amount,
0 credit,
NULL credit,
NULL,
NULL,
NULL,

68
services/db/install/changes/1.2-CHECK/14.clientGetMana.sql Normal file
View File

@ -0,0 +1,68 @@
USE `vn`;
DROP function IF EXISTS `clientGetMana`;
DELIMITER $$
USE `vn`$$
CREATE DEFINER=`root`@`%` FUNCTION `clientGetMana`(vClient INT) RETURNS decimal(10,2)
BEGIN
/**
* Devuelve el maná del cliente.
*
* @param vClient Id del cliente
* @return Maná del cliente
*/
DECLARE vMana DECIMAL(10,2);
DECLARE vFromDated DATE;
SELECT max(dated) INTO vFromDated
FROM vn.clientManaCache;
SELECT sum(mana) INTO vMana
FROM
(
SELECT mana
FROM vn.clientManaCache
WHERE clientFk = vClient
AND dated = vFromDated
UNION ALL
SELECT s.quantity * Valor
FROM vn.ticket t
JOIN vn.address a ON a.id = t.addressFk
JOIN vn.sale s on s.ticketFk = t.id
JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = s.id
WHERE Id_Componente IN (37, 39)
AND t.shipped > vFromDated
AND t.shipped < TIMESTAMPADD(DAY,1,CURDATE())
AND a.clientFk = vClient
UNION ALL
SELECT - Entregado
FROM vn2008.Recibos r
JOIN vn2008.Clientes c using(Id_Cliente)
WHERE r.Id_Banco = 66
AND r.Fechacobro > vFromDated
AND r.Fechacobro <= CURDATE()
AND c.Id_Cliente = vClient
UNION ALL
SELECT g.Importe
FROM vn2008.Greuges g
JOIN vn2008.Clientes c using(Id_Cliente)
WHERE g.Greuges_type_id = 3 -- Maná
AND g.Fecha > vFromDated
AND g.Fecha <= CURDATE()
AND c.Id_Cliente = vClient
) sub;
RETURN IFNULL(vMana,0);
END$$
DELIMITER ;