Sam
|
9e5fb89274
|
cleanup
|
2021-03-11 13:56:09 +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
|
dd4b079895
|
fixes user creation test
|
2021-03-11 13:10:54 +00:00 |
|
Sam
|
67644512ff
|
fixed error in user creation
|
2021-03-11 13:04:30 +00:00 |
|
Sam
|
f23e1670c5
|
removed geo search code, moved it to geosearch branch
|
2021-03-11 12:45:55 +00:00 |
|
Sam
|
fc3ea28b5c
|
fix for create_company_user
|
2021-03-11 12:33:37 +00:00 |
|
Sam
|
ef0fe3716e
|
fixed error in create_company_user view
|
2021-03-11 12:32:13 +00:00 |
|
Sam
|
8de48c6698
|
more tweaks for geo search
|
2021-03-11 12:17:40 +00:00 |
|
Sam
|
c343bda367
|
search tests broken, but geo search working
|
2021-03-11 12:09:32 +00:00 |
|
Sam
|
9794ab1f18
|
changing the way search workd to accommodate for georestrictions
|
2021-03-11 11:33:12 +00:00 |
|
Sam
|
5178eb9722
|
first steps for georestricted search results
|
2021-03-11 11:11:00 +00:00 |
|
Sam
|
391ada843c
|
fixed for fix of geo data in track_user view
|
2021-03-11 10:14:40 +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
|
9cf38333d9
|
Merge branch 'development' into diego
|
2021-03-11 08:37:33 +01:00 |
|
Diego Calvo
|
5c039f5ff2
|
price filter add equal to
|
2021-03-11 08:36:31 +01:00 |
|
Diego Calvo
|
8a2a379849
|
track_user geo fix
|
2021-03-10 15:06:09 +01:00 |
|
Sam
|
ae1deeff31
|
company.city wont show as dropdown list in admin
|
2021-03-10 13:42:21 +00:00 |
|
Sam
|
0eaaf2bc49
|
fixed create_company_user endoint, tests working
|
2021-03-10 13:24:02 +00:00 |
|
Sam
|
a033fa3606
|
readme update
|
2021-03-10 12:44:23 +00:00 |
|
Sam
|
faf3cfc3fa
|
new user activation working
|
2021-03-10 12:37:24 +00:00 |
|
Sam
|
e31d725ed1
|
email verification being sent upon user creation
|
2021-03-10 12:24:59 +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
|
c8181a2893
|
tweaks to email template
|
2021-03-10 10:42:33 +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
|
9b1405ecda
|
another change but still not working
|
2021-03-09 12:06:02 +00:00 |
|
Sam
|
170ca94022
|
changes but still not working
|
2021-03-09 11:59:16 +00:00 |
|
Sam
|
2eb6bf3acd
|
extended DjangoSuitConfig to customize admin navbar, not working yet
|
2021-03-09 11:43:14 +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
|
b629b2cd42
|
customized company model __str__
|
2021-03-09 11:13:22 +00:00 |
|
Sam
|
a8ef16206e
|
added dynamic field link to company, to display on admin if it has a shop_link
|
2021-03-09 10:11:09 +00:00 |
|
Sam
|
7a1aa496b7
|
first try at implementing product viewset "related" action
|
2021-03-08 13:47:47 +00:00 |
|
Sam
|
ff92c97d93
|
added link item to company admin display list
|
2021-03-08 13:23:19 +00:00 |
|
Sam
|
596386fb65
|
fixed wrong serach field name in company admin
|
2021-03-08 13:16:23 +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
|
cd6f8e558e
|
modified history admin config
|
2021-03-08 11:31:51 +00:00 |
|