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
3a9c4e0826
Adding a price without fees column to the order cycle customer report
2014-12-12 12:00:15 +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
086f69ccfb
Default payment method server/test_mode to live
2014-12-12 11:35:18 +11:00
Rohan Mitchell
e607c9855f
Add Pin Payments gateway
2014-12-12 10:59:23 +11:00
Rob Harrington
b9011d9abe
Remove obsolete spree checkout views
2014-12-11 16:17:15 +11:00
Rob Harrington
b7810df346
Revert "Removing obsolete checkout views"
...
This reverts commit d0e013c1a5
2014-12-11 16:09:17 +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
Rob Harrington
d0e013c1a5
Removing obsolete checkout views
2014-12-11 14:50:29 +11:00
Rob Harrington
2f83d71931
Adding mail/all.css to assets precompile list
2014-12-10 09:56:33 +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
Rohan Mitchell
19667f31fa
Add missing translation for welcome_to
2014-12-03 15:19:25 +11:00
Rohan Mitchell
95f8334370
Reinstate style
2014-12-03 12:28:22 +11:00
Rohan Mitchell
50e26ed96f
Remove old required partial
2014-12-03 12:22:43 +11:00
Rohan Mitchell
e30021537a
Merge branch 'master' into enterprise-form-required-fields
...
Conflicts:
app/views/admin/enterprises/_form.html.haml
app/views/admin/enterprises/_ng_form.html.haml
2014-12-03 12:20:52 +11:00
Rohan Mitchell
bd7253bdda
Merge branch 'using-simple-order-cycle'
2014-12-03 12:08:25 +11:00
Rohan Mitchell
fbef139fc5
Merge branch 'master' into using-simple-order-cycle
2014-12-03 11:57:59 +11:00
Rohan Mitchell
3358fb3d73
Name based on meaning instead of context
2014-12-03 09:39:36 +11:00
Paul Mackay
26bca0faf8
Localize more strings on home page.
2014-12-03 09:39:36 +11:00
Paul Mackay
73ece4075c
Add rails-i18n gem.
2014-12-03 09:39:35 +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
Rob Harrington
699c9a62a5
Removing pretty_inspect so that bugsnag alert work on production
2014-11-27 16:39:14 +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
5799f09caf
Merge branch 'master' into pretty-emails
2014-11-27 00:02:44 +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
258573f5a6
Remove obsolete text version of user signup_confirmation
2014-11-26 18:58:26 +11:00
Rob Harrington
0cf2df8358
Remove obsolete text version of order confirm_email
2014-11-26 18:54:50 +11:00
Rob Harrington
8a3bffb37d
Cart page conforms to convention in rest of checkout, adjusting helpers through checkout
2014-11-26 18:53:29 +11:00
Rob Harrington
8f27c643f1
Move override for cart line item into existing view replacement
2014-11-26 16:08:53 +11:00
Rob Harrington
a8dde3bbb9
Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry
2014-11-26 15:16:53 +11:00
Rob Harrington
f5acf36771
Hiding enterprise shop url in ent welcome email, as that may bot actually make sense
2014-11-26 14:50:19 +11:00
Rob Harrington
17a2e37eda
Fixing broken category lookup on BPE
2014-11-26 13:16:29 +11:00
Rob Harrington
f6b0863279
Make cost breakdowns consistent throughout checkout
2014-11-26 13:07:40 +11:00
Rob Harrington
c4961d2502
Whitespace crusader
2014-11-26 11:59:22 +11:00
