raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,691 Commits 20 Branches 451 Tags
7ccfdc8d21800ae116a83a303cedae90ecca04d2
Commit Graph

1786 Commits

Author SHA1 Message Date
Luis Ramos
71bf3f5f71 Merge pull request #4514 from luisramos0/backend_ctrl_overview 
Bring spree_backend overview controller to OFN
 2019-12-09 23:36:32 +00:00
Luis Ramos
6db15a0a20 Merge pull request #4524 from Matt-Yorkley/packing_reports 
Packing reports performance
 2019-12-02 17:32:52 +00:00
Matt-Yorkley
38c327dae0 Improve N+1 issues around #suppliers_of_products_distributed_by 
There's still some real mess here with repeating queries, but resolving it is out of scope for this quick PR
 2019-11-29 20:16:03 +01:00
luisramos0
cc3368704a Fix rubocop issues in reports_controller_decorator and in report line_items 2019-11-29 13:54:30 +00:00
luisramos0
3959f16d65 Switch some more references from Permissions to Permissions::Order 2019-11-29 12:22:50 +00:00
luisramos0
da6d035a1d Rename some reports permissions to order_permissions 2019-11-29 11:23:17 +00:00
luisramos0
c8d359a0da Merge spree/admin/overview_controller with its decorator 2019-11-27 22:08:46 +00:00
luisramos0
210757641c Add overview_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-11-27 22:08:06 +00:00
Luis Ramos
7cc034c2bc Merge pull request #4136 from mkllnk/4018-synchronise-checkout 
Lock variants during checkout to avoid race condition
 2019-11-27 15:40:28 +00:00
Matt-Yorkley
ff076fd7be Eager-load option_values in Api::ProductsController 2019-11-23 10:58:18 +01:00
Matt-Yorkley
19afc1a6da Eager-load option_values in Api::VariantsController 2019-11-23 10:58:18 +01:00
Matt-Yorkley
4ef682915c Eager-load option_values in Admin::EnterprisesController 2019-11-23 10:58:18 +01:00
Matt-Yorkley
e693e8ac37 Eager-load option_values in Admin::BulkLineItemsController 2019-11-23 10:58:18 +01:00
luisramos0
b066b87141 Bring return authorizations controller from spree_backend 2019-11-22 13:39:04 +00:00
Luis Ramos
0eb4574b37 Merge pull request #4422 from luisramos0/the_poc 
New Order Cycles edit page with steps
 2019-11-20 21:11:23 +00:00
Maikel Linke
50093c325a Move checkout locking to its own service 
It gives this complex logic more space and allows for better structure
and more comments at the right places.
 2019-11-19 18:18:01 +11:00
Maikel Linke
df2306cf82 Lock variants during checkout to avoid race condition 
It was possible that several people bought the same variant even though
there wasn't enough stock for everybody. That resulted in negative
stock.
 2019-11-19 18:18:01 +11:00
Luis Ramos
2b37592280 Merge pull request #4449 from luisramos0/properties 
Move properties and product properties from spree_backend to OFN
 2019-11-15 08:57:32 +00:00
luisramos0
14433e7764 Fix some rubocop issues in admin/order_cycles_controller 2019-11-12 12:02:36 +00:00
luisramos0
5fdb86ae43 Make simple create redirect to OC list but normal create to jump to incoming settings 2019-11-12 12:00:48 +00:00
luisramos0
5f1360e226 Move incoming and outgoing parts of the (not simple) OC new and edit pages to separate routes and views to make this page a multi step page 2019-11-12 12:00:48 +00:00
Pau Pérez Fabregat
ed15bc422e Merge pull request #4453 from luisramos0/rubo 
run rubocop --auto-correct
 2019-11-12 10:30:21 +01:00
Luis Ramos
3e318e5c4e Merge pull request #4425 from Matt-Yorkley/admin_eager_loading 
Eager-load variant associations in admin ProductsController
 2019-11-11 15:29:45 +00:00
