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

2502-supplier_summary + e2e #425

Merged
joan merged 15 commits from 2502-supplier_summary into dev 2020-10-29 07:55:38 +00:00
Conversation 0 Commits 15 Files Changed 32 +724 -40
bernat commented 2020-10-26 08:59:35 +00:00
Contributor
Copy Link
No description provided.
bernat changed title from 2502-supplier_summary to WIP: 2502-supplier_summary 2020-10-27 07:46:01 +00:00
carlosjr changed title from WIP: 2502-supplier_summary to 2502-supplier_summary + e2e 2020-10-28 11:31:45 +00:00
carlosjr requested changes 2020-10-28 12:49:25 +00:00
modules/supplier/back/methods/supplier/filter.js Outdated
@ -64,0 +65,4 @@
{'s.name': {like: `%${value}%`}},
{'s.nickname': {like: `%${value}%`}}
]};
// return {'s.id': value};
carlosjr commented 2020-10-28 11:51:34 +00:00
Contributor
Copy Link

remove comments

remove comments
modules/supplier/back/methods/supplier/specs/getSummary.spec.js
@ -0,0 +9,4 @@
expect(supplier.nif).toEqual('06089160W');
});
it(`should return a summary object containing it's supplier country`, async() => {
carlosjr commented 2020-10-28 11:53:54 +00:00
Contributor
Copy Link

containing it's supplier country relation

containing it's supplier country relation
joan marked this conversation as resolved
modules/supplier/front/descriptor/index.html Outdated
@ -0,0 +29,4 @@
ng-class="{bright: $ctrl.supplier.isActive == false}">
</vn-icon>
<vn-icon
vn-tooltip="Supplier official"
carlosjr commented 2020-10-28 12:06:08 +00:00
Contributor
Copy Link

official supplier

official supplier
modules/supplier/front/descriptor/locale/es.yml Outdated
@ -0,0 +1,5 @@
Tax number: NIF / CIF
All entries with current supplier: Todas las entradas con el proveedor actual
Go to client: Ir al cliente
Supplier official: Proveedor oficial
carlosjr commented 2020-10-28 12:10:25 +00:00
Contributor
Copy Link

official supplier

official supplier
modules/supplier/front/descriptor/locale/es.yml Outdated
@ -0,0 +2,4 @@
All entries with current supplier: Todas las entradas con el proveedor actual
Go to client: Ir al cliente
Supplier official: Proveedor oficial
Supplier inactive: Proveedor inactivo
carlosjr commented 2020-10-28 12:10:40 +00:00
Contributor
Copy Link

inactive supplier

inactive supplier
modules/supplier/front/search-panel/locale/es.yml Outdated
@ -1,3 +1,4 @@
Province: Provincia
Country: País
Tax number: Nif
No newline at end of file
carlosjr commented 2020-10-28 12:13:19 +00:00
Contributor
Copy Link

NIF

NIF
modules/supplier/front/search-panel/locale/es.yml Outdated
@ -2,3 +2,3 @@
Country: País
Tax number: Nif
No newline at end of file
Tax number: Nif
carlosjr commented 2020-10-28 12:13:56 +00:00
Contributor
Copy Link

Busca proveedores por id, nombre o alias

Busca proveedores por id, nombre o alias
modules/supplier/front/summary/locale/es.yml Outdated
@ -0,0 +1,5 @@
Is official: Es oficial
Country: País
Tax number: Nif
carlosjr commented 2020-10-28 12:16:27 +00:00
Contributor
Copy Link

NIF y CIF?

NIF y CIF?
modules/supplier/front/summary/locale/es.yml Outdated
@ -0,0 +1,5 @@
Is official: Es oficial
Country: País
Tax number: Nif
Search suppliers by id, name or alias: Busca proveedores por el id, el nombre o el alias
carlosjr commented 2020-10-28 12:16:45 +00:00
Contributor
Copy Link

-el

-el
modules/supplier/front/summary/style.scss Outdated
@ -0,0 +2,4 @@
vn-client-summary {
.alert span {
color: $color-alert !important
carlosjr commented 2020-10-28 12:19:55 +00:00
Contributor
Copy Link

is !important that important?

is !important that important?
joan approved these changes 2020-10-29 07:55:31 +00:00
joan left a comment
Contributor
Copy Link

LGTM

LGTM
joan merged commit a76b2525d4 into dev 2020-10-29 07:55:37 +00:00
joan deleted branch 2502-supplier_summary 2020-10-29 07:57:36 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
carlosjr
joan
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#425
No description provided.
Delete Branch "2502-supplier_summary"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?