raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,256 Commits 18 Branches 453 Tags
bdb40d68e99ca4c8df7fe65b65cb422facef5bac
Commit Graph

143 Commits

Author SHA1 Message Date
Luis Ramos
a6d7acb6f1 Convert spec to modern rspec syntax 2020-07-02 21:24:14 +01:00
Luis Ramos
d18fec7125 Move Base splitter from main app models to order management engine services 2020-07-02 21:24:14 +01:00
Luis Ramos
de8b97b2e1 Merge pull request #5526 from cillian/drop-blockenspiel 
Drop blockenspiel
 2020-06-29 20:09:26 +01:00
Matt-Yorkley
be0131b94c Merge pull request #5645 from coopdevs/fix-scss-deprecation-warning 
Rename *.css.scss to *.scss
 2020-06-29 20:36:42 +02:00
Cillian O'Ruanaidh
a9664e103d Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes. 2020-06-29 18:11:08 +01:00
Luis Ramos
8a9dae0ee2 Run rubocop autocorrect 
This is the result of bundle exec rubocop --auto-correct
 2020-06-22 12:23:10 +01:00
Pau Perez
f36e08a163 Rename *.css.scss to *.scss 
This fixes the following deprecation warning

```
DEPRECATION WARNING: Extra .css in SCSS file is unnecessary. Rename /usr/src/app/app/assets/stylesheets/darkswarm/variables.css.scss to /usr/src/app/app/assets/stylesheets/darkswar
m/variables.scss. (called from _app_views_layouts_darkswarm_html_haml___3990351141569700945_46957256630860 at /usr/src/app/app/views/layouts/darkswarm.html.haml:18)
(...)
```
 2020-06-19 16:29:08 +02:00
Pau Pérez Fabregat
db80992326 Merge branch 'master' into drop-blockenspiel 2020-06-19 12:12:10 +02:00
Pau Perez
456f369b76 Fix outstanding Rubocop violations 2020-06-15 10:17:34 +02:00
Cillian O'Ruanaidh
0ef3a7e24f Fix some more code climate violations for bulk coop specs which have been moved to the order management engine. 2020-06-13 16:23:11 +01:00
Cillian O'Ruanaidh
fdf0d92366 Move feature spec for bulk coop report to the order management engine. 2020-06-13 15:52:42 +01:00
Cillian O'Ruanaidh
ba126d5afc Move the bulk coop controller specs to the order management engine. 
Also deleting old :bulk_coop_report action from the Spree::Admin::ReportsController.
 2020-06-13 15:42:26 +01:00
Cillian O'Ruanaidh
3abcb5b23c Don't move the :parameter_not_allowed_error translation to a different scope yet. 
It will make it harder to merge and deploy this PR if every translation locale file has to be updated too.
 2020-06-13 15:37:44 +01:00
Cillian O'Ruanaidh
bcf79ef803 Fix code climate violations related to removing blockenspiel. 2020-06-13 13:27:44 +01:00
Cillian O'Ruanaidh
6dbb6f3f09 Add an underscore before unused method arguments rather than an empty splat operator so it's easier to understand what is being passed in. 2020-06-13 13:09:09 +01:00
Cillian O'Ruanaidh
293e8949a9 Remove unused AuthenticationWorkflow module from the BulkCoopReport specs. 2020-06-13 12:59:23 +01:00
Cillian O'Ruanaidh
bfc6daf076 Remove duplicate PackingReport tests from the BulkCoopReport spec. 
These tests already exist in spec/lib/open_food_network/packing_report_spec.rb:72
 2020-06-13 12:57:14 +01:00
Cillian O'Ruanaidh
ed82c7e3db BulkCoopReport has been moved to the engines/order_management so move it's spec there too. 2020-06-13 12:51:29 +01:00
Luis Ramos
88896b7730 Merge branch 'master' into 3-0-stable-jun-2 2020-06-08 19:17:11 +01:00
Cillian O'Ruanaidh
f90969134d Fix a couple of Rubocop violations. 2020-06-05 20:03:17 +01:00
Cillian O'Ruanaidh
bafa8beab3 Use :parameter_not_allowed_error_message to from base Reports::Authorizer. 2020-06-05 17:05:26 +01:00
Cillian O'Ruanaidh
e58852289f Move the :require_valid_datetime_range method to OrderManagement::Reports::Parameters::Base so it can be reused on multiple reports. 2020-06-05 16:58:56 +01:00
Cillian O'Ruanaidh
9172606780 Allow the order management report partial to be reused on different reports. 2020-06-05 16:51:43 +01:00
Cillian O'Ruanaidh
406309c577 Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine. 
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
 2020-06-05 16:43:38 +01:00
