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
1,486 Commits 18 Branches 451 Tags
a30e46d747860f4e6bcd05d146975751667f526e
Commit Graph

134 Commits

Author SHA1 Message Date
Rohan Mitchell
a30e46d747 Do not delete variant options_text when saving/refreshing products 2014-01-14 11:40:58 +11:00
Rohan Mitchell
9442b7b5dc On save, scale from chosen unit to base unit (eg. mL to L) 2014-01-14 11:13:19 +11:00
Rohan Mitchell
c43b56f3f8 On load, scale from base unit to chosen unit (eg. g to kg) 2014-01-14 10:16:21 +11:00
Rohan Mitchell
22ec6aa852 Add comment 2014-01-10 15:59:38 +11:00
Rohan Mitchell
9c28b5baae Fix product lists not matching when saving changes to product unit+values fields 2014-01-10 15:43:45 +11:00
Rohan Mitchell
894f86350e Fix megalitre unit specification 2014-01-07 15:17:32 +11:00
Rohan Mitchell
03aa5604e5 Reorder columns on BPE 2013-12-12 10:52:17 +11:00
Rohan Mitchell
a67c7b808d Do not set unit value or description on variant when unpacked field is undefined 2013-12-12 10:50:03 +11:00
Rohan Mitchell
42d3947861 Set unit value and description on variants 2013-12-12 10:14:05 +11:00
Rohan Mitchell
33f06f5eff Display unit value and description for variants in BPE 2013-12-06 15:57:37 +11:00
Rohan Mitchell
5e086af27a Update product variant_unit_name when variant unit is items 2013-12-06 13:16:33 +11:00
Rohan Mitchell
3adeed1fa0 Update attr name 2013-12-06 11:11:19 +11:00
Rohan Mitchell
62ca121db2 Rename directives to avoid using the ng namespace, which is reserved for angular core 2013-12-06 10:49:06 +11:00
Rohan Mitchell
84fe6706a2 Make 'Items' option appear in variant_unit field on BPE 2013-12-05 15:50:08 +11:00
Rohan Mitchell
8af7c57a88 Pack variant_unit fields back into products and dirtyProducts. These fields can now round-trip to the server. 2013-12-05 15:16:52 +11:00
Rohan Mitchell
e3043cc6ae Rename prepareProductsForSubmit to submitProducts 2013-12-05 15:16:52 +11:00
Rohan Mitchell
fefea54375 Do not include variant_unit_with_scale in product update check. When saving products, save variant_unit and variant_unit_scale. 2013-12-05 15:16:52 +11:00
Rohan Mitchell
2115e33189 Use == instead of is 2013-12-05 15:16:52 +11:00
Rohan Mitchell
0a07f38f15 Load and display variant_unit on BPE page 2013-12-05 15:16:52 +11:00
Rohan Mitchell
2a989652cb Use ||= 2013-12-05 15:16:52 +11:00
Rohan Mitchell
d552e84302 Tweak formatting 2013-12-05 15:16:52 +11:00
Rohan Mitchell
a8668e24e3 Finish converting bulk product update to coffeescript 2013-12-05 15:16:51 +11:00
Rohan Mitchell
634dd52a80 WIP: Convert bulk product update to coffeescript. 3 tests failing. 2013-12-05 15:16:51 +11:00
Will Marshall
0ac9bfd898 Moving our fix for the broken Spree function into our own JS 2013-11-29 14:24:56 +11:00
Rohan Mitchell
5386fa72cc Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises 2013-10-30 17:00:05 +11:00
Rohan Mitchell
5c9c96e174 Do not error if order cycle loads before enterprises 2013-10-24 13:40:27 +11:00
Rohan Mitchell
12061fd485 Order cycle admin does not allow save until page is loaded 2013-10-23 14:59:50 +11:00
Rohan Mitchell
b8320a9bb6 Rename some directives and internal login details 2013-10-19 09:45:38 +11:00
Rohan Mitchell
ea17e475a6 When viewing enterprise fees, only show those for the enterprise I select 2013-10-18 14:44:01 +11:00
Rohan Mitchell
a6877c6981 Only render calculator HTML in enterprise fee JSON if explicitly requested. Improves load time of order cycles page. 2013-10-16 10:37:09 +11:00
Rohan Mitchell
1d4198d402 Removing a supplier exchange removes variants from distribution 2013-09-30 09:46:39 +10:00
Rob H
08eb865469 Increase pagination size for products in BPE, resolves #14 2013-09-20 13:25:07 +05:45
Rohan Mitchell
d100d12ebe When a variant is removed from supply to an order cycle, remove it from distribution also 2013-09-20 11:11:59 +10:00
Rohan Mitchell
aab7176f2c Enterprise manager can bulk edit products 2013-08-22 11:21:49 +10:00
Rohan Mitchell
4d04a24342 Translate exchange fees for processing by rails 2013-08-16 10:22:29 +10:00
Rohan Mitchell
e6fdcf581a OrderCycle can fetch the direction of an exchange (incoming/outgoing) 2013-08-16 10:22:29 +10:00
Rohan Mitchell
8ff749d0eb Find enterprises participating in an order cycle 2013-08-14 09:48:45 +10:00
Rohan Mitchell
0293942816 Add order cycle service method to add and remove exchange fees 2013-08-14 09:48:45 +10:00
Rohan Mitchell
13df3b098b Make error messages more descriptive 2013-08-14 09:48:45 +10:00
Rohan Mitchell
47f6a5fbbf Add controller methods to add and remove exchange fees 2013-08-14 09:48:45 +10:00
Rohan Mitchell
4120bc3dca Output exchange fees as JSON 2013-08-14 09:48:45 +10:00
Rohan Mitchell
4a0e35deef Clear coordinator fees when coordinator changes 2013-07-30 13:46:30 +10:00
Rohan Mitchell
d64bcf0e94 Remove coordinator fees 2013-07-30 11:55:21 +10:00
Rohan Mitchell
24b957dc57 Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees. 2013-07-30 11:34:10 +10:00
Rohan Mitchell
dc7f8986a0 Click to add coordinator fee 2013-07-30 11:34:10 +10:00
Rohan Mitchell
ae0f82b479 Display only coordinator fees belonging to the selected coordinator 2013-07-30 11:34:10 +10:00
Rohan Mitchell
13a1809d6c Load enterprise fees in controllers 2013-07-30 11:34:10 +10:00
Rohan Mitchell
93e7ac53ad Add EnterpriseFee service for order cycles admin 2013-07-30 11:34:10 +10:00
Rohan Mitchell
a19a43da79 Add blank enterprise fees in js rather than in controller 2013-07-30 11:34:10 +10:00
Andrew Spinks
39536b2a13 And another dependency getting lost. 2013-07-24 17:52:15 +10:00