Rob Harrington
c1d04af5cc
Implementing monthly billing description logic in required pages
2015-12-16 19:18:57 +11:00
Rob Harrington
e6a51bb49d
Adding actions dropdown to admin order view/pages
2015-12-16 11:55:23 +11:00
Maikel Linke
0f2ae79e05
Fixing "Shop for" label on groups producer modal
2015-12-04 10:37:55 +11:00
Rob Harrington
75846a4d1f
Merge branch 'master' into line_item_naming
2015-11-16 10:38:42 +11:00
Rob Harrington
193325f81b
Improve formatting around saving on line items index (BOM)
2015-11-12 09:52:10 +11:00
Rob Harrington
27903a46e6
Adding new save-bar directive for handling save actions for index pages
2015-11-06 09:53:31 +11:00
Maikel Linke
5f80043857
using translate filter instead of root scope function with parameters
2015-10-09 10:21:26 +11:00
Maikel Linke
e9d1cf6eb5
using translate filter instead of root scope function
2015-10-08 18:09:11 +11:00
Maikel Linke
d62775a785
update specs and fix labels yes and no
2015-10-07 18:05:59 +11:00
Maikel Linke
8b40d094ee
new translate filter and updated specs for js translations
2015-10-07 15:47:51 +11:00
Maikel Linke
ae96541112
Internationalisation of Javascript views
2015-10-01 11:13:45 +10:00
Maikel Linke
f8725a0174
Removing unused JS partial
2015-10-01 11:12:31 +10:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +10:00
Maikel Linke
60b2596774
disable max quantity unless min quantity is set
2015-09-04 16:56:51 +10:00
Maikel Linke
0895bd8647
Non-integer values cannot be entered into shop front quantities
2015-09-03 17:42:26 +10:00
Rohan Mitchell
5688cfd1dd
WIP: Rename ofnEmptiesCart to ofnChangeHub
2015-07-31 16:56:08 +10:00
Rohan Mitchell
a509747ba7
Do not show double-ups of places to shop
2015-07-10 15:51:57 +10:00
Rohan Mitchell
e679f1175c
Add shop-for-products-at to map producer modals
2015-07-10 15:51:57 +10:00
Rohan Mitchell
faee88c404
Merge branch 'master' into redesign
2015-06-16 16:57:09 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Rob Harrington
0038ebaa1f
Fix styling issue for full sixteen column enterprise index panel
2015-06-15 16:10:33 +08:00
Rob Harrington
943c702e88
Hiding 'more' list if there are no overflow filter selectors
2015-06-15 15:54:55 +08:00
Rob Harrington
fb11c93943
Making ul element the root of filter_selectors directive, so resolve issue with using ng-repeat element as root of a replacement directive
2015-06-15 15:43:01 +08:00
Rob Harrington
066c8876ff
Only serializing unresolved enterprise issues, styling tweaks and fixes for index
2015-06-12 15:49:01 +08:00
Rob Harrington
6ab5efbe02
Last minute styling adjustments
2015-06-12 12:40:24 +08:00
Rob Harrington
59d5ebe9d4
Changes to copy
2015-06-12 12:32:17 +08:00
Rob Harrington
775718c776
Adding status panel on enterprise index
2015-06-12 12:09:00 +08:00
Rob Harrington
6f975593fe
Splitting enterprise index feature specs into their own file, reinstating old enterprise index for super admin users
2015-06-12 01:49:39 +08:00
Rob Harrington
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08:00
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