luisramos0
553d4ebaa0 Fix a few rubocop issues in reports code 2019-11-10 19:27:41 +00:00
luisramos0
9404aacfb2 run rubocop --auto-correct 2019-11-10 18:42:43 +00:00
luisramos0
af1eff9427 Bring properties and product_properties controllers from spree_backend 2019-11-08 17:18:04 +00:00
Luis Ramos
314ecf6d90 Merge pull request #4372 from luisramos0/images 
Move Images from spree_backend to OFN
 2019-11-08 16:21:33 +00:00
Luis Ramos
ea8eb0ee14 Merge pull request #4371 from luisramos0/payment_methods 
Move Payment methods from spree_backend to OFN
 2019-11-08 14:26:21 +00:00
Matt-Yorkley
34f4bbe06c Eager-load variant associations in admin ProductsController 2019-11-08 10:44:47 +00:00
Luis Ramos
52ab6c52bf Merge pull request #4057 from luisramos0/remove_spree_api_2 
Remove dependency to spree_api - step 2 - routes and views
 2019-11-06 13:23:32 +00:00
Luis Ramos
1e2ab27cda Merge pull request #4327 from kristinalim/feature/4315-prefill_dates_in_orders_and_fulfillment_report 
4315 Set default date range for Orders and Fulfillment report
 2019-10-29 11:11:59 +00:00
Luis Ramos
3e7bd7dc19 Merge pull request #4376 from luisramos0/ghosts 
Remove product from Order Cycles if product supplier changes
 2019-10-28 21:17:48 +00:00
luisramos0
9cffe48c70 Do not use Spree.t in spree admin users 2019-10-28 16:01:22 +00:00
luisramos0
f46e0a2a31 Remove outdated comment, action managed has already been removed 2019-10-28 16:01:22 +00:00
luisramos0
d7b9dc1190 Fix some rubocop issues 2019-10-28 16:00:36 +00:00
luisramos0
8aab9bacbe Delete now irrelevant authorize_api endpoint and logic 
OFN API is now authenticating all users, if no session and no key is provided an anonymous user will be created so that user can access public endpoints, authorization is then done at each individual endpoint. This makes this spree api auth call irrelevant
 2019-10-28 16:00:36 +00:00
luisramos0
abcc22c34b Merge Spree::Api::BaseController with Api::BaseController. All api controllers inherit from Api::BaseController now. We can probably simplify this controller even more now 2019-10-28 16:00:36 +00:00
luisramos0
0d34b607c3 Move spree/api/base_controller#find_product to api/product_controller where it is used exclusively 
Also, product_scope stops being an override
 2019-10-28 16:00:36 +00:00
luisramos0
b5a521476b Remove unused method from api/base_controller 2019-10-28 16:00:36 +00:00
luisramos0
7c64777a50 Remove requires_authentication check from api/base_controller. OFN api does not require auth, it always generates an anonymous user for public endpoints 2019-10-28 16:00:36 +00:00
luisramos0
b29983ac60 Add AMS versions of the error responses in api/base_controller and cover not_found case with a unit test 2019-10-28 16:00:36 +00:00
luisramos0
5846593637 Remove dependency to spree_api rabl responders, we should only use AMS from now on 2019-10-28 16:00:36 +00:00
Luis Ramos
02c0b89fa0 Merge pull request #4345 from Matt-Yorkley/shopfront_pagination 
Shopfront pagination
 2019-10-21 16:02:12 +01:00
Matt-Yorkley
7b0c55e15a Ensure producer properties are included in properties results 2019-10-18 21:15:13 +01:00
Matt-Yorkley
cbe2477d04 Fix property filters and improve test coverage 2019-10-18 21:15:13 +01:00
Matt-Yorkley
c730958fe4 Restrict search params passed to ProductsRenderer 2019-10-18 21:15:13 +01:00
Matt-Yorkley
542c1bf684 #slice :params in controller and rename to :args in service context 2019-10-18 21:15:13 +01:00
Matt-Yorkley
b3c89a9d6c Move OpenFoodNetwork::ProductsRenderer (lib) to ProductsRenderer (service) and refactor 2019-10-18 21:15:13 +01:00
Matt-Yorkley
c54cff10d4 Adjust API endpoint params 2019-10-18 21:15:13 +01:00
Matt-Yorkley
ab330e882e Remove product cache 2019-10-18 21:15:11 +01:00