2883-invoiceIn-Booking #786

Merged
carlosjr merged 17 commits from 2883-invoiceIn-Booking into dev 2022-01-24 15:29:57 +00:00
Owner
No description provided.
jgallego added 3 commits 2021-11-18 06:33:44 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
e5c9ea850b
testback done
gitea/salix/pipeline/head There was a failure building this commit Details
4f1fd5412d
faltan test
gitea/salix/pipeline/head This commit looks good Details
2dee9fec20
falta test checkToBook
jgallego added 1 commit 2021-11-18 06:36:14 +00:00
gitea/salix/pipeline/head This commit looks good Details
b936272898
Merge branch 'dev' into 2883-invoiceIn-Booking
jgallego added 1 commit 2021-11-18 06:38:58 +00:00
gitea/salix/pipeline/head This commit looks good Details
dc42c18ead
after gulp
jgallego added 1 commit 2021-11-18 07:21:09 +00:00
gitea/salix/pipeline/head This commit looks good Details
d46c590ccb
test
jgallego changed title from 2883-invoiceIn-Booking to WIP: 2883-invoiceIn-Booking 2021-11-19 06:27:55 +00:00
jgallego added 1 commit 2021-11-19 06:34:03 +00:00
gitea/salix/pipeline/head This commit looks good Details
c8e9416448
Merge branch 'dev' into 2883-invoiceIn-Booking
jgallego added 1 commit 2021-11-19 06:46:17 +00:00
gitea/salix/pipeline/head This commit looks good Details
fe97b9472c
db changes en el sprint actual
jgallego added 1 commit 2021-11-23 14:13:43 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
d0326fe354
reload section summary
jgallego added 1 commit 2021-12-14 07:33:35 +00:00
gitea/salix/pipeline/head This commit looks good Details
f669e7148c
onAcceptToBook test ok
jgallego added 151 commits 2021-12-14 08:51:23 +00:00
gitea/salix/pipeline/head This commit looks good Details
180fb95a00
feat(createAbsence): add backTest
gitea/salix/pipeline/head This commit looks good Details
00a33fabb3
update backTest
gitea/salix/pipeline/head This commit looks good Details
c1adba3249
Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
9de3db1961
fix(client_summary): show 10 tickets at least
gitea/salix/pipeline/head This commit looks good Details
98195bf7b0
fix(route_tickets): dialog show the name of clients
gitea/salix/pipeline/head This commit looks good Details
46d7a6e765
Added unit tests
gitea/salix/pipeline/head This commit looks good Details
60c0943044
Dark theme autofill color
gitea/salix/pipeline/head This commit looks good Details
ac9ed90f4a
feat(item): modify item_getBalance and do test
gitea/salix/pipeline/head This commit looks good Details
8f2e29787b
fix(payMethod): alter colums name
gitea/salix/pipeline/head This commit looks good Details
6fdd752d63
Searchbar focus css fix
gitea/salix/pipeline/head This commit looks good Details
e64e06b9ab
feat(client): change phone for payMethod in descriptor
gitea/salix/pipeline/head This commit looks good Details
7eba2fe509
Merge branch 'dev' into 3379-payMethod_ibanRequired
gitea/salix/pipeline/head This commit looks good Details
e5977be502
Merge branch 'dev' into 3374-itemPackingType
gitea/salix/pipeline/head This commit looks good Details
caad30d730
Merge pull request '3278 - Disallow claim creation for a ticket delivered more than seven days ago' (#791) from 3278-create_claim into dev
Reviewed-on: #791
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
fad44c0b74
Merge branch 'dev' into 3374-itemPackingType
gitea/salix/pipeline/head This commit looks good Details
02bc848b7e
Merge pull request 'feat(item-itemPackingType): add model and dumpedFixtures' (#794) from 3374-itemPackingType into dev
Reviewed-on: #794
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
ca0c3be843
Merge branch 'dev' into 3381-item_diary-claim
gitea/salix/pipeline/head This commit looks good Details
d2729e67e9
feat(item and latest-buys: add supplier filter
gitea/salix/pipeline/head This commit looks good Details
1e6805a161
remove unnecessary tabulation
gitea/salix/pipeline/head This commit looks good Details
97a66754a7
feat(item and entry): add back test
gitea/salix/pipeline/head This commit looks good Details
fe46dbd343
feat(entry_last-buys): add filter isFloramondo
gitea/salix/pipeline/head This commit looks good Details
80f651f37d
add entries less than a year ago
gitea/salix/pipeline/head There was a failure building this commit Details
fb6e443f03
feat(routes_tickets): button up when add tickets
gitea/salix/pipeline/head This commit looks good Details
a5ba02e2ec
feat(route_tickets): update frontTest
gitea/salix/pipeline/head This commit looks good Details
cb81ad3722
delete unnecessay space
gitea/salix/pipeline/head This commit looks good Details
dd19ac975d
Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
79181c633a
Merge pull request '3338-worker_calendar' (#787) from 3338-worker_calendar into dev
Reviewed-on: #787
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
ff0a3acd6e
Merge branch 'dev' into 3379-payMethod_ibanRequired
gitea/salix/pipeline/head There was a failure building this commit Details
a940d14256
fix(filterValue): fixed sql injection vulnerability
Refs: 3369
gitea/salix/pipeline/head This commit looks good Details
9fdfe64909
Merge branch 'dev' into 3381-item_diary-claim
gitea/salix/pipeline/head This commit looks good Details
cbcfdd33ec
Merge branch 'dev' into 3379-payMethod_ibanRequired
gitea/salix/pipeline/head This commit looks good Details
4ebad6b372
filter order was not properly being applied
gitea/salix/pipeline/head This commit looks good Details
c618b7c2ed
Merge pull request 'fix(payMethod): alter colums name' (#793) from 3379-payMethod_ibanRequired into dev
Reviewed-on: #793
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
ec7cb47ad5
Merge branch 'dev' into 3375-client_descriptor
gitea/salix/pipeline/head This commit looks good Details
2bba91c6a2
Merge pull request '3375-client_descriptor change phone for payMethod' (#795) from 3375-client_descriptor into dev
Reviewed-on: #795
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
cae3322c6b
Merge branch 'dev' into 3332-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
e6886871da
Merge pull request '3389-item and entry/latest-buys search-panels add filter supplier' (#796) from 3332-item_search-panel into dev
Reviewed-on: #796
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
1f2417b55e
Merge branch 'dev' into 3290-entry_latest-buys
gitea/salix/pipeline/head This commit looks good Details
6dc373677d
Merge pull request '3290-entry_last-buys add filter isFloramondo' (#797) from 3290-entry_latest-buys into dev
Reviewed-on: #797
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
854ed9936d
deleted unnecessary comma
gitea/salix/pipeline/head This commit looks good Details
51a3673160
Merge branch 'dev' into 3369-filterValue_sqli
gitea/salix/pipeline/head This commit looks good Details
07dcdab1ef
fix(sale): disabled clear icons
gitea/salix/pipeline/head This commit looks good Details
c67d78e5b9
Merge pull request 'fix(filterValue): fixed sql injection vulnerability' (#799) from 3369-filterValue_sqli into dev
Reviewed-on: #799
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
16df8fd2f3
Merge branch 'dev' into 3388-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
b9265b79d9
Merge pull request 'fix(sale): disabled clear icons' (#801) from 3388-ticket_sale into dev
Reviewed-on: #801
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
abb33c8514
feat(client): consumption.decription sortable
gitea/salix/pipeline/head This commit looks good Details
372d5ade17
refactor(smartTable): removeProp updated and tests
gitea/salix/pipeline/head This commit looks good Details
ae23f244a0
Merge pull request '3373-client_consumption description sortable' (#802) from 3373-client_consumption into dev
Reviewed-on: #802
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
c544cbfec7
Merge branch 'dev' into 3350-Smart_table_unit_tests
gitea/salix/pipeline/head This commit looks good Details
1dae7ad792
Merge pull request '3350-Smart_table_unit_tests' (#803) from 3350-Smart_table_unit_tests into dev
Reviewed-on: #803
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
02d89e5774
feat(item): add field genericFk in basic-data
gitea/salix/pipeline/head This commit looks good Details
5931692fac
test(item_basic-data): add genericFk e2e
gitea/salix/pipeline/head This commit looks good Details
8ede14ab40
fix(sales): update price on any change affecting the ticket total
Refs: 3363
gitea/salix/pipeline/head This commit looks good Details
00072a7dd1
landing searchable false
gitea/salix/pipeline/head This commit looks good Details
14270145f8
Merge pull request '3339-entry_latest-buys-search-panel add from and to filter' (#800) from 3339-entry_latest-buys-search-panel into dev
Reviewed-on: #800
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f98b0c7bbe
Merge branch 'dev' into 3363-sale_update_price
gitea/salix/pipeline/head This commit looks good Details
537c1bb664
Merge pull request 'fix(sales): update price on any change affecting the ticket total' (#804) from 3363-sale_update_price into dev
Reviewed-on: #804
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
fc2e81826d
export database
gitea/salix/pipeline/head This commit looks good Details
c03fe359b1
add acl
gitea/salix/pipeline/head This commit looks good Details
09c2b813b5
ACL update
gitea/salix/pipeline/head This commit looks good Details
0fc52cbf1d
Updated descriptor ACLs
gitea/salix/pipeline/head This commit looks good Details
4162f239cf
Allow basic-data access for hhrr
gitea/salix/pipeline/head This commit looks good Details
ab3902ebd8
Restricted account creation
gitea/salix/pipeline/head This commit looks good Details
0838f34771
Show alias section for marketing
gitea/salix/pipeline/head This commit looks good Details
5914e8e1ac
fixed e2e by adding acls where needed
gitea/salix/pipeline/head This commit looks good Details
f96f22c231
misspelled word
gitea/salix/pipeline/head This commit looks good Details
b7b6f62343
Merge pull request '3301-refactor(ticket): modify transferSales.js for avoid unnecessary logs' (#805) from 3301-ticket_transferSales into dev
Reviewed-on: #805
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
cdbd1964a6
Merge branch 'dev' into 3368-export_database
gitea/salix/pipeline/head This commit looks good Details
ec939674b9
Merge pull request '3368-export_database' (#806) from 3368-export_database into dev
Reviewed-on: #806
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
74fbae6510
refactor(route_ticket): add style in a style.scss
gitea/salix/pipeline/head This commit looks good Details
ba29df16c0
Merge branch 'dev' into 3377-modifyStyles
gitea/salix/pipeline/head There was a failure building this commit Details
9f8d2c7350
Merge pull request '3377-modifyStyles' (#798) from 3377-modifyStyles into dev
Reviewed-on: #798
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
eea9413628
fix(item_basic-data): controller, test e2e and model
gitea/salix/pipeline/head This commit looks good Details
771100ccab
remove unnecessary intro and comment
gitea/salix/pipeline/head This commit looks good Details
25371ef97b
Translation fix
gitea/salix/pipeline/head This commit looks good Details
d1add9ef84
sql changes
gitea/salix/pipeline/head This commit looks good Details
65053f5f28
feat(worker_time-control): add timestamp url param
gitea/salix/pipeline/head This commit looks good Details
442bf1940e
delete last commit, uploaed by error
gitea/salix/pipeline/head This commit looks good Details
2f7295020c
update column notificationEmail
gitea/salix/pipeline/head This commit looks good Details
b0cb7e1424
Updated fonts
gitea/salix/pipeline/head This commit looks good Details
e4d7d957eb
Rectified icons
gitea/salix/pipeline/head This commit looks good Details
49e9fcaa7c
remove unnecesary on-accept
gitea/salix/pipeline/head This commit looks good Details
a19ce34aae
Merge pull request '3384-item_basic-data add field genericFk' (#807) from 3384-item_basic-data into dev
Reviewed-on: #807
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f93da5f60d
Merge branch 'dev' into 3387-route_ticket
gitea/salix/pipeline/head This commit looks good Details
a82053854a
Merge pull request 'feat(route_ticket): add column province and change order other columns' (#808) from 3387-route_ticket into dev
Reviewed-on: #808
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
51a608cb5a
Merge branch 'dev' into 3325-notify_absence
gitea/salix/pipeline/head This commit looks good Details
df337360de
Merge pull request 'update column notificationEmail' (#810) from 3325-notify_absence into dev
Reviewed-on: #810
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
85e3b47408
test(worker_time-control): tested url parameter timestamp
gitea/salix/pipeline/head This commit looks good Details
594f258232
modify js date format
gitea/salix/pipeline/head This commit looks good Details
1176b23bb9
Merge branch 'dev' into 2676-worker_time-control
gitea/salix/pipeline/head This commit looks good Details
68a3a4d1e0
Merge pull request '2676-worker_time-control add timestamp url param' (#809) from 2676-worker_time-control into dev
Reviewed-on: #809
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
21bd625b3b
add exceprion to half day absence
gitea/salix/pipeline/head This commit looks good Details
d760eba446
Merge branch 'dev' into 3275-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
d5c0be5a9d
refactor(ticket_sale): logic and tests
gitea/salix/pipeline/head This commit looks good Details
238577ec8f
refactor: change ids by codes and add fixtures
gitea/salix/pipeline/head This commit looks good Details
cfdef6d090
Merge pull request 'feat(worker_calendar): add restrictions to add absence and to add hours recorded' (#812) from 3275-worker_calendar into dev
Reviewed-on: #812
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
decd4b5a95
separate sql procedures
gitea/salix/pipeline/head This commit looks good Details
7acf7c5bea
Changed duplicated button...
gitea/salix/pipeline/head This commit looks good Details
23e55a1a82
Merge pull request 'Duplicated bank entity creation button on supplier account' (#814) from supplier_account into dev
Reviewed-on: #814
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
75e32feb16
refactor ticket_sale
gitea/salix/pipeline/head This commit looks good Details
bc2b2f37e8
Merge pull request '3372-ticket_sale multi-check for recalculatePrice' (#811) from 3372-ticket_sale into dev
Reviewed-on: #811
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
b565d35a8b
Merge pull request '3386-route_ticket_buscaman' (#816) from 3386-route_ticket_buscaman into dev
Reviewed-on: #816
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
f63426304f
Removed font color
gitea/salix/pipeline/head This commit looks good Details
af670ae3e9
fdescribe
jgallego added 1 commit 2022-01-19 13:19:39 +00:00
gitea/salix/pipeline/head This commit looks good Details
3c8e6a16a2
Merge branch 'dev' into 2883-invoiceIn-Booking
jgallego added 1 commit 2022-01-19 13:52:05 +00:00
gitea/salix/pipeline/head This commit looks good Details
563b93a7be
test front checkToBook
jgallego changed title from WIP: 2883-invoiceIn-Booking to 2883-invoiceIn-Booking 2022-01-19 13:52:41 +00:00
carlosjr requested changes 2022-01-19 14:48:28 +00:00
@ -211,5 +211,6 @@
"Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
"You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
"You can't change the credit set to zero from a manager": "No puedes cambiar el cŕedito establecido a cero por un gerente",
"Amounts do not match": "Amounts do not match",
Contributor

this should be in spanish

this should be in spanish
joan marked this conversation as resolved
@ -0,0 +26,4 @@
if (typeof options == 'object')
Object.assign(myOptions, options);
if (!myOptions.transaction) {
Contributor

creating transaction on a read methods is required.

creating transaction on a read methods is required.
Contributor

is not* required

is not* required
jgallego marked this conversation as resolved
@ -0,0 +32,4 @@
}
try {
return (await Self.rawSql(`
Contributor

It is easier for code maintenance to extract values to constants or variables

It is easier for code maintenance to extract values to constants or variables
jgallego marked this conversation as resolved
@ -0,0 +45,4 @@
WHERE
ii.id = ?`, [id, id]))[0];
} catch (e) {
if (tx) await tx.rollback();
Contributor

endpoints that don't create transactions should not attempt to rollback.

(also the commit was missing)

endpoints that don't create transactions should not attempt to rollback. (also the commit was missing)
jgallego marked this conversation as resolved
@ -0,0 +9,4 @@
try {
const invoiceIntotals = await models.InvoiceIn.getTotals(invoiceInId, options);
expect(invoiceIntotals.totalTaxableBase).toEqual(invoiceIntotals.totalDueDay);
Contributor

will this fail if both properties are undefined?

will this fail if both properties are undefined?
@ -89,3 +91,1 @@
let summaryObj = await Self.app.models.InvoiceIn.findById(id, filter, myOptions);
summaryObj.totals = await getTotals(id);
summaryObj.totals = await models.InvoiceIn.getTotals(id);
Contributor

doesn't getTotal expect a transaction?

doesn't getTotal expect a transaction?
@ -52,2 +52,4 @@
.then(res => this.entity = res.data);
}
checktoBook() {
Contributor

function naming must be in lowerCamelCase

function naming must be in lowerCamelCase
jgallego marked this conversation as resolved
jgallego added 1 commit 2022-01-20 09:05:29 +00:00
gitea/salix/pipeline/head This commit looks good Details
6d66ab7bea
getTotals without transaction
jgallego added the
CR / Tests passed
label 2022-01-21 06:29:51 +00:00
carlosjr requested changes 2022-01-21 08:41:57 +00:00
@ -0,0 +38,4 @@
WHERE
ii.id = ?`, [id, id]);
return (result);
Contributor

remove the ()

remove the ()
jgallego marked this conversation as resolved
@ -21,0 +37,4 @@
});
describe('checkToBook()', () => {
it(`should show both warning messages`, () => {
Contributor

the description of the test states two warning messages will be shown but the test doesn't check that

the description of the test states two warning messages will be shown but the test doesn't check that
jgallego marked this conversation as resolved
jgallego added 1 commit 2022-01-24 14:35:37 +00:00
gitea/salix/pipeline/head This commit looks good Details
dad4119300
getTotal remove ()
jgallego added 1 commit 2022-01-24 14:40:42 +00:00
gitea/salix/pipeline/head This commit looks good Details
5fbbae7ac6
Merge branch 'dev' into 2883-invoiceIn-Booking
carlosjr approved these changes 2022-01-24 15:29:43 +00:00
carlosjr left a comment
Contributor

LGTM

LGTM
carlosjr merged commit 52990c0d03 into dev 2022-01-24 15:29:57 +00:00
carlosjr deleted branch 2883-invoiceIn-Booking 2022-01-24 15:29:58 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 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#786
No description provided.