Pau Perez
456f369b76
Fix outstanding Rubocop violations
2020-06-15 10:17:34 +02:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Luis Ramos
052dbca1ba
Merge pull request #5370 from Matt-Yorkley/dont-render-twice
...
Don't render twice
2020-05-07 18:15:47 +01:00
Luis Ramos
1e9b4516cb
Merge pull request #5318 from Matt-Yorkley/caching-api
...
[Caching] API Action Caching on shop filters
2020-05-07 11:42:52 +01:00
Luis Ramos
be4104d6f3
Merge branch 'master' into 3-0-stable-may-5
2020-05-05 19:11:20 +01:00
Matt-Yorkley
4f4b3fb206
Don't render twice 🙈
2020-05-05 15:21:05 +02:00
Matt-Yorkley
a25a75bbe8
Ensure action caching includes GET params
...
By default the auto-generated action cache keys looks like this:
`views/0.0.0.0:3000/api/order_cycles/1/properties`
With this change the cache keys now look like this:
`views/0.0.0.0:3000/api/order_cycles/1/properties?distributor=3`
2020-04-28 15:11:14 +02:00
Matt-Yorkley
ea1ec1a1c6
Use ActionCaching in OrderCyclesController (taxons and properties)
2020-04-28 15:11:12 +02:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
Matt-Yorkley
e4985a9d51
Avoid needlessly fetching the current user records (for authentication and API key checks)
...
These endpoints are absolutely public, and don't need the current user at any point.
2020-04-28 14:06:02 +02:00
Matt-Yorkley
eb7de18298
Return early (before hitting the DB) in complex product list rendering if we already know the order cycle is closed
2020-04-28 13:51:25 +02:00
Matt-Yorkley
67a7140642
Memoize distributor and order_cycle in Api::OrderCyclesController
2020-04-28 13:48:07 +02:00
Luis Ramos
dd717fe8ac
Merge pull request #5184 from Matt-Yorkley/inventory-loading
...
Inventory loading
2020-04-09 13:26:12 +01:00
Matt-Yorkley
ececbce596
Only select id in producers query
2020-04-09 09:16:44 +02:00
Matt-Yorkley
1b7ac1a252
Don't re-use fat serializers when thin ones are needed.
...
This cuts the pageload and query count in half, again.
2020-04-09 09:10:41 +02:00
Matt-Yorkley
64c66ddedc
Eager-load variant data for overridable products
...
Cuts query count and page load time in half for this endpoint.
2020-04-07 15:16:32 +02:00
Matt-Yorkley
bc859cf9f7
Add api/shops_controller and refactor
2020-04-04 17:02:27 +02:00
Matt-Yorkley
af48cac140
Load closed shops in a separate request on /shops page
2020-04-04 14:06:10 +02:00
Luis Ramos
384ca310a3
Merge branch 'master' into 3-0-stable-apr3
2020-04-03 18:26:26 +01:00
Luis Ramos
a29f263041
Make explicit the namespace of the BaseController for api controllers
2020-03-22 09:55:07 +00:00
Luis Ramos
de2c6a8717
Revert previous commits and use collection_singular_ids=(ids) setter instead
2020-03-10 11:21:36 +00:00
Luis Ramos
e5f05b4db9
Handle case where no user_ids are sent to the controller. Fixes original spec.
2020-03-07 20:10:32 +00:00
Luis Ramos
56c29ab472
Make EnterprisesController inherit from Api::BaseController to fix authentication and fix problem with saving params[:user_ids]
2020-03-07 18:14:36 +00:00
Pau Pérez Fabregat
9440363a22
Merge pull request #4821 from luisramos0/3_val_issues
...
[Spree 2.1] Fix creation of enterprises/users in specs
2020-02-28 11:34:27 +01:00
Luis Ramos
bd0245229b
Move enterprise logo and promo_image setting in factories to after creation fixes a problem with enterprise_roles in the enterprise validation
2020-02-27 18:32:56 +00:00
Matt-Yorkley
eae7dc7f2e
Temporarily add extra debugging to help with strong parameters
2020-02-22 16:24:28 +01:00
Matt-Yorkley
98fdbb8621
Update deprecated #scoped calls
...
Model#scoped is now deprecated. Model#where(nil) in Rails 4 returns the same result as Model#scoped in Rails 3
2020-02-22 11:06:51 +00:00
Matt-Yorkley
53645517af
Update deprecated #find_by_* methods
2020-02-22 11:06:51 +00:00
François Turbelin
4c7bd4d6a8
Fix mess with order
2020-02-13 06:38:13 +01:00
François Turbelin
523b266308
Put back created_at desc as default order
2020-02-13 06:38:13 +01:00
François Turbelin
212413c8b3
Avoid mutable q params
2020-02-13 06:38:13 +01:00
François Turbelin
b248dc598e
Cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
89d2750fc4
Set default value at backend side
2020-02-13 06:38:13 +01:00
François Turbelin
7100111f93
Fix specs and cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
56f9adc5b7
Filter Admin products by name asc
2020-02-13 06:38:13 +01:00
luisramos0
a5fe5fb448
Remove usage of deleted const DEFAULT_PAGE
...
If params[:page] is not in the request, the results will not be paginated now
2020-02-03 15:04:34 +00:00
luisramos0
4c51d60bfd
Make pagination optional in the ExchangeProductsController
2020-02-03 13:11:26 +00:00
luisramos0
947914724a
Add frozen string literal magic comment
2020-01-28 18:02:58 +00:00
luisramos0
4596399bc2
Extract logic from controller to renderer service
...
Re-using the filter_visible method for both products and variants
2020-01-28 18:02:58 +00:00
luisramos0
685abccb61
Make variant count consider oc config and not count variants that are hidden in the inventory of the coordinator of the OC
2020-01-28 18:02:58 +00:00
Luis Ramos
3080eb9dfd
Merge pull request #4578 from kshlyk/remove_soft_delete_from_product_and_variant_api
...
Removing duplicate API method soft_delete for both products and variants
2020-01-14 11:32:10 +00:00
Luis Ramos
3171b60d6f
Merge pull request #4580 from Matt-Yorkley/order_capture
...
Use asynchronous requests for order capture and ship actions
2020-01-13 17:14:40 +00:00
Matt-Yorkley
a3ee6674ea
Use asynchronous requests for order capture and ship actions
2019-12-18 14:15:46 +01:00
Konstantin Shlyk
e6ca6bacac
soft_delete api method deleted for products and variants
2019-12-14 01:05:35 +03:00
luisramos0
00478cc57c
Add count variants endpoint and use it instead of loading exchange products
2019-12-12 18:48:35 +00:00
luisramos0
d5e42ee1e5
Paginate exchange products results
...
This commit breaks the OC page when there are more than 100 products in an exchange
2019-12-12 18:48:35 +00:00
luisramos0
ff584f9be9
Adapt exchange products routes to make api/exchanges/products (without exchange_id) also go to exchange_products#index
2019-12-12 18:44:45 +00:00
luisramos0
a589ba38da
Rename exchanges_products_controller to better exchange_products_controller
2019-12-12 18:44:45 +00:00
luisramos0
197fb36524
Extract ExchangeProductsRenderer from ExchangesProductsController
2019-12-12 18:44:45 +00:00
luisramos0
62e6f09d94
Make exchange products more simple
2019-12-12 18:44:45 +00:00
