summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
Rohan Mitchell
a207f50aeb
Merge branch 'master' into delay-devise-emails
...
Conflicts:
script/run_tests.sh
2015-04-30 12:29:06 +10:00
Rohan Mitchell
3b61d7a1e0
Add ref for country ISO codoes
2015-04-29 14:12:08 +10:00
Rohan Mitchell
c3f99d7540
Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country
2015-04-29 14:07:58 +10:00
Rohan Mitchell
7a78f4870a
Use phantomjs for js specs, so we can run them in CI
2015-04-22 16:33:44 +10:00
Rohan Mitchell
998288e21f
Keep failed jobs around for debugging. Limit max runtime to 15 mins (we're only sending emails at present). Notify bugsnag of errors in jobs.
2015-04-21 15:37:36 +10:00
Rohan Mitchell
048c6a8ee8
Include only the bare minimum of helpers into JS template context to avoid intermittent SASS @include issues
2015-04-17 13:41:38 +10:00
Rohan Mitchell
05551aa2a9
Make helpers available to javascript templates
2015-04-17 13:41:38 +10:00
Rohan Mitchell
9bbc151cae
Admin can set enterprises to charge or not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
2b5fc656fe
Configure delayed job logging, add startup script for monit
2015-04-17 10:40:25 +10:00
Rob Harrington
7ebea23fda
Adding route for now for_order_cycle action on enterprise fees
2015-04-06 10:23:08 +10:00
Paul Mackay
d4cf44a6dd
Use COUNTRY_CODE instead of COUNTRY in application.yml.
2015-03-29 17:06:05 +01:00
Rob Harrington
4dff3fe79c
Removing unused distributable action from products api
2015-03-27 16:07:38 +11:00
Rohan Mitchell
1005a06583
Merge branch 'currency-config' of https://github.com/folklabs/openfoodnetwork into folklabs-currency-config
2015-03-25 11:39:43 +11:00
Paul Mackay
af9a7a2ed4
#443 : Support currency configuration. Fix LOCALE variable name.
2015-03-24 15:34:45 +00:00
Rohan Mitchell
4491d3cc73
Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix
...
Conflicts:
app/views/admin/order_cycles/_row.html.haml
spec/features/admin/order_cycles_spec.rb
2015-03-16 12:14:54 +11:00
Rohan Mitchell
1e5e009735
Spree init works when database has not been created, remove duplicate FK from db/schema.rb
2015-03-12 11:29:01 +11:00
Victor Nava
4e1eb33ff5
Redirect users to proper login page when they type /login
2015-03-05 11:25:35 +11:00
Matt-Yorkley
be55f461d0
Report: sales tax on orders
2015-03-05 10:43:50 +11: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
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
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
