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
Rohan Mitchell
636ed2ad0d
Make bi-directional relationships
2015-02-13 09:24:48 +11:00
Rohan Mitchell
1d61e91afd
When enterprise created, grant permission to all co-owned enterprises, not just hubs
2015-02-13 09:24:48 +11:00
Maikel Linke
6b5a1255f8
fixing a bunch of tests
2015-02-12 16:36:18 +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
Maikel Linke
a7c2a73fa8
make groups editable by group owners
2015-02-05 12:05:39 +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
Maikel Linke
8d9f8beff3
creating facebook url
2015-02-02 10:33:13 +11:00
Rohan Mitchell
c0a7d22a50
Add permitted_by scope to EnterpriseRelationship
2015-01-30 16:36:45 +11:00
Rohan Mitchell
fafbfe8735
Simplify, simplify
2015-01-30 15:56:10 +11:00
Rohan Mitchell
7ac888ae00
Admin can grant create_variant_overrides permission
2015-01-30 11:56:05 +11:00
Rob Harrington
36430d3bad
Enterprise permalink generator handles blank permalink case
2015-01-22 10:19:46 +11:00
Rob Harrington
7520552fd7
Removing spec for testing empty permalink, since we now force permalink to be created when empty
2015-01-22 10:19:46 +11:00
Rob Harrington
3e5ea3fe63
Adding automatic permalink generation on enterprise creation
2015-01-22 10:19:45 +11:00
Rob Harrington
6b10a4a775
Restoring enterprise permalinks when they cause errors
2015-01-22 10:19:43 +11:00
Rob Harrington
9f0aeb5adf
Adding unique permalink to enterprises
2015-01-22 10:19:41 +11:00
summerscope
d2d3a577ea
Merging master into this branch to make it easy to pull for staging push
2015-01-15 17:38:35 +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
a4d4622521
Add VariantOverride.decrement_stock
2015-01-12 10:39:23 +11:00
Rohan Mitchell
20f650b472
Add VariantOverride.stock_overriden?
2015-01-12 09:32:02 +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
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
c4b45bdbbf
Fix line items returning prices with fractional cents
2014-12-18 16:24:59 +11:00
Rohan Mitchell
f5ee9ba2f3
VariantOverride looks up count_on_hand
2014-12-18 10:21:07 +11:00
Rohan Mitchell
6c300431d2
Move Product#variants_for to Variant.for_distribution scope
2014-12-17 13:42:30 +11:00
Rohan Mitchell
91c500417b
Swap param order
2014-12-17 08:55:27 +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
