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

..

admin/enterprises/show

Remove distributor_info: 'how does it work' from enterprises edit page

2014-09-11 14:39:14 +10:00

enterprises/_distributor_details

Removing a chili, refactoring order mailer

2013-12-13 15:40:22 +11:00

spree

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

add_capture_order_shortcut.rb

Add distributor name to admin orders table

2013-09-12 15:16:51 +10:00

add_change_distributor_form_to_checkout_address.rb

Disable distributor change in checkout until it takes order cycles into account

2013-06-17 11:45:23 +10:00

add_cms_admin_tab.rb

Remove unneeded :partial from override

2013-02-14 15:35:50 +11:00

add_cms_checkout_distribution.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_cms_tabs_to_main_nav_bar.rb

Move additional of tabs to main nav bar to defaces, rather than overriding view directly

2013-02-14 15:42:47 +11:00

add_cms_to_cart.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_distributor_details_js_to_product.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_distributor_details_to_product.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_distributor_to_add_to_cart_form.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-06 11:25:26 +11:00

add_enterprise_fees_to_admin_configurations_menu.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

add_group_buy_to_admin_product_edit.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

add_multi_cart_to_home.rb

Add simple angular cart to the main page.

2013-08-08 18:31:56 +10:00

add_orders_admin_sub_menu.rb

Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page

2014-01-16 13:20:07 +08:00

add_source_to_product.rb

WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name

2013-02-07 13:07:14 +11:00

order_cycle_selection.rb

Fix order cycle selection on products page

2013-04-05 11:26:47 +11:00

remove_search_bar.rb

Removed search box and distributor/supplier sidebar from the hub page.

2013-08-21 10:49:43 +10:00

remove_side_bar.rb

Removed search box and distributor/supplier sidebar from the hub page.

2013-08-21 10:49:43 +10:00

replace_checkout_payment_button.rb

remove disabled flag

2013-07-16 17:01:12 +10:00

replace_order_details_steps_data.rb

Finished revision of defaces

2013-02-09 00:40:34 +11:00

replace_payment_name_with_description.rb

WIP (Spree Update): Fix frontend order payment summary

2013-07-23 10:43:08 +10:00

replace_shipping_address_form_with_distributor_details.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

set_auth_token_in_backend.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

set_auth_token_in_frontend.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

sidebar_home_index.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

sidebar_product_index.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

sidebar_taxons_show.rb

Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue

2013-02-07 15:09:25 +11:00

split_products_by_distributor_on_home.rb

Rename split partial and update overrides

2013-04-05 11:34:03 +11:00

split_products_by_distributor_on_products_home.rb

Rename split partial and update overrides

2013-04-05 11:34:03 +11:00

split_products_by_distributor_on_products_search.rb

Rename split partial and update overrides

2013-04-05 11:34:03 +11:00

split_products_by_distributor_on_taxons_show.rb

Rename split partial and update overrides

2013-04-05 11:34:03 +11:00