raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,608 Commits 18 Branches 451 Tags
4e9ae7549e8cdc7fb69ffebfcb5ef896064515db
Commit Graph

169 Commits

Author SHA1 Message Date
Rob H
4e9ae7549e Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page 2014-01-16 13:20:07 +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
68e5de0290 Update acceptance specs to expect unit values to be stored in base units 2014-01-14 15:14:54 +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
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
c396c2a21f Improve speed of BPE specs 2014-01-09 12:37:43 +11:00
Rohan Mitchell
420ff37562 Provide explicit ordering for intermittently failing spec 2014-01-09 12:09:50 +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
ac17502046 Fix test 2014-01-08 12:30:32 +08:00
Rohan Mitchell
c08c42b087 Fix inconsistent test fails - insignificant ordering 2014-01-08 15:11:46 +11:00
Will Marshall
e0c352d135 Merge branch 'master' into darkswarm 
Conflicts:
	spec/features/admin/products_spec.rb
 2014-01-08 14:49:47 +11:00
Rohan Mitchell
2fec16af5d Merge branch 'master' into product-amount-units 2014-01-07 16:00:06 +11:00
Will Marshall
06ab4d5384 Patching some further regression bugs 2014-01-07 15:28:11 +11:00
Will Marshall
8e0a7d9072 Pretties, fixing the email validation issue with admin authentication steps 2014-01-07 11:04:40 +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
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
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
06995bd3c6 Add controls to alter the number of products displayed for BPE 2013-12-22 17:31:27 +08:00
Rob H
530d38c7d0 Add basic pagination informaion to BPE 2013-12-22 16:58:48 +08:00
Rohan Mitchell
9f47ff64fa Update spec now that bulk product edit is the default product edit view 2013-12-17 15:29:25 +11:00
Rohan Mitchell
124b6df75d Show undated order cycles on index page 2013-12-13 14:51:43 +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
e98031e581 Fixing some minor report bugs 2013-12-13 10:12:41 +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
385a80a305 Revert "Can set variant_unit_name when unit type is not items" - this applies to a different field. 
This reverts commit 8f6f37355c.
 2013-12-06 14:38:46 +11:00
Rohan Mitchell
8f6f37355c Can set variant_unit_name when unit type is not items 2013-12-06 14:25:19 +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
b21263e1c0 Display text field for variant_unit_name 2013-12-06 12:06:16 +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
0a07f38f15 Load and display variant_unit on BPE page 2013-12-05 15:16:52 +11:00
Will Marshall
7bc754a598 Adding filtering to the products page 2013-11-28 13:44:21 +11:00
Will Marshall
d39cb74d06 Merge branch 'customers' 2013-11-22 16:55:11 +11:00
Will Marshall
27f99d1383 Working version of Customers reports without filters 2013-11-22 16:53:57 +11:00
Will Marshall
51ea6fcd67 Starting on the Customers Report 2013-11-22 14:57:11 +11:00
Rohan Mitchell
4898460132 Fix failing spec with table reorder, lambda-fy scopes that use time 2013-11-22 14:00:04 +11:00
Rohan Mitchell
94c33e5f45 Colour order cycle rows based on their status 2013-11-22 11:31:04 +11:00
Rohan Mitchell
f75879bec1 Put order cycle variants in a tooltip 2013-11-22 10:03:49 +11:00
Will Marshall
5e170a843e Forcing a rebuild on Jenkins 2013-11-21 17:22:47 +11:00
Will Marshall
c695bafe69 Reworking the way the Reports works so we have more granular control over what shows 2013-11-21 16:45:59 +11:00
Rohan Mitchell
dfcf567f26 Sort payment methods by name 2013-11-21 14:42:28 +11:00