diff --git a/app/overrides/add_change_distributor_form_to_checkout_address.rb b/app/overrides/add_change_distributor_form_to_checkout_address.rb new file mode 100644 index 0000000000..8dd5a7f090 --- /dev/null +++ b/app/overrides/add_change_distributor_form_to_checkout_address.rb @@ -0,0 +1,5 @@ +Deface::Override.new(:virtual_path => "spree/checkout/edit", + :insert_after => "[data-hook='checkout_summary_box']", + :partial => "spree/checkout/other_available_distributors", + :name => "add_change_distributor_form_to_checkout_address", + :original => '60b9b1a39079f4efa85ff0425108edf671349d4f') \ No newline at end of file diff --git a/app/overrides/add_feedback_script.rb b/app/overrides/add_feedback_script.rb index 28933c7457..1bfb854c10 100644 --- a/app/overrides/add_feedback_script.rb +++ b/app/overrides/add_feedback_script.rb @@ -1,4 +1,5 @@ Deface::Override.new(:virtual_path => "spree/layouts/spree_application", :insert_bottom => "[data-hook='inside_head']", :partial => "layouts/feedback_script", - :name => "add_feedback_script") \ No newline at end of file + :name => "add_feedback_script", + :original => '429dfd9824ee588f51fb1b69013933424f149592') \ No newline at end of file diff --git a/app/overrides/product_filters.rb b/app/overrides/product_filters.rb deleted file mode 100644 index 051046cfd2..0000000000 --- a/app/overrides/product_filters.rb +++ /dev/null @@ -1,16 +0,0 @@ -# In sidebar, always render both taxonomies and filters - -Deface::Override.new(:virtual_path => "spree/home/index", - :replace => "[data-hook='homepage_sidebar_navigation']", - :partial => 'spree/sidebar', - :name => 'sidebar') - -Deface::Override.new(:virtual_path => "spree/products/index", - :replace => "[data-hook='homepage_sidebar_navigation']", - :partial => 'spree/sidebar', - :name => 'sidebar') - -Deface::Override.new(:virtual_path => "spree/taxons/show", - :replace => "[data-hook='taxon_sidebar_navigation']", - :partial => 'spree/sidebar', - :name => 'sidebar') diff --git a/app/overrides/rearrange_cart_form.rb b/app/overrides/rearrange_cart_form.rb deleted file mode 100644 index 9a23c00206..0000000000 --- a/app/overrides/rearrange_cart_form.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Remove column layout from cart form items so we can style it with CSS -Deface::Override.new(:virtual_path => "spree/orders/edit", - :replace => "[data-hook='inside_cart_form']", - :partial => "spree/orders/inside_cart_form", - :name => "inside_cart_form") - -Deface::Override.new(:virtual_path => "spree/orders/edit", - :replace => "#empty-cart[data-hook]", - :partial => "spree/orders/empty_cart_form", - :name => "empty_cart_form") diff --git a/app/overrides/rearrange_empty_cart_form.rb b/app/overrides/rearrange_empty_cart_form.rb new file mode 100644 index 0000000000..813173f489 --- /dev/null +++ b/app/overrides/rearrange_empty_cart_form.rb @@ -0,0 +1,6 @@ +# Remove column layout from cart form items so we can style it with CSS +Deface::Override.new(:virtual_path => "spree/orders/edit", + :replace => "#empty-cart[data-hook]", + :partial => "spree/orders/empty_cart_form", + :name => "rearrange_empty_cart_form", + :original => 'b5a751777e66ccbd45d7f1b980ecd201af94cb5b') \ No newline at end of file diff --git a/app/overrides/rearrange_inside_cart_form.rb b/app/overrides/rearrange_inside_cart_form.rb new file mode 100644 index 0000000000..fd4f873ad5 --- /dev/null +++ b/app/overrides/rearrange_inside_cart_form.rb @@ -0,0 +1,6 @@ +# Remove column layout from cart form items so we can style it with CSS +Deface::Override.new(:virtual_path => "spree/orders/edit", + :replace => "[data-hook='inside_cart_form']", + :partial => "spree/orders/inside_cart_form", + :name => "rearrange_inside_cart_form", + :original => 'e30b0e749869c51f004242b0cb7be582b45e044e') diff --git a/app/overrides/replace_checkout_payment_button.rb b/app/overrides/replace_checkout_payment_button.rb index 6f7912d087..cbc8e9c875 100644 --- a/app/overrides/replace_checkout_payment_button.rb +++ b/app/overrides/replace_checkout_payment_button.rb @@ -1,4 +1,5 @@ Deface::Override.new(:virtual_path => "spree/checkout/_payment", :replace => "code[erb-loud]:contains('submit_tag t(:save_and_continue)')", - :partial => "spree/checkout/process_my_order_button", - :name => "process_my_order_button") \ No newline at end of file + :text => "<%= submit_tag 'Process My Order', :class => 'continue button primary' %>", + :name => "replace_checkout_payment_button", + :original => 'ce2043a01931b3bc16b045302ebb0e0bb9150b67') \ No newline at end of file diff --git a/app/overrides/replace_delivery_address.rb b/app/overrides/replace_delivery_address.rb deleted file mode 100644 index 60b9883d5f..0000000000 --- a/app/overrides/replace_delivery_address.rb +++ /dev/null @@ -1,9 +0,0 @@ -Deface::Override.new(:virtual_path => "spree/checkout/_address", - :replace => "[data-hook='shipping_fieldset_wrapper']", - :partial => "spree/checkout/distributor", - :name => "replace_shipping_form") - -Deface::Override.new(:virtual_path => "spree/checkout/edit", - :insert_after => "[data-hook='checkout_summary_box']", - :partial => "spree/checkout/other_available_distributors", - :name => "other_available_distributors") diff --git a/app/overrides/replace_shipping_address_form_with_distributor_details.rb b/app/overrides/replace_shipping_address_form_with_distributor_details.rb new file mode 100644 index 0000000000..c408dc8ed4 --- /dev/null +++ b/app/overrides/replace_shipping_address_form_with_distributor_details.rb @@ -0,0 +1,5 @@ +Deface::Override.new(:virtual_path => "spree/checkout/_address", + :replace => "[data-hook='shipping_fieldset_wrapper']", + :partial => "spree/checkout/distributor", + :name => "replace_shipping_address_form_with_distributor_details", + :original => '53e219f90a2e1ba702a767261d0c2afe100ac751') diff --git a/app/overrides/set_auth_token_in_backend.rb b/app/overrides/set_auth_token_in_backend.rb new file mode 100644 index 0000000000..d794d68b28 --- /dev/null +++ b/app/overrides/set_auth_token_in_backend.rb @@ -0,0 +1,5 @@ +Deface::Override.new(:virtual_path => "spree/layouts/admin", + :insert_bottom => "[data-hook='admin_inside_head']", + :partial => "layouts/auth_token_script", + :name => "set_auth_token_in_backend", + :original => '6bc2c5de1c8f7542d033548557437c9fe4b3ba02') \ No newline at end of file diff --git a/app/overrides/set_auth_token_in_frontend.rb b/app/overrides/set_auth_token_in_frontend.rb new file mode 100644 index 0000000000..6797955b36 --- /dev/null +++ b/app/overrides/set_auth_token_in_frontend.rb @@ -0,0 +1,5 @@ +Deface::Override.new(:virtual_path => "spree/layouts/spree_application", + :insert_bottom => "[data-hook='inside_head']", + :partial => "layouts/auth_token_script", + :name => "set_auth_token_in_frontend", + :original => '5659ac7dbf6ac6469907b005b85285b894677815') \ No newline at end of file diff --git a/app/overrides/set_auth_token_in_test.rb b/app/overrides/set_auth_token_in_test.rb deleted file mode 100644 index eb1b7128b3..0000000000 --- a/app/overrides/set_auth_token_in_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -Deface::Override.new(:virtual_path => "spree/layouts/spree_application", - :insert_bottom => "[data-hook='inside_head']", - :partial => "layouts/auth_token_script", - :name => "auth_token_script") - -Deface::Override.new(:virtual_path => "spree/layouts/admin", - :insert_bottom => "[data-hook='admin_inside_head']", - :partial => "layouts/auth_token_script", - :name => "auth_token_script") diff --git a/app/overrides/sidebar_home_index.rb b/app/overrides/sidebar_home_index.rb new file mode 100644 index 0000000000..7965478336 --- /dev/null +++ b/app/overrides/sidebar_home_index.rb @@ -0,0 +1,7 @@ +# In sidebar, always render both taxonomies and filters + +Deface::Override.new(:virtual_path => "spree/home/index", + :replace => "[data-hook='homepage_sidebar_navigation']", + :partial => 'spree/sidebar', + :name => 'sidebar_home_index', + :original => 'f5a06c5f558ec681c172ad62ddcf8f84ad0a99c4') \ No newline at end of file diff --git a/app/overrides/sidebar_product_index.rb b/app/overrides/sidebar_product_index.rb new file mode 100644 index 0000000000..94fdd92b95 --- /dev/null +++ b/app/overrides/sidebar_product_index.rb @@ -0,0 +1,7 @@ +# In sidebar, always render both taxonomies and filters + +Deface::Override.new(:virtual_path => "spree/products/index", + :replace => "[data-hook='homepage_sidebar_navigation']", + :partial => 'spree/sidebar', + :name => 'sidebar_product_index', + :original => 'd9d1b3d18721e1c68eeaac898ca006bf8afb176c') \ No newline at end of file diff --git a/app/overrides/sidebar_taxons_show.rb b/app/overrides/sidebar_taxons_show.rb new file mode 100644 index 0000000000..510b24ef1d --- /dev/null +++ b/app/overrides/sidebar_taxons_show.rb @@ -0,0 +1,7 @@ +# In sidebar, always render both taxonomies and filters + +Deface::Override.new(:virtual_path => "spree/taxons/show", + :replace => "[data-hook='taxon_sidebar_navigation']", + :partial => 'spree/sidebar', + :name => 'sidebar_taxons_show', + :original => '697641363ffdb1fce91d8eea7cc883e983236ed2') \ No newline at end of file diff --git a/app/overrides/split_products_by_distributor.rb b/app/overrides/split_products_by_distributor.rb deleted file mode 100644 index 7e57b1909a..0000000000 --- a/app/overrides/split_products_by_distributor.rb +++ /dev/null @@ -1,19 +0,0 @@ -Deface::Override.new(:virtual_path => "spree/home/index", - :replace => "[data-hook='homepage_products']", - :partial => "spree/shared/products_by_distributor", - :name => "products_home") - -Deface::Override.new(:virtual_path => "spree/products/index", - :replace => "[data-hook='homepage_products']", - :partial => "spree/shared/products_by_distributor", - :name => "products_products") - -Deface::Override.new(:virtual_path => "spree/products/index", - :replace => "[data-hook='search_results']", - :partial => "spree/shared/products_by_distributor", - :name => "products_search") - -Deface::Override.new(:virtual_path => "spree/taxons/show", - :replace => "[data-hook='taxon_products']", - :partial => "spree/shared/products_by_distributor", - :name => "products_taxon") diff --git a/app/overrides/split_products_by_distributor_on_home.rb b/app/overrides/split_products_by_distributor_on_home.rb new file mode 100644 index 0000000000..67a45f61b7 --- /dev/null +++ b/app/overrides/split_products_by_distributor_on_home.rb @@ -0,0 +1,5 @@ +Deface::Override.new(:virtual_path => "spree/home/index", + :replace => "[data-hook='homepage_products']", + :partial => "spree/shared/products_by_distributor", + :name => "split_products_by_distributor_on_home", + :original => '589053f6f3e534b0be729081bdfc0378beb29cca') diff --git a/app/overrides/split_products_by_distributor_on_products_home.rb b/app/overrides/split_products_by_distributor_on_products_home.rb new file mode 100644 index 0000000000..d21a61b150 --- /dev/null +++ b/app/overrides/split_products_by_distributor_on_products_home.rb @@ -0,0 +1,5 @@ +Deface::Override.new(:virtual_path => "spree/products/index", + :replace => "[data-hook='homepage_products']", + :partial => "spree/shared/products_by_distributor", + :name => "split_products_by_distributor_on_products_home", + :original => '22097416de0a5851d43c572301779de06ed84d17') \ No newline at end of file diff --git a/app/overrides/split_products_by_distributor_on_products_search.rb b/app/overrides/split_products_by_distributor_on_products_search.rb new file mode 100644 index 0000000000..81204a8311 --- /dev/null +++ b/app/overrides/split_products_by_distributor_on_products_search.rb @@ -0,0 +1,5 @@ +Deface::Override.new(:virtual_path => "spree/products/index", + :replace => "[data-hook='search_results']", + :partial => "spree/shared/products_by_distributor", + :name => "split_products_by_distributor_on_products_search", + :original => '5a764faee41bd3f2bb13b60bfeb61e63fede9fac') \ No newline at end of file diff --git a/app/overrides/split_products_by_distributor_on_taxons_show.rb b/app/overrides/split_products_by_distributor_on_taxons_show.rb new file mode 100644 index 0000000000..60459856e3 --- /dev/null +++ b/app/overrides/split_products_by_distributor_on_taxons_show.rb @@ -0,0 +1,5 @@ +Deface::Override.new(:virtual_path => "spree/taxons/show", + :replace => "[data-hook='taxon_products']", + :partial => "spree/shared/products_by_distributor", + :name => "split_products_by_distributor_on_taxons_show", + :original => '27b6ecd3954022246568b3ddf5e80462aa511ece') \ No newline at end of file diff --git a/app/views/spree/checkout/_process_my_order_button.html.erb b/app/views/spree/checkout/_process_my_order_button.html.erb deleted file mode 100644 index 8347497347..0000000000 --- a/app/views/spree/checkout/_process_my_order_button.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= submit_tag "Process My Order", :class => 'continue button primary' %> \ No newline at end of file