Rohan Mitchell
83754a01ef
Make side menu item visibility declarative
2015-01-15 13:43:39 +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
2170c7ede1
Fix broken JS spec
2015-01-15 13:43:38 +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
Rob Harrington
6f95fa8546
Merge remote-tracking branch 'origin/shopfront-filters'
2014-12-19 15:40:01 +11:00
Rob Harrington
a810fc88ac
Dedicated new enterprise form
2014-12-19 14:05:24 +11:00
Rob Harrington
24cf3dee74
Hiding Shop Preferences in enterprise form
2014-12-19 14:05:24 +11:00
Rob Harrington
21e4f40616
Implementing primary taxon ordering on the shopfront
2014-12-19 14:05:23 +11:00
Rob Harrington
f145a7ed65
Moving taxons into its own module, adding preferred shopfront taxon order to enterprise
2014-12-19 14:04:02 +11:00
Rob Harrington
a38e27e504
Adapting taxon autocompleter to allow multiple selection of taxons
2014-12-19 14:04:02 +11:00
Rob Harrington
b18163bfaf
Remove separate long description injection, use full enterprise serializer instead
2014-12-19 14:04:01 +11:00
Rob Harrington
a489aa7ad9
Fixing enterprise feature spec, adding first shop preference
2014-12-19 14:04:00 +11:00
Rob Harrington
33d4f03a99
Adding shop preferences pane, fiddling with icons
2014-12-19 14:04:00 +11:00
Rob Harrington
612c8a95b2
Adding icons to enterprise edit side menu
2014-12-19 14:04:00 +11:00
Rob Harrington
76acd706ea
Adding ability to show and hide menu items
2014-12-19 14:03:59 +11:00
Rob Harrington
eb2a6f0ef5
Splitting contact and social into two separate partials
2014-12-19 14:03:59 +11:00
Rob Harrington
f86d4a1996
Pulling headings out of enterprise form partials, displaying each conditionally
2014-12-19 14:03:24 +11:00
Rob Harrington
d8349bc037
menu refers to SideMenu object
2014-12-19 13:52:02 +11:00
Rob Harrington
39ca0ce3dc
WIP: Adding a side_menu to the enterprise form
2014-12-19 13:52:01 +11:00
summerscope
515348a8fb
Change the filtersActive variable for this page only
2014-12-19 12:52:57 +11:00
Rohan Mitchell
5fcb2982fa
Fees are calculated correctly for items with variant overrides
2014-12-18 11:53:17 +11:00
Rohan Mitchell
99dce6e8d6
Merge branch 'enterprise-form-confirmation'
2014-12-12 15:29:59 +11:00
Rohan Mitchell
84b607433c
Creating and then updating the new override updates the same override instead of creating a duplicate
2014-12-12 13:33:14 +11:00
Rohan Mitchell
fb980981fb
Display variant override errors
2014-12-12 13:33:14 +11:00
Rohan Mitchell
c38686c820
Create new variant overrides
2014-12-12 13:33:14 +11:00
Rohan Mitchell
531b35bbc6
WIP: Extract variant overrides to own controller - route, controller, views
2014-12-12 13:33:14 +11:00
Rohan Mitchell
91434fe12a
Rename override_variants to variant_overrides - JS file names
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a6f116aa09
WIP: Rename override_variants to variant_overrides - JS
2014-12-12 13:33:13 +11:00
Rohan Mitchell
51d2805de9
WIP: Rename override_variants to variant_overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a1906a71fa
Return promise directly
2014-12-12 13:33:13 +11:00
Rohan Mitchell
47592cdbd8
Submit variant overrides to server
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d67e614947
Remove extracted method
2014-12-12 13:33:13 +11:00
Rohan Mitchell
0a984b9041
Remove duplicate status message on BPE
2014-12-12 13:33:13 +11:00
Rohan Mitchell
c62ce57e0f
Display count of dirty variant overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a1fc4dec43
Updating variant overrides stores dirty values
2014-12-12 13:33:13 +11:00
Rohan Mitchell
7255520471
Display success message on save variant overrides (stub)
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a8e1265a58
Swap parameter ordering - follows convention Rails.logger.error 'foo'
2014-12-12 13:33:13 +11:00
Rohan Mitchell
9c4c0f87e3
Rename methods to reduce naming duplication
2014-12-12 13:33:13 +11:00
Rohan Mitchell
bcc3815f6b
Extract status message to a service
2014-12-12 13:33:13 +11:00
Rohan Mitchell
abf58c0e02
Provide blank values for all variant overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d3e639aa03
Index variant overrides by hub_id x variant_id
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5cf3579b26
Extract variant overrides to service
2014-12-12 13:33:12 +11:00
Rohan Mitchell
3aedbb6c48
Display variant overrides
2014-12-12 13:33:12 +11:00
Rohan Mitchell
8baed4429c
Indexer accepts arbitrary key to index by. Fix bug: Return an object instead of an array.
2014-12-12 13:33:12 +11:00
Rohan Mitchell
a3a3832c8d
Only show products that the chosen hub can add to an order cycle
2014-12-12 13:33:12 +11:00
Maikel Linke
440044372b
Leave-page-warning only after changing inputs
...
The enterprise form is now set 'dirty' whenever an input changes. The
navigation callback confirms to leave the page only if the form is
dirty.
2014-12-11 14:27:08 +11:00
Maikel Linke
76739a4746
Unify nav-check and nav-callback attributes in nav-check-callback
...
The value of nav-check was not used and nav-callback was only important
if nav-check was given. So we need only one attribute, now named
nav-check-callback.
2014-12-11 12:14:51 +11:00
Maikel Linke
11f1261dd3
Navigation Callbacks for WebKit
2014-12-11 12:07:48 +11:00
Maikel Linke
27896534f0
Navigation Callbacks (confirmation to leave) refs
...
A navigation callback could give only a fixed value at load time. Now it
can act depending on the site's state just before the page is unloaded.
2014-12-11 12:05:59 +11:00
Rob Harrington
5799f09caf
Merge branch 'master' into pretty-emails
2014-11-27 00:02:44 +11:00
