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
1,631 Commits 21 Branches 450 Tags
224d91083d8317db2494b89d5737cbbe5261bfee
Commit Graph

165 Commits

Author SHA1 Message Date
Rob H
224d91083d BOM: Add factory to monitor changes made to line_items 2014-01-30 14:12:28 +08:00
Rob H
90f88d260b Confirm deletion of line items on BOM 2014-01-19 21:59:07 +08:00
Rob H
b9a3031663 Line item delete button works 2014-01-19 21:46:11 +08:00
Rob H
701b5aceb4 Add 'All' option to supplier and distributor filters 2014-01-18 14:26:07 +08:00
Rob H
79631ebb8e Add distributor filter to BOM 2014-01-18 12:48:52 +08:00
Rob H
680b5c8a42 Add supplier filter to BOM 2014-01-18 11:13:32 +08:00
Rob H
d6b4f8129c Match supplier of each line item with the list fetched from server 2014-01-17 17:14:05 +08:00
Rob H
94c375ad31 WIP: changing BOM listing from orders to line items 2014-01-17 16:57:08 +08:00
Rob H
5aa032b54c BOM: fetchOrders sends request to API and resetOrders stores returned data 2014-01-17 14:00:02 +08:00
Rob H
c6d9bfafbc Create shared services module for backend angularjs, rename modules 2014-01-17 13:48:28 +08:00
Rob H
970942ff42 Add JS spec and basic initialisation code for BOM 2014-01-17 13:16:35 +08:00
Rob H
ce5b24a777 Prevent duplicate filters being added 2014-01-15 15:50:41 +08:00
Rob H
8146301b2f Add validation to BPE advanced filter box 2014-01-15 14:35:46 +08:00
Rohan Mitchell
29235cd2cb Merge branch 'master' into product-amount-units 
Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb
 2014-01-14 15:34:05 +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
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
Rob H
aff35e5749 Remove unused toggle-column-list directive 2014-01-10 01:08:03 +08:00
Rob H
29ba0ccc97 Initialise BPE page with 'Available On' column hidden 2014-01-10 00:46:42 +08:00
Rob H
ee2da3e008 Toggle new view controls on BPE 2014-01-10 00:26:54 +08:00
Rohan Mitchell
894f86350e Fix megalitre unit specification 2014-01-07 15:17:32 +11:00
Rob H
177782fac5 Status message works when updating products with filters applied 2014-01-06 18:20:00 +08:00
Rob H
49b9b8f635 Add messages to BPE interface for cases when 0 or > 500 products are found 2014-01-05 19:17:50 +08: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
Rob H
687332d2b0 Add loading splash to BPE 2014-01-04 15:50:26 +08:00
Rob H
c6222f2180 BPE pagination works with filtering 2014-01-02 15:22:10 +08:00
Rob H
6b865aa38c Display BPE update message correctly 2014-01-02 13:10:06 +08:00
Rob H
ef78609049 Prevent page being orphaned when changing page size in BPE 2013-12-26 19:37:21 +08:00
Rob H
2df0545819 Fix some outstanding updating issues in BPE 2013-12-23 23:09:19 +08:00
Rob H
3372f1d605 BPE page nav using page numbers 2013-12-23 17:19:38 +08:00
Rob H
ffbfbffb28 WIP: Add basic page nav controls to BPE 2013-12-23 09:22:31 +08:00
Rob H
530d38c7d0 Add basic pagination informaion to BPE 2013-12-22 16:58:48 +08: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