Rohan Mitchell
ff28da345d
Find variant overrides for some hubs
2014-12-12 13:33:12 +11:00
Rohan Mitchell
91b386003a
Add VariantOverrideSerializer
2014-12-12 13:33:12 +11:00
Rohan Mitchell
a3a3832c8d
Only show products that the chosen hub can add to an order cycle
2014-12-12 13:33:12 +11:00
Rohan Mitchell
500b5ce347
Enterprise managers can access override variants
2014-12-12 13:33:12 +11:00
Rohan Mitchell
b1ba519a73
When finding per hub order cycle enterprises, also return managed producers
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5b82fcaca7
Inject hub permissions - which producers each hub can add to order cycle
2014-12-12 13:33:12 +11:00
Rob Harrington
6a226e4f92
Fixing typos and changing delivery address display in order confirmation email
2014-12-12 12:00:15 +11:00
Rohan Mitchell
e607c9855f
Add Pin Payments gateway
2014-12-12 10:59:23 +11:00
Rob Harrington
dfb9e5bde5
Order reports now present the price of line items with adjustments included
2014-12-11 15:48:29 +11:00
Rob Harrington
3be437485a
Redirecting any spree checkout_state redirects to our checkout controller
2014-12-11 14:53:11 +11:00
Rohan Mitchell
ec08ab4cc9
Merge pull request #307 from openfoodfoundation/replace-fixtures
...
Replacing fixtures with minimal seeding
2014-12-04 16:31:30 +11:00
Maikel Linke
5c191bcc7f
Moving test seeding into spec/support/seeds.rb
2014-12-04 15:38:59 +11:00
Maikel Linke
8e280919ac
Using simple_order_cycle in clone spec
...
Creating a coordinator fee and two exchanges in the spec instead of
using a full order_cycle. Timing of this single test:
Before: 15.32 seconds
After: 6.26 seconds
2014-11-28 15:36:34 +11:00
Maikel Linke
e240933b29
Using simple_order_cycle in spec
...
Before: 4 minutes 6.9 seconds
After: 3 minutes 27.4 seconds
2014-11-28 14:45:35 +11:00
Maikel Linke
349b7de11a
Using simple_order_cycle
...
Before: 2 minutes 58.3 seconds
After: 35.04 seconds
2014-11-28 14:02:55 +11:00
Maikel Linke
73b8f37d77
Using simple_order_cycle
...
Before: 2 minutes 8.7 seconds
After: 16.11 seconds
2014-11-28 13:55:06 +11:00
Maikel Linke
aa2cefb88c
Using simple_order_cycle where applicable
...
Before: 3 minutes 0 seconds
After: 1 minute 21.02 seconds
2014-11-28 13:45:25 +11:00
Maikel Linke
ccd03bfa84
Using simple_order_cycle
...
Test timings were not accurate. Output:
4 order_cycles: 9.94 seconds
2 order_cycles: 9.87 seconds
0 order_cycles: 9.9 seconds
Felt execution was much higher
2014-11-28 13:20:05 +11:00
Maikel Linke
7f764db4d7
Using simple_order_cycle
...
order_cycle: 1 minute 56.88 seconds
simple_order_cycle: 1 minute 8.05 seconds
2014-11-28 12:39:05 +11:00
Maikel Linke
082a3cd9ab
Creating simple_order_cycle instead of order_cycle
...
Speedup on my machine:
1 minute 44.52 seconds
21.9 seconds
2014-11-28 12:29:47 +11:00
Maikel Linke
ef0b0a9a94
Replacing fixtures with minimal seeding
...
Seeding:
1 country: Australia
2 states: Vic, NSW
2014-11-27 16:38:39 +11:00
Rob Harrington
9782a9d3d6
Hopefully fixing Poltergeist Timeout error due to long long time for first admin spec
2014-11-27 14:42:02 +11:00
Rob Harrington
45bcee16ef
Pulling out obsolete setup in BOM spec to make it more like BPE spec, see if that helps with intermittent fails
2014-11-27 09:44:13 +11:00
Rob Harrington
38440dd70a
Ammending checkout specs for two emails on placement of order
2014-11-26 23:16:11 +11:00
Rob Harrington
9bd3909449
Merge master into pretty-emails
2014-11-21 14:43:01 +11:00
Rohan Mitchell
0b030a85ff
Incrementally load products
2014-11-21 13:49:09 +11:00
Rohan Mitchell
824b00743e
Extract fetch-by-page from BPE to service
2014-11-21 13:49:09 +11:00
Rohan Mitchell
58fdc48b9f
Display products in table
2014-11-21 13:49:09 +11:00
Rohan Mitchell
7069b30e71
Add indexer service (equivalent of Dereferencer, but named more accurately)
2014-11-21 13:49:09 +11:00
Rohan Mitchell
680ba379c1
User can select a hub
2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720
Do not show producers in hubs list
2014-11-21 13:49:09 +11:00
Rohan Mitchell
4c9aa96b17
have_select2 can test for an exact set of options
2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31
Show list of hubs to select for managing variant overrides
2014-11-21 13:49:09 +11:00
Rohan Mitchell
d810388248
Add have_select2 capybara matcher
2014-11-21 13:49:09 +11:00
Rohan Mitchell
2b0f6b7865
Add ProductProxy which wraps the product's variants in VariantProxys
2014-11-21 13:49:09 +11:00
Rohan Mitchell
f3fa5edb9d
Add simple variant proxy
2014-11-21 13:49:09 +11:00
Rohan Mitchell
f9b4c07219
Add initial VariantOverride model with price lookup
2014-11-21 13:49:09 +11:00
Rohan Mitchell
bf6d0a2beb
Port remaining specs to BulkProducts service specs
2014-11-21 08:41:41 +11:00
Rohan Mitchell
5eb40261a8
Port clone products specs to BulkProducts service specs
2014-11-21 08:41:41 +11:00
Rohan Mitchell
221e9344fd
Port fetch products specs to BulkProducts service specs
2014-11-21 08:41:41 +11:00
Rohan Mitchell
387d25b8f2
WIP: More extracting BulkProducts-specific specs to their own file
2014-11-21 08:41:41 +11:00
Rohan Mitchell
7e2c979c96
WIP: Extracting BulkProducts-specific specs to their own file
2014-11-21 08:41:41 +11:00
Rohan Mitchell
7e4d337773
Extract DisplayProperties to a service
...
Conflicts:
app/assets/javascripts/admin/bulk_product_update.js.coffee
2014-11-21 08:41:41 +11:00
Rohan Mitchell
29e49b67cc
In BPE, rename producer and category JSON attrs to producer_id and category_id
...
Conflicts:
spec/features/admin/bulk_product_update_spec.rb
2014-11-21 08:41:41 +11:00
Rohan Mitchell
021cca4fca
Stylistic changes
2014-11-21 08:41:41 +11:00
Rob Harrington
c9d0721acd
Rewire order confirmation email so that two separate emails are sent, one for customers and one for shop owners
2014-11-19 11:03:00 +11:00
Rob Harrington
d9d6b7bee4
Adding filtering to Users and Enterprises report
2014-11-14 16:36:22 +11:00
Rob Harrington
79a83ee206
Adding users and enterprises report, controller action and template
2014-11-14 16:36:22 +11:00
Rob Harrington
66a3410087
WIP: Adding new report to ability spec
2014-11-14 16:36:22 +11:00
Rob Harrington
65a5960fcc
WIP: Add route for User and Enterprise report
2014-11-14 16:36:22 +11:00
