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

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank West
b05b9747b8 Fix enterprise description display formatting 
Removes `text-small` class from container and change container to `div`
instead of `p` for semantic differentiation.
 2018-05-18 07:20:56 -07: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
Pau Pérez Fabregat
5b89f6a159 Merge pull request #2285 from coopdevs/get-last-spree-fork-changes 
Upgrade spree to point to 1c3dfc7fb
 2018-05-16 08:42:41 +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
v1.15.1 		2018-05-15 08:24:39 +02:00
Maikel
1b371e6388 Merge pull request #2249 from mkllnk/upgrade-rubocop-config 
Upgrade Rubocop config to be compatible with 0.55
 2018-05-15 16:19:38 +10:00
Maikel Linke
7c68ac9d0c Wait for dialog to appear before using it 
Travis was failing a few times. This should make the spec more robust.
 2018-05-15 15:00:18 +10:00
Frank West
91351c3f78 Confirm first user when seeding database 
Currently the first user is not confirmed until running the task
`openfoodnetwork:dev:load_sample_data`. This task does not need to be
run on a minimum implementation of a new server or development setup.

We now confirm the first user during seeding. This could be the default
email address or the user entered email address entered during seeding.
 2018-05-14 15:30:04 -07:00
Pau Pérez Fabregat
6033981ad5 Merge pull request #2283 from coopdevs/remove-outdated-specs 
Remove no longer valid tests
 2018-05-14 13:22:00 +02:00
Pau Perez
6f8317b007 Upgrade spree to point to 1c3dfc7fb 
This will fetch latest changes applied in the fork. It also changes the
Github organization we fetch it from. From now on we'll work there and
not in Coopdevs org.
 2018-05-14 13:05:51 +02:00
Pau Perez
5c260dae51 Remove no longer valid tests 
`#available_to_order?` is gone in Spree 2.0 and our customization on top
of it went away with #2256.
 2018-05-14 12:30:11 +02:00
Pau Pérez Fabregat
1991a7f34d Merge pull request #2256 from coopdevs/add-custom-package 
Add custom package
 2018-05-14 10:44:05 +02:00
Buildkite
f2e07419a8 Merge remote-tracking branch 'origin/master' into HEAD 2018-05-11 03:37:13 +00:00