raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-14 23:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 19 Branches 453 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

12401 Commits

Author SHA1 Message Date
Andy Brett
3877721209 Merge pull request #6631 from Matt-Yorkley/actionmailer-deliver 
[Deprecation] Replace ActionMailer#deliver with ActionMailer#deliver_now
 2021-01-08 17:42:31 -08:00
Andy Brett
d6656804eb Merge pull request #6557 from luisramos0/rubocop 
Rubocop exceptions update
 2021-01-08 17:36:23 -08:00
Matt-Yorkley
b7ecf4791a Extract more sanitizing logic from Api::ProductSerializer and make service more generic/re-usable. 2021-01-09 01:07:11 +00:00
Matt-Yorkley
496f2dab69 Ensure Jobs are instantiated correctly 
We should not be using `Delayed::Job.enqueue` anywhere...
 2021-01-08 23:18:55 +00:00
Matt-Yorkley
2dc918ff59 Ensure all Job classes correctly inherit from ActiveJob 2021-01-08 23:18:55 +00:00
Matt-Yorkley
ff962c1c9b Change various Mailer invocations from #deliver_now to #deliver_later 2021-01-08 23:18:55 +00:00
Luis Ramos
2e4a206825 Add new offenses to exceptions file 2021-01-08 22:43:15 +00:00
Luis Ramos
0b45533237 Update rubocop todo list 2021-01-08 22:43:15 +00:00
Andy Brett
59527ab38a refactor filter to a service 2021-01-08 13:37:18 -08:00
Matt-Yorkley
3e6445c51c Replace deprecated ActionMailer#deliver with ActionMailer#deliver_now 
DEPRECATION WARNING: `#deliver` is deprecated and will be removed in Rails 5. Use `#deliver_now` to deliver immediately or `#deliver_later` to deliver through Active Job.
 2021-01-08 20:35:47 +00:00
Matt-Yorkley
3b1ad29d20 Fix view rendering in Api::BaseController 2021-01-08 17:47:09 +00:00
Matt-Yorkley
eec9f27353 Move controller concern to correct directory 
This is a controller concern, it should live in app/controllers/concerns/
 2021-01-08 17:47:09 +00:00
Matt-Yorkley
0dd57fc3de Render an empty JSON object instead of a blank string 2021-01-08 17:47:09 +00:00
Matt-Yorkley
261ed751cb Remove explicit content_type declarations in Api::OrderCyclesController 
This should be handled in `Api::BaseController`
 2021-01-08 17:47:09 +00:00
Matt-Yorkley
d0800b5e32 Specify json format for API routes that return json in OrderCycleResource 2021-01-08 17:47:09 +00:00
Pau Pérez Fabregat
95ab6c7d83 Merge pull request #6627 from Matt-Yorkley/dead-code-product-available 
Delete dead code Spree::Product#available?
 2021-01-08 17:35:21 +01:00
Matt-Yorkley
139773bc22 Add inverse_of to associations between shipping methods and rates 
See 20d913c21c
 2021-01-08 15:42:58 +00:00
Matt-Yorkley
f07c2dcd84 Add inverse_of for associations involved in cart processing 
7bac3e7b2c

and

61bd5446e1
 2021-01-08 15:42:58 +00:00
Pau Pérez Fabregat
9cf71c703d Merge pull request #6615 from Matt-Yorkley/money 
Money!
 2021-01-08 13:24:14 +01:00
Pau Pérez Fabregat
b51d8c573a Merge pull request #6614 from Matt-Yorkley/api-errors 
API Bugnag errors
 2021-01-08 12:59:11 +01:00
Pau Pérez Fabregat
bd83443595 Merge pull request #6611 from jibees/6196-fix-text-wrapping-on-oc 
6196 fix text wrapping on oc
 2021-01-08 11:48:41 +01:00
Jean-Baptiste Bellet
fc71808517 use flex property to manage responsive 
and remove unsued properties
 2021-01-08 11:24:16 +01:00
Jean-Baptiste Bellet
5869eb1841 add new div container 
to use flexbox properties for its two child divs
named: select-and-closing-container
 2021-01-08 11:23:23 +01:00
