raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,617 Commits 18 Branches 451 Tags
87b092fdf774f75bbcff44bb18fb7bf3adfcd91f
Commit Graph

141 Commits

Author SHA1 Message Date
Rohan Mitchell
e9f04c3c15 Clean up whitespace 2014-12-19 10:01:21 +11:00
Rohan Mitchell
6e0576235d Use create\! instead of build - more concise, raises exception on error 2014-12-19 09:51:32 +11:00
Rohan Mitchell
27d646c0e8 Tweak indentation, remove some blank lines 2014-12-19 09:51:32 +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
Lynne Davis
7e49bd634e Updated the specs with Rohans suggestions 2014-12-12 18:23:43 +00:00
Rohan Mitchell
0b3dfa7278 Merge branch 'product-reports-without-deleted' 2014-12-12 15:29:03 +11:00
Rohan Mitchell
b1ba519a73 When finding per hub order cycle enterprises, also return managed producers 2014-12-12 13:33:12 +11:00
Rohan Mitchell
5b82fcaca7 Inject hub permissions - which producers each hub can add to order cycle 2014-12-12 13:33:12 +11:00
Lynne Davis
079781576b Adding new specs and a couple updates the lib/report 2014-12-11 12:47:56 +00:00
Maikel Linke
3cc79d0036 Filter deleted products in products report 
BugHerd 484: Remove deleted products from Product / Inventory reports
 2014-12-05 15:52:10 +11:00
Rohan Mitchell
2b0f6b7865 Add ProductProxy which wraps the product's variants in VariantProxys 2014-11-21 13:49:09 +11:00
Rohan Mitchell
f3fa5edb9d Add simple variant proxy 2014-11-21 13:49:09 +11:00
Rob Harrington
d9d6b7bee4 Adding filtering to Users and Enterprises report 2014-11-14 16:36:22 +11:00
Rob Harrington
79a83ee206 Adding users and enterprises report, controller action and template 2014-11-14 16:36:22 +11:00
Rafael Schouten
feff4fd46f fix reports taxons and specs 2014-10-25 18:51:03 +11:00
Rafael Schouten
6f1c90ea25 add toxons to prodcut reports 2014-10-25 17:09:23 +11:00
Rob H
b49a4cbc4f Fix intermittent failing spec 2014-09-08 11:11:07 +10:00
Rohan Mitchell
9ec5dc6466 Find enterprises that we manage products for 2014-09-05 15:10:14 +10:00
Rohan Mitchell
e023a66167 Bulk product edit lists managed products 2014-09-05 15:10:14 +10:00
Rohan Mitchell
913c167fdf Revert 5ede8d1, reinstating a4be0ff..7b89e6a 2014-09-05 15:10:12 +10:00
Rob H
5ede8d169f Revert a4be0ff..7b89e6a for deployment 2014-08-28 14:32:57 +10:00
Rohan Mitchell
5ef13d3c5a Change 'add products to OC' permission into the more general 'add enterprise to OC' 2014-08-28 10:09:50 +10:00
Rohan Mitchell
099a5b0b7b Show E2E related enterprise exchanges in OC 2014-08-28 10:09:50 +10:00
Rohan Mitchell
34602244ca Show permitted suppliers in order cycle add supplier select box 2014-08-28 10:09:50 +10:00
Rohan Mitchell
8548a1a67e Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class 2014-08-28 10:09:50 +10:00
Rohan Mitchell
50b8eaecab Add fundraising fees 2014-08-13 15:07:32 +10:00
Rob H
30a14edb06 Adding 'Total Units' field to supplier report 2014-08-07 14:21:01 +10:00
Will Marshall
bb09236468 Merge branch 'laura_and_will' 2014-07-31 16:06:39 +10:00
Rohan Mitchell
494b572c69 Do not show zero fees 2014-07-31 15:36:26 +10:00
Rohan Mitchell
a26450d173 Remove unused spree searcher class - causing intermittent test failures 2014-07-31 14:58:18 +10:00
Rohan Mitchell
8c41a6c909 Calculate fee breakdown 2014-07-31 11:36:53 +10:00
Rohan Mitchell
66cece5903 WIP: Extract order cycle fee calculations to EnterpriseFeeCalculator 2014-07-31 11:36:53 +10:00
Rohan Mitchell
989a14fa37 Change KL to kL, update specs for ML to kL change 2014-07-17 16:16:08 +10:00
Rohan Mitchell
470ae7e729 Fix unreliable spec 2014-07-04 14:39:27 +10:00
Rob H
51d3f65934 Remove spree's product tab for all but admin users 2014-06-23 22:01:19 +10:00
Rohan Mitchell
2f2e0d41af On customer reports, do not show orders through a hub that the current user does not manage 2014-06-19 10:35:32 +10:00
Rohan Mitchell
3b7fc9f105 Reword spec descriptions 2014-06-19 10:03:05 +10:00
Rob H
7f2b3d62f4 OptionValueNamer spec refactor 2014-06-04 15:39:04 +10:00
Rob H
8d87cfbc35 Move option value naming logic into separate lib class 2014-06-04 14:54:42 +10:00
Rohan Mitchell
9e46108e9a Enterprise user can only add order cycle exchanges where it manages the participant enterprise 2014-05-23 12:18:22 +10:00
Rohan Mitchell
14dee8d7fe OrderCycleFormApplicator requires permitted_enterprises to be set explicitly 2014-05-23 12:09:38 +10:00
Rohan Mitchell
095b9bf67a Enterprise user can only update order cycle exchanges where it manages the participant enterprise 2014-05-23 12:05:46 +10:00
Rohan Mitchell
9b15c213d1 When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges 2014-05-23 11:28:00 +10:00
Will Marshall
5f712a8984 Removing code 2014-05-14 15:16:29 +10:00
Rohan Mitchell
607045f858 Fix inconsistent spec fail - sorting 2014-05-07 09:27:08 +10:00
Rohan Mitchell
ce2882de35 OrderCycleFormApplicator uses exchanges.incoming instead of role 2014-03-27 09:49:08 +11:00
Rohan Mitchell
0d97397084 Fix fragile specs (ordering) 2014-03-12 15:00:20 +11:00
Rohan Mitchell
890af85d30 Create per-order adjustments with EnterpriseFeeApplicator 2014-02-26 13:28:05 +11:00
Rohan Mitchell
08009d4020 Extract application of enterprise fees as adjustments into its own class 2014-02-21 15:48:58 +11:00
Will Marshall
6e36142809 Making some changes to the data on the products inventory page 2013-12-13 11:39:45 +11:00