Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Maikel Linke
80bf6e61ad
redirect /t/products/:id to /
2015-06-13 11:59:52 +10:00
Maikel Linke
f44ac5b27b
Merge branch 'url-redirects' into e2e-links
2015-06-12 17:03:31 +10:00
Maikel Linke
d61073f08d
redirect /enterprises to /
2015-06-12 10:47:50 +10:00
Maikel Linke
2fb8f9f8a3
Redirect /products to /
...
GitHub issue #571
2015-06-12 10:47:50 +10:00
Rob Harrington
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Maikel Linke
ffa960b02e
Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor
2015-06-05 13:48:24 +10:00
Rob Harrington
439d122e93
Merge branch 'master' into customers
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
2015-06-03 15:19:40 +08:00
Continuous Integration
1d08ae89da
Auto-merge from CI [skip ci]
2015-05-28 14:31:25 +10:00
Rob Harrington
7f80c02c0e
Adding route for managed route for admin orders
2015-05-20 11:45:05 +10:00
Rohan Mitchell
0a2f2e0fba
Output summary data without customisation
...
Add route for xero invoices report
Add require for reports controller decorator
2015-05-15 12:35:05 +10:00
Rob Harrington
2afd501af3
Wiring up update action for customers controller
2015-05-13 12:44:34 +10:00
Rob Harrington
37ff61d663
Adding basic routing to display customer index page
2015-05-13 12:44:32 +10:00
Rohan Mitchell
b5a6f9c1bc
Add infrastructure so admin can configure content. Make homepage tagline CTA configurable.
2015-05-06 14:54:16 +10:00
Rob Harrington
9ebbdd8dc7
Adding route for groups/signup
...
Conflicts:
config/routes.rb
2015-05-04 22:14:43 +10:00
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
Rob Harrington
7ebea23fda
Adding route for now for_order_cycle action on enterprise fees
2015-04-06 10:23:08 +10:00
Rob Harrington
4dff3fe79c
Removing unused distributable action from products api
2015-03-27 16:07:38 +11: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
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
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
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
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
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
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
Rob Harrington
81715aaf5d
Remove unrequired store registration action
2014-10-17 11:01:39 +11:00
Rob Harrington
908c242d36
Confirmation email when creating enterprise
2014-10-15 10:48:05 +11:00
Rob Harrington
d3e72b5a2a
Adding images to registration process
2014-09-19 12:41:24 +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
Rob H
d6aae0050f
Angularise payment method provider UI
2014-08-08 17:47:50 +10:00
