Rohan Mitchell
85882a73ff
Merge branch 'lin-d-hop-266reportsbranch'
2014-12-19 16:51:38 +11:00
Rob Harrington
fcb14f32d2
Validating user input for shopfront taxon order
2014-12-19 14:04:02 +11:00
Rohan Mitchell
e9f04c3c15
Clean up whitespace
2014-12-19 10:01:21 +11:00
Rohan Mitchell
4a30f27b3d
Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
spec/models/spree/order_spec.rb
2014-12-19 09:38:02 +11:00
Rohan Mitchell
31823f2dbd
Setting both values to blank deletes override
2014-12-12 13:33:14 +11:00
Rohan Mitchell
c38686c820
Create new variant overrides
2014-12-12 13:33:14 +11:00
Rohan Mitchell
27444c6589
Extract variant overrides to own controller - permissions
2014-12-12 13:33:14 +11:00
Rohan Mitchell
51d2805de9
WIP: Rename override_variants to variant_overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
ff28da345d
Find variant overrides for some hubs
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
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
Lynne Davis
633a8a49e2
updating spec based on the wise advice of Rohan
2014-12-03 00:35:53 +00: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
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
Lynne Davis
35c27bf516
First specs for additional scope to order model. Not liking the repeated code so would appreciate feedback to get rid of it. Thanks!
2014-11-27 20:36:41 +00:00
Rob Harrington
9bd3909449
Merge master into pretty-emails
2014-11-21 14:43:01 +11:00
Rohan Mitchell
f9b4c07219
Add initial VariantOverride model with price lookup
2014-11-21 13:49:09 +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
66a3410087
WIP: Adding new report to ability spec
2014-11-14 16:36:22 +11:00
Rob Harrington
ee2ee5dba7
Adding an enterprise welcome email
2014-11-12 15:20:51 +11:00
Rob Harrington
e1823212d6
Reconfirmation email not required when we already know about new email address for enterprise
2014-11-06 21:19:22 +11:00
Rohan Mitchell
abeabd5b1c
Add Enterprise#ready_for_checkout?
2014-10-31 14:04:43 +11:00
Rohan Mitchell
94d50f220f
Display an error message to admin when there are hubs in order cycles that are not ready for checkout
2014-10-31 12:22:02 +11:00
Rohan Mitchell
f0d3b987d4
Show hubs as unavailable when they do not have available payment and shipping methods
2014-10-31 12:22:02 +11:00
Rob Harrington
977c508833
Make enterprise limit error messages more specific
2014-10-30 13:02:16 +11:00
Rob Harrington
cc0e205f50
Merge master into onbaording
2014-10-24 15:36:59 +11:00
Rob Harrington
a157528974
Adding specs for single ent dash and remove product ability for profiles
2014-10-24 15:27:08 +11:00
Rob Harrington
2e0d5eb829
Adding set_sells action to enterprises
2014-10-23 10:27:53 +11:00
Rafael Schouten
069b9ce91d
fix email length validation spec
2014-10-22 17:49:44 +11:00
Rob Harrington
565d6739b3
Add 'activated' scope to enterprises
2014-10-22 15:13:52 +11:00
Rafael Schouten
a53cbb677d
fix report typos
2014-10-22 14:55:01 +11:00
Rafael Schouten
afa6119ec1
better coverage for enterprise abilities, hide products from non producers
2014-10-22 14:53:20 +11:00
Rafael Schouten
89ce4ba632
Merge branch 'master' into bugfix
...
Conflicts:
app/models/enterprise.rb
2014-10-21 08:51:23 +11:00
Rafael Schouten
08cd273be3
Merge branch 'migrate_ent_types' into bugfix
...
Conflicts:
app/models/spree/ability_decorator.rb
2014-10-18 07:37:41 +11:00
Rafael Schouten
2a7dd8b8f1
update ability specs for reports
2014-10-18 06:53:38 +11:00
Rob Harrington
cae8d566df
Explicit confirmed_at to ensure that confirmation emails are sent
2014-10-17 17:49:18 +11:00
Rob Harrington
b2565991e6
Merge branch 'master' into reg_and_ent_types
2014-10-17 12:33:21 +11:00
Rob Harrington
28807d4f4d
Merge migrate_ent_types into reg
2014-10-17 10:20:48 +11:00
Rafael Schouten
f1280a31a6
Merge branch 'reports' into bugfix
2014-10-17 07:41:30 +11:00
Rafael Schouten
6fd9741daf
use build instead of create, and reorganise code
2014-10-16 16:51:09 +11:00
Rafael Schouten
a1d74649f3
rename spec and clear todo
2014-10-16 16:50:19 +11:00
Rafael Schouten
f0a3296e52
change enterprise category name ans use symbols instead of strings
2014-10-16 16:26:49 +11:00
Rohan Mitchell
0e03b5f209
Admin can change the format that Spree::Images are stored/served in
2014-10-16 12:41:11 +11:00
Rafael Schouten
1577c01a77
add reports abilities specs
2014-10-16 04:29:33 +11:00
Rob Harrington
96878f5dcb
Don't require confirmation for enterprises where the email address has already been confirmed for another enterprise
2014-10-15 17:22:56 +11:00
Rob Harrington
c76a3815c0
Add unconfirmed scope
2014-10-15 15:45:47 +11:00
