raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-26 01:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rob H
2013-02-07 13:07:14 +11:00
parent 3507c5414d
commit 99b4530db2
19 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/overrides/add_cms_admin_tab.rb
View File

@@ -1,5 +1,6 @@
Deface::Override.new(:virtual_path => "spree/layouts/admin",
:name => "add_cms_admin_tab",
:insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
:text => "<%= tab 'CMS Admin', :url => main_app.cms_admin_path %>",
:original => '6999548b86c700f2cc5d4f9d297c94b3617fd981')
Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
:name => "add_cms_admin_to_admin_configurations_menu",
:insert_bottom => "[data-hook='admin_configurations_sidebar_menu']",
:text => "<li><%= link_to 'CMS Admin', main_app.cms_admin_path %></li>",
:partial => 'enterprise_fees/admin_configurations_menu',
:original => '29e0ab9c171ffab1988cb439b5d42300b78fe088' )

0
app/overrides/add_distributor_to_admin_product.rb → app/overrides/add_distributor_to_admin_product_edit.rb
View File

3
app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb
View File

@@ -1,5 +1,6 @@
Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
:name => "add_enterprise_fees_to_admin_configurations_menu",
:insert_bottom => "[data-hook='admin_configurations_sidebar_menu']",
:text => "<li><%= link_to 'Enterprise Fees', main_app.admin_enterprise_fees_path %></li>",
:partial => 'enterprise_fees/admin_configurations_menu',
:original => '29e0ab9c171ffab1988cb439b5d42300b78fe088')
:original => '8445a03cc903cacc832f395757ffcfaa7e99ca92')

2
app/overrides/add_enterprises_admin_tab.rb
View File

@@ -2,4 +2,4 @@ Deface::Override.new(:virtual_path => "spree/layouts/admin",
:name => "add_enterprises_admin_tab",
:insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
:text => "<%= tab :enterprises, :url => main_app.admin_enterprises_path %>",
:original => '82e51ad38c8538eca88b683d6d874d8fdb5b5032')
:original => '6999548b86c700f2cc5d4f9d297c94b3617fd981')

9
app/overrides/add_group_buy_to_admin_product.rb
View File

@@ -1,9 +0,0 @@
Deface::Override.new(:virtual_path => "spree/admin/products/_form",
:insert_top => "[data-hook='admin_product_form_right']",
:partial => "spree/admin/products/group_buy_form",
:name => "group buy")
Deface::Override.new(:virtual_path => "spree/admin/products/new",
:insert_bottom => ".right",
:partial => "spree/admin/products/group_buy_form",
:name => "group buy")

5
app/overrides/add_group_buy_to_admin_product_edit.rb Normal file
View File

@@ -0,0 +1,5 @@
Deface::Override.new(:virtual_path => "spree/admin/products/_form",
:insert_top => "[data-hook='admin_product_form_right']",
:partial => "spree/admin/products/group_buy_form",
:name => "add_group_buy_to_admin_product_edit",
:original => '0c0e8d714989e48ee246a8253fb2b362f108621a')

8
app/overrides/add_order_cycles_admin_tab.rb
View File

@@ -1,5 +1,5 @@
Deface::Override.new(:virtual_path => "spree/layouts/admin",
:name => "add_order_cycles_admin_tab",
Deface::Override.new(:virtual_path => "spree/layouts/admin",
:name => "add_order_cycles_admin_tab",
:insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
:text => "<%= tab 'Order Cycles', :url => main_app.admin_order_cycles_path %>",
:original => '3ff44d141dd4998561d0ff79b9df3b185207e325')
:text => "<%= tab 'Order Cycles', :url => main_app.admin_order_cycles_path %>",
:original => 'd4e321201ecb543e92192a031c8896a45dde3576')

3
app/overrides/add_source_to_product.rb
View File

@@ -1,4 +1,5 @@
Deface::Override.new(:virtual_path => "spree/products/show",
:insert_bottom => "[data-hook='product_left_part_wrap']",
:partial => "spree/products/source",
:name => "product_source")
:name => "add_source_to_product",
:original => 'bce3ba4847b3eac8ae061774a664ac4951d3d9db')

5
app/overrides/add_supplier_and_group_buy_to_admin_product_new.rb Normal file
View File

@@ -0,0 +1,5 @@
Deface::Override.new(:virtual_path => "spree/admin/products/new",
:insert_before => "[data-hook='new_product_attrs']",
:partial => "spree/admin/products/supplier_and_group_buy_for_new",
:name => "add_supplier_and_group_buy_to_admin_product_new",
:original => '59b7ed369769267bdedb596768fcfcc2cb94f122')

8
app/overrides/add_supplier_to_admin_product.rb
View File

@@ -1,9 +1,5 @@
Deface::Override.new(:virtual_path => "spree/admin/products/_form",
:insert_top => "[data-hook='admin_product_form_right']",
:partial => "spree/admin/products/supplier_form",
:name => "supplier")
Deface::Override.new(:virtual_path => "spree/admin/products/new",
:insert_bottom => ".right",
:partial => "spree/admin/products/supplier_form",
:name => "supplier")
:name => "add_supplier_to_admin_product",
:original => '18bd94de3eb8bdf8b669932bf04fc59e2e85288b')

