Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tracking Number link to Tracking URL page #2829

Merged
merged 1 commit into from
Sep 4, 2018
Merged

Tracking Number link to Tracking URL page #2829

merged 1 commit into from
Sep 4, 2018

Conversation

JuanCrg90
Copy link
Contributor

This change allows showing the tracking URL in the admin panel instead of only the tracking number.

@@ -50,7 +50,12 @@
<tr class="show-tracking total">
<td colspan="5">
<% if carton.tracking.present? %>
<strong><%= Spree::Carton.human_attribute_name(:tracking) %>:</strong> <%= carton.tracking %>
<strong><%= Spree::Carton.human_attribute_name(:tracking) %>:</strong>
<% if carton.tracking_url.nil? %>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd probably just write this as

<% if carton.tracking_url %>
  <%= link_to carton.tracking, carton.tracking_url, target: "_blank" %>
<% else %>
  <%= carton.tracking %>
<% end %>

but either way this seems fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated, Thank you 😄

@JuanCrg90 JuanCrg90 changed the base branch from master to v2.4 August 15, 2018 21:54
@JuanCrg90 JuanCrg90 changed the base branch from v2.4 to master August 15, 2018 21:54
Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Build errors unrelated

Copy link
Member

@gmacdougall gmacdougall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

LGTM! Thanks for this, I'm rebasing on to master to get the build green.

@JuanCrg90
Copy link
Contributor Author

😄 Thanks

@tvdeyen tvdeyen merged commit 24ae668 into solidusio:master Sep 4, 2018
@JuanCrg90 JuanCrg90 deleted the show-tracking-url-admin branch September 4, 2018 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants