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.

Sign up for GitHub

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

Admin order shipments ui cleaning #2414

Merged
merged 4 commits into from
Dec 12, 2017
Merged

Admin order shipments ui cleaning #2414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fa77b3
Add a vertical-middle class for table rows
tvdeyen Sep 21, 2017
b5b6bff
Vertically middle align order shipping and tracking rows
tvdeyen Sep 21, 2017
41b31a7
Remove unnecessary shipments variant select stock css
tvdeyen Sep 21, 2017
a24dba1
Clean up html in autocomplete stock template
tvdeyen Sep 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions backend/app/assets/javascripts/spree/backend/templates/variants/autocomplete_stock.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<fieldset>
<fieldset class="no-border-bottom">
<legend align="center">{{ t "select_stock" }}</legend>
<table class="stock-levels" data-hook="stock-levels">
<colgroup>
Expand All @@ -15,7 +15,7 @@
</thead>
<tbody>
{{#each variant.stock_items}}
<tr>
<tr class="vertical-middle">
<td>{{this.stock_location_name}}</td>
{{#unless ../variant.track_inventory}}
<td>
Expand All @@ -40,8 +40,9 @@
<button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="{{ t "add" }}" data-action="add"></button>
</td>
{{else}}
<td>{{ t "out_of_stock" }}</td>
<td>{{ t "out_of_stock" }}</td>
<td>0</td>
<td></td>
{{/if}}
{{/unless}}
</tr>
Expand Down
20 changes: 0 additions & 20 deletions backend/app/assets/stylesheets/spree/backend/sections/_orders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,26 +45,6 @@
}
}

// Customize orduct add fieldset
#add-line-item {
fieldset {
padding: 10px 0;

.field {
margin-bottom: 0;

input[type="text"], input[type="number"] {
width: 100%;
}
}
.actions {
.button {
margin-top: 28px;
}
}
}
}

[data-hook="adjustments_new_coupon_code"] {
margin-bottom: 18px;
}
Expand Down
4 changes: 3 additions & 1 deletion backend/app/assets/stylesheets/spree/backend/shared/_tables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ table {
@extend .table;
border-spacing: 0;

&.sortable td {
&.sortable td,
tr.vertical-middle td,
tr.vertical-middle th {
vertical-align: middle;
}

Expand Down
4 changes: 2 additions & 2 deletions backend/app/views/spree/admin/orders/_shipment.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
<%= render 'spree/admin/orders/shipment_manifest', { shipment_number: shipment.number, shipment_manifest: manifest_items } %>

<% unless shipment.shipped? %>
<tr class="edit-shipping-method">
<tr class="edit-shipping-method vertical-middle">
</tr>
<% end %>

<tr class="edit-tracking">
<tr class="edit-tracking vertical-middle">
</tr>

<% if order.special_instructions.present? %>
Expand Down