Commit Graph

338 Commits

Author SHA1 Message Date
Sam
c38e9dd822 unified the db queries in product search, one per chunk 2021-02-15 11:07:22 +00:00
Sam
ef0f36bff5 added initial support for nested tags in product search 2021-02-15 10:28:29 +00:00
Sam
eb174f027a switched tag field to local TagTreeModel 2021-02-15 10:07:38 +00:00
Diego Calvo
57ab82a6a2 solve conflicts 2021-02-15 10:16:47 +01:00
Sam
798c960ead removed mytreetag model 2021-02-12 13:44:25 +00:00
Sam
682a41e828 leftover file deleted 2021-02-12 12:35:57 +00:00
Sam
bd8d05bd39 changes to readme, and addtaxonomy 2021-02-12 12:34:08 +00:00
Sam
e5fdeb7cdb added tag filtering for companies 2021-02-12 12:18:06 +00:00
Sam
c4faa89a99 fixes to the my_ views, and their tests 2021-02-12 12:03:16 +00:00
Diego Calvo
c4e7ce4fef Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into diego 2021-02-12 12:45:42 +01:00
Sam
0a61cea599 query params filter working with tags in Product 2021-02-12 11:28:55 +00:00
Sam
9a6a30553a added custom filter with tag support to products 2021-02-12 11:09:32 +00:00
Sam
77b1660fc3 testing tag filtering 2021-02-12 10:49:09 +00:00
Diego Calvo
5f0c81d947 Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into diego 2021-02-12 11:23:13 +01:00
Sam
58797d2972 added local TagTreeModel for testing 2021-02-11 13:51:05 +00:00
Sam
82a6273b3d increased tag count in product model 2021-02-11 13:29:06 +00:00
Sam
83241cd788 loadgisdata working, removed old addgeo 2021-02-11 13:03:25 +00:00
Sam
20a4040aa7 improvements to loadgisdata 2021-02-11 12:51:59 +00:00
Sam
2de6a66af1 working on adding geospatial data to geo models 2021-02-11 12:33:09 +00:00
Sam
2ad212b192 added multipolygon field to geo modls 2021-02-11 11:28:07 +00:00
Sam
0a69fd8b89 added gadm geo package dataset 2021-02-11 11:26:05 +00:00
Sam
202a1b14f6 added gadm geo package dataset 2021-02-11 11:25:56 +00:00
Diego Calvo
95e5a70690 Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into diego 2021-02-11 11:53:55 +01:00
Sam
d577a6b202 changed company.city to charfield 2021-02-11 10:21:31 +00:00
Diego Calvo
862b65a5b2 my_company correction 2021-02-10 15:02:57 +01:00
Sam
208f96add7 changes to addtestdata 2021-02-10 13:52:39 +00:00
Sam
02f6b29e5f created TreeTag model, fixes for addtaxonomy command 2021-02-10 13:03:10 +00:00
Sam
41e68031fa work on initial tag load 2021-02-10 12:50:25 +00:00
Sam
07c3a42ee8 Merge branch 'sam' into development 2021-02-10 12:03:54 +00:00
Sam
4d35f67587 readme update 2021-02-10 12:03:12 +00:00
Sam
fa237142ad added ip and geoip functionality to email_manager action 2021-02-10 11:55:03 +00:00
Sam
dad8c00b84 improvement to email_manager action as per documentation 2021-02-10 11:01:33 +00:00
Sam
25231b3b16 improvements to email templates 2021-02-10 10:43:26 +00:00
Diego Calvo
3b801768e4 handle errors 2021-02-10 10:58:09 +01:00
Diego Calvo
c4c03653e2 Merge branch 'development' of https://bitbucket.org/enreda/back-latienda into development 2021-02-09 14:56:15 +01:00
Diego Calvo
0675c48903 create coop user with geo 2021-02-09 14:55:42 +01:00
Sam
202369e189 added empty action "related" to ProductViewSet 2021-02-09 13:40:40 +00:00
Sam
94b62ce494 replaced StatsLog.model with a generic foreign key 2021-02-09 13:20:49 +00:00
Sam
d3862629e9 cleanup 2021-02-09 13:08:48 +00:00
Sam
9be0971fb8 implemented basic filter creation during product search 2021-02-09 13:07:56 +00:00
Sam
742f78b4b6 improvemets to product search 2021-02-09 12:20:01 +00:00
Sam
7e7552742a conflict resolution 2021-02-09 12:06:28 +00:00
Sam
a5979b9373 enabled custom serializers in my_ endpoints 2021-02-09 12:04:47 +00:00
Sam
d0deec9417 added drf-extra-fields to handle PointField serialization 2021-02-09 11:41:26 +00:00
Diego Calvo
02037d5b43 create coop user endpoint 2021-02-09 10:29:45 +01:00
Diego Calvo
8223032ef7 split search and serializer 2021-02-08 14:51:24 +01:00
Sam
4460f1121a added missing import 2021-02-05 13:54:54 +00:00
Sam
39f6a8bcfb added action endpoint for emailing company manager 2021-02-05 13:53:55 +00:00
Sam
a9cb7cedd6 email verification sent for users loaded thru CSV 2021-02-05 13:11:09 +00:00
Sam
75234953c0 improvement to search test 2021-02-05 09:57:11 +00:00