raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,515 Commits 21 Branches 450 Tags
aaae8dce2d019e7e38be7702e34dac3a4e1d3dab
Commit Graph

198 Commits

Author SHA1 Message Date
Rohan Mitchell
494b572c69 Do not show zero fees 2014-07-31 15:36:26 +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
03273a76ad Merge branch 'fix_units' 2014-07-18 14:11:41 +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
3758a8ae2b Add rake task to export enterprises to CSV 2014-07-16 09:33:59 +10:00
Rafael Schouten
ef1b72cec9 Megalitres to Kilolitres 2014-07-03 00:07:57 +01:00
Rob H
9b126df5b6 Add variant display_name to reports 2014-06-23 14:31:16 +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
9ccdd3b4e0 Add reactive integrity test that soft-deleted variants are removed from order cycles 2014-06-12 14:59:27 +10:00
Rob H
8d87cfbc35 Move option value naming logic into separate lib class 2014-06-04 14:54:42 +10:00
Rohan Mitchell
d1028cb912 User import/export includes addresses 2014-05-23 17:51:19 +10:00
Rohan Mitchell
9aadc9d1ce Add initial user import/export via CSV 2014-05-23 17:51:19 +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
Will Marshall
bbb70342b3 Merging 2014-05-02 15:35:43 +10:00
Rohan Mitchell
c9aefa507a Remove chili 2014-05-02 14:25:32 +10:00
Will Marshall
9fb4b2f9d8 Ctrl-C now cancels karma 2014-05-02 14:19:52 +10:00
Will Marshall
dfd1dd609d Re-engaging checkout spec 2014-05-02 14:13:00 +10:00
Will Marshall
d74265e44d Ctrl-C now cancels karma 2014-05-02 14:04:43 +10:00
Rohan Mitchell
ad6021a116 Revert "In specs, correctly disable referential integrity for postgres" 
This reverts commit 1610e1448a.
 2014-04-25 17:14:25 +10:00
Rohan Mitchell
1610e1448a In specs, correctly disable referential integrity for postgres 2014-04-25 16:58:25 +10:00
Rohan Mitchell
6c86254a90 Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user 2014-04-24 13:20:16 +10:00
Rohan Mitchell
95a6e34523 Spec access denied to regular user when soft-deleting variants 2014-04-24 13:20:16 +10:00
Rohan Mitchell
e28a450875 Add API call to soft-delete a variant 2014-04-24 13:20:16 +10:00
Will Marshall
5ac5b74f01 Setting up a Rake task for Jasmine/Karma 2014-04-08 18:09:02 +10:00
Rohan Mitchell
ce2882de35 OrderCycleFormApplicator uses exchanges.incoming instead of role 2014-03-27 09:49:08 +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
12743850b4 Removing a chili, refactoring order mailer 2013-12-13 15:40:22 +11:00
Will Marshall
6e36142809 Making some changes to the data on the products inventory page 2013-12-13 11:39:45 +11:00
Rohan Mitchell
29308dca76 Enable order cycles by default 2013-11-29 10:49:33 +11:00
Will Marshall
33b23dd265 Sorting the bitching product report like a boss 2013-11-28 17:06:06 +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
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
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
306eaab262 Remove uservoice 2013-11-15 16:31:46 +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
Will Marshall
9097246301 Removing uservoice 2013-11-14 11:07:58 +11:00
Rohan Mitchell
34607ff556 Rename misc items from openfoodweb to openfoodnetwork 2013-10-18 17:43:59 +11:00
Rohan Mitchell
89f93cae77 Rename namespaced includes from open_food_web to open_food_network 2013-10-18 17:43:18 +11:00