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

Merge pull request '3893-supplier.fiscal-data' (#947) from 3893-supplier.fiscal-data into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #947
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2022-05-16 06:05:30 +00:00
parent 3c738efb2a 10cd9c5b87
commit a71e53fdf4
12 changed files with 95 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
db/changes/10451-april/00-aclSupplierActivity.sql Normal file
View File

@ -0,0 +1,5 @@
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
VALUES('SupplierActivity', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
VALUES('SupplierActivity', '*', 'WRITE', 'ALLOW', 'ROLE', 'administrative');

8
db/dump/fixtures.sql
View File

@ -1313,11 +1313,11 @@ INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `pr
(5, 442, 'GCR building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'),
(6, 442, 'The Gotham Tonight building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222');
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`)
INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
VALUES
(1, 'Plants SL', 'Plants nick', 4100000001, 1, '06089160W', 0, CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1),
(2, 'Farmer King', 'The farmer', 4000020002, 1, '87945234L', 0, CURDATE(), 1, 'supplier address 2', 'SILLA', 2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals', 1),
(442, 'Verdnatura Levante SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, CURDATE(), 1, 'supplier address 3', 'SILLA', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'flowerPlants', 1);
(1, 'Plants SL', 'Plants nick', 4100000001, 1, '06089160W', 0, CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'),
(2, 'Farmer King', 'The farmer', 4000020002, 1, '87945234L', 0, CURDATE(), 1, 'supplier address 2', 'SILLA', 2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'),
(442, 'Verdnatura Levante SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, CURDATE(), 1, 'supplier address 3', 'SILLA', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V');
INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`)
VALUES

10
modules/supplier/back/methods/supplier/getSummary.js
View File

@ -41,7 +41,9 @@ module.exports = Self => {
'sageTaxTypeFk',
'sageTransactionTypeFk',
'sageWithholdingFk',
'workerFk'
'workerFk',
'supplierActivityFk',
'healthRegister'
],
include: [
{
@ -98,6 +100,12 @@ module.exports = Self => {
}
}
},
{
relation: 'supplierActivity',
scope: {
fields: ['code', 'name']
}
}
]
};

4
modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
View File

@ -66,6 +66,8 @@ describe('Supplier updateFiscalData', () => {
city: 'VALENCIA',
provinceFk: 2,
countryFk: 1,
supplierActivityFk: 'animals',
healthRegister: '400664487H'
};
const result = await app.models.Supplier.updateFiscalData(ctx, supplierId);
@ -80,6 +82,8 @@ describe('Supplier updateFiscalData', () => {
expect(result.city).toEqual('VALENCIA');
expect(result.provinceFk).toEqual(2);
expect(result.countryFk).toEqual(1);
expect(result.supplierActivityFk).toEqual('animals');
expect(result.healthRegister).toEqual('400664487H');
// Restores
ctx.args = defaultData;

8
modules/supplier/back/methods/supplier/updateFiscalData.js
View File

@ -56,6 +56,14 @@ module.exports = Self => {
{
arg: 'countryFk',
type: 'any'
},
{
arg: 'supplierActivityFk',
type: 'string'
},
{
arg: 'healthRegister',
type: 'string'
}],
returns: {
arg: 'res',

3
modules/supplier/back/model-config.json
View File

@ -11,6 +11,9 @@
"SupplierAccount": {
"dataSource": "vn"
},
"SupplierActivity": {
"dataSource": "vn"
},
"SupplierAgencyTerm": {
"dataSource": "vn"
},

18
modules/supplier/back/models/supplier-activity.json Normal file
View File

@ -0,0 +1,18 @@
{
"name": "SupplierActivity",
"base": "VnModel",
"options": {
"mysql": {
"table": "supplierActivity"
}
},
"properties": {
"code": {
"type": "string",
"id": true
},
"name": {
"type": "string"
}
}
}

11
modules/supplier/back/models/supplier.json
View File

@ -101,6 +101,12 @@
},
"isPayMethodChecked": {
"type": "boolean"
},
"supplierActivityFk": {
"type": "string"
},
"healthRegister": {
"type": "string"
}
},
"relations": {
@ -159,6 +165,11 @@
"type": "hasMany",
"model": "SupplierAddress",
"foreignKey": "supplierFk"
},
"supplierActivity": {
"type": "belongsTo",
"model": "SupplierActivity",
"foreignKey": "supplierActivityFk"
}
}
}

21
modules/supplier/front/fiscal-data/index.html
View File

@ -30,6 +30,11 @@
data="sageWithholdings"
order="withholding">
</vn-crud-model>
<vn-crud-model
auto-load="true"
url="SupplierActivities"
data="supplierActivities">
</vn-crud-model>
<form name="form" vn-http-submit="watcher.submit()" class="vn-w-md">
<vn-card class="vn-pa-lg">
<vn-horizontal>
@ -87,6 +92,22 @@
<tpl-item>{{id}}: {{transaction}}</tpl-item>
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal>
<vn-autocomplete vn-one
ng-model="$ctrl.supplier.supplierActivityFk"
data="supplierActivities"
show-field="name"
value-field="code"
label="Supplier activity"
rule>
</vn-autocomplete>
<vn-textfield
vn-one
label="Healt register"
ng-model="$ctrl.supplier.healthRegister"
rule>
</vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield
vn-one

2
modules/supplier/front/fiscal-data/locale/es.yml
View File

@ -1,3 +1,5 @@
Sage tax type: Tipo de impuesto Sage
Sage transaction type: Tipo de transacción Sage
Sage withholding: Retención Sage
Supplier activity: Actividad proveedor
Healt register: Pasaporte sanitario

7
modules/supplier/front/summary/index.html
View File

@ -113,6 +113,13 @@
label="Sage withholding"
value="{{::$ctrl.summary.sageWithholding.withholding}}">
</vn-label-value>
<vn-label-value
label="Supplier activity"
value="{{::$ctrl.summary.supplierActivity.name}}">
</vn-label-value>
<vn-label-value
label="Healt register"
value="{{::$ctrl.summary.healthRegister}}">
</vn-one>
</vn-horizontal>
<vn-horizontal>

4
modules/supplier/front/summary/locale/es.yml
View File

@ -7,4 +7,6 @@ Sage tax type: Tipo de impuesto Sage
Sage transaction type: Tipo de transacción Sage
Sage withholding: Retencion Sage
Go to the supplier: Ir al proveedor
Responsible: Responsable
Responsible: Responsable
Supplier activity: Actividad proveedor
Healt register: Pasaporte sanitario