4794 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	fa4741eb65	Update auto-creation of E2E links: more specific and restricted link creation	2015-02-26 13:49:15 +11:00
Rohan Mitchell	f83ceae5d1	Fix feature: Enterprises list is shortened when error in bulk update	2015-02-18 15:32:56 +11:00
Rohan Mitchell	224864a8d8	Merge pull request #385 from openfoodfoundation/empty-cart-typo ... Fixed typo in empty cart error message	2015-02-18 10:59:17 +11:00
Liv Galendez	b9248d3e2c	Fixed typo in empty cart error message	2015-02-18 10:47:09 +11:00
Rohan Mitchell	32a898b6a2	Remove unnecessary db:schema:load db:seed, these are performed by db:setup	2015-02-13 09:26:34 +11:00
Rohan Mitchell	636ed2ad0d	Make bi-directional relationships	2015-02-13 09:24:48 +11:00
Rohan Mitchell	1d61e91afd	When enterprise created, grant permission to all co-owned enterprises, not just hubs	2015-02-13 09:24:48 +11:00
Rob Harrington	12dc0b93aa	Scoping users correctly for realz this time	2015-02-12 16:20:46 +11:00
Rob Harrington	5503760ce3	Scoping users correctly	2015-02-12 13:45:25 +11:00
Rob Harrington	9fa5a9e766	Fix before_filter load order for enterprises#shop	2015-02-12 11:34:58 +11:00
Rob Harrington	a62f48441d	Restrict ability to change managers of enterprises using update action	2015-02-12 11:34:58 +11:00
Rob Harrington	5c09ebf138	Adding manager managment to enterprise edit form	2015-02-12 11:34:58 +11:00
Rob Harrington	ee5ab22501	Moving interface for changing owner to new 'Users' tab	2015-02-12 11:34:58 +11:00
Rob Harrington	ad1f837c44	Admin users can access all users through known_users	2015-02-12 11:34:58 +11:00
Rob Harrington	dcb24cf06c	Controller method to allow enterprise users to search for other users which share management of their enterprises	2015-02-12 11:34:58 +11:00
Rob Harrington	b73619d168	Adding known_users method to Spree::User	2015-02-12 11:34:58 +11:00
Rob Harrington	dde1a27d3a	Adding ability to search for known users	2015-02-12 11:34:57 +11:00
Rohan Mitchell	46aee6f77c	Upgrade Rails to 3.2.21	2015-02-11 14:30:49 +11:00
Rohan Mitchell	ca558a4ecc	Fix admin tab to check correct permission	2015-02-11 11:55:48 +11:00
Rohan Mitchell	fce7714994	Load correct set of variant override producers, use variant_override_enterprises_per_hub, tighten specs	2015-02-04 11:20:08 +11:00
Rohan Mitchell	7ca9670073	Admin can access variant override only when it can add hub to order cycle and it can create variant overrides for the producer of the variant	2015-02-04 11:09:48 +11:00
Rohan Mitchell	22f6ece83f	When fetching products for variant overrides admin, fetch all overridable products	2015-02-04 10:16:34 +11:00
Rohan Mitchell	a7bb04b890	Find all producers for which we can create variant overrides	2015-02-04 10:13:35 +11:00
Rohan Mitchell	4c586d1b7e	Fetching enterprises for which hubs can create variant overrides: allow all hubs that we can add to order cycle, find producers via create_variant_overrides permission	2015-02-04 10:04:57 +11:00
Rohan Mitchell	7ea143d19a	Provide AR relation instead of array in stub	2015-02-04 09:42:04 +11:00
Rohan Mitchell	25189d190b	Shift method	2015-02-04 09:30:01 +11:00
Rohan Mitchell	c0a7d22a50	Add permitted_by scope to EnterpriseRelationship	2015-01-30 16:36:45 +11:00
Rohan Mitchell	fafbfe8735	Simplify, simplify	2015-01-30 15:56:10 +11:00
Rohan Mitchell	7ac888ae00	Admin can grant create_variant_overrides permission	2015-01-30 11:56:05 +11:00
Rohan Mitchell	ed4d78bca8	Decorators can't be in same file name as original file, otherwise the original file is ignored	2015-01-30 11:23:49 +11:00
Rohan Mitchell	a25bf32156	Show extended variant name/unit info for admin variant overrides	2015-01-29 15:15:28 +11:00
Rohan Mitchell	7a5c56cbca	Do not show out of stock lines on order confirmation page	2015-01-29 13:19:04 +11:00
Rob Harrington	cbae7dcc8e	Adding visible to user and enterprises report, and sorting by confirmation date	2015-01-29 10:46:44 +11:00
Rob Harrington	9163b0c1ad	Adding missing equals sign to test for equality in permalink migration 0.7.3	2015-01-28 11:37:02 +11:00
Rob Harrington	fd9f65f1b6	Merge branch 'shopfront-filters' into shop-url	2015-01-28 10:57:11 +11:00
Rob Harrington	713999c1d8	Merge branch 'master' into shop-url	2015-01-28 10:53:42 +11:00
Rob Harrington	21db56ce6c	Rollback angularjs upgrade	2015-01-28 08:41:14 +11:00
Rob Harrington	adbe127e76	Revert "Update bindonce" ... This reverts commit 48dc85cfc2.	2015-01-25 14:08:29 +11:00
Lynne Davis	3c4ad4121f	LD adding whitespace to get my master version back in line with origin	2015-01-22 14:00:48 +00:00
Lynne Davis	8e8f38e484	app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-22 12:01:20 +00:00
Rob Harrington	b429be707c	Split out payment and shipping methods from admin enterprises controller as services	2015-01-22 12:19:41 +11:00
Rob Harrington	4829e59663	Fixing checkout controller spec	2015-01-22 10:46:31 +11:00
Rob Harrington	d12fdd23fb	Fixing navcheck callback	2015-01-22 10:46:01 +11:00
Rob Harrington	b0a29801b6	Making spec controller product request spec a little bit more robust	2015-01-22 10:20:03 +11:00
Rob Harrington	6ebd58b67d	Updating home spec to reflect new shopfront url	2015-01-22 10:19:47 +11:00
Rob Harrington	0791cc3c2a	Making sure that we have a .path() in HashNavigation	2015-01-22 10:19:47 +11:00
Rob Harrington	76acbb6159	Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0)	2015-01-22 10:19:47 +11:00
Rob Harrington	d7ea81e821	Prevent default form action from submitting ordercycle forms	2015-01-22 10:19:47 +11:00
Rob Harrington	9245af6a8f	Producer properties routes use enterprise permalink	2015-01-22 10:19:47 +11:00
Rob Harrington	36430d3bad	Enterprise permalink generator handles blank permalink case	2015-01-22 10:19:46 +11:00