Commit Graph

258 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 7370269e4d ticket.sale now shows Packing type 2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz 7004ad5ade removed several columns from bulk edit and added packingOut
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 12:47:40 +02:00
Carlos Jimenez Ruiz c776d34cdf invoiceIn basic data and summary added some fields
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 17:08:21 +02:00
Carlos Jimenez Ruiz e418d6239b fixed getSummary unit test
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 11:28:23 +02:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz 72a0b774de add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 14:15:28 +02:00
Joan Sanchez 93399d6de6 Updated description
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 11:18:44 +02:00
Joan Sanchez 65dc0e3780 2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good Details
2021-04-06 13:46:38 +02:00
Joan Sanchez 5ef3ff40ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-06 09:14:11 +02:00
Joan Sanchez a2144405ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 17:04:37 +02:00
Joan Sanchez 9bbf43c590 Replace http with https
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 14:34:16 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz 767665e3c9 endpoint indentation + type updated yo array of objects
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 10:39:19 +01:00
Carlos Jimenez Ruiz 3c8ed85e69 sum is now made on backend and html amends 2021-03-26 10:33:53 +01:00
jorgebl e01b7420d9 Added total cost of item 2021-03-24 13:54:29 +01:00
jorgebl 32ea2dbda6 Added permisions from models in table salix ACL 2021-03-08 12:32:35 +01:00
jorgebl 63ac492845 Added message for duplicated names
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 08:45:14 +01:00
jorgebl 4cc3fc90c5 conditionals if name already exists 2021-03-04 21:30:56 +01:00
jorgebl 300f78f31e added permisions logistic boss 2021-03-04 20:07:45 +01:00
jorgebl 92db67292c Removed botanical field and changes "edi" for "vn"
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 07:56:31 +01:00
Joan Sanchez 89abf424fb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-02-25 08:17:26 +01:00
Joan Sanchez c2a2204437 Regex change
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 16:04:09 +01:00
Joan Sanchez ddb77a5c05 Regex change
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 15:55:09 +01:00
Joan Sanchez d3879635a8 Regex changes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2021-02-24 15:54:02 +01:00
jorgebl f1c481de64 QA refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 14:49:58 +01:00
Joan Sanchez 1c819e692e Floramondo image download fixes
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 14:37:49 +01:00
jorgebl df9ca2ad3e Fixed filter description 2021-02-24 12:24:50 +01:00
Joan Sanchez 347ac77878 Changes to file names
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 09:59:41 +01:00
jorgebl 69f53972d5 Added filter for selection
gitea/salix/pipeline/head This commit looks good Details
2021-02-22 16:43:40 +01:00
Joan Sanchez ddb443ab8f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-02-18 13:17:34 +01:00
Joan Sanchez 8ddbcc24a7 Added priority to image download queue
gitea/salix/pipeline/head This commit looks good Details
2021-02-18 13:03:49 +01:00
Carlos Jimenez Ruiz 3d948ef317 warning color added lines with clientType loses 2021-02-09 10:43:19 +01:00
Joan Sanchez f041e0d897 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-02-04 18:44:25 +01:00
Joan Sanchez 215e0c9fc4 Image download fix for images without extension
gitea/salix/pipeline/head This commit looks good Details
2021-02-03 15:01:09 +01:00
Joan Sanchez a845f53f0a Bug fixes
gitea/salix/pipeline/head This commit looks good Details
2021-02-03 12:43:30 +01:00
Carlos Jimenez Ruiz ff94b182a1 error is not a required field
gitea/salix/pipeline/head This commit looks good Details
2021-02-03 10:16:46 +01:00
Joan Sanchez 7bcbf5303e Fix where
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 16:08:57 +01:00
Joan Sanchez 9d5d2e9177 Added method prune again
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 15:57:33 +01:00
Joan Sanchez ca47fe6827 2476 - downloadImages() method refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-28 12:23:18 +01:00
Carlos Jimenez Ruiz fe04f00c28 fixed unit test for upsertFixedPrice 2021-01-20 14:39:23 +01:00
Carlos Jimenez Ruiz 464366fdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz 3ec641f733 filter unit tests 2021-01-18 15:42:38 +01:00
Carlos Jimenez Ruiz 8d6dd3e03a minor refactors 2021-01-18 14:17:01 +01:00
Carlos Jimenez Ruiz 3251d737e6 fixed price index implementation 2021-01-18 14:16:39 +01:00
Jorge Padawan 97c8faaf50 Add column multiplier on item section
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 11:43:48 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Joan Sanchez 7693a1c449 2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:05:57 +01:00
Joan Sanchez dfbe1a02d2 Removed unused import
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 14:06:41 +01:00
Joan Sanchez 08af948eb0 Merge branch 'dev' into 2574-itemTag_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 12:39:17 +00:00
Carlos Jimenez Ruiz 54d31f15bb fixed collection tests pollution
gitea/salix/pipeline/head This commit looks good Details
2020-11-09 14:53:26 +01:00
Joan Sanchez a30cfd2218 Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 09:21:20 +01:00
Joan Sanchez a325ef2a78 2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-04 11:29:10 +01:00
Carlos Jimenez Ruiz c622175192 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 18:57:33 +02:00
Carlos Jimenez Ruiz dd6035606f some more tests fixed + refactors 2020-10-15 18:57:27 +02:00
Bernat Exposito 0fbbe9b2ae Merge pull request 'new module supplier, created section index and searchpanel' (#413) from 2501-supplier_index into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #413
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-10-15 07:57:57 +00:00
Bernat Exposito Domenech cc35998f62 new module supplier, created section index and searchpanel
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 08:15:04 +02:00
Carlos Jimenez Ruiz 30d00d0f63 fix getWasteDetail test 2020-10-14 10:53:20 +02:00
Joan Sanchez 2e3402b0cd Updated method description
gitea/salix/pipeline/head This commit looks good Details
2020-10-14 07:18:39 +02:00
Carlos Jimenez Ruiz c04b7a0657 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 10:31:06 +02:00
Bernat Exposito Domenech 6e081df4e8 fix test
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 08:17:00 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Javi Gallego 1b13e58e10 item basic-data añadir isFragile
gitea/salix/pipeline/head This commit looks good Details
2020-09-17 09:58:00 +02:00
Joan Sanchez d0ac1b621c Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 09:06:11 +00:00
Joan Sanchez 004c9d7341 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 08:27:08 +02:00
Joan Sanchez 5ef9afdb53 Empty url fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 15:07:57 +02:00
Carlos Jimenez Ruiz a00f64e7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create 2020-09-03 16:29:38 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Joan Sanchez a3382300f9 2402 - Added create entry section
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 14:08:56 +02:00
Carlos Jimenez Ruiz 9fa3f17a9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-01 17:45:00 +02:00
Joan Sanchez 0a542a2057 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:38:03 +02:00
Joan Sanchez 8aa9918d84 2409 - Added filter by selection
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 15:03:00 +02:00
Carlos Jimenez Ruiz c70ad808a0 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz a66656dcce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-27 15:14:41 +02:00
Joan Sanchez a75938b6d0 Updated error handler
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:23:40 +02:00
Joan Sanchez 55d047c0dd Renamed error var
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:11:22 +02:00
Joan Sanchez fd67a85fe8 Changed to 1 second
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 14:09:21 +02:00
Joan Sanchez 6f3fb83cd7 Changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 13:53:11 +02:00
Carlos Jimenez Ruiz 3a82ef0e06 2375 entry lastBuy seccion
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 16:33:47 +02:00
Carlos Jimenez Ruiz d23e3eff76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-26 09:49:52 +02:00
Joan Sanchez ea4f561bcf Added try-catch
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-08-26 07:33:00 +02:00
Joan Sanchez 4ef540c8f3 Changed download path
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 09:48:02 +02:00
Joan Sanchez 2a7495bac9 Image queue fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-08-18 09:45:26 +02:00
Joan Sanchez 1ef6637ad3 Added clearInterval()
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 08:37:39 +02:00
Joan Sanchez 8968f41b75 Queue changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 08:10:40 +02:00
Carlos Jimenez Ruiz dee3ab166a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-17 14:18:44 +02:00
Joan Sanchez a10e091b62 Added limit
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 16:26:35 +02:00
Joan Sanchez 7a3de746cc Added limit
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 14:00:40 +02:00
Joan Sanchez bbf15da16f Changed tmp uri
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 13:38:52 +02:00
Joan Sanchez c0794808f0 Updated tmp directory
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 13:09:53 +02:00
Joan Sanchez c9ed17d981 Changes to dowload item photos endpoint
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 12:16:25 +02:00
Carlos Jimenez Ruiz f2730dd51c some parts of latestsBuys WIP
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-20 11:31:47 +02:00
Joan Sanchez da3d20bb16 Restored limit
gitea/salix/pipeline/head This commit looks good Details
2020-07-15 12:11:44 +02:00
Joan Sanchez 72dfa4262a Removed limit
gitea/salix/pipeline/head This commit looks good Details
2020-07-15 12:00:38 +02:00
Joan Sanchez 68c19fa22a Removed test
gitea/salix/pipeline/head This commit looks good Details
2020-07-14 11:17:53 +02:00
Joan Sanchez e557bd2815 Renamed method
gitea/salix/pipeline/head This commit looks good Details
2020-07-14 11:16:50 +02:00
Joan Sanchez 3074c9ce35 Fixed async image registration
gitea/salix/pipeline/head This commit looks good Details
2020-07-14 09:32:50 +02:00
Joan Sanchez 80075a6471 Added limit
gitea/salix/pipeline/head This commit looks good Details
2020-07-13 14:46:00 +02:00
Joan Sanchez 99aa6b666d Mkdir recursive
gitea/salix/pipeline/head This commit looks good Details
2020-07-13 14:31:50 +02:00
Joan Sanchez 838b8a5382 Fix scope var
gitea/salix/pipeline/head This commit looks good Details
2020-07-13 14:22:19 +02:00