Maikel Linke
903bd21577
Merge remote-tracking branch 'origin/master' into group-pages-merge
...
Conflicts:
README.markdown
db/schema.rb
2015-02-13 15:42:36 +11:00
Rob Harrington
ad1f837c44
Admin users can access all users through known_users
2015-02-12 11:34:58 +11:00
Rob Harrington
b73619d168
Adding known_users method to Spree::User
2015-02-12 11:34:58 +11:00
Rob Harrington
dde1a27d3a
Adding ability to search for known users
2015-02-12 11:34:57 +11:00
Rohan Mitchell
7ca9670073
Admin can access variant override only when it can add hub to order cycle and it can create variant overrides for the producer of the variant
2015-02-04 11:09:48 +11:00
Maikel Linke
91b35d068c
Adding owner to groups
...
Groups have owners and users own groups. The owners are displayed and
changable on the group's page by admin users.
2015-02-02 15:58:34 +11:00
Rohan Mitchell
fafbfe8735
Simplify, simplify
2015-01-30 15:56:10 +11:00
Rohan Mitchell
2d82f76a43
Fix changed var in ability spec
2015-01-15 13:43:39 +11:00
Rohan Mitchell
d5437e1508
edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise
2015-01-15 13:43:39 +11:00
Rohan Mitchell
90ad2e2b7d
Allow enterprises with 'edit profile' permission to edit enterprises
2015-01-15 13:43:39 +11:00
Rohan Mitchell
307cc313df
Stub scope_to_hub in spec that wasn't expecting it
2015-01-13 11:46:41 +11:00
Rohan Mitchell
0431e0048c
Merge branch 'master' into variant-overrides-frontend
...
Conflicts:
app/controllers/shop_controller.rb
app/views/shop/products/_form.html.haml
spec/controllers/shop_controller_spec.rb
2015-01-12 16:48:51 +11:00
Rohan Mitchell
ac59665e3c
Test validations without creating models in database
2015-01-08 09:48:33 +11:00
Rohan Mitchell
e4efda2f96
Move model spec into validations block
2015-01-08 09:37:35 +11:00
Rohan Mitchell
087ccb52f9
Merge branch 'tax_cat_dropdown' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-tax_cat_dropdown
2015-01-08 09:09:20 +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
c4b45bdbbf
Fix line items returning prices with fractional cents
2014-12-18 16:24:59 +11:00
Rohan Mitchell
6c300431d2
Move Product#variants_for to Variant.for_distribution scope
2014-12-17 13:42:30 +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
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
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
Matt-Yorkley
c3829ae64f
Tax category dropdown on create product form
2014-11-23 15:18:16 +00:00
Rob Harrington
9bd3909449
Merge master into pretty-emails
2014-11-21 14:43:01 +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
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
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
b2565991e6
Merge branch 'master' into reg_and_ent_types
2014-10-17 12:33:21 +11:00
Rafael Schouten
a1d74649f3
rename spec and clear todo
2014-10-16 16:50:19 +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
Rafael Schouten
e476324c60
fix for_order_cycle test
2014-10-07 00:22:45 +11:00
Rafael Schouten
017d6b1273
move for order cycles permission, for now, but needs review
2014-10-06 01:35:46 +11:00
Rafael Schouten
b3520c4385
Bugfix for specs
2014-10-02 16:49:32 +10:00
