spree_core 2.1.1 → 2.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/spree/base_controller.rb +1 -2
- data/app/helpers/spree/products_helper.rb +8 -3
- data/app/mailers/spree/base_mailer.rb +5 -0
- data/app/models/spree/ability.rb +0 -3
- data/app/models/spree/adjustment.rb +2 -1
- data/app/models/spree/app_configuration.rb +2 -0
- data/app/models/spree/classification.rb +3 -0
- data/app/models/spree/country.rb +2 -1
- data/app/models/spree/image.rb +1 -1
- data/app/models/spree/line_item.rb +2 -0
- data/app/models/spree/order.rb +33 -16
- data/app/models/spree/order/checkout.rb +1 -1
- data/app/models/spree/payment.rb +14 -2
- data/app/models/spree/payment/processing.rb +3 -3
- data/app/models/spree/preferences/configuration.rb +5 -1
- data/app/models/spree/preferences/preferable.rb +5 -1
- data/app/models/spree/preferences/store.rb +14 -15
- data/app/models/spree/product.rb +4 -3
- data/app/models/spree/product/scopes.rb +7 -14
- data/app/models/spree/return_authorization.rb +3 -6
- data/app/models/spree/shipment.rb +4 -1
- data/app/models/spree/state.rb +1 -0
- data/app/models/spree/stock/availability_validator.rb +1 -1
- data/app/models/spree/stock/estimator.rb +26 -26
- data/app/models/spree/stock/quantifier.rb +1 -1
- data/app/models/spree/stock_item.rb +11 -7
- data/app/models/spree/variant.rb +4 -3
- data/config/locales/en.yml +8 -2
- data/config/routes.rb +1 -0
- data/db/default/spree/countries.rb +26 -26
- data/db/migrate/20130213191427_create_default_stock.rb +5 -2
- data/db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb +15 -0
- data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb +19 -0
- data/db/migrate/20130909115621_change_states_required_for_countries.rb +9 -0
- data/db/migrate/20131001013410_remove_unused_credit_card_fields.rb +12 -0
- data/lib/spree/core/controller_helpers/order.rb +1 -1
- data/lib/spree/core/controller_helpers/ssl.rb +22 -13
- data/lib/spree/core/engine.rb +2 -10
- data/lib/spree/core/permalinks.rb +1 -5
- data/lib/spree/core/preference_rescue.rb +25 -0
- data/lib/spree/core/product_filters.rb +34 -38
- data/lib/spree/core/routes.rb +48 -0
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/money.rb +4 -0
- data/lib/spree/permitted_attributes.rb +1 -1
- data/lib/spree/testing_support/factories/credit_card_factory.rb +1 -1
- metadata +15 -9
- data/app/views/spree/shared/_address.html.erb +0 -38
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
<div class="address vcard">
|
|
2
|
-
<div class="fn"><%= address.full_name %></div>
|
|
3
|
-
<% unless address.company.blank? %>
|
|
4
|
-
<div class="org">
|
|
5
|
-
<%= address.company %>
|
|
6
|
-
</div>
|
|
7
|
-
<% end %>
|
|
8
|
-
<div class="adr">
|
|
9
|
-
<div class="street-address">
|
|
10
|
-
<div class="street-address-line">
|
|
11
|
-
<%= address.address1 %>
|
|
12
|
-
</div>
|
|
13
|
-
<% unless address.address2.blank? %>
|
|
14
|
-
<div class="street-address-line">
|
|
15
|
-
<%= address.address2 %>
|
|
16
|
-
</div>
|
|
17
|
-
<% end %>
|
|
18
|
-
</div>
|
|
19
|
-
<div class="local">
|
|
20
|
-
<span class="locality"><%= address.city %></span>
|
|
21
|
-
<span class="region"><%= address.state_text %></span>
|
|
22
|
-
<span class="postal-code"><%= address.zipcode %></span>
|
|
23
|
-
<div class="country-name"><%= address.country.try(:name) %></div>
|
|
24
|
-
</div>
|
|
25
|
-
</div>
|
|
26
|
-
<% unless address.phone.blank? %>
|
|
27
|
-
<div class="tel">
|
|
28
|
-
<span class="type"><%= Spree.t(:phone) %></span>
|
|
29
|
-
<%= address.phone %>
|
|
30
|
-
</div>
|
|
31
|
-
<% end %>
|
|
32
|
-
<% unless address.alternative_phone.blank? %>
|
|
33
|
-
<div class="alternative-phone tel">
|
|
34
|
-
<span class="type"><%= Spree.t(:alternative_phone) %></span>
|
|
35
|
-
<%= address.alternative_phone %>
|
|
36
|
-
</div>
|
|
37
|
-
<% end %>
|
|
38
|
-
</div>
|