3
app/overrides/cart_item_description.rb
View File

@@ -1,4 +1,5 @@
Deface::Override.new(:virtual_path => "spree/orders/_line_item",
:replace => "[data-hook='cart_item_description']",
:partial => "spree/orders/cart_item_description",
:name => "cart_item_description")
:name => "cart_item_description",
:original => 'ce2b7ddab2a6a13b25159ea18f6ab50991409d3e')

4
app/overrides/display_payment_information_after_purchase.rb
View File

@@ -1,4 +0,0 @@
Deface::Override.new(:virtual_path => "spree/shared/_order_details",
:replace => "div.payment-info",
:partial => "spree/shared/order_details_payment_info",
:name => "order_details_payment_info")

1
app/views/enterprise_fees/_admin_configurations_menu.html.haml
View File

@@ -1 +0,0 @@
%li= link_to "Enterprise Fees", main_app.admin_enterprise_fees_path

2
app/views/spree/admin/products/_distributors_form.html.haml
View File

@@ -11,4 +11,4 @@
= label_tag "#{pd_form.object_name}[_destroy]", pd_form.object.distributor.name
= pd_form.hidden_field :distributor_id
%td
= pd_form.collection_select :shipping_method_id, Spree::ShippingMethod.all, :id, :name
= pd_form.collection_select :shipping_method_id, Spree::ShippingMethod.all, :id, :name, {}, :class => "select2"

12
app/views/spree/admin/products/_group_buy_form.html.haml
View File

@@ -1,11 +1,13 @@
= f.field_container :group_buy do
= f.label :group_buy, 'Group buy?'
%br
= f.radio_button :group_buy, '1', :checked => f.object.group_buy
= f.label :group_buy_1, 'Yes'
= f.radio_button :group_buy, '0', :checked => !f.object.group_buy
= f.label :group_buy_0, 'No'
.alpha.two.columns
= f.radio_button :group_buy, '1', :checked => f.object.group_buy
= f.label :group_buy_1, 'Yes'
.alpha.two.columns
= f.radio_button :group_buy, '0', :checked => !f.object.group_buy
= f.label :group_buy_0, 'No'
%br.clear
= f.field_container :group_buy_unit_size do
= f.label :group_buy_unit_size
%br

20
app/views/spree/admin/products/_supplier_and_group_buy_for_new.html.haml Normal file
View File

@@ -0,0 +1,20 @@
.row
.alpha.six.columns
= f.field_container :supplier do
= f.label :supplier
= f.collection_select(:supplier_id, Enterprise.is_primary_producer, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
= f.error_message_on :supplier
.four.columns
= f.field_container :group_buy do
= f.label :group_buy, 'Group buy?'
%br
.alpha.two.columns
= f.radio_button :group_buy, '1', :checked => f.object.group_buy
= f.label :group_buy_1, 'Yes'
.omega.two.columns
= f.radio_button :group_buy, '0', :checked => !f.object.group_buy
= f.label :group_buy_0, 'No'
.omega.six.columns
= f.field_container :group_buy_unit_size do
= f.label :group_buy_unit_size
= f.text_field :group_buy_unit_size, :class => "fullwidth"

2
app/views/spree/admin/products/_supplier_form.html.haml
View File

@@ -1,5 +1,5 @@
= f.field_container :supplier do
= f.label :supplier
%br
= f.collection_select(:supplier_id, Enterprise.is_primary_producer, :id, :name, :include_blank => true)
= f.collection_select(:supplier_id, Enterprise.is_primary_producer, :id, :name, {:include_blank => true}, {:class => "select2"})
= f.error_message_on :supplier

2
app/views/spree/shared/_order_details_payment_info.html.haml
View File

@@ -1,2 +0,0 @@
- if order.payment_method.type == "Spree::PaymentMethod::Check"
= simple_format order.payment_method.description

10
app/views/spree/shared/_order_details_steps_data.html.erb
View File

@@ -31,15 +31,15 @@
<div class="flash notice">Your payment via PayPal has been processed successfully.</div>
<% elsif order.payment_method.name.include? "EFT" %>
<span><%= order.payment_method.description.html_safe %></span>
<% elsif order.creditcards.empty? == false %>
<% elsif order.credit_cards.empty? == false %>
<span class="cc-type">
<%= image_tag "creditcards/icons/#{order.creditcards.first.cc_type}.png" %>
<%= t(:ending_in)%> <%= order.creditcards.first.last_digits %>
<%= image_tag "credit_cards/icons/#{order.credit_cards.first.cc_type}.png" %>
<%= t(:ending_in)%> <%= order.credit_cards.first.last_digits %>
</span>
<br />
<span class="full-name">
<%= order.creditcards.first.first_name %>
<%= order.creditcards.first.last_name %>
<%= order.credit_cards.first.first_name %>
<%= order.credit_cards.first.last_name %>
</span>
<% elsif order.payment_method.type == "Spree::PaymentMethod::Check" %>
<span><%= order.payment_method.description %></span>