Rohan Mitchell
|
422061f137
|
Merge branch 'master' into products-caching
Conflicts:
app/controllers/shop_controller.rb
app/models/enterprise_fee.rb
app/models/order_cycle.rb
app/models/variant_override.rb
db/schema.rb
lib/open_food_network/products_renderer.rb
spec/lib/open_food_network/products_renderer_spec.rb
|
2016-03-03 09:42:52 +11:00 |
|
Rob Harrington
|
4de0a5c220
|
Renaming 'Variant Overrides' index page to 'Inventory'
|
2016-03-02 12:10:22 +11:00 |
|
Rohan Mitchell
|
ec55af5b8a
|
Display products cache integrity checker results on cache settings admin page
|
2016-03-02 11:05:03 +11:00 |
|
Rob Harrington
|
da325780b1
|
Adding BMC link to configurations menu
|
2015-12-16 19:18:57 +11:00 |
|
Rob Harrington
|
cdb0c2db33
|
Admin Orders show page uses line_item.full_name to describe line_items
|
2015-10-28 13:07:32 +11:00 |
|
Rob Harrington
|
fa8c3d65dc
|
Adding settings for global accounts and billing setup
|
2015-09-17 22:37:56 +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 |
|
Rohan Mitchell
|
b5a6f9c1bc
|
Add infrastructure so admin can configure content. Make homepage tagline CTA configurable.
|
2015-05-06 14:54:16 +10:00 |
|
Maikel Linke
|
ecf635e080
|
handle missing bill_address on admin order page
|
2015-04-29 14:32:13 +10:00 |
|
Maikel Linke
|
355221a273
|
Adding customer name to order edit page heading
|
2015-04-24 12:33:25 +10:00 |
|
Rohan Mitchell
|
ca558a4ecc
|
Fix admin tab to check correct permission
|
2015-02-11 11:55:48 +11:00 |
|
Rohan Mitchell
|
d83ff4ef33
|
Remove short wait, show variant overrides tab in admin
|
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
|
d02511bf1d
|
WIP: Rename override_variants to variant_overrides - file and dir name changes
|
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
|
49d5cb2f05
|
Do not show Override Variants tab - hide this until feature is ready
|
2014-11-21 13:49:09 +11:00 |
|
Rohan Mitchell
|
2c74a94e31
|
Show list of hubs to select for managing variant overrides
|
2014-11-21 13:49:09 +11:00 |
|
Rob H
|
44fb34d7be
|
Rearrange admin title
|
2014-06-26 12:20:42 +10:00 |
|
Rob H
|
51d3f65934
|
Remove spree's product tab for all but admin users
|
2014-06-23 22:01:19 +10:00 |
|
Rob H
|
a21c2c20f7
|
Change 'Spree' in admin page title to 'OFN'
|
2014-06-23 11:26:46 +10:00 |
|
Rohan Mitchell
|
27b8c4508f
|
Split product distribution editing into its own admin page
|
2013-11-13 15:22:17 +11:00 |
|