raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,410 Commits 18 Branches 451 Tags
17a2e37edaac3ede0d98aac6bf8a4f74be277101
Commit Graph

373 Commits

Author SHA1 Message Date
Rob Harrington
17a2e37eda Fixing broken category lookup on BPE 2014-11-26 13:16:29 +11:00
Rohan Mitchell
0b030a85ff Incrementally load products 2014-11-21 13:49:09 +11:00
Rohan Mitchell
001bf999d0 Extract Spree API authorisation to service 2014-11-21 13:49:09 +11:00
Rohan Mitchell
824b00743e Extract fetch-by-page from BPE to service 2014-11-21 13:49:09 +11:00
Rohan Mitchell
58fdc48b9f Display products in table 2014-11-21 13:49:09 +11:00
Rohan Mitchell
7069b30e71 Add indexer service (equivalent of Dereferencer, but named more accurately) 2014-11-21 13:49:09 +11:00
Rohan Mitchell
680ba379c1 User can select a hub 2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720 Do not show producers in hubs list 2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31 Show list of hubs to select for managing variant overrides 2014-11-21 13:49:09 +11:00
Rohan Mitchell
5eb40261a8 Port clone products specs to BulkProducts service specs 2014-11-21 08:41:41 +11:00
Rohan Mitchell
7e4d337773 Extract DisplayProperties to a service 
Conflicts:

	app/assets/javascripts/admin/bulk_product_update.js.coffee
 2014-11-21 08:41:41 +11:00
Rohan Mitchell
356a03ac4e WIP: Extract bulk product edit product management to BulkProducts service 
Conflicts:

	app/assets/javascripts/admin/bulk_product_update.js.coffee
 2014-11-21 08:41:41 +11:00
Rohan Mitchell
29e49b67cc In BPE, rename producer and category JSON attrs to producer_id and category_id 
Conflicts:

	spec/features/admin/bulk_product_update_spec.rb
 2014-11-21 08:41:41 +11:00
Rob Harrington
7a719952fc Adding informative messages about email confirmations to enterprise form 2014-11-12 15:20:52 +11:00
Rob Harrington
cc0e205f50 Merge master into onbaording 2014-10-24 15:36:59 +11:00
Rob Harrington
b182c6afc8 Merge in remote changes 2014-10-24 13:02:26 +11:00
summerscope
b172c4fd4f Search query make empty string rather than undefined 2014-10-24 12:53:04 +11:00
Rob Harrington
900ef4ddcc Change type form is aware of existing state of enterprise 2014-10-24 11:12:54 +11:00
Rob Harrington
f03c7ba02d Rename sellCtrl to changeTypeFormCtrl 2014-10-24 11:02:16 +11:00
Rob Harrington
46ab424655 Moving welcomeCrtl to enterprise module as sellsCtrl 2014-10-24 09:10:45 +11:00
Rob Harrington
e1cf5ceb57 Can set producer_profile_only using welcome page 2014-10-23 16:42:00 +11:00
Rohan Mitchell
f09698be47 Select all works on simple order cycles edit interface 2014-10-23 15:54:52 +11:00
Rob Harrington
77c0e36ed6 Adding input validation to welcome page 2014-10-23 14:23:50 +11:00
Rohan Mitchell
bf61d12bfa Merge branch 'simple-order-cycles' 
Conflicts:
	app/views/admin/order_cycles/_row.html.haml
 2014-10-23 12:11:34 +11:00
Rohan Mitchell
ab76c66b68 Admin can update order cycles with simple interface 2014-10-23 11:38:15 +11:00
Rohan Mitchell
f7c1340f99 Admin can view an order cycle in the simple edit form 2014-10-23 11:08:27 +11:00
Rohan Mitchell
56ebe688dc Fix file naming 2014-10-23 10:22:03 +11:00
Rohan Mitchell
8b616e7d17 Add unit spec for order cycles simple create controller 2014-10-23 10:21:19 +11:00
Rohan Mitchell
f74ec03cef Rename 2014-10-23 09:26:55 +11:00
Rohan Mitchell
66e13d40f4 Select all works on simple order cycles interface 2014-10-22 19:17:28 +11:00
Rob Harrington
262972a911 Adding basic angular to welcome form 2014-10-22 19:02:39 +11:00
Rohan Mitchell
3e61aa7267 Simple interface remove coordinator fee 2014-10-22 17:26:22 +11:00
Rohan Mitchell
28352be729 Save pickup time and instructions 2014-10-22 17:17:05 +11:00
Rohan Mitchell
549ef4b79d When saving an OC from the simple interface, include outgoing variants 2014-10-22 17:08:16 +11:00
Rafael Schouten
96ff387d1f fix navigation check on submission 2014-10-22 15:34:31 +11:00
Rafael Schouten
175e430a2b uss oop for nav check 2014-10-22 14:51:17 +11:00
Rafael Schouten
08cd273be3 Merge branch 'migrate_ent_types' into bugfix 
Conflicts:
	app/models/spree/ability_decorator.rb
 2014-10-18 07:37:41 +11:00
Rafael Schouten
577cb06371 make navCallback actually versatile 2014-10-18 01:42:29 +11:00
Rohan Mitchell
deedafde9a WIP: Simple order cycle form loads and displays correct info 2014-10-17 16:55:55 +11:00
Rohan Mitchell
078d2bac11 Extract factories from order cycles admin angular 2014-10-17 16:50:16 +11:00
Rohan Mitchell
f060da9c8d Rename angular app order_cycle -> admin.order_cycles 2014-10-17 14:13:27 +11:00
Rafael Schouten
9536b3e764 add navigation directive default 2014-10-17 07:58:08 +11:00
Rafael Schouten
245c1eb305 use a directive for navigation check to attach it to the page instead of the controller 2014-10-17 07:40:08 +11:00
Rafael Schouten
5e41865871 add utils angular module and navigation check factory 2014-10-14 00:26:04 +11:00
Rafael Schouten
9a6958573a Merge branch 'master' into bugfix 
Conflicts:
	app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
 2014-10-12 21:19:02 +11:00
Rafael Schouten
20a94b4365 Merge branch 'master' into migrate_ent_types 
Conflicts:
	app/serializers/api/admin/enterprise_serializer.rb
 2014-10-07 10:52:26 +11:00
Rafael Schouten
881e82e825 add some angular documentation 2014-10-06 22:59:06 +11:00
Rafael Schouten
f0c9e7cd44 fix for tests, remove open in new tab 2014-10-04 13:12:36 +10:00
Rafael Schouten
f3fc70ebf0 Merge branch 'master' into raf_bugfix 
Conflicts:
	app/assets/stylesheets/admin/openfoodnetwork.css.scss
 2014-10-04 12:51:55 +10:00
Rafael Schouten
dee471b1c7 move text angular files 2014-10-03 16:43:56 +10:00