Sam
|
2629292c64
|
added product id to image path
|
2021-03-26 10:16:19 +00:00 |
|
Diego Calvo
|
79393320c1
|
get_descendats categories in search_products
|
2021-03-19 14:31:59 +01:00 |
|
Diego Calvo
|
815a55f45c
|
real solve conflicts with categories
|
2021-03-19 14:13:24 +01:00 |
|
Diego Calvo
|
3c7dfe731f
|
solve conflicts with categories
|
2021-03-19 14:11:56 +01:00 |
|
Sam
|
23109cfb39
|
new way of handling category searches
|
2021-03-19 10:53:49 +00:00 |
|
Diego Calvo
|
48f7a82af1
|
categories by name
|
2021-03-19 11:24:28 +01:00 |
|
Diego Calvo
|
ff1afb714f
|
min and max prices values instead of dict
|
2021-03-19 08:14:36 +01:00 |
|
Sam
|
2673aa51aa
|
changed product categories from label to name
|
2021-03-18 11:20:30 +00:00 |
|
Sam
|
d2ee4273b9
|
filtering product searches with empty string working now
|
2021-03-17 11:30:11 +00:00 |
|
Sam
|
6a3bd7acea
|
fixing changes to product search
|
2021-03-17 10:31:39 +00:00 |
|
Sam
|
62c6b76e36
|
Merge branch 'diego' into development
|
2021-03-17 10:18:07 +00:00 |
|
Sam
|
aac2c5777e
|
small fixes
|
2021-03-17 10:16:31 +00:00 |
|
Diego Calvo
|
440c845286
|
Merge branch 'master' into diego
|
2021-03-16 15:03:46 +01:00 |
|
Diego Calvo
|
11465f4a6a
|
list of categories in search_products
|
2021-03-16 15:02:31 +01:00 |
|
Sam
|
9e476f4007
|
created endpoint to get all categories
|
2021-03-16 12:06:08 +00:00 |
|
Sam
|
6557207e45
|
new purchase email templates working
|
2021-03-15 12:21:18 +00:00 |
|
Diego Calvo
|
fc7e80eb5c
|
send email to manager if coop has no email
|
2021-03-15 13:07:47 +01:00 |
|
Sam
|
23b78dd11a
|
Merge branch 'sam' into development
|
2021-03-15 11:26:03 +00:00 |
|
Sam
|
c0bc86a1a6
|
Merge branch 'diego' into development
|
2021-03-15 11:25:04 +00:00 |
|
Diego Calvo
|
d11c4a5c36
|
revert last commit
|
2021-03-15 12:04:27 +01:00 |
|
Sam
|
a920a9fa61
|
trying to get new templates to work
|
2021-03-15 10:49:17 +00:00 |
|
Diego Calvo
|
048f6dbb70
|
perform_create in MyProductsViewSet for creating with creator and company
|
2021-03-15 11:45:44 +01:00 |
|
Sam
|
5da01b318e
|
fixed email sending for html content type
|
2021-03-12 13:45:36 +00:00 |
|
Sam
|
778d65d84e
|
implemented new email templates, but not rendering
|
2021-03-12 12:37:27 +00:00 |
|
Sam
|
37f222e6c9
|
changes for my endpoints
|
2021-03-12 10:22:23 +00:00 |
|
Sam
|
4cf22fd969
|
bunch of stuff
|
2021-03-11 13:51:14 +00:00 |
|
Sam
|
5fe3883fcd
|
my products ordered by created date, descending
|
2021-03-11 13:18:50 +00:00 |
|
Sam
|
8a004b127e
|
Merge branch 'sam' into development
|
2021-03-11 10:00:59 +00:00 |
|
Sam
|
4a7975d77a
|
Merge branch 'diego' into development
|
2021-03-11 09:59:03 +00:00 |
|
Diego Calvo
|
5c039f5ff2
|
price filter add equal to
|
2021-03-11 08:36:31 +01:00 |
|
Sam
|
0eaaf2bc49
|
fixed create_company_user endoint, tests working
|
2021-03-10 13:24:02 +00:00 |
|
Sam
|
bb0b8729cb
|
changes to related product action, test ok
|
2021-03-10 12:13:21 +00:00 |
|
Sam
|
39c8bd5e44
|
history admin dropdown for admin
|
2021-03-10 11:52:43 +00:00 |
|
Sam
|
d01d5bf407
|
fix for history admin crashing when company is null
|
2021-03-10 11:41:02 +00:00 |
|
Sam
|
aa9a6bdf81
|
fixed email error
|
2021-03-10 10:51:45 +00:00 |
|
Sam
|
3cbc807bf7
|
finished work on purchase_email endpoint, for now
|
2021-03-10 10:23:43 +00:00 |
|
Sam
|
c6f051ac65
|
added email validation to purchase_email view
|
2021-03-10 10:10:16 +00:00 |
|
Sam
|
f0a076057c
|
fixes to purchase_email and readme update
|
2021-03-09 13:47:18 +00:00 |
|
Sam
|
4218d94a26
|
testing purchase_email but getting 401 with AllowAny
|
2021-03-09 13:00:59 +00:00 |
|
Sam
|
89e3e446f3
|
more work on purchase_email endpoint and basic templates
|
2021-03-09 12:44:01 +00:00 |
|
Sam
|
d65f9d2388
|
added purchase_email endpoint to products views
|
2021-03-09 12:27:15 +00:00 |
|
Sam
|
0fee0a2f6d
|
implemented dropdowns for fk fields in product and company admin
|
2021-03-09 11:30:54 +00:00 |
|
Sam
|
2a731b3c3b
|
fixed error in history admin when company was none
|
2021-03-09 11:15:34 +00:00 |
|
Sam
|
7a1aa496b7
|
first try at implementing product viewset "related" action
|
2021-03-08 13:47:47 +00:00 |
|
Sam
|
230cfbe043
|
minucia
|
2021-03-08 13:10:15 +00:00 |
|
Sam
|
3b28238a62
|
added AdminCompanyViewSet for users with role SITE_ADMIN
|
2021-03-08 13:02:57 +00:00 |
|
Sam
|
642688b98d
|
added AdminProductsViewSet for users with role SITE_ADMIN
|
2021-03-08 12:54:06 +00:00 |
|
Sam
|
ec27937b85
|
switched my_company and my_products from method to class views
|
2021-03-08 12:24:44 +00:00 |
|
Sam
|
ebd1b6744c
|
product search only for active products
|
2021-03-08 11:50:43 +00:00 |
|
Sam
|
c25d23548d
|
mods to django admin
|
2021-03-08 11:10:03 +00:00 |
|