Paul Mackay
ca665dc6bc
Merge master into producer-emails.
2015-03-04 19:09:43 +00:00
Maikel Linke
ff4bd449a2
Setting default_country_id by application.yml
...
The spree default_country_id was set using ENV["DEFAULT_COUNTRY"] for
production environment, but not for tests and development. Since tests
reset the default_country_id in specs/support/seeds.rb, only the
development environment had a fix id set to 12. This is removed now.
This fixes creating enterprises and enterprise groups without sample
data (12 is Australia).
2015-02-26 16:29:46 +11:00
Rob Harrington
ee5ab22501
Moving interface for changing owner to new 'Users' tab
2015-02-12 11:34:58 +11:00
Rohan Mitchell
22f6ece83f
When fetching products for variant overrides admin, fetch all overridable products
2015-02-04 10:16:34 +11:00
Rob Harrington
39889390ef
Altering shop page routing so that shop url is copy-and-pastable
2015-01-22 10:19:42 +11:00
Rob Harrington
9286c82b43
Removing obsolete methods
2015-01-22 10:19:42 +11:00
Rob Harrington
c330e49a7f
Moving permalink check action to enterprise controller
2015-01-22 10:19:42 +11:00
Rob Harrington
e2268e53bb
Adding action to check uniquness of enterprise permalink against existing routes
2015-01-22 10:19:41 +11:00
Paul Mackay
67b17de695
#275 : Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.
2014-12-30 11:33:13 +00: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
c38686c820
Create new variant overrides
2014-12-12 13:33:14 +11:00
Rohan Mitchell
531b35bbc6
WIP: Extract variant overrides to own controller - route, controller, views
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
e607c9855f
Add Pin Payments gateway
2014-12-12 10:59:23 +11:00
Rob Harrington
2f83d71931
Adding mail/all.css to assets precompile list
2014-12-10 09:56:33 +11:00
Rohan Mitchell
19667f31fa
Add missing translation for welcome_to
2014-12-03 15:19:25 +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
Rohan Mitchell
0b030a85ff
Incrementally load products
2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31
Show list of hubs to select for managing variant overrides
2014-11-21 13:49:09 +11:00
Rohan Mitchell
76c300283b
Remove CONTACT_STRING config - Rob has an admin-managable override for this coming soon
2014-11-20 15:59:06 +11:00
Rohan Mitchell
8096ca2519
Merge remote-tracking branch 'origin/config' into config
2014-11-20 15:41:15 +11:00
Rob Harrington
65a5960fcc
WIP: Add route for User and Enterprise report
2014-11-14 16:36:22 +11:00
Paul Mackay
05437e2a56
#275 : start on producer email.
2014-11-09 11:17:46 +00:00
Rob Harrington
898af0a55e
Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice
2014-11-06 21:19:21 +11:00
Rohan Mitchell
98f434dad3
Merge branch 'i18n' of https://github.com/folklabs/openfoodnetwork into folklabs-i18n
2014-11-05 11:54:42 +11:00
Lynne Davis
6f6ae309c6
266 UK: Adding first UK report - Payment Methods Report - to find balances per ordercycle for multiple payment method options. Working, but not complete to spec yet
2014-11-02 11:26:39 +00:00
Paul Mackay
543368169f
#254 : Localisation of home page and welcome email.
2014-10-31 06:59:43 +00:00
Rafael Schouten
098afacce3
Merge branch 'config' of https://github.com/openfoodfoundation/openfoodnetwork into config
2014-10-25 15:32:16 +11:00
Rafael Schouten
8395dbb3e9
Merge branch 'master' into config
...
Conflicts:
.gitignore
Gemfile
2014-10-25 15:29:53 +11:00
Rob Harrington
5a837226a4
Route set_sells through put rather than post
2014-10-23 11:38:51 +11:00
Rob Harrington
2e0d5eb829
Adding set_sells action to enterprises
2014-10-23 10:27:53 +11:00
Rafael Schouten
78b0e02ffe
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork
2014-10-18 16:03:04 +11:00
Rob Harrington
4d078feea2
Add default scope to devise to stop it from checking other devise enabled models (in this case :enterprise)
2014-10-17 16:12:51 +11:00
Rob Harrington
81715aaf5d
Remove unrequired store registration action
2014-10-17 11:01:39 +11:00
Rafael Schouten
4defb38cf4
update karma config
2014-10-17 04:01:36 +11:00
Rob Harrington
908c242d36
Confirmation email when creating enterprise
2014-10-15 10:48:05 +11:00
Rafael Schouten
b647f9382f
revert included file
2014-10-01 17:11:00 +10:00
Rafael Schouten
dee869a273
move checks and links in sidebars
2014-09-26 17:58:00 +10:00
Rob Harrington
1a86206e1f
Fixing super annoying server reload bug
2014-09-24 13:01:40 +10:00
Rob Harrington
d3e72b5a2a
Adding images to registration process
2014-09-19 12:41:24 +10:00
Rafael Schouten
a5680e611e
add example yml
2014-09-17 12:05:28 +10:00
Rafael Schouten
9448e1cbe4
add figaro env config
2014-09-16 00:13:43 +10:00
Rob H
6ee3010fa7
Differentiation of on-boarding process by url
2014-09-12 11:00:34 +10:00
Rob H
c92aa41e28
Adding introduction and details pages to registration process
2014-09-11 16:34:19 +10:00
Rob H
595aa760cb
Loads registration page with authentication
2014-09-11 16:34:19 +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
1d77812ab8
Admin can list enterprise roles
2014-08-15 16:09:04 +10:00
Rob H
f19af52556
WIP: angularised provider settings for payment method works on create (for admin only at this stage)
2014-08-08 17:47:50 +10:00
