Matt-Yorkley
42c1584e6f
Fix pagination conflict with LineItemsCtrl requests
2018-10-22 18:13:56 +01:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02:00
Pau Pérez Fabregat
20077c99b5
Merge pull request #2618 from coopdevs/enable-style-send-cop
...
Favor #public_send over #send using Rubocop's cop
2018-09-20 19:03:40 +02:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
Matt-Yorkley
e577bcb46f
Prepare angular controller and serialized data
2018-09-17 14:18:23 +01:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
Maikel Linke
a447fe4f40
Require lib file where needed
...
We can't always rely on other parts of the code been loaded first. We
need to declare dependencies so that they are always present.
I just ran into this problem in my dev environment.
2018-09-13 12:01:16 +10:00
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02:00
Kristina Lim
01d4b8fb10
Allow custom resource permission for admin controllers
2018-09-04 01:18:48 +08:00
Maikel Linke
2ceb969925
Style recently merged code
...
We enabled more Rubocop checks and code that was merged around the same
time, didn't comply with the new checks.
2018-07-26 10:52:56 +10:00
Maikel Linke
bbe21b7804
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into issue-2297-edit-product-cancel
2018-06-20 10:31:17 +10:00
Pau Pérez Fabregat
20c25cd030
Merge pull request #2368 from Matt-Yorkley/uk/admin_orders
...
Uk/admin orders
2018-06-19 11:00:35 +02:00
Frank West
8324b00999
Renames product bulk edit action to index
...
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.
It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
2018-06-19 17:51:23 +10:00
Pau Pérez Fabregat
b1bccb07f2
Merge pull request #2369 from coopdevs/product-import-for-superadmins-only
...
Show product import's UI only to superadmins
2018-06-19 09:23:58 +02:00
Maikel Linke
67c2574b0b
Show report search instructions
...
Solves: https://github.com/openfoodfoundation/openfoodnetwork/issues/2356
2018-06-18 11:08:58 +10:00
Maikel Linke
7a2218fe26
Style the reports controller
2018-06-18 11:08:58 +10:00
Maikel Linke
66567fd9e6
Unify report table rendering
...
There is a lot of code duplication in the report views and we would like
to change that code. So we move it into one file first.
2018-06-18 11:08:58 +10:00
Pau Perez
78e59d059a
Show product import's UI only to superadmins
...
We still need to iterate on its implementation and it's too early to
make it publicly available.
2018-06-11 19:50:53 +02:00
Matt-Yorkley
7bef474efd
Admin Order guest checkout status
2018-06-09 02:43:42 +01:00
Maikel
9d2c1976e0
Merge pull request #2343 from mkllnk/2212-remove-report-default-filters
...
2212 remove report default filters
2018-06-06 12:19:47 +10:00
Maikel Linke
02c4795640
Remove default dates from reports
...
Closes https://github.com/openfoodfoundation/openfoodnetwork/issues/2212
2018-05-29 16:47:23 +10:00
Matt-Yorkley
91521dc2b0
Improve import_date queries
2018-05-26 19:34:20 +01:00
Matt-Yorkley
d9c720e89a
Tidy up import_date
2018-05-26 19:34:20 +01:00
Matt-Yorkley
73f7bc3db0
Remove use of before_filter
2018-05-26 19:34:20 +01:00
Matt-Yorkley
3a6f316ede
Codeclimate refactor
2018-05-26 19:34:20 +01:00
Matt-Yorkley
b3c906b3a4
Product Import v3 with asynchronous processing
...
Fixed spec
Quick spec tweak
2018-05-26 19:34:19 +01:00
Matt-Yorkley
ffbb67d480
PI inventories additions
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867
PI timestamps
2018-05-26 19:34:19 +01:00
Pau Perez
889199a525
Refactor Overview Controller to make it more clear
...
Assigns meaningful names to the boolean conditions to make it easier
to understand, breaks down the big and nested if/else and converts the
specs to RSpec 3.
Note the check `!spree_current_user.admin?` has been removed because
in admin/base_controller_decorator.rb `#authorize_admin` is already
called.
2018-05-22 10:21:35 +02:00
Maikel Linke
40b0a0bd5a
Determine searching state by params, not request
...
We may want to use GET for searching or POST to display a certain report
type.
2018-05-18 11:27:48 +10:00
Maikel Linke
63799b2cb1
Remove outdated comment
2018-05-18 11:27:48 +10:00
Maikel Linke
8e2aee71da
Compile Order Cycle Management only on search
2018-05-18 11:27:48 +10:00
Maikel Linke
7a546087b2
Compile Packing report data only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
1e80487afc
Compile Order And Distributors only on search
...
And move most logic into the report class like the others.
2018-05-18 11:27:47 +10:00
Maikel Linke
53436024e2
Compile Orders & Fulfillment report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
feb33c3ca5
Compile Payments report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
bf74282e5f
Compile Bulk Co-Op report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
5f9d239f19
Compile Products & Inventory report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
d464216027
Don't compile Sales Tax report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
b8ca37e9d2
Don't compile xero report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
14e7cdd138
Don't compile customers report data before search
...
Distributors, suppliers and order cycles are still loaded for the search
form.
2018-05-18 11:27:47 +10:00
Maikel Linke
8393b1d4c0
Don't compile user-enterprises report before search
2018-05-18 11:27:47 +10:00
Maikel Linke
fcd41c67fa
Add logic for showing empty reports initially
2018-05-18 11:27:47 +10:00
Maikel Linke
031c4d417e
Simplify report rendering
2018-05-18 11:27:47 +10:00
Maikel Linke
41bb5e4e96
Unify report rendering
2018-05-18 11:27:47 +10:00
Maikel Linke
f3d542a3ec
Fix style and spelling
2018-05-18 11:27:46 +10:00
Maikel Linke
36b5f0eea7
Render only displayed report options
2018-05-18 11:27:46 +10:00
Maikel Linke
742e9d2a5f
Remove more code duplication
2018-05-18 11:27:46 +10:00
