verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Javi Gallego 2025-02-19 12:52:27 +01:00
parent ed61d6488d b42f5885bf
commit 9e64e4224a
9 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/routines/vn/triggers/claim_beforeInsert.sql
View File

@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`claim_beforeInsert`
FOR EACH ROW
BEGIN
SET NEW.editorFk = account.myUser_getId();
IF (SELECT shipped FROM ticket WHERE id = NEW.ticketFk) > util.VN_NOW() THEN
CALL util.throw('Future ticket date not allowed');
END IF;
END$$
DELIMITER ;

4
db/routines/vn/triggers/zone_beforeInsert.sql
View File

@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`zone_beforeInsert`
FOR EACH ROW
BEGIN
SET NEW.editorFk = account.myUser_getId();
IF NEW.priceOptimum = 0 THEN
SET NEW.priceOptimum = NEW.price;
END IF;
END$$
DELIMITER ;

4
db/routines/vn/triggers/zone_beforeUpdate.sql
View File

@ -4,5 +4,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`zone_beforeUpdate`
FOR EACH ROW
BEGIN
SET NEW.editorFk = account.myUser_getId();
IF NEW.priceOptimum = 0 THEN
CALL util.throw('The priceOptimum cannot be 0');
END IF;
END$$
DELIMITER ;

3
db/versions/11445-brownDendro/00-firstScript.sql Normal file
View File

@ -0,0 +1,3 @@
UPDATE vn.zone
SET priceOptimum = price
WHERE priceOptimum = 0;

1
modules/ticket/back/methods/ticket/getSales.js
View File

@ -98,6 +98,7 @@ module.exports = Self => {
for (let sale of sales) {
const problems = saleProblems.get(sale.id);
sale.claim = claimedSales.get(sale.id);
if (problems) {
for (const problem in problems)
sale[problem] = problems[problem];

4
modules/ticket/back/methods/ticket/state.js
View File

@ -43,8 +43,8 @@ module.exports = Self => {
const {code} = await models.State.findById(params.stateFk, {fields: ['code']}, myOptions);
params.code = code;
} else {
const state = await models.State.findOne({where: {id: params.code}}, myOptions);
params.stateFk = state.id;
const {id} = await models.State.findOne({where: {code: params.code}}, myOptions);
params.stateFk = id;
}
if (!params.userFk) {

2
modules/ticket/front/future/index.html
View File

@ -92,7 +92,7 @@
</td>
<td class="icon-field">
<vn-icon
ng-show="::ticket.isTaxDataChecked === 0"
ng-show="::ticket.isTaxDataChecked !== 0"
translate-attr="{title: 'No verified data'}"
class="bright"
icon="icon-no036">

2
modules/ticket/front/index/index.html
View File

@ -40,7 +40,7 @@
</vn-td>
<vn-td class="icon-field">
<vn-icon
ng-show="::ticket.isTaxDataChecked === 0"
ng-show="::ticket.isTaxDataChecked !== 0"
translate-attr="{title: 'No verified data'}"
class="bright"
icon="icon-no036">

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "salix-back",
"version": "25.08.0",
"version": "25.10.0",
"author": "Verdnatura Levante SL",
"description": "Salix backend",
"license": "GPL-3.0",