Andy Brett
72a65426a0 allow '&' and spaces 2021-01-07 20:50:43 -08:00
Matt-Yorkley
52b43d8c23 Delete dead code 
This method isn't called from anywhere
 2021-01-07 16:03:04 +00:00
Maikel Linke
18b1504935 Emphasize disabled Add button when out of stock 
Using the same grey as was used in the bulk modal already. This makes it
more consistent and hopefully more clear.
 2021-01-07 10:32:10 +11:00
Matt-Yorkley
cca16c6e1f Fix stock issue and update specs (now passing) 
See: dcd5944a29
 2021-01-06 20:13:38 +00:00
Matt-Yorkley
45e4d86631 Merge money_decorator.rb with money.rb 
The #rounded method was left out, as it appears to be dead code.
 2021-01-06 19:17:00 +00:00
Matt-Yorkley
bd4560cff6 Don't serialize all variant override objects where they are not needed 
This is only needed in one place, and only as a count, and can cause huge amounts of superfluous data to be fetched and serialized, for example in the admin products index page (where variant override data is not used at all).
 2021-01-06 16:04:47 +00:00
Matt-Yorkley
c482173394 Delete dead code 
This AMS injection method is no longer referenced anywhere in the codebase
 2021-01-06 13:20:31 +00:00
Matt-Yorkley
b842bfbc3d Explicitly notify Bugsnag on errors during API response processing 
These errors are currently not being sent :/
 2021-01-06 12:59:19 +00:00
Jean-Baptiste Bellet
39fc80172e move css property 2021-01-06 09:49:12 +01:00
Jean-Baptiste Bellet
1b4906d55a adjust margin according to old design 2021-01-06 09:17:11 +01:00
Jean-Baptiste Bellet
6e6be09740 use display flex to align 2021-01-06 09:16:38 +01:00
Jean-Baptiste Bellet
3a8b63b371 remove height constraint 2021-01-06 09:16:19 +01:00
Matt-Yorkley
540aa913a3 Tidy up Api::OrderController#index 2021-01-05 21:08:02 +00:00
Matt-Yorkley
fe0a0395d8 Remove DEFAULT_PAGE constants 2021-01-05 19:07:46 +00:00
Matt-Yorkley
4bb2653306 Tidy up pagination in Api::ProductsController#overridable and Angular PagedFetcher service 
Refactors away some unnecessary mess and unblocks the last remaining issue in upgrading the Kaminari gem (deprecated calls to #num_pages method)
 2021-01-05 18:57:08 +00:00
Matt-Yorkley
47f9a3f08a Add guard clause and remove conditionals 
Sometimes the objects are not paginated. In this case we need to avoid trying to render pagination data, as it will throw an error. This guard clause also means we can remove messy conditionals from several controllers.
 2021-01-05 18:51:24 +00:00
Paulo Vilarinho
f53089c16c fix products controller spec erros 2021-01-05 15:11:26 -03:00
Paulo Vilarinho
c99b250a5f refactor pagination data removing default_per_page parameter 2021-01-05 12:18:47 -03:00
Paulo Vilarinho
4d217c9e9d refactor render paginated products 2021-01-05 12:04:59 -03:00
Paulo Vilarinho
9a62ba8ed5 remove hound errors 2021-01-05 11:59:49 -03:00
Paulo Vilarinho
81c3c1cf32 remove default page 2021-01-05 11:57:54 -03:00
Paulo Vilarinho
330d42ea98 change inclue position to start of class 2021-01-05 11:48:02 -03:00
Paulo Vilarinho
efd4b97f5c fix depracation warnings from kaminary 2021-01-05 00:33:29 -03:00
Paulo Vilarinho
ccac16c5b2 fix orders controllers specs errors 2021-01-05 00:07:38 -03:00
Paulo Vilarinho
ab586f58b1 apply pagination data concern to bulk line items controller 2021-01-04 20:22:58 -03:00
Paulo Vilarinho
3f324537a5 apply pagination data concern to exchange products controller 2021-01-04 20:22:43 -03:00
Paulo Vilarinho
1c5f6e7222 apply pagination data concern to orders controller 2021-01-04 20:22:14 -03:00