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,764 Commits 18 Branches 451 Tags
e92d21ec4e8cc78329ebcdc574fa63b44b07ca61
Commit Graph

203 Commits

Author SHA1 Message Date
Rohan Mitchell
6d1a202800 Fix grammar 2014-02-19 13:32:57 +11:00
Rohan Mitchell
acbf1ed680 Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI 2014-02-19 13:12:52 +11:00
Rohan Mitchell
3f9f24157c Do not show unit value or description when product does not have a unit-related option type 2014-02-19 12:07:53 +11:00
Rohan Mitchell
3024bbbeb5 Edit unit value and description of variant 2014-02-19 11:56:37 +11:00
Rohan Mitchell
7b80518621 On admin variant edit page, do not show option values for unit-related option types 2014-02-19 11:29:26 +11:00
Rohan Mitchell
701896be95 BPE: Add variant and save it to server. Edit the saved variant. 2014-02-13 11:52:44 +11:00
Rohan Mitchell
4d24fec6fb BPE: Add a variant. Do not show edit on unsaved variants. Delete unsaved variants. 2014-02-13 09:26:07 +11:00
Rohan Mitchell
4aa43cfbe0 Set the master unit value for a product without variants 2014-02-12 13:57:49 +11:00
Will Marshall
2bb004ebaa Adding notes field to products 2014-02-04 14:11:32 +11:00
Rob H
9373dcea3d Merge branch 'master' into bom 2014-01-31 12:32:23 +08:00
Rob H
58d1bf0092 BOM: can update quantities of line_items 2014-01-31 11:57:57 +08:00
Rob H
3beb633ed9 BOM: 'update-pending' class removed when value is init value 2014-01-31 11:24:14 +08:00
Rob H
7dbb7a5c2c BOM: applying ofnLineItemUpdAttr directive to quantity field, tracks changes with update-pending class 2014-01-31 11:17:27 +08:00
Rob H
a5ffdbb1ba Display quantity in field for BOM 2014-01-31 10:48:28 +08:00
Rob H
3bf36f0e55 Fix orders specs which fail because of new admin orders submenu 2014-01-30 14:06:32 +08:00
Rohan Mitchell
6d2f77b308 Fix report spec 2014-01-22 10:16:45 +11:00
Will Marshall
aec5894c70 Adding a promo image to enterprises 2014-01-21 16:32:55 +11:00
Rob H
b9a3031663 Line item delete button works 2014-01-19 21:46:11 +08:00
Rob H
02f8917722 Add delete button to BOM page 2014-01-18 21:00:54 +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
6c1d149397 Add columns for quantity and max to BOM 2014-01-17 18:26:30 +08:00
Rob H
0e861d98af Add column for variant description to BOM 2014-01-17 17:32:29 +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
e0d03fa305 Listing more attributes of orders on BOM page 2014-01-17 15:29:08 +08:00
Rob H
00dfa62f43 Basic listing of orders on BOM page 2014-01-17 14:56:26 +08:00
Rohan Mitchell
87cf596a30 For a product with one or more on_demand variants, don't show 'On demand' at the product level 2014-01-17 16:12:07 +11:00
Rohan Mitchell
ed78cc053b Do not update product on_hand when product has on_demand variants 2014-01-17 16:12:07 +11:00
Rohan Mitchell
4518e30849 Display infinite on_hand as read-only 2014-01-17 16:12:07 +11:00
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
Will Marshall
cbce5958e0 Removing an attr_accessible which breaks EVERYTHING 2014-01-16 15:47:38 +11:00
Will Marshall
0ddef9626e First working image upload for enterprise logos 2014-01-16 15:47:38 +11:00
Rohan Mitchell
d861495d7d Fix incomplete save when first setting variant_unit 2014-01-16 14:20:26 +11: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