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

refs #6199 Added minQuantity in item #1786

Merged
alexm merged 8 commits from 6199-minQuantity into test 2023-10-13 11:06:51 +00:00
Conversation 1 Commits 8 Files Changed 10 +92 -54
guillermo commented 2023-10-10 08:50:57 +00:00
Member
Copy Link
No description provided.
guillermo added 1 commit 2023-10-10 08:50:59 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
03afea3b8e refs #6199 Added minQuantity in item
guillermo requested review from jgallego 2023-10-10 08:51:14 +00:00
jgallego requested changes 2023-10-10 09:20:12 +00:00
jgallego left a comment
Owner
Copy Link

falta traducció

falta traducció
guillermo added 1 commit 2023-10-10 11:48:49 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
d2ce920f13 refs #6199 Added minQuantity in catalog and more
guillermo requested review from jgallego 2023-10-10 11:50:54 +00:00
guillermo commented 2023-10-10 11:51:40 +00:00
Author
Member
Copy Link

Tienes pantallazos de como ha quedado en el propio redmine.

Tienes pantallazos de como ha quedado en el propio redmine.
jgallego requested changes 2023-10-11 05:14:57 +00:00
jgallego left a comment
Owner
Copy Link

la part del css que t'explique alex pero hi ha que posar lo minim

la part del css que t'explique alex pero hi ha que posar lo minim
modules/item/front/basic-data/locale/es.yml Outdated
@ -16,3 +16,3 @@
Do photo: Hacer foto
Recycled Plastic: Plástico reciclado
Non recycled plastic: Plástico no reciclado
Non recycled plastic: Plástico no
jgallego commented 2023-10-11 05:12:27 +00:00
Owner
Copy Link

Plástico no reciclado

Plástico no reciclado
guillermo marked this conversation as resolved
modules/order/back/methods/order/catalogFilter.js Outdated
@ -123,0 +115,4 @@
i.stars,
tci.price,
tci.available,
w.lastName lastName,
jgallego commented 2023-10-11 05:13:13 +00:00
Owner
Copy Link

lleva lastName, no cal alias

lleva lastName, no cal alias
guillermo marked this conversation as resolved
modules/order/front/catalog-view/index.html Outdated
@ -40,0 +41,4 @@
display: flex;
align-items: center;
justify-content: flex-end;
color: #fb5252;
jgallego commented 2023-10-11 05:14:23 +00:00
Owner
Copy Link

en salix no posem rgb has de gastar els colors generics.

en salix no posem rgb has de gastar els colors generics.
guillermo marked this conversation as resolved
guillermo added 1 commit 2023-10-11 05:39:18 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
2b41bf7eb1 refs #6199 Requested changes
guillermo requested review from jgallego 2023-10-11 05:39:26 +00:00
guillermo added 1 commit 2023-10-11 05:58:42 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
d41233efaf refs #6199 Requested change, name of color
guillermo added 1 commit 2023-10-11 06:28:28 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
6b1dded222 refs #6199 Requested change, position of input
jgallego requested review from alexm 2023-10-11 06:58:10 +00:00
jgallego approved these changes 2023-10-11 06:58:15 +00:00
Dismissed
alexm requested changes 2023-10-13 06:17:41 +00:00
modules/order/front/catalog-view/style.scss Outdated
@ -44,4 +44,14 @@ vn-order-catalog {
height: 30px;
position: relative;
}
.text-caption-reduced {
alexm commented 2023-10-13 06:04:08 +00:00
Member
Copy Link

Has provat a gastar vn-vertical o vn-horizontal?

Has provat a gastar vn-vertical o vn-horizontal?
guillermo commented 2023-10-13 07:03:50 +00:00
Author
Member
Copy Link

Para centrar el span verticalmente tengo que hacer:

        display: flex;
        align-items: center;
        justify-content: flex-end;

He probado muchas formas pero la única forma sin empastrarlo mucho ha sido esa

Para centrar el span verticalmente tengo que hacer: ``` display: flex; align-items: center; justify-content: flex-end; ``` He probado muchas formas pero la única forma sin empastrarlo mucho ha sido esa
guillermo marked this conversation as resolved
modules/order/front/catalog-view/style.scss Outdated
@ -47,0 +50,4 @@
justify-content: flex-end;
color: $color-alert;
}
.min-quantity-icon {
alexm commented 2023-10-13 06:17:31 +00:00
Member
Copy Link

Aci hi ha clases en diferents tamanys que igual te val: front/core/styles/text.scss
I per al margin pots gastar "bootstrap" vn-mr-[xs, sm, md, lg. xl]

Aci hi ha clases en diferents tamanys que igual te val: front/core/styles/text.scss I per al margin pots gastar "bootstrap" vn-mr-[xs, sm, md, lg. xl]
guillermo marked this conversation as resolved
guillermo added 1 commit 2023-10-13 07:02:16 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
7367656a35 refs #6199 Requested changes
guillermo dismissed jgallego’s review 2023-10-13 07:02:17 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

guillermo requested review from alexm 2023-10-13 07:04:05 +00:00
alexm added 1 commit 2023-10-13 08:23:53 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
fa90132934 refs #6199 fix(orderCatalogView): html and css
alexm approved these changes 2023-10-13 08:40:11 +00:00
Dismissed
jgallego approved these changes 2023-10-13 09:25:53 +00:00
Dismissed
guillermo added 1 commit 2023-10-13 10:33:16 +00:00
gitea/salix/pipeline/head This commit looks good Details
e1c1d1a556 refs #6199 Fixed tests
guillermo dismissed alexm’s review 2023-10-13 10:33:17 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

guillermo dismissed jgallego’s review 2023-10-13 10:33:17 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

alexm approved these changes 2023-10-13 11:06:12 +00:00
alexm merged commit 2250fca6bb into test 2023-10-13 11:06:51 +00:00
alexm deleted branch 6199-minQuantity 2023-10-13 11:06:51 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
alexm
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#1786
No description provided.
Delete Branch "6199-minQuantity"

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?