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
1,970 Commits 21 Branches 450 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

136 Commits

Author SHA1 Message Date
Will Marshall
0690fcda48 Reworking the way the Sidebar works 2014-03-27 11:54:25 +11:00
Rohan Mitchell
3104d285ca Order cycle admin JS uses exchanges.incoming instead of role 2014-03-27 09:30:53 +11:00
Rob H
cbd3722380 Merge branch 'master' into bom 2014-03-21 13:47:50 +11:00
Rob H
7302d0552e Fixing js specs 2014-03-21 13:11:04 +11:00
Will Marshall
dbc8e1bcf1 Reworking the tests for the new app 2014-03-20 16:58:57 +11:00
Rob H
ed0b7da20f BOM page has a fancy calculation box for managing group buys 2014-03-20 14:40:24 +11:00
Will Marshall
fc4f108724 Adding tests and views to handle changing shipping prices 2014-03-14 12:59:37 +11:00
Rob H
c86cfe092f BOM: Add bulk delete action 2014-03-14 09:37:28 +11:00
Rob H
9a291e28ec Add bulk action checkboxes to BOM 2014-03-12 18:25:51 +11:00
Rohan Mitchell
4d8a23346c Fix bug: Unselecting product variant unit in BPE doesn't save 2014-03-12 12:35:52 +11:00
Rob H
641796ed64 BOM: and quick search 2014-03-06 16:32:23 +11:00
Rob H
200e3fef77 Merge branch 'master' into bom 2014-03-06 12:52:36 +11:00
Rob H
0726d591ac BOM: can filter by order cycle 2014-03-06 10:50:27 +11:00
Rohan Mitchell
922d817748 Product list view: For product with variants, show product price as min(variant prices) 2014-03-05 16:16:42 +11:00
Rob H
9f19e91e90 Merge branch 'master' into bom 2014-03-05 10:15:39 +11:00
Rob H
2a713245a8 BOM: date filter refactor and works with pending changes 2014-03-05 10:14:35 +11:00
Rob H
1f569e4be1 Add loading splash to BOM 2014-02-22 14:49:19 +11:00
Rob H
1b10bf53c0 WIP: BOM loads with orders filtered by default date restrictions 2014-02-22 11:33:36 +11:00
Rob H
5ec7a10e16 Add date filter fields to BOM 2014-02-21 14:01:33 +11:00
Rohan Mitchell
f88b930137 Extract unit_value_with_description into unit_description only when a string starting with a number is provided 2014-02-19 13:32:17 +11:00
Rohan Mitchell
547f46fbc9 Deal with unit_value of zero correctly - do not treat as nil 2014-02-18 10:32:36 +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
Rohan Mitchell
b2ad6c7d57 Filter products for submit includes master variant 2014-02-11 19:23:27 +11:00
Rohan Mitchell
e845c0dc06 Remove derived attributes from master variant 2014-02-11 19:20:46 +11:00
Rohan Mitchell
0b255ed1e9 Pack the master variant before sending to the server 2014-02-11 19:19:12 +11:00
Rohan Mitchell
c7c70252d0 ofnTrackProduct and ofnTrackVariant accept nested properties as arguments 2014-02-11 19:13:11 +11:00
Rob H
17456ebf2e BOM: only fetch completed orders 2014-02-07 15:29:31 +11:00
Rohan Mitchell
33691085bd Only perform scaling when a scale is present. Fixes items values not saving then loading as infinity. 2014-02-06 13:51:08 +11:00
Rob H
9373dcea3d Merge branch 'master' into bom 2014-01-31 12:32:23 +08:00
Rob H
d679c7ac30 BOM dataSubmitter service changes class of relevant element based on response 2014-01-31 11:38:38 +08:00
Rob H
4fb06b76c7 BOM: Add switchClass service to help visualise update status 2014-01-30 18:34:48 +08:00
Rob H
b8448853ac BOM: Add dataSubmitter service to handle updates 2014-01-30 17:09:55 +08:00
Rob H
224d91083d BOM: Add factory to monitor changes made to line_items 2014-01-30 14:12:28 +08:00
Rob H
1723ff22eb Ignore confirm boxes when deleting line items in js tests 2014-01-22 18:41:03 +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
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
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
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
d0d0fc1a06 Fix intermittently failing spec - comparison of slightly differing dates 2014-01-14 11:47:56 +11:00