spree_core 4.1.13 → 4.2.0.rc4
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 -2
- data/app/finders/spree/addresses/find.rb +1 -12
- data/app/finders/spree/base_finder.rb +14 -0
- data/app/finders/spree/countries/find.rb +11 -3
- data/app/finders/spree/credit_cards/find.rb +2 -2
- data/app/finders/spree/orders/find_current.rb +1 -1
- data/app/helpers/spree/base_helper.rb +61 -20
- data/app/helpers/spree/mail_helper.rb +29 -0
- data/app/helpers/spree/products_helper.rb +2 -1
- data/app/mailers/spree/base_mailer.rb +19 -5
- data/app/mailers/spree/order_mailer.rb +13 -4
- 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 +3 -6
- data/app/models/concerns/spree/user_methods.rb +11 -5
- data/app/models/concerns/spree/user_payment_source.rb +1 -1
- data/app/models/spree/ability.rb +45 -34
- data/app/models/spree/address.rb +17 -1
- data/app/models/spree/adjustment.rb +1 -0
- data/app/models/spree/app_configuration.rb +4 -0
- data/app/models/spree/app_dependencies.rb +4 -2
- data/app/models/spree/base.rb +5 -0
- data/app/models/spree/credit_card.rb +5 -0
- data/app/models/spree/fulfilment_changer.rb +58 -16
- data/app/models/spree/inventory_unit.rb +2 -7
- data/app/models/spree/line_item.rb +8 -7
- data/app/models/spree/log_entry.rb +1 -1
- data/app/models/spree/option_type.rb +7 -1
- data/app/models/spree/order.rb +27 -5
- data/app/models/spree/order/payments.rb +10 -2
- data/app/models/spree/payment.rb +18 -4
- data/app/models/spree/payment/processing.rb +2 -2
- data/app/models/spree/payment_method.rb +3 -3
- data/app/models/spree/preferences/store.rb +1 -1
- data/app/models/spree/price.rb +25 -6
- data/app/models/spree/product.rb +29 -9
- data/app/models/spree/promotion.rb +10 -15
- data/app/models/spree/promotion/rules/product.rb +2 -1
- data/app/models/spree/promotion/rules/user.rb +2 -1
- data/app/models/spree/promotion_handler/coupon.rb +1 -1
- data/app/models/spree/promotion_handler/promotion_duplicator.rb +9 -3
- data/app/models/spree/refund.rb +2 -2
- data/app/models/spree/reimbursement.rb +2 -0
- data/app/models/spree/return_item/eligibility_validator/default.rb +0 -2
- data/app/models/spree/return_item/eligibility_validator/{r_m_a_required.rb → rma_required.rb} +0 -0
- data/app/models/spree/shipment.rb +3 -6
- data/app/models/spree/shipping_method.rb +1 -5
- data/app/models/spree/shipping_rate.rb +2 -11
- data/app/models/spree/stock/availability_validator.rb +3 -4
- data/app/models/spree/stock_item.rb +1 -5
- data/app/models/spree/stock_location.rb +13 -2
- data/app/models/spree/store.rb +51 -2
- data/app/models/spree/store_credit.rb +1 -1
- data/app/models/spree/variant.rb +16 -10
- data/app/models/spree/zone.rb +17 -4
- data/app/presenters/spree/variant_presenter.rb +9 -1
- data/app/presenters/spree/variants/option_types_presenter.rb +1 -0
- data/app/services/spree/account/addresses/create.rb +6 -1
- data/app/services/spree/account/addresses/{base.rb → helper.rb} +1 -3
- data/app/services/spree/account/addresses/update.rb +6 -1
- data/app/services/spree/compare_line_items.rb +4 -2
- data/app/sorters/spree/base_sorter.rb +35 -0
- data/app/sorters/spree/orders/sort.rb +1 -37
- data/app/sorters/spree/products/sort.rb +9 -32
- data/app/validators/email_validator.rb +1 -1
- 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/initializers/inflections.rb +3 -0
- data/config/initializers/rails61_fixes.rb +3 -0
- data/config/locales/en.yml +145 -19
- data/db/default/spree/countries.rb +10 -4
- data/db/default/spree/states.rb +42 -5
- data/db/default/spree/stores.rb +17 -12
- data/db/default/spree/zones.rb +5 -2
- data/db/migrate/20130326175857_add_stock_location_to_rma.rb +1 -1
- data/db/migrate/20140309033438_create_store_from_preferences.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 +3 -0
- 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/20200610113542_add_label_to_spree_addresses.rb +5 -0
- data/db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb +5 -0
- data/db/migrate/20201006110150_add_checkout_zone_field_to_store.rb +12 -0
- data/db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb +6 -0
- data/db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb +5 -0
- data/db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb +5 -0
- data/db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb +5 -0
- data/db/migrate/20210114182625_create_spree_payment_methods_stores.rb +10 -0
- data/db/migrate/20210114220232_migrate_data_payment_methods_stores.rb +15 -0
- data/db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb +5 -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.rb +2 -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/order.rb +9 -4
- data/lib/spree/core/controller_helpers/store.rb +16 -1
- data/lib/spree/core/importer/order.rb +9 -9
- data/lib/spree/core/product_filters.rb +3 -3
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/i18n.rb +7 -21
- data/lib/spree/permitted_attributes.rb +8 -5
- data/lib/spree/service_module.rb +6 -2
- data/lib/spree/testing_support/authorization_helpers.rb +7 -4
- data/lib/spree/testing_support/capybara_config.rb +1 -1
- data/lib/spree/testing_support/factories/promotion_factory.rb +29 -17
- data/lib/spree/testing_support/factories/shipment_factory.rb +7 -9
- data/lib/spree/testing_support/factories/store_factory.rb +11 -8
- data/lib/spree/testing_support/factories/zone_factory.rb +16 -13
- data/lib/spree/testing_support/i18n.rb +1 -1
- data/lib/spree/testing_support/order_walkthrough.rb +8 -3
- data/lib/spree/testing_support/rspec_retry_config.rb +10 -0
- data/spree_core.gemspec +10 -8
- data/vendor/assets/javascripts/cleave.js +1669 -0
- metadata +105 -30
- 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
- data/lib/spree/i18n/base.rb +0 -17
- data/lib/spree/i18n/initializer.rb +0 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 661697daa0303090a2d39f0b439929bf8b54e59722ad738cee547487ba27aaf2
|
4
|
+
data.tar.gz: 8de83da0c8c3aa629f8389e40c63c178391d5a51a370da3595f0e1ce6edf431f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1b2cffe1a5872d559bb2ff7b0361e99c3d2cf6436a57e6ba1779550fb587651316c6c031c019b8e2150feae8df15f5d04ec500ae245585b9886f5584cb89ae2c
|
7
|
+
data.tar.gz: 83bba2eb568b84622dd523b4b943bcfee3cba206bce126ba9cf2a094b671e53d6094e8129edc4b8d620630fccf0783f962e3311fa1d41baf149575155bd7cf4e
|
@@ -7,8 +7,7 @@ class Spree::BaseController < ApplicationController
|
|
7
7
|
include Spree::Core::ControllerHelpers::Search
|
8
8
|
include Spree::Core::ControllerHelpers::Store
|
9
9
|
include Spree::Core::ControllerHelpers::StrongParameters
|
10
|
+
include Spree::Core::ControllerHelpers::CurrencyHelpers
|
10
11
|
|
11
12
|
respond_to :html
|
12
13
|
end
|
13
|
-
|
14
|
-
require 'spree/i18n/initializer'
|
@@ -1,13 +1,21 @@
|
|
1
1
|
module Spree
|
2
2
|
module Countries
|
3
|
-
class Find
|
4
|
-
def initialize(scope
|
3
|
+
class Find < ::Spree::BaseFinder
|
4
|
+
def initialize(scope:, params:)
|
5
5
|
@scope = scope
|
6
6
|
|
7
7
|
@shippable = String(params[:filter][:shippable]) unless params[:filter].nil?
|
8
8
|
end
|
9
9
|
|
10
10
|
def call
|
11
|
+
ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
|
12
|
+
Spree::Countries::Find.new.call is deprecated and will be removed in Spree 5.0.
|
13
|
+
Please use Spree::Countries::Find.new.execute instead
|
14
|
+
DEPRECATION
|
15
|
+
execute
|
16
|
+
end
|
17
|
+
|
18
|
+
def execute
|
11
19
|
countries = by_shippability(scope)
|
12
20
|
|
13
21
|
countries
|
@@ -15,7 +23,7 @@ module Spree
|
|
15
23
|
|
16
24
|
private
|
17
25
|
|
18
|
-
attr_reader :shippable
|
26
|
+
attr_reader :shippable
|
19
27
|
|
20
28
|
def shippable?
|
21
29
|
shippable.present?
|
@@ -1,7 +1,7 @@
|
|
1
1
|
module Spree
|
2
2
|
module CreditCards
|
3
|
-
class Find
|
4
|
-
def execute
|
3
|
+
class Find < ::Spree::BaseFinder
|
4
|
+
def execute
|
5
5
|
return scope.default.take if params[:id].eql?('default')
|
6
6
|
return scope.where(payment_method_id: params[:filter]['payment_method_id']) if params[:filter].present?
|
7
7
|
|
@@ -1,13 +1,7 @@
|
|
1
1
|
module Spree
|
2
2
|
module BaseHelper
|
3
3
|
def available_countries
|
4
|
-
|
5
|
-
|
6
|
-
countries = if checkout_zone && checkout_zone.kind == 'country'
|
7
|
-
checkout_zone.country_list
|
8
|
-
else
|
9
|
-
Spree::Country.all
|
10
|
-
end
|
4
|
+
countries = current_store.countries_available_for_checkout
|
11
5
|
|
12
6
|
countries.collect do |country|
|
13
7
|
country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
|
@@ -22,6 +16,13 @@ module Spree
|
|
22
16
|
to_html
|
23
17
|
end
|
24
18
|
|
19
|
+
def display_compare_at_price(product_or_variant)
|
20
|
+
product_or_variant.
|
21
|
+
price_in(current_currency).
|
22
|
+
display_compare_at_price_including_vat_for(current_price_options).
|
23
|
+
to_html
|
24
|
+
end
|
25
|
+
|
25
26
|
def link_to_tracking(shipment, options = {})
|
26
27
|
return unless shipment.tracking && shipment.shipping_method
|
27
28
|
|
@@ -34,7 +35,15 @@ module Spree
|
|
34
35
|
end
|
35
36
|
end
|
36
37
|
|
37
|
-
def logo(image_path =
|
38
|
+
def logo(image_path = nil, options = {})
|
39
|
+
image_path ||= if current_store.logo.attached? && current_store.logo.variable?
|
40
|
+
main_app.url_for(current_store.logo.variant(resize: '244x104>'))
|
41
|
+
elsif current_store.logo.attached? && current_store.logo.image?
|
42
|
+
main_app.url_for(current_store.logo)
|
43
|
+
else
|
44
|
+
Spree::Config[:logo]
|
45
|
+
end
|
46
|
+
|
38
47
|
path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
|
39
48
|
|
40
49
|
link_to path, 'aria-label': current_store.name, method: options[:method] do
|
@@ -42,8 +51,33 @@ module Spree
|
|
42
51
|
end
|
43
52
|
end
|
44
53
|
|
54
|
+
def object
|
55
|
+
instance_variable_get('@' + controller_name.singularize)
|
56
|
+
end
|
57
|
+
|
58
|
+
def og_meta_data
|
59
|
+
og_meta = {}
|
60
|
+
|
61
|
+
if object.is_a? Spree::Product
|
62
|
+
image = default_image_for_product_or_variant(object)
|
63
|
+
og_meta['og:image'] = main_app.url_for(image.attachment) if image&.attachment
|
64
|
+
|
65
|
+
og_meta['og:url'] = spree.url_for(object) if frontend_available? # url_for product needed
|
66
|
+
og_meta['og:type'] = object.class.name.demodulize.downcase
|
67
|
+
og_meta['og:title'] = object.name
|
68
|
+
og_meta['og:description'] = object.description
|
69
|
+
|
70
|
+
price = object.price_in(current_currency)
|
71
|
+
if price
|
72
|
+
og_meta['product:price:amount'] = price.amount
|
73
|
+
og_meta['product:price:currency'] = current_currency
|
74
|
+
end
|
75
|
+
end
|
76
|
+
|
77
|
+
og_meta
|
78
|
+
end
|
79
|
+
|
45
80
|
def meta_data
|
46
|
-
object = instance_variable_get('@' + controller_name.singularize)
|
47
81
|
meta = {}
|
48
82
|
|
49
83
|
if object.is_a? ApplicationRecord
|
@@ -67,16 +101,10 @@ module Spree
|
|
67
101
|
meta
|
68
102
|
end
|
69
103
|
|
70
|
-
def
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
image = default_image_for_product_or_variant(object)
|
75
|
-
image&.attachment.present? ? main_app.url_for(image.attachment) : asset_path(Spree::Config[:logo])
|
76
|
-
end
|
77
|
-
|
78
|
-
def meta_image_data_tag
|
79
|
-
tag('meta', property: 'og:image', content: meta_image_url_path) if meta_image_url_path
|
104
|
+
def og_meta_data_tags
|
105
|
+
og_meta_data.map do |property, content|
|
106
|
+
tag('meta', property: property, content: content) unless property.nil? || content.nil?
|
107
|
+
end.join("\n")
|
80
108
|
end
|
81
109
|
|
82
110
|
def meta_data_tags
|
@@ -97,7 +125,13 @@ module Spree
|
|
97
125
|
def pretty_time(time)
|
98
126
|
return '' if time.blank?
|
99
127
|
|
100
|
-
[I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p')].join(' ')
|
128
|
+
[I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p %Z')].join(' ')
|
129
|
+
end
|
130
|
+
|
131
|
+
def pretty_date(date)
|
132
|
+
return '' if date.blank?
|
133
|
+
|
134
|
+
[I18n.l(date.to_date, format: :long)].join(' ')
|
101
135
|
end
|
102
136
|
|
103
137
|
def seo_url(taxon, options = nil)
|
@@ -168,5 +202,12 @@ module Spree
|
|
168
202
|
style if style.in? Spree::Image.styles.with_indifferent_access
|
169
203
|
end
|
170
204
|
end
|
205
|
+
|
206
|
+
def meta_robots
|
207
|
+
return unless current_store.respond_to?(:seo_robots)
|
208
|
+
return if current_store.seo_robots.blank?
|
209
|
+
|
210
|
+
tag('meta', name: 'robots', content: current_store.seo_robots)
|
211
|
+
end
|
171
212
|
end
|
172
213
|
end
|
@@ -0,0 +1,29 @@
|
|
1
|
+
module Spree
|
2
|
+
module MailHelper
|
3
|
+
include BaseHelper
|
4
|
+
|
5
|
+
def variant_image_url(variant)
|
6
|
+
image = default_image_for_product_or_variant(variant)
|
7
|
+
image ? main_app.url_for(image.url(:small)) : 'noimage/small.png'
|
8
|
+
end
|
9
|
+
|
10
|
+
def name_for(order)
|
11
|
+
order.name || Spree.t('customer')
|
12
|
+
end
|
13
|
+
|
14
|
+
def store_logo
|
15
|
+
@order&.store&.mailer_logo || @order&.store&.logo || current_store.mailer_logo || current_store.logo
|
16
|
+
end
|
17
|
+
|
18
|
+
def default_logo
|
19
|
+
Spree::Config.mailer_logo || Spree::Config.logo
|
20
|
+
end
|
21
|
+
|
22
|
+
def logo_path
|
23
|
+
return default_logo unless store_logo.attached?
|
24
|
+
return main_app.url_for(store_logo.variant(resize: '244x104>')) if store_logo.variable?
|
25
|
+
|
26
|
+
return main_app.url_for(store_logo) if store_logo.image?
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
@@ -110,7 +110,8 @@ module Spree
|
|
110
110
|
variants: @variants,
|
111
111
|
is_product_available_in_currency: is_product_available_in_currency,
|
112
112
|
current_currency: current_currency,
|
113
|
-
current_price_options: current_price_options
|
113
|
+
current_price_options: current_price_options,
|
114
|
+
current_store: current_store
|
114
115
|
).call.to_json
|
115
116
|
end
|
116
117
|
|
@@ -1,10 +1,18 @@
|
|
1
1
|
module Spree
|
2
2
|
class BaseMailer < ActionMailer::Base
|
3
|
+
helper Spree::MailHelper
|
4
|
+
|
5
|
+
def current_store
|
6
|
+
@current_store ||= Spree::Store.current
|
7
|
+
end
|
8
|
+
helper_method :current_store
|
9
|
+
|
3
10
|
def from_address
|
4
|
-
|
11
|
+
@order&.store&.mail_from_address || current_store.mail_from_address
|
5
12
|
end
|
6
13
|
|
7
|
-
def money(amount, currency =
|
14
|
+
def money(amount, currency = nil)
|
15
|
+
currency ||= current_store.default_currency
|
8
16
|
Spree::Money.new(amount, currency: currency).to_s
|
9
17
|
end
|
10
18
|
helper_method :money
|
@@ -15,7 +23,8 @@ module Spree
|
|
15
23
|
helper_method :frontend_available?
|
16
24
|
|
17
25
|
def mail(headers = {}, &block)
|
18
|
-
ensure_default_action_mailer_url_host
|
26
|
+
ensure_default_action_mailer_url_host(headers[:store_url])
|
27
|
+
set_email_locale
|
19
28
|
super if Spree::Config[:send_core_emails]
|
20
29
|
end
|
21
30
|
|
@@ -24,9 +33,14 @@ module Spree
|
|
24
33
|
# this ensures that ActionMailer::Base.default_url_options[:host] is always set
|
25
34
|
# this is only a fail-safe solution if developer didn't set this in environment files
|
26
35
|
# http://guides.rubyonrails.org/action_mailer_basics.html#generating-urls-in-action-mailer-views
|
27
|
-
def ensure_default_action_mailer_url_host
|
36
|
+
def ensure_default_action_mailer_url_host(store_url = nil)
|
28
37
|
ActionMailer::Base.default_url_options ||= {}
|
29
|
-
ActionMailer::Base.default_url_options[:host] ||=
|
38
|
+
ActionMailer::Base.default_url_options[:host] ||= store_url || current_store.url
|
39
|
+
end
|
40
|
+
|
41
|
+
def set_email_locale
|
42
|
+
locale = @order&.store&.default_locale || current_store&.default_locale
|
43
|
+
I18n.locale = locale if locale.present?
|
30
44
|
end
|
31
45
|
end
|
32
46
|
end
|
@@ -2,16 +2,25 @@ module Spree
|
|
2
2
|
class OrderMailer < BaseMailer
|
3
3
|
def confirm_email(order, resend = false)
|
4
4
|
@order = order.respond_to?(:id) ? order : Spree::Order.find(order)
|
5
|
+
current_store = @order.store
|
5
6
|
subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
|
6
|
-
subject += "#{
|
7
|
-
mail(to: @order.email, from: from_address, subject: subject)
|
7
|
+
subject += "#{current_store.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
|
8
|
+
mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
|
9
|
+
end
|
10
|
+
|
11
|
+
def store_owner_notification_email(order)
|
12
|
+
@order = order.respond_to?(:id) ? order : Spree::Order.find(order)
|
13
|
+
current_store = @order.store
|
14
|
+
subject = Spree.t('order_mailer.store_owner_notification_email.subject', store_name: current_store.name)
|
15
|
+
mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject, store_url: current_store.url)
|
8
16
|
end
|
9
17
|
|
10
18
|
def cancel_email(order, resend = false)
|
11
19
|
@order = order.respond_to?(:id) ? order : Spree::Order.find(order)
|
20
|
+
current_store = @order.store
|
12
21
|
subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
|
13
|
-
subject += "#{
|
14
|
-
mail(to: @order.email, from: from_address, subject: subject)
|
22
|
+
subject += "#{current_store.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
|
23
|
+
mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
|
15
24
|
end
|
16
25
|
end
|
17
26
|
end
|
@@ -2,9 +2,11 @@ module Spree
|
|
2
2
|
class ReimbursementMailer < BaseMailer
|
3
3
|
def reimbursement_email(reimbursement, resend = false)
|
4
4
|
@reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
|
5
|
+
@order = @reimbursement.order
|
6
|
+
current_store = @reimbursement.store || Spree::Store.current
|
5
7
|
subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
|
6
|
-
subject += "#{
|
7
|
-
mail(to: @
|
8
|
+
subject += "#{current_store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@order.number}"
|
9
|
+
mail(to: @order.email, from: current_store.mail_from_address, subject: subject, store_url: current_store.url)
|
8
10
|
end
|
9
11
|
end
|
10
12
|
end
|
@@ -2,9 +2,11 @@ module Spree
|
|
2
2
|
class ShipmentMailer < BaseMailer
|
3
3
|
def shipped_email(shipment, resend = false)
|
4
4
|
@shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
|
5
|
+
@order = @shipment.order
|
6
|
+
current_store = @shipment.store
|
5
7
|
subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
|
6
|
-
subject += "#{
|
7
|
-
mail(to: @
|
8
|
+
subject += "#{current_store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
|
9
|
+
mail(to: @order.email, from: from_address, subject: subject, store_url: current_store.url)
|
8
10
|
end
|
9
11
|
end
|
10
12
|
end
|
@@ -4,19 +4,16 @@ module Spree
|
|
4
4
|
|
5
5
|
included do
|
6
6
|
has_one :default_price,
|
7
|
-
-> { where
|
7
|
+
-> { with_deleted.where(currency: Spree::Config[:currency]) },
|
8
8
|
class_name: 'Spree::Price',
|
9
9
|
dependent: :destroy
|
10
10
|
|
11
11
|
delegate :display_price, :display_amount, :price, :currency, :price=,
|
12
|
-
:price_including_vat_for, :currency=,
|
12
|
+
:price_including_vat_for, :currency=, :display_compare_at_price,
|
13
|
+
:compare_at_price, :compare_at_price=, to: :find_or_build_default_price
|
13
14
|
|
14
15
|
after_save :save_default_price
|
15
16
|
|
16
|
-
def default_price
|
17
|
-
Spree::Price.unscoped { super }
|
18
|
-
end
|
19
|
-
|
20
17
|
def has_default_price?
|
21
18
|
!default_price.nil?
|
22
19
|
end
|
@@ -30,15 +30,20 @@ module Spree
|
|
30
30
|
self.whitelisted_ransackable_associations = %w[bill_address ship_address]
|
31
31
|
self.whitelisted_ransackable_attributes = %w[id email]
|
32
32
|
|
33
|
+
def self.with_email(query)
|
34
|
+
where("#{table_name}.email LIKE ?", "%#{query}%")
|
35
|
+
end
|
36
|
+
|
33
37
|
def self.with_address(query, address = :ship_address)
|
34
38
|
left_outer_joins(address).
|
35
39
|
where("#{Spree::Address.table_name}.firstname like ?", "%#{query}%").
|
36
40
|
or(left_outer_joins(address).where("#{Spree::Address.table_name}.lastname like ?", "%#{query}%"))
|
37
41
|
end
|
38
42
|
|
39
|
-
def self.
|
40
|
-
|
41
|
-
|
43
|
+
def self.with_email_or_address(email, address)
|
44
|
+
left_outer_joins(:addresses).
|
45
|
+
where("#{Spree::Address.table_name}.firstname LIKE ? or #{Spree::Address.table_name}.lastname LIKE ? or #{table_name}.email LIKE ?",
|
46
|
+
"%#{address}%", "%#{address}%", "%#{email}%")
|
42
47
|
end
|
43
48
|
end
|
44
49
|
|
@@ -54,8 +59,9 @@ module Spree
|
|
54
59
|
first
|
55
60
|
end
|
56
61
|
|
57
|
-
def total_available_store_credit
|
58
|
-
|
62
|
+
def total_available_store_credit(currency = nil)
|
63
|
+
currency ||= Spree::Config[:currency]
|
64
|
+
store_credits.where(currency: currency).reload.to_a.sum(&:amount_remaining)
|
59
65
|
end
|
60
66
|
|
61
67
|
private
|