luisramos0
38fd028a9f
Fix some rubocop issues from previous commit
2020-02-21 10:52:56 +00:00
luisramos0
4e84310d63
Add StripeSCA where StripeConnect is treated as an exception in the setting up of process of a payment method and subscriptions
...
Here we are copy pasting and adding stripe SCA because we are planning to delete the StripeConnect that will be replaced by the stripe sca implementation
2020-02-21 10:52:56 +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
luisramos0
0bec492208
Fix some rubocop issues
2019-12-12 18:44:45 +00:00
luisramos0
79b2460664
Make simple create and edit OC load exchange products on init
...
Simple create makes a new type of call to exchange products with no exchange_id and no prder_cycle_id, it simply lists supplied products for a given enterprise
2019-12-12 18:44:44 +00:00
luisramos0
2b3bc6d1ff
Remove supplied products from enterprise serializer and from UI side
...
This list of products s now loaded in a specific call to ExchangeProducts and for each specific exchange
2019-12-12 18:44:44 +00:00
Luis Ramos
e0e833b2f3
Merge pull request #4454 from luisramos0/sort_products
...
Sort products alphabetically in OC edit page
2019-11-27 22:27:42 +00:00
luisramos0
6e51be095b
Add order to supplied products in enterprise serializer so that products in exchanges are sorted alphabetically
2019-11-12 12:04:42 +00:00
luisramos0
1c7237869a
Refactor products_scope to make it more simple
2019-11-12 12:04:42 +00:00
Matt-Yorkley
a1146aed1b
Refactor #sort_by_supplier_id
2019-11-12 11:59:39 +00:00
Matt-Yorkley
e73f2d682c
Remove N+1 in editable_variants_for_incoming_exchanges
2019-11-12 11:59:13 +00:00
Matt-Yorkley
170bc94d92
Refactor order_cycle_serializer
2019-11-12 11:59:13 +00:00
luisramos0
9404aacfb2
run rubocop --auto-correct
2019-11-10 18:42:43 +00:00
Maikel Linke
ada34d27ca
Avoid asking the cloud if an image exists
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/4392
Amazon's DNS is failing at the moment and some users can't access the
admin panel because of this error.
While `exists?` asks the storage server if the file is actually there,
`file?` just checks if we have the file name stored in the database
and the file should be there. It's much faster and less error prone.
2019-10-23 11:36:20 +11: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
ab330e882e
Remove product cache
2019-10-18 21:15:11 +01:00
luisramos0
bdb3dd5aaf
Fix long lines in app/serializers
2019-09-19 16:32:09 +01:00
luisramos0
a44a251d96
Remove duplicated attributes tag from all serializers to create consistency
2019-09-19 16:32:09 +01:00
luisramos0
2921ee19e1
Add api/order/{order_number} ednpoint and its new order detailed serializer
2019-09-19 16:32:09 +01:00
luisramos0
6796d91a07
Add some basic attributes to address and order serializers that will be used in the order show api endpoint
2019-09-19 16:32:09 +01:00
luisramos0
26f5ece7c0
Add a few relevant attributes to shipment serializer and fix some details in shipment controller spec
2019-09-08 12:15:33 +01:00
luisramos0
a21a4aba5d
Convert spree/api/shipments from rabl to AMS and adapt its spec
2019-09-08 12:15:33 +01:00
Luis Ramos
e3ce2a7486
Merge pull request #4104 from luisramos0/convert_taxons_to_ams
...
Convert spree/api/taxons views from rabl to AMS
2019-09-06 00:04:10 +01:00
Pau Pérez Fabregat
369a5a8a2f
Merge pull request #4101 from luisramos0/remove_variants_rabl
...
Convert spree/api/products and spree/api/variants views from rabl to AMS
2019-09-02 12:14:26 +02:00
luisramos0
9f5c9916ba
Add back required api actions (create, update and destroy) and add AMS serializers for the jstree action
2019-08-28 22:06:56 +01:00
luisramos0
d08de4bdf9
Add extra fields to taxon serializer to be used in the api
2019-08-28 22:06:56 +01:00
Pau Pérez Fabregat
92b05c76a3
Merge pull request #4068 from luisramos0/replace_oc_rabl
...
Convert order_cycle.rabl to Api::OrderCycleSerializer
2019-08-08 12:23:09 +02:00
Maikel
229e6fa0a3
Merge pull request #4073 from luisramos0/kill_more_rabl
...
Replace update_prod_image.rabl with ImageSerializer in api/product_image_controller
2019-08-06 15:00:33 +10:00
Pau Pérez Fabregat
64d21969f0
Merge pull request #4064 from luisramos0/convert_search_Rabl
...
Replace views/admin/variants/search.rabl with Api::Admin::VariantSerializer
2019-08-05 15:07:10 +02:00
luisramos0
c3fbf9cdf9
Remove unused pagination from index and respective specs, fix spec for search by sku by adding sku to the serializer and adapt a few specs to pass with AMS attrivbutes,
2019-07-31 09:40:19 +01:00
luisramos0
180598c603
Convert spree/api/variants_controller to AMS by changing base_controller, using render json instad of respond with, deleting rabl templates and adapting specs
...
Delete unused pagination spec
2019-07-31 09:40:19 +01:00
luisramos0
6ebfb02d0e
Update ImageSerializer with missing image size urls: mini/thumb_url, product/image_url that is used in the product image modal
2019-07-30 20:15:21 +01:00
luisramos0
8868b7eb12
Fix rubocop issue: use nested class/module definition
2019-07-29 19:05:39 +01:00
luisramos0
ca5a5bf301
Convert oc.rabl to oc serializer and use it in both haml file and controller
2019-07-29 18:13:29 +01:00
luisramos0
2d5eccbf97
Add :in_stock, :stock_location_id, :stock_location_name to admin variant serializer, these are needed for the variant_autocomplete js code from spree
2019-07-23 21:38:29 +01:00
luisramos0
7e6259da31
Replace admin/variants/search rabl template with existing admin variant serializer with a few added attributes
...
This commit fixes a bug as the image of the variatn was not being rendered, we need to fetch the image of the product, not the image of the variant.
2019-07-23 21:37:45 +01:00
luisramos0
a1e6e4c38f
Fix rubocop issues
2019-07-23 14:35:24 +01:00
luisramos0
9b567a6710
Remove injection_json that renders json partials, we only use ams serializers now, not rabl partials
2019-07-21 23:55:59 +01:00
luisramos0
a8ce31fa90
Replace views/json/_flash.rabl with an ams injector with serializer
2019-07-21 22:56:15 +01:00
luisramos0
4c964fea0d
Replace views/json/_current_user.rabl with an ams injector with serializer
2019-07-21 22:48:36 +01:00
Matt-Yorkley
785595a951
Reduce initial queries on shop page by ~95%
2019-06-12 09:47:01 +01:00
Matt-Yorkley
a91ae8947b
Only query visible enterprises
2019-06-12 09:47:01 +01:00
Matt-Yorkley
4ec46c2db6
Fix groups index page
2019-06-12 09:47:01 +01:00
Matt-Yorkley
698d3672a6
List only current taxons for active enterprises
2019-06-12 09:47:01 +01:00
Matt-Yorkley
ed97400a23
Improve producers performance
2019-06-12 09:47:01 +01:00
Matt-Yorkley
45d65baf8e
Improve shops performance
2019-06-12 09:47:01 +01:00
Matt-Yorkley
e329b4bfb0
Improve queries for serializers
2019-06-12 09:47:01 +01:00
Matt-Yorkley
563f9a4f5f
Remove another N+1
2019-05-29 12:28:56 +01:00
Matt-Yorkley
2dd4c1ccaf
Cut OC edit #for_order_cycle queries in half
2019-05-29 10:01:46 +01:00