Item Fixed prices #307

Merged
jsegarra merged 17 commits from :feature/FixedPrices into dev 2024-04-24 07:39:23 +00:00
Contributor
https://redmine.verdnatura.es/issues/6534
hyervoni added 7 commits 2024-04-18 16:16:45 +00:00
wbuezas added 2 commits 2024-04-19 15:27:00 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
3f5c711fa1
Improvements
wbuezas added 1 commit 2024-04-19 15:48:17 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
9212e53905
resolve conflicts
hyervoni changed title from WIP: feature/FixedPrices to Item Fixed prices 2024-04-19 15:48:44 +00:00
hyervoni requested review from alexm 2024-04-19 15:48:52 +00:00
hyervoni requested review from jsegarra 2024-04-19 15:48:52 +00:00
wbuezas added 1 commit 2024-04-19 15:52:54 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
d5832eaf41
improvement
jsegarra requested changes 2024-04-19 16:16:23 +00:00
Dismissed
@ -0,0 +94,4 @@
const columns = computed(() => [
{
label: t('item.fixedPrice.itemId'),
Member

Propuesta, podemos definir un objeto configuración default y así reducir líneas?

Propuesta, podemos definir un objeto configuración default y así reducir líneas?
Contributor

Estructuras en común entre columnas definidas y reutilizadas

Commit: e11625e05f

Estructuras en común entre columnas definidas y reutilizadas Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/e11625e05f70cffadedc7b02c96c974725225886
jsegarra marked this conversation as resolved
@ -0,0 +317,4 @@
const daysInWeek = 7;
const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
fixedPricesOriginalData.value.push({
Member

Mismo objeto

Mismo objeto
Contributor

Cambiado

Commit: dce48b536d

Cambiado Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/dce48b536d536ab01a401422662ce14533085f42
jsegarra marked this conversation as resolved
@ -0,0 +333,4 @@
const lastItemCopy = JSON.parse(
JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
);
const { id, ...restOfData } = lastItemCopy;
Member

RestOfData la propongo cambiar por rest o restOfitem

RestOfData la propongo cambiar por rest o restOfitem
Contributor

Cambiado

Commit: 1398a146ff

Cambiado Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/1398a146ffd68a979d2f8a235ca51fbe364a5a04
jsegarra marked this conversation as resolved
@ -0,0 +386,4 @@
date.setHours(0, 0, 0, 0);
const timeDifference = today - date;
if (timeDifference > 0) return 'warning';
Member

Is bigger e is lower es lo mismo menos la comparación
Código duplicado

Is bigger e is lower es lo mismo menos la comparación Código duplicado
Contributor

Si, lo había copiado exactamente igual que como estaba en salix, pero bueno le hice un refactor.

Commit: 2105d7870b

Si, lo había copiado exactamente igual que como estaba en salix, pero bueno le hice un refactor. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/2105d7870b0f5bb0d9d30511bee9ad59dc6819bc
jsegarra marked this conversation as resolved
wbuezas added 1 commit 2024-04-22 12:07:57 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
1398a146ff
Change restOfData to restOfItem
wbuezas added 1 commit 2024-04-22 12:38:27 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2105d7870b
Refactor isBigger and isLower
wbuezas added 1 commit 2024-04-22 12:42:36 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
dce48b536d
Change in newPrice assign
wbuezas added 1 commit 2024-04-22 14:30:25 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
e11625e05f
set columns default attrs to avoid repeating code
jsegarra approved these changes 2024-04-23 12:46:43 +00:00
Dismissed
Member

Faltaban estos cambios: https://redmine.verdnatura.es/issues/7260 aprobamos PR para no frenar la migración
Solucionamos nosotros.

Solo faltaria arreglar conflictos

Faltaban estos cambios: https://redmine.verdnatura.es/issues/7260 aprobamos PR para no frenar la migración Solucionamos nosotros. Solo faltaria arreglar conflictos
alexm approved these changes 2024-04-24 07:15:21 +00:00
Dismissed
jsegarra added 1 commit 2024-04-24 07:34:27 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
de91364ee8
Merge remote-tracking branch 'origin/dev' into feature/FixedPrices
jsegarra dismissed jsegarra’s review 2024-04-24 07:34:27 +00:00
Reason:

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

jsegarra dismissed alexm’s review 2024-04-24 07:34:27 +00:00
Reason:

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

jsegarra requested review from jsegarra 2024-04-24 07:36:52 +00:00
jsegarra approved these changes 2024-04-24 07:36:58 +00:00
Dismissed
jsegarra added 1 commit 2024-04-24 07:37:40 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
8bb3d48c81
Merge branch 'dev' into feature/FixedPrices
jsegarra dismissed jsegarra’s review 2024-04-24 07:37:40 +00:00
Reason:

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

jsegarra requested review from jsegarra 2024-04-24 07:38:42 +00:00
jsegarra approved these changes 2024-04-24 07:39:08 +00:00
jsegarra merged commit 331484dbc7 into dev 2024-04-24 07:39:23 +00:00
jsegarra deleted branch feature/FixedPrices 2024-04-24 07:39:23 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
4 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-front#307
No description provided.