spree_core 4.1.15 → 4.2.0.beta
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/spree/base_controller.rb +1 -0
- data/app/helpers/spree/base_helper.rb +23 -2
- data/app/helpers/spree/mail_helper.rb +24 -0
- data/app/mailers/spree/base_mailer.rb +17 -3
- data/app/mailers/spree/order_mailer.rb +11 -2
- data/app/mailers/spree/reimbursement_mailer.rb +4 -2
- data/app/mailers/spree/shipment_mailer.rb +4 -2
- data/app/models/concerns/spree/default_price.rb +2 -1
- data/app/models/concerns/spree/user_methods.rb +11 -5
- data/app/models/spree/app_configuration.rb +5 -0
- data/app/models/spree/app_dependencies.rb +1 -7
- data/app/models/spree/line_item.rb +11 -3
- data/app/models/spree/option_type.rb +5 -1
- data/app/models/spree/order/address_book.rb +20 -7
- data/app/models/spree/order/store_credit.rb +0 -8
- data/app/models/spree/order.rb +28 -12
- data/app/models/spree/price.rb +26 -2
- data/app/models/spree/product.rb +17 -7
- data/app/models/spree/promotion_handler/coupon.rb +3 -2
- data/app/models/spree/reimbursement.rb +2 -0
- data/app/models/spree/shipment.rb +2 -5
- data/app/models/spree/stock_location.rb +13 -2
- data/app/models/spree/store.rb +19 -2
- data/app/models/spree/variant.rb +15 -2
- data/app/presenters/spree/variant_presenter.rb +7 -0
- data/app/presenters/spree/variants/option_types_presenter.rb +1 -0
- data/app/services/spree/checkout/update.rb +2 -13
- data/app/views/layouts/spree/base_mailer.html.erb +45 -40
- data/app/views/spree/order_mailer/cancel_email.html.erb +19 -25
- data/app/views/spree/order_mailer/cancel_email.text.erb +24 -2
- data/app/views/spree/order_mailer/confirm_email.html.erb +18 -65
- data/app/views/spree/order_mailer/confirm_email.text.erb +2 -1
- data/app/views/spree/order_mailer/store_owner_notification_email.html.erb +23 -0
- data/app/views/spree/order_mailer/store_owner_notification_email.text.erb +38 -0
- data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb +53 -58
- data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb +3 -1
- data/app/views/spree/shared/_base_mailer_footer.html.erb +6 -14
- data/app/views/spree/shared/_base_mailer_header.html.erb +12 -32
- data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +293 -625
- data/app/views/spree/shared/_purchased_items_table.html.erb +60 -0
- data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb +13 -0
- data/app/views/spree/shared/purchased_items_table/_line_item.html.erb +27 -0
- data/app/views/spree/shared/purchased_items_table/_subtotal.html.erb +13 -0
- data/app/views/spree/shared/purchased_items_table/_total.html.erb +13 -0
- data/app/views/spree/shipment_mailer/shipped_email.html.erb +31 -36
- data/app/views/spree/shipment_mailer/shipped_email.text.erb +2 -1
- data/config/initializers/assets.rb +1 -0
- data/config/locales/en.yml +113 -13
- data/db/default/spree/stores.rb +11 -10
- data/db/migrate/20140309033438_create_store_from_preferences.rb +1 -1
- data/db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb +1 -1
- data/db/migrate/20191017121054_add_supported_currencies_to_store.rb +10 -0
- data/db/migrate/20200102141311_add_social_to_spree_stores.rb +4 -1
- data/db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb +1 -1
- data/db/migrate/20200308210757_add_default_locale_to_spree_store.rb +7 -0
- data/db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb +7 -0
- data/db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb +7 -0
- data/db/migrate/20200423123001_add_default_country_id_to_spree_store.rb +9 -0
- data/db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb +8 -0
- data/db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb +5 -0
- data/db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb +7 -0
- data/db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb +7 -0
- data/db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb +5 -0
- data/lib/generators/spree/dummy/dummy_generator.rb +1 -0
- data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js +0 -2
- data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js +0 -2
- data/lib/generators/spree/mailers_preview/mailers_preview_generator.rb +23 -0
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb +13 -0
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb +5 -0
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb +5 -0
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb +11 -0
- data/lib/spree/core/controller_helpers/common.rb +1 -0
- data/lib/spree/core/controller_helpers/currency_helpers.rb +15 -0
- data/lib/spree/core/controller_helpers/store.rb +12 -1
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/core.rb +1 -0
- data/lib/spree/permitted_attributes.rb +7 -4
- data/lib/spree/testing_support/authorization_helpers.rb +7 -4
- data/lib/spree/testing_support/capybara_ext.rb +0 -7
- data/lib/spree/testing_support/factories/store_factory.rb +11 -8
- data/spree_core.gemspec +6 -6
- data/vendor/assets/javascripts/cleave.js +1669 -0
- metadata +44 -32
- data/app/finders/spree/addresses/find.rb +0 -17
- data/app/models/spree/order_contents.rb +0 -31
- data/app/services/spree/account/addresses/base.rb +0 -39
- data/app/services/spree/account/addresses/create.rb +0 -18
- data/app/services/spree/account/addresses/update.rb +0 -18
- data/app/views/spree/order_mailer/_adjustment.html.erb +0 -8
- data/app/views/spree/order_mailer/_subtotal.html.erb +0 -8
- data/app/views/spree/order_mailer/_total.html.erb +0 -8
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
<table class="purchase_content">
|
|
2
|
+
<%= render collection: line_items, partial: 'spree/shared/purchased_items_table/line_item', as: :line_item %>
|
|
3
|
+
<%= render 'spree/shared/purchased_items_table/subtotal', order: order %>
|
|
4
|
+
<% if order.line_item_adjustments.exists? %>
|
|
5
|
+
<% if order.all_adjustments.promotion.eligible.exists? %>
|
|
6
|
+
<% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
|
|
7
|
+
<tr>
|
|
8
|
+
<td></td>
|
|
9
|
+
<td>
|
|
10
|
+
<p class="f-fallback purchase_total purchase_total--label">
|
|
11
|
+
<%= Spree.t(:promotion) %> <%= label %>:
|
|
12
|
+
</p>
|
|
13
|
+
</td>
|
|
14
|
+
<td>
|
|
15
|
+
<p class="f-fallback purchase_total">
|
|
16
|
+
<%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
|
|
17
|
+
</p>
|
|
18
|
+
</td>
|
|
19
|
+
</tr>
|
|
20
|
+
<% end %>
|
|
21
|
+
<% end %>
|
|
22
|
+
<% end %>
|
|
23
|
+
<% order.shipments.group_by { |s| s.selected_shipping_rate&.name }.each do |name, shipments| %>
|
|
24
|
+
<tr>
|
|
25
|
+
<td></td>
|
|
26
|
+
<td>
|
|
27
|
+
<p class="f-fallback purchase_total purchase_total--label">
|
|
28
|
+
<%= Spree.t(:shipping) %> <%= name %>:
|
|
29
|
+
</p>
|
|
30
|
+
</td>
|
|
31
|
+
<td>
|
|
32
|
+
<p class="f-fallback purchase_total">
|
|
33
|
+
<%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
|
|
34
|
+
</p>
|
|
35
|
+
</td>
|
|
36
|
+
</tr>
|
|
37
|
+
<% end %>
|
|
38
|
+
<% if order.all_adjustments.eligible.tax.exists? %>
|
|
39
|
+
<% order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
|
|
40
|
+
<tr>
|
|
41
|
+
<td></td>
|
|
42
|
+
<td>
|
|
43
|
+
<p class="f-fallback purchase_total purchase_total--label">
|
|
44
|
+
<%= Spree.t(:tax) %> <%= label %>:
|
|
45
|
+
</p>
|
|
46
|
+
</td>
|
|
47
|
+
<td>
|
|
48
|
+
<p class="f-fallback purchase_total">
|
|
49
|
+
<%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
|
|
50
|
+
</p>
|
|
51
|
+
</td>
|
|
52
|
+
</tr>
|
|
53
|
+
<% end %>
|
|
54
|
+
<% end %>
|
|
55
|
+
<% order.adjustments.eligible.each do |adjustment| %>
|
|
56
|
+
<% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
|
|
57
|
+
<%= render 'spree/shared/purchased_items_table/adjustment', adjustment: adjustment, order: order %>
|
|
58
|
+
<% end %>
|
|
59
|
+
<%= render 'spree/shared/purchased_items_table/total', order: order %>
|
|
60
|
+
</table>
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
<tr>
|
|
2
|
+
<td></td>
|
|
3
|
+
<td>
|
|
4
|
+
<p class="f-fallback purchase_total purchase_total--label">
|
|
5
|
+
<%= raw(adjustment.label) %>:
|
|
6
|
+
</p>
|
|
7
|
+
</td>
|
|
8
|
+
<td>
|
|
9
|
+
<p class="f-fallback purchase_total">
|
|
10
|
+
<%= Spree::Money.new(adjustment.amount, currency: order.currency) %>
|
|
11
|
+
</p>
|
|
12
|
+
</td>
|
|
13
|
+
</tr>
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
<tr>
|
|
2
|
+
<td class="purchase_image">
|
|
3
|
+
<% if frontend_available? %>
|
|
4
|
+
<%= link_to(image_tag(variant_image_url(line_item.variant)), spree.product_url(line_item.product)) %>
|
|
5
|
+
<% else %>
|
|
6
|
+
<%= image_tag(variant_image_url(line_item.variant)) %>
|
|
7
|
+
<% end %>
|
|
8
|
+
</td>
|
|
9
|
+
<td class="purchase_item">
|
|
10
|
+
<strong>
|
|
11
|
+
<span class="f-fallback">
|
|
12
|
+
<% if frontend_available? %>
|
|
13
|
+
<%= link_to raw(line_item.name), spree.product_url(line_item.product) %>
|
|
14
|
+
<% else %>
|
|
15
|
+
<%= raw(line_item.name) %>
|
|
16
|
+
<% end %>
|
|
17
|
+
</span>
|
|
18
|
+
</strong>
|
|
19
|
+
<p class="purchase_item--additional"><%= raw(line_item.variant.options_text) -%></p>
|
|
20
|
+
</td>
|
|
21
|
+
<td class="align-right">
|
|
22
|
+
<span class="f-fallback purchase_item_price">
|
|
23
|
+
<%= line_item.quantity %> x <%= line_item.single_money %>
|
|
24
|
+
<%= line_item.display_amount %>
|
|
25
|
+
</span>
|
|
26
|
+
</td>
|
|
27
|
+
</tr>
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
<tr>
|
|
2
|
+
<td class="purchase_footer" valign="middle"></td>
|
|
3
|
+
<td class="purchase_footer" valign="middle">
|
|
4
|
+
<p class="f-fallback purchase_total purchase_total--label">
|
|
5
|
+
<%= Spree.t('order_mailer.subtotal') %>
|
|
6
|
+
</p>
|
|
7
|
+
</td>
|
|
8
|
+
<td class="purchase_footer" valign="middle">
|
|
9
|
+
<p class="f-fallback purchase_total">
|
|
10
|
+
<%= order.display_item_total %>
|
|
11
|
+
</p>
|
|
12
|
+
</td>
|
|
13
|
+
</tr>
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
<tr>
|
|
2
|
+
<td></td>
|
|
3
|
+
<td>
|
|
4
|
+
<p class="f-fallback purchase_total purchase_total--label">
|
|
5
|
+
<strong><%= Spree.t('order_mailer.total') %></strong>
|
|
6
|
+
</p>
|
|
7
|
+
</td>
|
|
8
|
+
<td>
|
|
9
|
+
<p class="f-fallback purchase_total">
|
|
10
|
+
<strong><%= order.display_total %></strong>
|
|
11
|
+
</p>
|
|
12
|
+
</td>
|
|
13
|
+
</tr>
|
|
@@ -1,41 +1,36 @@
|
|
|
1
|
-
<
|
|
1
|
+
<h1>
|
|
2
|
+
<%= Spree.t('shipment_mailer.shipped_email.dear_customer', name: name_for(@shipment.order)) %>
|
|
3
|
+
</h1>
|
|
4
|
+
<p>
|
|
5
|
+
<%= Spree.t('shipment_mailer.shipped_email.instructions', number: @shipment.order.number) %>
|
|
6
|
+
</p>
|
|
7
|
+
<table class="purchase" role="presentation">
|
|
2
8
|
<tr>
|
|
3
9
|
<td>
|
|
4
|
-
<
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
<p>
|
|
11
|
-
<%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
|
|
12
|
-
</p>
|
|
13
|
-
<table class="container">
|
|
14
|
-
<tr>
|
|
15
|
-
<td class="wrapper last">
|
|
16
|
-
<table class="twelve columns">
|
|
17
|
-
<%= render collection: @shipment.manifest.map(&:line_item), partial: 'spree/shared/mailer_line_item', as: :line_item %>
|
|
18
|
-
</table>
|
|
19
|
-
</td>
|
|
20
|
-
</tr>
|
|
21
|
-
</table>
|
|
22
|
-
<p>
|
|
23
|
-
<%= Spree.t('shipment_mailer.shipped_email.shipping_method', shipping_method: @shipment.shipping_method.name) %>
|
|
24
|
-
</p>
|
|
25
|
-
<% if @shipment.tracking %>
|
|
26
|
-
<p>
|
|
27
|
-
<%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking) %>
|
|
28
|
-
</p>
|
|
29
|
-
<% end %>
|
|
30
|
-
<% if @shipment.tracking_url %>
|
|
31
|
-
<p>
|
|
32
|
-
<%= Spree.t('shipment_mailer.shipped_email.track_link', url: link_to(@shipment.tracking_url, @shipment.tracking_url)).html_safe %>
|
|
33
|
-
</p>
|
|
34
|
-
<% end %>
|
|
35
|
-
<p>
|
|
36
|
-
<%= Spree.t('shipment_mailer.shipped_email.thanks') %>
|
|
37
|
-
</p>
|
|
10
|
+
<h3><%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %></h3>
|
|
11
|
+
</td>
|
|
12
|
+
</tr>
|
|
13
|
+
<tr>
|
|
14
|
+
<td colspan="2">
|
|
15
|
+
<%= render 'spree/shared/purchased_items_table', line_items: @shipment.manifest.map(&:line_item), order: @shipment.order %>
|
|
38
16
|
</td>
|
|
39
|
-
<td class="expander"></td>
|
|
40
17
|
</tr>
|
|
41
18
|
</table>
|
|
19
|
+
<p>
|
|
20
|
+
<%= Spree.t('shipment_mailer.shipped_email.shipping_method', shipping_method: @shipment.shipping_method.name) %>
|
|
21
|
+
</p>
|
|
22
|
+
<% if @shipment.tracking %>
|
|
23
|
+
<p>
|
|
24
|
+
<%= Spree.t('shipment_mailer.shipped_email.track_information', tracking: @shipment.tracking) %>
|
|
25
|
+
</p>
|
|
26
|
+
<% end %>
|
|
27
|
+
<% if @shipment.tracking_url %>
|
|
28
|
+
<p>
|
|
29
|
+
<%= Spree.t('shipment_mailer.shipped_email.track_link', url: link_to(@shipment.tracking_url, @shipment.tracking_url)).html_safe %>
|
|
30
|
+
</p>
|
|
31
|
+
<% end %>
|
|
32
|
+
<p>
|
|
33
|
+
<%= Spree.t('shipment_mailer.shipped_email.thanks') %>
|
|
34
|
+
<br />
|
|
35
|
+
<%= Spree.t('shipment_mailer.shipped_email.store_team', store_name: current_store.name) %>
|
|
36
|
+
</p>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
|
|
1
|
+
<%= Spree.t('shipment_mailer.shipped_email.dear_customer', name: name_for(@shipment.order)) %>
|
|
2
2
|
|
|
3
3
|
<%= Spree.t('shipment_mailer.shipped_email.instructions', number: @shipment.order.number) %>
|
|
4
4
|
|
|
@@ -14,3 +14,4 @@
|
|
|
14
14
|
<%= Spree.t('shipment_mailer.shipped_email.track_link', url: @shipment.tracking_url) if @shipment.tracking_url %>
|
|
15
15
|
|
|
16
16
|
<%= Spree.t('shipment_mailer.shipped_email.thanks') %>
|
|
17
|
+
<%= Spree.t('shipment_mailer.shipped_email.store_team', store_name: current_store.name) %>
|