Commit Graph

502 Commits

Author SHA1 Message Date
Rob Harrington
1c1f82f4ee Using events to update index row text on save, adding alert icons for enterprises without producer or package selected 2015-06-12 01:49:37 +08:00
Rob Harrington
e575b0e490 Switching enterprise index to its own dedicated serializer, so we can spit out ownership 2015-06-12 01:49:37 +08:00
Rob Harrington
5a08344812 Changing 'shop' column and panel to 'package' 2015-06-12 01:49:37 +08:00
Rob Harrington
e3d7c00c8e Removing option of 'producer profile only' from enterprise shop panel 2015-06-12 01:49:36 +08:00
Rob Harrington
8aa55088ab Adding a parent directive to coorindate styling of panel tabs 2015-06-12 01:49:36 +08:00
Rob Harrington
6b35e993bd WIP: More work on panel content, styling and data submission logic 2015-06-12 01:49:36 +08:00
Rob Harrington
b84f5a26a1 WIP: Splitting type panel into separate producer and shop panels, playing with styling 2015-06-12 01:49:35 +08:00
Rob Harrington
451ba1c01b panel rows adjust to span the number of visible columns 2015-06-12 01:49:35 +08:00
Rob Harrington
0c36738472 Adding basic generalised panel row infrastructure to indexUtils 2015-06-12 01:49:35 +08:00
Rohan Mitchell
610a4c03fe Merge branch 'master' into redesign
Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Maikel Linke
fe27b1d446 text changes to the registration wizard 2015-05-29 15:24:17 +10:00
Rohan Mitchell
eac22df200 Merge branch 'master' into redesign
Conflicts:
	app/assets/javascripts/templates/product_modal.html.haml
2015-05-13 09:53:20 +10:00
Rick Giner
368402f115 Changed selectors' ng-repeat. Using existing variable instead of method call 2015-05-03 15:24:16 +10:00
Rick Giner
9e70c80d1d bind-once in product modal 2015-05-03 14:48:27 +10:00
Rick Giner
9c26b3ebb2 bind-once in partials 2015-05-03 14:34:42 +10:00
summerscope
427f535026 Redesign big chunk of work:
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
Rob Harrington
b1b1bfd8f6 Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page 2015-04-24 16:05:39 +10:00
Rob Harrington
6cde1f7732 Add tooltip with value for selectors 2015-04-23 14:11:50 +10:00
Rob Harrington
7b83438b5e Pulling property values into the shopfront 2015-04-23 13:51:49 +10:00
Rob Harrington
ed15b95de0 Adding properties and taxons to producer modal 2015-04-23 12:31:20 +10:00
Rob Harrington
3df2720b31 Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only 2015-04-23 12:31:06 +10:00
Rohan Mitchell
0d9ba4257d Merge branch 'properties' 2015-04-17 15:25:51 +10:00
Rohan Mitchell
a6a5fdfb3b Require that the user selects whether their enterprise charges sales tax 2015-04-17 13:41:38 +10:00
Rohan Mitchell
0bdb8f7241 User can set whether an enterprise charges sales tax when registering 2015-04-17 13:41:38 +10:00
Rob Harrington
0cf8b017b9 Pulling out taxons and properties placeholders from producer and product modals 2015-04-17 13:20:01 +10:00
summerscope
938eff8482 More layout tweaks to enterprise modal template 2015-03-19 16:13:47 +11:00
summerscope
b99e94cecf WIP on producer and product modals 2015-03-19 16:02:52 +11:00
summerscope
c76aa1d1c2 WIP on product modal 2015-03-19 14:52:09 +11:00
summerscope
dc1dd2e243 Changing the class .filter-box for shopfront to .filter-shopfront
This prevents the issue with inheritance / styling crossover
2015-03-13 16:06:46 +11:00
summerscope
bce64a1ead WIP product modals for shopfront 2015-03-13 15:34:11 +11:00
Rob Harrington
274a7a3c73 Fixing up the one liner filter styling a bit 2015-03-12 09:56:06 +11:00
Rob Harrington
578475a403 Filter products list on shop by active properties 2015-03-06 16:14:11 +11:00
Rob Harrington
e948bf1591 Only render selector icons if the icon exists 2015-03-06 11:32:01 +11:00
Rob Harrington
cb623b75c1 Generalising taxons-selector -> filter-selector 2015-03-05 18:15:14 +11:00
Rob Harrington
e7854bcd8e Moving single line selectors to template, making sure other users of taxons-selector still work 2015-03-05 16:38:21 +11:00
Rob Harrington
4afef8215a Basic implementation of single line selectors 2015-03-05 12:12:36 +11:00
summerscope
1753432f36 Adding new loading animation to replace ugly and large gif 2015-01-16 17:06:40 +11:00
summerscope
932604bd69 Add in logic to style price column differently if nul vs has value 2015-01-15 16:01:00 +11:00
summerscope
b5879d51ac Merging master into shopfront-filters branch 2015-01-15 14:15:25 +11:00
summerscope
6863dd75ef Restyling button for price breakdown to make it more clear that users press again to close the pop over 2014-12-19 17:05:13 +11:00
Rohan Mitchell
5fcb2982fa Fees are calculated correctly for items with variant overrides 2014-12-18 11:53:17 +11:00
Rob Harrington
e9a3f8ce91 Require user to choose producer or not 2014-10-17 12:29:51 +11:00
summerscope
b671543a95 Style and make pretty the finished step of profile creation 2014-10-17 12:25:04 +11:00
summerscope
4abc59f66d Change styling on the enterprise name because we dont know what type it is yet 2014-10-17 12:02:21 +11:00
summerscope
4aa2aa5aee Tweaking layout, text, styling for registration box 2014-10-17 11:56:25 +11:00
summerscope
2c5208ce6b Change ent type page, simplify! 2014-10-17 11:17:53 +11:00
summerscope
4884734ab5 Align Continue buttons right consistently 2014-10-17 10:43:19 +11:00
Rob Harrington
28807d4f4d Merge migrate_ent_types into reg 2014-10-17 10:20:48 +11:00
Rob Harrington
a6480e6831 Merge in enterprise confirmation 2014-10-16 11:52:10 +11:00
Rob Harrington
e0e8ba814f Show explanation of confirm process on final page of registration 2014-10-15 16:20:45 +11:00