Matt-Yorkley
fc2cc09ea5
checkout redirect excludes angular path variables
2018-05-26 18:13:35 +01:00
Pau Pérez Fabregat
e04141d797
Merge pull request #2291 from coopdevs/remove-producers-tab-from-dashboard
...
Remove producers tab from dashboard
2018-05-25 19:24:29 +02:00
Pau Pérez Fabregat
9d57beb33f
Merge pull request #2305 from Matt-Yorkley/uk/domain_headers
...
Ensure domain in SSL header matches request with or without www prefix
2018-05-23 20:08:56 +02:00
Pau Perez
2a3772dba0
Do not show icons for producer-enterprises
...
Payment and shipping methods don't apply to them.
2018-05-22 16:50:27 +02:00
Pau Perez
208e3bbadd
Ensure non-distributors are listed in dashboard
...
We want to show all enterprises in a single list regardless of their
type.
2018-05-22 10:21:35 +02:00
Pau Perez
bd34f27ace
Inline partials into enterprises view
...
Now there are no tabs in the dashboard so is pointless to refer to them
and to split in multiple partials.
2018-05-22 10:21:35 +02: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
Pau Perez
51f3542a92
Remove no longer used Angular controller
...
There are no tabs to keep track of now.
2018-05-22 10:21:35 +02:00
Pau Perez
5a182e8e88
Remove enterprises producers tab from dashboard
2018-05-22 10:21:35 +02:00
Matt-Yorkley
c2934d3570
Ensure domain in SSL header matches request with or without www prefix
2018-05-21 17:50:34 +01:00
Maikel Linke
d218a51d96
Test public instead of private method
...
Refactoring and styling the whole thing, possibly causing conflicts with
other pull requests.
2018-05-18 11:27:48 +10:00
Maikel Linke
57dd984512
Convert specs to RSpec 3.7.0 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/lib/open_food_network/order_and_distributor_report_spec.rb
* 2 conversions
from: == expected
to: eq(expected)
* 2 conversions
from: obj.should
to: expect(obj).to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:48 +10:00
Maikel Linke
7f8f935017
Shorten module referencing
2018-05-18 11:27:48 +10:00
Maikel Linke
0fa9ca653e
Move duplicate code into its own module
2018-05-18 11:27:48 +10: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
8a1a540f3d
Clarify creating objects for test context
2018-05-18 11:27:48 +10:00
Maikel Linke
acee5da31b
Remove unnecessary whitespace
2018-05-18 11:27:48 +10:00
Maikel Linke
8a4457e8e4
Give better names
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
983e128d90
Half test run time by loading less data
...
On my computer it took 3 seconds to load all four orders with all the
attached order cycles and enterprises.
Runtime before: 56.38 seconds
Runtime after: 25.14 seconds
This really speeds up developing reports.
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
28d66ad3e0
Activate dormant specs
...
It looks like a typo prevented a bunch of specs from being run.
2018-05-18 11:27:47 +10:00
Maikel Linke
5aef7031d2
Convert specs to RSpec 3.7.0 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/features/admin/reports_spec.rb
* 40 conversions
from: obj.should
to: expect(obj).to
* 10 conversions
from: == expected
to: eq(expected)
* 3 conversions
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:46 +10:00
Maikel Linke
682b92e617
Avoid deprication warning for using stub
2018-05-18 11:27:46 +10:00
Maikel Linke
99a6afd9cd
Convert specs to RSpec 3.7.0 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/controllers/spree/admin/reports_controller_spec.rb
* 20 conversions
from: obj.should
to: expect(obj).to
* 14 conversions
from: obj.should_not
to: expect(obj).not_to
* 5 conversions
from: == expected
to: eq(expected)
* 4 conversions
from: obj.stub(:message)
to: allow(obj).to receive(:message)
* 2 conversions
from: obj.should_receive(:message)
to: expect(obj).to receive(:message)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:46 +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
Maikel Linke
6a52ca8113
Remove code duplication
2018-05-18 11:27:46 +10:00
Maikel
4df9a0afa2
Merge pull request #2272 from rtrunkhill/620-error-message-tweak
...
changed error message in en.yml line 2207
2018-05-18 11:19:45 +10:00
Maikel
48b9536621
Merge pull request #2268 from stveep/1213-back-empties-cart
...
Set response headers to disable cache - to avoid back button emptying…
2018-05-18 10:54:05 +10:00
stveep
6efc0ab802
Set response headers to disable cache - to avoid back button emptying cart ( #1213 )
2018-05-18 09:57:32 +10:00
Maikel
b15f4de921
Merge pull request #2270 from mkllnk/2265-update-active-merchant
...
Update activemerchant to v1.78 with new root cert
2018-05-18 09:54:15 +10:00
Rory Trunkhill
5706cecf26
modify enterprise eror name message #620
2018-05-17 18:10:35 +00:00
Pau Pérez Fabregat
e356d712c4
Merge pull request #2288 from frank-west-iii/issue-2182-confirm-first-user
...
Confirm first user when seeding database
2018-05-16 08:51:12 +02:00
Maikel Linke
585bba0e23
Update activemerchant to v1.78 with new root cert
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2265 .
Most changes are in gateways we don't use, I believe. There has been a
change in Stripe, but we use another implementation, I guess.
2018-05-15 16:48:03 +10:00
Pau Pérez Fabregat
a28fa441c5
Merge pull request #2282 from openfoodfoundation/transifex
...
Transifex
2018-05-15 08:24:39 +02:00
