raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 21 Branches 450 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

637 Commits

Author SHA1 Message Date
Rohan Mitchell
d0d0fc1a06 Fix intermittently failing spec - comparison of slightly differing dates 2014-01-14 11:47:56 +11:00
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
9c28b5baae Fix product lists not matching when saving changes to product unit+values fields 2014-01-10 15:43:45 +11:00
Rohan Mitchell
cbe46bffed Merge branch 'bpe_paginate' 
Conflicts:
	config/ng-test.conf.js
 2014-01-09 12:07:42 +11:00
Rob H
2e56d7a551 Can remove filters from BPE 2014-01-05 17:53:32 +08:00
Rob H
fb9fd5089a WIP: Adding a hard filter to BPE works 2014-01-05 17:04:27 +08:00
Rob H
a6d7044dfd WIP: Adding basic UI for applying hard filtering to BPE 2014-01-04 19:21:10 +08:00
Rob H
7ef358a476 Add basic hard filter adding js infrastructure for BPE 2014-01-04 16:44:00 +08:00
Will Marshall
b5dd921a81 Our feature spec is breaking but we'll work that out 2013-12-19 10:44:47 +11:00
Will Marshall
b3a4d826b8 Dumping OrderCycle data via :javascript tags instead of ng-init, Angularising the selector stuff 2013-12-18 17:05:47 +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
Will Marshall
36694822db Starting to prettify 2013-12-12 10:28:43 +11:00
Rohan Mitchell
42d3947861 Set unit value and description on variants 2013-12-12 10:14:05 +11:00
Will Marshall
8f41078c0c Reworking our bindings so everything stacks on objects and automagically updates 2013-12-11 15:39:50 +11:00
Will Marshall
bc4f472523 Fixing up the tests with some refactoring 2013-12-11 15:33:57 +11:00
Will Marshall
44fe304efb Building out and testing our Product and OrderCycle Angular stuff 2013-12-11 12:42:33 +11:00
Will Marshall
4db8f755bf Getting an order cycle update function in place like a boss 2013-12-11 12:42:02 +11:00
Rohan Mitchell
33f06f5eff Display unit value and description for variants in BPE 2013-12-06 15:57:37 +11:00
Will Marshall
63dfa0b696 Getting the test framework set up for Angular, setting up a products fetch stub 2013-12-06 15:24:42 +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
a4edacc138 Change to double quotes for spec names 2013-12-06 10:41:28 +11:00
Rohan Mitchell
d9d6d48ede Centralise ctrl calls 2013-12-06 10:14:38 +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
0a07f38f15 Load and display variant_unit on BPE page 2013-12-05 15:16:52 +11:00
Rohan Mitchell
21154a9455 Convert bulk product update spec to coffeescript 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
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
1d4198d402 Removing a supplier exchange removes variants from distribution 2013-09-30 09:46:39 +10:00
Rohan Mitchell
32204076bd Update js specs for pagination fix 2013-09-30 09:18:49 +10:00
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
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
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
Rob H
275b64c7d3 Fix broken delete action for variants 2013-07-23 10:43:08 +10:00