kit-eco.social/consumocuidado-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • f23e1670c5 removed geo search code, moved it to geosearch branch Sam 2021-03-11 12:45:55 +00:00
  • fc3ea28b5c fix for create_company_user Sam 2021-03-11 12:33:37 +00:00
  • ef0fe3716e fixed error in create_company_user view Sam 2021-03-11 12:32:13 +00:00
  • 8de48c6698 more tweaks for geo search Sam 2021-03-11 12:17:40 +00:00
  • c343bda367 search tests broken, but geo search working Sam 2021-03-11 12:09:32 +00:00
  • 9794ab1f18 changing the way search workd to accommodate for georestrictions Sam 2021-03-11 11:33:12 +00:00
  • 5178eb9722 first steps for georestricted search results Sam 2021-03-11 11:11:00 +00:00
  • 391ada843c fixed for fix of geo data in track_user view Sam 2021-03-11 10:14:40 +00:00
  • 8a004b127e Merge branch 'sam' into development Sam 2021-03-11 10:00:59 +00:00
  • 4a7975d77a Merge branch 'diego' into development Sam 2021-03-11 09:59:03 +00:00
  • 9cf38333d9 Merge branch 'development' into diego Diego Calvo 2021-03-11 08:37:33 +01:00
  • 5c039f5ff2 price filter add equal to Diego Calvo 2021-03-11 08:36:31 +01:00
  • 8a2a379849 track_user geo fix Diego Calvo 2021-03-10 15:06:09 +01:00
  • ae1deeff31 company.city wont show as dropdown list in admin Sam 2021-03-10 13:42:21 +00:00
  • 0eaaf2bc49 fixed create_company_user endoint, tests working Sam 2021-03-10 13:24:02 +00:00
  • a033fa3606 readme update Sam 2021-03-10 12:44:23 +00:00
  • faf3cfc3fa new user activation working Sam 2021-03-10 12:37:24 +00:00
  • e31d725ed1 email verification being sent upon user creation Sam 2021-03-10 12:24:59 +00:00
  • bb0b8729cb changes to related product action, test ok Sam 2021-03-10 12:13:21 +00:00
  • 39c8bd5e44 history admin dropdown for admin Sam 2021-03-10 11:52:43 +00:00
  • d01d5bf407 fix for history admin crashing when company is null Sam 2021-03-10 11:41:02 +00:00
  • aa9a6bdf81 fixed email error Sam 2021-03-10 10:51:45 +00:00
  • c8181a2893 tweaks to email template Sam 2021-03-10 10:42:33 +00:00
  • 3cbc807bf7 finished work on purchase_email endpoint, for now Sam 2021-03-10 10:23:43 +00:00
  • c6f051ac65 added email validation to purchase_email view Sam 2021-03-10 10:10:16 +00:00
  • f0a076057c fixes to purchase_email and readme update Sam 2021-03-09 13:47:18 +00:00
  • 4218d94a26 testing purchase_email but getting 401 with AllowAny Sam 2021-03-09 13:00:59 +00:00
  • 89e3e446f3 more work on purchase_email endpoint and basic templates Sam 2021-03-09 12:44:01 +00:00
  • d65f9d2388 added purchase_email endpoint to products views Sam 2021-03-09 12:27:15 +00:00
  • 9b1405ecda another change but still not working Sam 2021-03-09 12:06:02 +00:00
  • 170ca94022 changes but still not working Sam 2021-03-09 11:59:16 +00:00
  • 2eb6bf3acd extended DjangoSuitConfig to customize admin navbar, not working yet Sam 2021-03-09 11:43:14 +00:00
  • 0fee0a2f6d implemented dropdowns for fk fields in product and company admin Sam 2021-03-09 11:30:54 +00:00
  • 2a731b3c3b fixed error in history admin when company was none Sam 2021-03-09 11:15:34 +00:00
  • b629b2cd42 customized company model __str__ Sam 2021-03-09 11:13:22 +00:00
  • a8ef16206e added dynamic field link to company, to display on admin if it has a shop_link Sam 2021-03-09 10:11:09 +00:00
  • 7a1aa496b7 first try at implementing product viewset "related" action Sam 2021-03-08 13:47:47 +00:00
  • ff92c97d93 added link item to company admin display list Sam 2021-03-08 13:23:19 +00:00
  • 596386fb65 fixed wrong serach field name in company admin Sam 2021-03-08 13:16:23 +00:00
  • 230cfbe043 minucia Sam 2021-03-08 13:10:15 +00:00
  • 3b28238a62 added AdminCompanyViewSet for users with role SITE_ADMIN Sam 2021-03-08 13:02:57 +00:00
  • 642688b98d added AdminProductsViewSet for users with role SITE_ADMIN Sam 2021-03-08 12:54:06 +00:00
  • ec27937b85 switched my_company and my_products from method to class views Sam 2021-03-08 12:24:44 +00:00
  • ebd1b6744c product search only for active products Sam 2021-03-08 11:50:43 +00:00
  • cd6f8e558e modified history admin config Sam 2021-03-08 11:31:51 +00:00
  • c25d23548d mods to django admin Sam 2021-03-08 11:10:03 +00:00
  • 44294223ed blank model fields Sam 2021-03-08 10:50:39 +00:00
  • 4316ab6f2b showing googlemaps in company admin Sam 2021-03-05 13:13:49 +00:00
  • 1aa2698763 customization to model admin forms Sam 2021-03-05 12:38:17 +00:00
  • 14a2f3ca0b customization to model admin forms Sam 2021-03-05 12:35:16 +00:00
  • 8518bd09ce fixed product views to only list active products Sam 2021-03-05 11:49:21 +00:00
  • 375db09bb3 only validated companies showing in views Sam 2021-03-05 11:44:26 +00:00
  • a92b44c0b2 companies added by csv could be active Sam 2021-03-05 11:35:20 +00:00
  • ae25f5fadc added active booleand field to product, default False Sam 2021-03-05 11:29:27 +00:00
  • bcea4abb23 added random_company_sample endpoint Sam 2021-03-05 11:26:40 +00:00
  • 7825810448 change company view to descending order by created date Sam 2021-03-05 11:06:05 +00:00
  • cdb18ea157 added company_name as a vector in product search Sam 2021-03-05 10:41:25 +00:00
  • f81bbee4e6 added object count to my_products Sam 2021-03-05 10:13:31 +00:00
  • e7366226ea merge conflix Sam 2021-03-04 13:38:06 +00:00
  • 6d79583540 product category in admin almost fixed Sam 2021-03-04 13:34:46 +00:00
  • 085c6f86a7 added custom autocomplete for category in product admin, still not working correctly Sam 2021-03-04 13:23:11 +00:00
  • 657b717c07 working to fix tag widgets in admin Sam 2021-03-04 12:37:15 +00:00
  • c094c9a9f9 Adding blank to Tag and attributes pablogg 2021-03-04 13:20:41 +01:00
  • c99b81b751 implemented pagination for my_products and my_company Sam 2021-03-04 11:50:26 +00:00
  • 8068921bb7 changed tags to protected, and not all lowercase Sam 2021-03-04 10:59:10 +00:00
  • b3aa80a9fa Merge branch 'diego' into development Sam 2021-03-04 10:33:30 +00:00
  • 2d704ff91f fixed issue of products deleted if category tag deleted Sam 2021-03-04 10:31:48 +00:00
  • 5ab1642d0b delete print... Diego Calvo 2021-03-04 10:14:11 +01:00
  • 76c45a1dd7 add company in product creation Diego Calvo 2021-03-04 09:32:54 +01:00
  • cf973caf5a added geo support to track_user view Sam 2021-03-03 13:45:16 +00:00
  • 5595d14f2b Merge branch 'diego' into sam Sam 2021-03-03 13:23:52 +00:00
  • d5b6dec656 fixes to track_user, and StatsLog model Sam 2021-03-03 13:18:06 +00:00
  • b793aaef36 comment fix Sam 2021-03-03 12:40:08 +00:00
  • 3b487c7ce6 test fixes for track_user view Sam 2021-03-03 12:34:51 +00:00
  • 0b3f91d566 add full_name to user in create_company_user Diego Calvo 2021-03-03 13:28:28 +01:00
  • ef5771461c advances in TrackUserViewTest Sam 2021-03-03 12:25:54 +00:00
  • 884fe1e2b5 added StatsLogViewSetTest Sam 2021-03-03 11:52:32 +00:00
  • ff8453e003 readme update Sam 2021-03-03 10:49:44 +00:00
  • ddf7aee312 improvements to csv product loading Sam 2021-03-03 10:41:34 +00:00
  • 794250a6ab cleanup Sam 2021-03-02 13:55:10 +00:00
  • 4a0a9c3788 work on product csv loading Sam 2021-03-02 13:53:48 +00:00
  • 8bae68907e finished tests for new search Sam 2021-03-02 13:43:08 +00:00
  • 1338570c05 partial improvements to search Sam 2021-03-02 13:17:37 +00:00
  • 5bab1d75cb improvemento to product search Sam 2021-03-02 12:10:14 +00:00
  • 03f06c270c changes to csv data headers Sam 2021-03-02 11:10:58 +00:00
  • 9baa13f30a improvements to search functionality Sam 2021-03-02 11:01:22 +00:00
  • 626461bd99 removed lower() when parsing csv data Sam 2021-03-02 10:45:10 +00:00
  • f71f880a6b improvements to coop product loader Sam 2021-03-02 10:44:23 +00:00
  • 40bc3568c1 Merge branch 'development' pablogg 2021-02-28 19:49:14 +01:00
  • 2b68413aea Method to import products tested from shell pablogg 2021-02-28 19:42:22 +01:00
  • c61ea440d4 fix null/blank true fields pablogg 2021-02-28 18:45:31 +01:00
  • 54cebf842d Merge branch 'master' of bitbucket.org:enreda/back-latienda Sam 2021-02-26 14:01:19 +00:00
  • 223b944199 improvements in product loader Sam 2021-02-26 13:59:30 +00:00
  • d4160316fb fix ipdb pablogg 2021-02-26 14:41:08 +01:00
  • 7f86d979ed Merge branch 'master' of bitbucket.org:enreda/back-latienda pablogg 2021-02-26 14:28:41 +01:00
  • 25b8e561d3 improvements to coop loader Sam 2021-02-26 13:16:37 +00:00
  • 874068881d improvements to csv loading code Sam 2021-02-26 12:47:23 +00:00
  • fb2da7d2cf fixed error in serialier change ofr product search Sam 2021-02-26 11:52:17 +00:00
  • 0f7af9c0fb isolated cooploading functionality Sam 2021-02-26 11:46:40 +00:00
  • 86020afd27 search response includes min and max prices Sam 2021-02-26 10:58:36 +00:00