raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,900 Commits 18 Branches 452 Tags
7cc2bc4fde83d2c4c059c19afee3242afc01e821
Commit Graph

59 Commits

Author SHA1 Message Date
Rob Harrington
7c9b4dbc3e Resolving unmerged section in bulk order management template 2015-06-03 15:33:04 +08:00
Rob Harrington
439d122e93 Merge branch 'master' into customers 
Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	db/schema.rb
	spec/javascripts/unit/bulk_order_management_spec.js.coffee
 2015-06-03 15:19:40 +08:00
Rob Harrington
903ed7e507 Merge branch 'master' into variable_weights 
Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	app/views/spree/api/line_items/bulk_show.v1.rabl
	spec/features/admin/bulk_order_management_spec.rb
 2015-05-21 17:31:33 +10:00
Rob Harrington
05131de1ad Use full_name on BOM instead of options_text 2015-05-20 14:11:31 +10:00
Rob Harrington
a873278881 Moving line-item-upd-attr to indexUtils module, renaming to obj-for-update 2015-05-13 12:44:35 +10:00
Rob Harrington
3e7d331892 BOM uses columns controller from index utils module 2015-05-13 12:44:34 +10:00
Rob Harrington
30bb948d35 Making ofn-line-item-upd-attr work without ng-model 
Conflicts:
	app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
 2015-05-13 12:44:31 +10:00
Lynne Davis
3179887842 Do not allow line_item.unit_value to be updated if the variant.unit_value is zero 2015-05-09 19:12:24 +01:00
Lynne Davis
2a991ad130 Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight. 2015-05-09 19:10:55 +01:00
summerscope
1753432f36 Adding new loading animation to replace ugly and large gif 2015-01-16 17:06:40 +11:00
Rob H
3d4e00a03c Swtich API key injection over to helper 2014-09-11 17:07:05 +10:00
Rob H
3b9cd3f46a Make loading on BOM look more like BPE 2014-08-08 14:05:53 +10:00
Rob H
6ba0d6c5f9 WIP: Split out admin angularjs 2014-05-02 21:38:39 +10:00
Rob H
56204d4ea6 Upgrade Admin AngularJS 2014-05-01 13:01:52 +10:00
Rob H
43106d5db8 Add explanation to top of BOM 2014-04-24 15:10:45 +10:00
Rob H
b59aa53158 Add edit order button to BOM 2014-04-24 13:49:28 +10:00
Rob H
6228cc0c55 BOM: Add order cycle column 2014-04-10 15:34:23 +10:00
Rob H
5c7d36ba9b BOM: interface cleanup and adding 'Clear All' button for filters 2014-04-10 15:29:09 +10:00
Rob H
645b6d5a8f BOM: change datetimepickers to datepickers 2014-04-10 10:51:55 +10:00
Rob H
c5d5f5a9e6 BOM: view information about max quantities ordered 2014-04-10 10:33:57 +10:00
Rob H
aad5ad4bc0 BOM interface cleanup 2014-04-06 19:22:17 +10:00
Rob H
0a6230088d Make BOM bulk action dropdown pretty 2014-04-06 17:39:53 +10:00
Rob H
366555d9a7 Remove old column toggle from BOM 2014-04-05 10:08:37 +11:00
Rob H
980797493d Create dropdown list for toggling columns 2014-04-04 19:36:06 +11:00
Rob H
9c65dd2ace BOM: add warning message about missing unit values to group buy calc box 2014-03-27 14:18:00 +11:00
Rob H
0c2e215fef BOM: Add a method to check that all selected variants have a unit_value 2014-03-27 14:11:19 +11:00
Rob H
cd1086ce05 WIP: Bulk calculation box work with shared resources 2014-03-26 16:44:26 +11:00
Rob H
f2729f9e80 Add more columns to BOM 2014-03-21 13:46:48 +11:00
Rob H
b329aed0f2 BOM: Can toggle columns, and interface rearrange 2014-03-21 13:00:12 +11:00
Rob H
8c998e6fa8 BOM: columns are sortable 2014-03-20 15:39:13 +11:00
Rob H
ed0b7da20f BOM page has a fancy calculation box for managing group buys 2014-03-20 14:40:24 +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
Rob H
bed1c171b6 BOM: display product name and unit 2014-03-07 14:46:40 +11:00
Rob H
b6bd07abd3 BOM: show name from billing address 2014-03-07 12:56:39 +11:00
Rob H
641796ed64 BOM: and quick search 2014-03-06 16:32:23 +11:00
Rob H
0726d591ac BOM: can filter by order cycle 2014-03-06 10:50:27 +11:00
Rob H
2a713245a8 BOM: date filter refactor and works with pending changes 2014-03-05 10:14:35 +11:00
Rob H
41c61b3b12 BOM date filters work 2014-02-22 15:51:14 +11:00
Rob H
1f569e4be1 Add loading splash to BOM 2014-02-22 14:49:19 +11:00
Rob H
83e228dc63 Display message when no matching orders found for BOM 2014-02-22 11:48:24 +11:00
Rob H
5ec7a10e16 Add date filter fields to BOM 2014-02-21 14:01:33 +11:00
Rob H
58d1bf0092 BOM: can update quantities of line_items 2014-01-31 11:57:57 +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
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
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