François Turbelin
4f2b7094d0
Use before_action instead of before_filter
2020-09-02 21:48:13 +02:00
François Turbelin
d5800642e7
Map DFC SuppliedProduct with OFN Variant
2020-08-30 23:11:59 +02:00
François Turbelin
c3cf08156d
Add People controller
2020-08-13 11:49:45 +02:00
François Turbelin
8d4587506b
Add SuppliedProducts controller
2020-08-13 11:46:48 +02:00
François Turbelin
99e905c768
Simplify enterprise check logic
2020-08-13 11:02:31 +02:00
François Turbelin
46d38930d9
Add some ajustements
2020-08-12 20:53:02 +02:00
François Turbelin
a4e8982351
Rename ProductsController into CatalogItemsController
2020-08-12 19:51:12 +02:00
François Turbelin
13e15f823e
Add Read action for Enterprise and CatalogItem
2020-08-12 19:43:20 +02:00
François Turbelin
508ecd6bf7
Adjust with Rubocop suggestions
2020-08-12 13:46:23 +02:00
François Turbelin
d10fda6227
Put context inside serializer
2020-08-12 13:37:48 +02:00
François Turbelin
2a8268ca73
Use ActiveModelSerializer for DFC serialization
2020-08-12 13:37:01 +02:00
François Turbelin
8687e0199d
Apply cosmetics
2020-08-05 08:20:14 +02:00
François Turbelin
2549d454ab
Maintain specs
2020-07-23 09:28:32 +02:00
François Turbelin
645b4a9505
Use multiple serializers
2020-07-22 22:45:50 +02:00
François Turbelin
9f02ee3874
Use new serialization
2020-07-22 21:08:25 +02:00
François Turbelin
21fc14a9fe
Use a better products list for catalog
2020-07-22 21:08:25 +02:00
Luis Ramos
5e8438c446
Move all calculators outside the spree namespace
2020-07-07 17:26:23 +01:00
Luis Ramos
cd60ee2116
Use flat_map to make ship methods selection faster
2020-07-03 13:48:08 +01:00
Luis Ramos
758bb17142
Fix some easy rubocop issues and add some exceptions to to manual todo list
2020-07-02 21:24:15 +01:00
Luis Ramos
21ec6ccf0d
Remove unused sort packages from prioritizer
2020-07-02 21:24:15 +01:00
Luis Ramos
d323c5bdcb
Simplify packer and coordinator baed on the fact that there's only one stock_location so there will only be one package per order
2020-07-02 21:24:15 +01:00
Luis Ramos
ff046f7a6c
Remove conditionals related to Config.track_inventory_levels, this config is always true in OFN
2020-07-02 21:24:14 +01:00
Luis Ramos
ee937988e8
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
ee66e37521
Move adjuster, estimator, packer and prioritizer to order management engine
2020-07-02 21:24:14 +01:00
Luis Ramos
83974a832c
Move Coordinator from Spree::Stock to OrderManagement::Stock
2020-07-02 21:24:14 +01:00
Luis Ramos
f0b3ed0d79
Merge Spree::Stock::Package into OrderManagement::Stock::Package
2020-07-02 21:24:14 +01:00
Luis Ramos
943cb7bf05
Move Stock::Package to OrderManagement::Stock::Package
2020-07-02 21:24:14 +01:00
Luis Ramos
1b28592f58
Now that the stock code is on out side we can clean up!
...
Remove everything related to splitters (including bringing environment.rb so we remove the splitters variable from it
2020-07-02 21:24:14 +01:00
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