Pau Pérez Fabregat
fb339d6a99 Merge pull request #5263 from luisramos0/pdp 
[Mobile] Restyle product modal
 2020-06-03 08:55:20 +02:00
Luis Ramos
c9a7a6e897 Merge branch 'master' into 3-0-stable-jun-2 2020-06-02 16:00:45 +01:00
Matt-Yorkley
1e3bf7fec4 Merge pull request #5487 from coopdevs/fix-schedule-factory 
[Spree 2.1] Allow to create order_cycle_schedules
 2020-05-30 13:49:47 +02:00
Pau Perez
815cd73ff3 DRY specs 2020-05-29 11:15:47 +02:00
Pau Perez
06b7a95fb1 DRY duplicate subscription declaration 2020-05-28 14:00:53 +02:00
Matt-Yorkley
89dd7ddb86 Update setting of request headers in DFC controller spec 2020-05-26 15:32:07 +02:00
Matt-Yorkley
bde4acd22f Update get calls in DFC controller spec 2020-05-26 15:21:02 +02:00
Pau Perez
a33396984f Fix and DRY specs 2020-05-22 18:17:59 +02:00
Pau Perez
d9686d6982 Enable spec files to be executed alone 
This fixes the annoying error

```
NameError:
  uninitialized constant OrderManagement::Subscriptions::Whatever
```

and let's you execute the spec file in isolation. It slows down way too
much having the run the entire engine test suite while developing. And
it makes me nervous too.
 2020-05-22 15:55:03 +02:00
Luis Ramos
758d7c82f7 Rename order_cycle.accessible_by to remove name clash with active record 2020-05-19 12:21:13 +01:00
Luis Ramos
edaf419857 Use rem instead of px or em 2020-05-15 12:12:07 +01:00
Luis Ramos
e239bb33f8 Improve the mobile cookies policy modal with a margin 2020-05-15 12:12:07 +01:00
Luis Ramos
19da0ba969 Merge branch 'master' into 3-0-stable-may13 2020-05-13 19:50:32 +01:00
Luis Ramos
41645e8351 Merge pull request #5334 from coopdevs/output-logs-in-djs-log-file 
Output logs in Delayed Job's log file
 2020-05-12 10:05:26 +01:00
Pau Perez
ee94101edd Log subs jobs to DJ's log file 
There's a bunch of logging bits we need to find out what happened in
`#5294`, the first of which is logging as we are used to for Rails
itself.  Turns out we were already logging but the log lines weren't
displayed.

That's because workers have no access to the Rails logger unless we hack
things a bit in the config/initializer. If we want to keep DJ's logs in
a different file, which I think is good for debugging purposes, we need
to diverge from Rails.logger.

However, there's no access to Delayed::Worker.logger in custom job
classes either so there's no way other than mimicking that logger's format
if we want log lines to be consistent.

Now the current logs will see the light like:

```
2020-05-07T14:09:42+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) RUNNING
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 1
2020-05-07T14:09:42+0000: Issue in Subscription Order 2: complete
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 7
2020-05-07T14:09:42+0000: Issue in Subscription Order 3: complete
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) COMPLETED after 0.3378
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] 1 jobs processed at 2.8054 j/s, 0 failed
```

We'll see if we need to format these messages differently to make them
more greppeable.
 2020-05-07 17:21:39 +02:00
François Turbelin
d5b69ec90c Remove before call when no factorization 2020-05-06 22:04:56 +02:00
François Turbelin
13f00480ce Use serialized_data 2020-05-06 22:04:56 +02:00
François Turbelin
f6e06b5658 Use default enterprise_id to get the entreprise 2020-05-06 22:04:56 +02:00
François Turbelin
99798b010f Use ActionController::Base 2020-05-06 22:04:56 +02:00
François Turbelin
43293f00df Make the endpoint unrelated to enterprise id 
Better to avoid to have endpoint specific to an enterprise
as we don't know the enterprise id yet on DFC side
 2020-05-06 22:04:56 +02:00
François Turbelin
f0f8224934 Put back former lighter inclusions 2020-05-06 22:04:56 +02:00
François Turbelin
830bf796d0 Update authors and remove emails 2020-05-06 22:04:56 +02:00
François Turbelin
dd9c994f9d Use spree_api_controller_setup layer 2020-05-06 22:04:56 +02:00
François Turbelin
c1d173d601 Add the access token logic, light version 2020-05-06 22:04:56 +02:00
François Turbelin
a8fb059482 Add basic spec 2020-05-06 22:04:56 +02:00
François Turbelin
496174255f Add REAME.md file 2020-05-06 22:04:56 +02:00