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
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
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
Rafael Schouten
56a9658b14
update ability spec
2014-10-01 16:55:41 +10:00
Rafael Schouten
4fde0ad2d7
Merge branch 'master' into migrate_ent_types
2014-10-01 16:11:20 +10:00
Rafael Schouten
a49991c696
set abilities tests to pending, need to discuss further
2014-09-28 22:55:49 +10:00
Rob Harrington
4b2f1cefa0
Spliting order management abilities out of product management abilities
2014-09-26 17:11:11 +10:00
Rob Harrington
299b0fe5be
Allowing all enterprise users to access products
2014-09-26 15:01:23 +10:00
Rob Harrington
17ce80a417
Allow new user to create enterprises
2014-09-19 18:31:23 +10:00
Rob H
f1c19ea64c
Enterprise validates owner enterprise_limit
2014-09-11 14:54:51 +10:00
Rob H
7fbc9aa680
User validates the number of enterprises owned
2014-09-11 14:54:51 +10:00
Rob H
31de5d45ea
Adding owner to enterprise
2014-09-11 14:36:09 +10:00
Rohan Mitchell
fe1c60ba47
Enterprise manager can edit products from enterprises it has manage_products permission on
2014-09-05 15:10:16 +10:00
Rohan Mitchell
57af658e7c
For OC, fetch all enterprises we have access to, including those via E2E relationships
2014-09-05 15:10:13 +10:00
Rohan Mitchell
3524e658f8
Error when creating product and master is invalid, instead of creating a product without a master
2014-08-25 11:52:15 +10:00
Rohan Mitchell
50e4c5fac9
Users with only a profile-level enterprise see only menu items for enterprise management
2014-08-19 14:26:45 +10:00
Rob H
044a4c6816
Finish changing class names for PayPal gateways
2014-08-08 23:19:13 +10:00
Rob H
51f912033b
Remove test for PayPalExpress UK which does not exist anymore
2014-08-08 22:39:26 +10:00
Rob H
40d290951c
Fix failing specs related to requiring distributor for payment method
2014-08-08 17:47:51 +10:00
Rob H
16215289d0
Spec for payment method clean_name translation
2014-08-08 17:47:50 +10:00
Rob H
f021d260b1
Require payment_methods to be associated with at least one hub
2014-08-08 17:47:50 +10:00
