5613 Commits

Author	SHA1	Message	Date
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	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
Maikel Linke	91b35d068c	Adding owner to groups ... Groups have owners and users own groups. The owners are displayed and changable on the group's page by admin users.	2015-02-02 15:58:34 +11:00
Maikel Linke	8d9f8beff3	creating facebook url	2015-02-02 10:33:13 +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	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
Maikel Linke	7a48d7fe22	Updating feature spec for groups	2015-01-22 16:04:46 +11: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	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	d7ea81e821	Prevent default form action from submitting ordercycle forms	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
Rob Harrington	7520552fd7	Removing spec for testing empty permalink, since we now force permalink to be created when empty	2015-01-22 10:19:46 +11:00
Rob Harrington	3e5ea3fe63	Adding automatic permalink generation on enterprise creation	2015-01-22 10:19:45 +11:00
Rob Harrington	b98c01b280	Updating permalink controller specs	2015-01-22 10:19:44 +11:00
Rob Harrington	6b10a4a775	Restoring enterprise permalinks when they cause errors	2015-01-22 10:19:43 +11:00
Rob Harrington	4088bdc236	Clean up permalink checker	2015-01-22 10:19:43 +11:00
Rob Harrington	9b78963d5a	Adding a javascript interface for checking permalinks and user input on enterprise console	2015-01-22 10:19:43 +11:00
Rob Harrington	c3659612ed	enterprise routes use permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	7a6cd98646	Fixing failing spec, missing permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	9286c82b43	Removing obsolete methods	2015-01-22 10:19:42 +11:00
Rob Harrington	c330e49a7f	Moving permalink check action to enterprise controller	2015-01-22 10:19:42 +11:00
Rob Harrington	e2268e53bb	Adding action to check uniquness of enterprise permalink against existing routes	2015-01-22 10:19:41 +11:00
Rob Harrington	9f0aeb5adf	Adding unique permalink to enterprises	2015-01-22 10:19:41 +11:00
Rohan Mitchell	41e42c78c4	Update spec link name	2015-01-16 17:25:38 +11:00
Rob Harrington	1d80bee595	Cart item total reflects total number of items in the cart	2015-01-16 16:06:51 +11:00
summerscope	d2d3a577ea	Merging master into this branch to make it easy to pull for staging push	2015-01-15 17:38:35 +11:00
Rohan Mitchell	dcc04ea538	On enterprise edit page, do not show side menu links we don't have permission to	2015-01-15 13:43:39 +11:00
Rohan Mitchell	2d82f76a43	Fix changed var in ability spec	2015-01-15 13:43:39 +11:00
Rohan Mitchell	d5437e1508	edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise	2015-01-15 13:43:39 +11:00
Rohan Mitchell	f0bd9c1065	Fix failing specs due to addition of another enterprise	2015-01-15 13:43:39 +11:00
Rohan Mitchell	f6e9c9494c	Enterprise user can edit profiles it has permission to	2015-01-15 13:43:39 +11:00
Rohan Mitchell	90ad2e2b7d	Allow enterprises with 'edit profile' permission to edit enterprises	2015-01-15 13:43:39 +11:00
Rohan Mitchell	cfb69ae7d2	Add Permissions#editable_enterprises	2015-01-15 13:43:38 +11:00
Rohan Mitchell	a93a824b83	Admin can grant permission for an enterprise to edit the profile of another	2015-01-15 13:43:38 +11:00
Rohan Mitchell	307cc313df	Stub scope_to_hub in spec that wasn't expecting it	2015-01-13 11:46:41 +11:00
Rohan Mitchell	0431e0048c	Merge branch 'master' into variant-overrides-frontend ... Conflicts: app/controllers/shop_controller.rb app/views/shop/products/_form.html.haml spec/controllers/shop_controller_spec.rb	2015-01-12 16:48:51 +11:00
Rohan Mitchell	20bde803c8	Display overridden prices when products are in the cart	2015-01-12 14:58:35 +11:00
Rohan Mitchell	6b43354386	Restructure spec	2015-01-12 14:37:43 +11:00
Rohan Mitchell	d52b6b34e3	Spec: do not subtract stock from overrides that do not override count_on_hand	2015-01-12 11:33:53 +11:00
Rohan Mitchell	4583e29ae3	When order is placed, subtract stock from variant override	2015-01-12 11:23:53 +11:00
Rohan Mitchell	a4d4622521	Add VariantOverride.decrement_stock	2015-01-12 10:39:23 +11:00
Rohan Mitchell	20f650b472	Add VariantOverride.stock_overriden?	2015-01-12 09:32:02 +11:00
Rohan Mitchell	e9f32f5329	Spec that shipping category can be set when creating new products	2015-01-09 12:46:36 +11:00