raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,631 Commits 20 Branches 451 Tags
224d91083d8317db2494b89d5737cbbe5261bfee
Commit Graph

1064 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
1744cc9548 Orders API retrieves order number 2014-01-19 18:41:16 +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
e2d9e9c4eb BOM API collects distributor for orders 2014-01-18 11:50:36 +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
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
15c0350c29 Add product name as proxy for variant_unit_text to Order Managment API 2014-01-17 12:09:31 +08:00
Rob H
cfbf4d5bc4 Adding attributes to Order Managment API 2014-01-17 10:35:40 +08: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
Rob H
031414a41f Make BPE menu tab selected 2014-01-16 13:18:28 +08:00
Rob H
11499178cb Set up API for Bulk Order Management (BOM) 2014-01-16 11:56:11 +08:00
Will Marshall
26a8daed0e Patching up the order mailer to set reply_to 2014-01-16 11:39:10 +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
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
a60c9a9cea When variant already has a value set, remove old option value and assign a new one 2014-01-09 14:11:54 +11:00
Rohan Mitchell
cbe46bffed Merge branch 'bpe_paginate' 
Conflicts:
	config/ng-test.conf.js
 2014-01-09 12:07:42 +11:00
Will Marshall
533a987684 Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom 2014-01-08 15:20:33 +11:00
Will Marshall
7838d759ee Removing redundant functionality from the Order Populator 2014-01-08 14:45:40 +11:00
Rohan Mitchell
ea3e697b73 Rename method for clarity, remove outdated specs for OrderPopulator 2014-01-08 14:14:45 +11:00
Rohan Mitchell
20ad906f7a Fix multicart use of OrderPopulator 2014-01-08 14:13:19 +11:00
Rohan Mitchell
dd16934496 Remove redundant serializer spec, reinstate creation of order distribution charges 2014-01-08 13:22:34 +11:00
Rohan Mitchell
eda4f241e2 Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests 2014-01-08 11:39:05 +11:00
Rohan Mitchell
ef56574d82 Pass quantity to OrderPopulator 2014-01-08 11:37:38 +11:00
Will Marshall
5e041a6f4f Uncommenting the old OP code 2014-01-08 10:35:27 +11:00
Rohan Mitchell
2fec16af5d Merge branch 'master' into product-amount-units 2014-01-07 16:00:06 +11:00
Rohan Mitchell
894f86350e Fix megalitre unit specification 2014-01-07 15:17:32 +11:00
Rohan Mitchell
042e8386ab Refactor: Extract methods to simplify 2014-01-07 15:16:36 +11:00
Will Marshall
4d03f65766 Reworking everything to use RABL 2014-01-07 15:06:47 +11:00
Rohan Mitchell
ebae76375f Fix specs to work with unit_value stored in base units, scale units correctly for output 2014-01-07 14:57:30 +11:00