Skip to content

Commit

Permalink
Merge pull request #3490 from nebulab/kennyadsl/adjust-send-mail-label
Browse files Browse the repository at this point in the history
[Admin] Change shipment email checkbox label
  • Loading branch information
kennyadsl authored Jan 29, 2020
2 parents c9a2b9e + 19b739b commit b90365d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion backend/spec/features/admin/orders/shipments_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def ship_shipment
end

it "doesn't send a shipping confirmation email when ask to suppress the mailer" do
uncheck 'Send Mailer'
uncheck 'Send Shipment Email'

expect {
perform_enqueued_jobs {
Expand Down
2 changes: 1 addition & 1 deletion core/config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1958,7 +1958,7 @@ en:
select_a_stock_location: Select a stock location
selected_quantity_not_available: selected of %{item} is not available.
send_copy_of_all_mails_to: Send Copy of All Mails To
send_mailer: Send Mailer
send_mailer: Send Shipment Email
send_mails_as: Send Mails As
server: Server
server_error: The server returned an error
Expand Down

0 comments on commit b90365d

Please sign in to comment.