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

ref #5417 date filters added #1773

Merged
jorgep merged 16 commits from 5417-fixCustomerPayments into dev 2023-10-19 06:23:21 +00:00
Conversation 0 Commits 16 Files Changed 2 +87 -15
jorgep commented 2023-09-29 12:44:56 +00:00
Member
Copy Link
No description provided.
jorgep added the
CR / Tests passed
 label 2023-09-29 12:44:56 +00:00
jorgep added 1 commit 2023-09-29 12:44:57 +00:00
gitea/salix/pipeline/head This commit looks good Details
6f4a12e50f ref #5417 date filters added
jorgep requested review from alexm 2023-09-29 12:45:01 +00:00
jorgep requested review from jgallego 2023-09-29 12:45:09 +00:00
alexm reviewed 2023-10-02 05:09:33 +00:00
modules/client/back/methods/client/transactions.js Outdated
@ -31,0 +32,4 @@
{
arg: 'from',
type: 'date',
http: {source: 'query'}
alexm commented 2023-10-02 05:09:33 +00:00
Member
Copy Link

http: {source: 'query'} es el tipo por defecto?

http: {source: 'query'} es el tipo por defecto?
jorgep marked this conversation as resolved
alexm requested changes 2023-10-02 05:11:02 +00:00
modules/client/back/methods/client/transactions.js Outdated
@ -49,1 +59,4 @@
if (ctx.args && args.to) {
const dateTo = args.to;
dateTo.setHours(23, 59, 0, 0);
alexm commented 2023-10-02 05:10:27 +00:00
Member
Copy Link

.setHours(23, 59, 59, 999);

.setHours(23, 59, 59, 999);
jorgep marked this conversation as resolved
modules/client/back/methods/client/transactions.js Outdated
@ -57,1 +72,4 @@
return {'t.amount': (value * 100)};
case 'from':
return {'t.created': {gte: value}};
alexm commented 2023-10-02 05:10:52 +00:00
Member
Copy Link

Aci hi ha un intro que sobra

Aci hi ha un intro que sobra
jorgep marked this conversation as resolved
jorgep added 1 commit 2023-10-02 06:35:22 +00:00
gitea/salix/pipeline/head This commit looks good Details
250cb3cb68 Merge branch 'dev' into 5417-fixCustomerPayments
jorgep added 2 commits 2023-10-02 06:50:44 +00:00
jorgep added 1 commit 2023-10-02 07:05:45 +00:00
gitea/salix/pipeline/head This commit looks good Details
a7128b8187 ref #5417 fix transactions
jorgep added 1 commit 2023-10-02 07:57:32 +00:00
gitea/salix/pipeline/head This commit looks good Details
a00cf557b7 Merge branch 'dev' into 5417-fixCustomerPayments
jorgep added 2 commits 2023-10-02 08:07:02 +00:00
jorgep added 1 commit 2023-10-04 13:55:35 +00:00
gitea/salix/pipeline/head This commit looks good Details
9d086f5433 Merge branch 'dev' into 5417-fixCustomerPayments
jorgep added 1 commit 2023-10-05 06:29:33 +00:00
gitea/salix/pipeline/head This commit looks good Details
d6d95b3533 Merge branch 'dev' into 5417-fixCustomerPayments
jorgep requested review from alexm 2023-10-05 06:29:44 +00:00
jgallego approved these changes 2023-10-13 12:48:22 +00:00
Dismissed
jorgep added 2 commits 2023-10-16 06:22:30 +00:00
alexm requested changes 2023-10-18 05:21:50 +00:00
modules/client/back/methods/client/transactions.js Outdated
@ -28,6 +28,14 @@ module.exports = Self => {
arg: 'amount',
type: 'number',
http: {source: 'query'}
alexm commented 2023-10-18 05:18:36 +00:00
Member
Copy Link

http: {source: 'query'} es el tipo por defecto?

http: {source: 'query'} es el tipo por defecto?
jorgep commented 2023-10-18 06:31:42 +00:00
Author
Member
Copy Link

No, pero en este caso los datos llegan así.

No, pero en este caso los datos llegan así.
jorgep marked this conversation as resolved
modules/client/back/methods/client/transactions.js Outdated
@ -47,6 +55,11 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
if (ctx.args && args.to) {
alexm commented 2023-10-18 05:18:20 +00:00
Member
Copy Link

Parlarem en una reunio de salix, que no debiem gastar ctx.args. Si no definir dalt els parametros
https://docs.google.com/document/d/1vjyL64Rqi40kLxEpB9nISU_r3cndQfp3NdsnlPagzv4/edit
(el punt 2)

Parlarem en una reunio de salix, que no debiem gastar ctx.args. Si no definir dalt els parametros https://docs.google.com/document/d/1vjyL64Rqi40kLxEpB9nISU_r3cndQfp3NdsnlPagzv4/edit (el punt 2)
jorgep marked this conversation as resolved
jorgep added 1 commit 2023-10-18 10:04:59 +00:00
jorgep added 1 commit 2023-10-18 10:06:58 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
251d71a437 ref #5417 refactor transactions
jorgep dismissed jgallego’s review 2023-10-18 10:06:58 +00:00
Reason:

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

jorgep requested review from alexm 2023-10-18 10:07:29 +00:00
alexm requested changes 2023-10-18 10:36:06 +00:00
modules/client/back/methods/client/specs/transactions.spec.js Outdated
@ -66,0 +69,4 @@
try {
const options = {transaction: tx};
const ctx = {args: {from: '2000/12/31'}};
alexm commented 2023-10-18 10:36:01 +00:00
Member
Copy Link

I aci no te falla? args

I aci no te falla? args
jorgep commented 2023-10-18 11:35:00 +00:00
Author
Member
Copy Link

Sí, lo acabo de arreglar.

Sí, lo acabo de arreglar.
jorgep marked this conversation as resolved
jorgep added 1 commit 2023-10-18 11:24:25 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
330fb08aac ref #5417 fix back test
jorgep added 1 commit 2023-10-18 11:38:57 +00:00
jorgep requested review from alexm 2023-10-18 11:39:20 +00:00
alexm approved these changes 2023-10-19 05:33:33 +00:00
jorgep merged commit f5784eec01 into dev 2023-10-19 06:23:21 +00:00
jorgep deleted branch 5417-fixCustomerPayments 2023-10-19 06:23:21 +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#1773
No description provided.
Delete Branch "5417-fixCustomerPayments"

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?