Commit Graph

125 Commits

Author SHA1 Message Date
Will Marshall
67e72f4504 Setting up after_login redirects 2014-05-22 10:42:44 +10:00
Will Marshall
df82627bd1 Starting to rework login behaviour when hitting /admin 2014-05-20 15:47:00 +10:00
Rob H
93dedb690d Change overview controller to class_eval 2014-05-16 10:03:35 +10:00
Rob H
c98d2e71d8 Add scroll pane to admin dashboard 2014-05-09 17:20:53 +10:00
Rob H
01c5822fcc Add basic dashboard to admin section 2014-05-09 15:48:58 +10:00
Rob H
2b283405e7 Only admin and users of distributors can access admin orders 2014-04-13 10:09:17 +10:00
Rob H
8e54bf1e2e Enterprise users are aurthorised to view BOM 2014-04-04 09:11:56 +11:00
Rohan Mitchell
353d2a4d9c Do not error when creating variant for product without non-unit option type 2014-02-27 11:28:07 +11:00
Rohan Mitchell
7b80518621 On admin variant edit page, do not show option values for unit-related option types 2014-02-19 11:29:26 +11:00
Rob H
00dfa62f43 Basic listing of orders on BOM page 2014-01-17 14:56:26 +08:00
Rohan Mitchell
cbe46bffed Merge branch 'bpe_paginate'
Conflicts:
	config/ng-test.conf.js
2014-01-09 12:07:42 +11:00
Rob H
177782fac5 Status message works when updating products with filters applied 2014-01-06 18:20:00 +08:00
Will Marshall
e98031e581 Fixing some minor report bugs 2013-12-13 10:12:41 +11:00
Will Marshall
7bc754a598 Adding filtering to the products page 2013-11-28 13:44:21 +11:00
Will Marshall
27f99d1383 Working version of Customers reports without filters 2013-11-22 16:53:57 +11:00
Will Marshall
b3bf3a8378 Adding the plumbing for Customers reports, and one tiny refactor to products 2013-11-22 14:56:57 +11:00
Will Marshall
c695bafe69 Reworking the way the Reports works so we have more granular control over what shows 2013-11-21 16:45:59 +11:00
Rohan Mitchell
dfcf567f26 Sort payment methods by name 2013-11-21 14:42:28 +11:00
Will Marshall
612a80ec15 A little refactoring, some comment removal 2013-11-21 14:28:23 +11:00
Will Marshall
d703e1836f Working build of P&I report 2013-11-21 14:06:24 +11:00
Will Marshall
6a11b2685f Controller plumbing for Product & Inventory report 2013-11-20 13:58:01 +11:00
Will Marshall
5772fa9589 Boilerplate for the new Product and Inventory report, sans any functionality 2013-11-20 10:34:18 +11:00
Rohan Mitchell
27b8c4508f Split product distribution editing into its own admin page 2013-11-13 15:22:17 +11:00
Rohan Mitchell
48f18a93de Order shipping methods by name, not distributor 2013-11-07 16:25:43 +11:00
Rohan Mitchell
0755b515d1 Only show shipping methods that enterprise user has access to 2013-11-07 16:25:43 +11:00
Rohan Mitchell
89f93cae77 Rename namespaced includes from open_food_web to open_food_network 2013-10-18 17:43:18 +11:00
Rohan Mitchell
57f7d489ff Rename OpenFoodWeb namespace to OpenFoodNetwork 2013-10-18 17:29:55 +11:00
Rohan Mitchell
8ccad4b53a Return an error code when bulk product edit save fails 2013-10-18 16:23:25 +11:00
Rohan Mitchell
3b5e6f5742 When viewing shipping methods, only show those for the distributor I select 2013-10-18 10:01:11 +11:00
Rohan Mitchell
e6041aaf2f Enterprise user can view, create and edit payment methods 2013-10-18 09:09:53 +11:00
Rohan Mitchell
358ca25f31 Admin can assign multiple distributors to a shipping method 2013-10-17 11:16:26 +11:00
Rohan Mitchell
751801653e Bulk product update with >25 products succeeds 2013-10-16 14:36:22 +11:00
David Cook
2df2096d74 Sort payment and shipping methods by distributor name 2013-09-19 15:21:14 +10:00
David Cook
2e13abf933 Show only orders I am distributing 2013-09-19 15:21:14 +10:00
David Cook
402ed01207 Refactor/cleanup 2013-09-19 12:12:50 +10:00
David Cook
42a31ccd74 Show all relevant suppliers and distributors in report drop-down 2013-09-18 12:34:44 +10:00
David Cook
ad4301df90 Add supplier selection to Orders & Fulfillment Report 2013-09-18 12:34:43 +10:00
David Cook
4c2d6b38ea Ensure 'No Order Cycle' remains selected after clicking 'Search' 2013-09-18 09:57:03 +10:00
David Cook
b34d940457 Renamed report column to 'Curr. Cost per Unit' for clarity 2013-09-18 09:27:34 +10:00
David Cook
3fbd5dc625 Fix 'No Order Cycle' dropdown in Orders & Fulfillment Reports 2013-09-18 09:27:34 +10:00
David Cook
9782dd8264 Get line item cost from order, not current product price which may have changed. Also removed unnecessary total columns. 2013-09-18 09:27:34 +10:00
David Cook
e57ad81934 Add 'No Order Cycle' option and cycle dates to dropdown in Orders & Fulfillment Reports 2013-09-18 09:27:34 +10:00
David Cook
5ec3c1831d Only show order cycles that the user has access to in reports drop-down 2013-09-18 09:26:50 +10:00
David Cook
fe513d42c4 Rename 'Order Cycles' report group to 'Orders & Fulfillment' 2013-09-18 09:25:51 +10:00
David Cook
7e96ba909e Show a list of Order Cycles report types in the description column 2013-09-13 09:59:35 +10:00
David Cook
25b25b7681 New scope Order.not_state to filter out cancelled orders from reports 2013-08-30 17:07:17 +10:00
David Cook
bf3c5c6dd6 Merge branch 'master' into reports-completed-only
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
2013-08-30 16:42:00 +10:00
David Cook
6a303d7db9 Merge branch 'enterprise-reports'
Conflicts:
	app/models/spree/ability_decorator.rb
2013-08-30 16:27:13 +10:00
David Cook
61e5ec24e7 Generalise ModelClassFromControllerName 2013-08-30 15:21:30 +10:00
David Cook
80bfc5ce53 Ensure Supplier enterprise users can only view their own products in reports 2013-08-30 15:17:27 +10:00