Commit Graph

125 Commits

Author SHA1 Message Date
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
Will Marshall
7bc754a598 Adding filtering to the products page 2013-11-28 13:44:21 +11:00
Will Marshall
fbe0e2cc29 Basic plumbing for the Customers in place 2013-11-22 16:22:44 +11:00
Will Marshall
beb6110bc3 Fixing up a bug in the aggregate filtering 2013-11-21 15:04:33 +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
e853c1275e Working filters for Product&Inventory Report 2013-11-21 11:25:37 +11:00
Will Marshall
ca16314535 Working scopes for child variant and master variants 2013-11-20 14:11:22 +11:00
Will Marshall
84346c7fbd Starting specing P&I Report 2013-11-20 13:59:02 +11:00
Rohan Mitchell
59935619e3 Rename OrderCycle#distributed_variants_by to variants_distributed_by 2013-11-15 14:34:05 +11:00
Rohan Mitchell
d73af509e0 When removing exchanges from an order cycle, compare by id only. Avoids erroneously removing exchanges where another attr has changed in an unimportant way. 2013-11-15 12:09:26 +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
8e269353a8 Rename all open_food_web dirs to open_food_network 2013-10-18 17:19:47 +11:00
Rohan Mitchell
2f73161421 Move patch to address class - much simpler 2013-09-18 07:14:21 +10:00
Rohan Mitchell
56590e2f4a Instrument saving spree addresses with invalid values in an attempt to track down the cause of some invalid records finding their way into the database 2013-09-17 18:06:06 +10:00
David Cook
4f9c7fb601 Remove distributor_id from payment method and update tests 2013-09-13 16:58:19 +10:00