solidus_backend 2.3.1 → 2.4.0.beta1

data/app/views/spree/admin/shared/_order_summary.html.erb

@@ -1,7 +1,11 @@
 <header id="order_tab_summary" data-hook>
   <dl class="additional-info">
     <dt class="order-state" id="order_status" data-hook><%= Spree.t(:status) %>:</dt>
-    <dd class="order-state"><span class="state <%= @order.state %>"><%= Spree.t(@order.state, scope: :order_state) %></span></dd>
+    <dd class="order-state">
+      <span class="pill pill-<%= @order.state %>">
+        <%= Spree.t(@order.state, scope: :order_state) %>
+      </span>
+    </dd>
 
     <% if @order.user.present? %>
       <dt data-hook='admin_order_user_link'><%= Spree.t(:user) %>:</dt>
@@ -25,11 +29,23 @@
     <dt data-hook='admin_order_tab_total_title'><%= Spree::Order.human_attribute_name(:total) %>:</dt>
     <dd id='order_total'><%= @order.display_total.to_html %></dd>
 
-    <dt class="order-shipment_state <%= "hidden" unless @order.completed? %>"><%= Spree::Shipment.model_name.human %>: </dt>
-    <dd class="order-shipment_state <%= "hidden" unless @order.completed? %>" id='shipment_status'><span class="state <%= @order.shipment_state %>"><%= Spree.t(@order.shipment_state, scope: :shipment_states, default: [:missing, "none"]) %></span></dd>
+    <% if @order.shipment_state %>
+      <dt class="order-shipment_state"><%= Spree::Shipment.model_name.human %>: </dt>
+      <dd class="order-shipment_state" id='shipment_status'>
+        <span class="pill pill-<%= @order.shipment_state %>">
+          <%= Spree.t(@order.shipment_state, scope: :shipment_states) %>
+        </span>
+      </dd>
+    <% end %>
 
-    <dt class="order-payment_state <%= "hidden" unless @order.completed? %>"><%= Spree::Payment.model_name.human %>: </dt>
-    <dd class="order-payment_state <%= "hidden" unless @order.completed? %>" id='payment_status'><span class="state <%= @order.payment_state %>"><%= Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %></span></dd>
+    <% if @order.payment_state %>
+      <dt class="order-payment_state"><%= Spree::Payment.model_name.human %>: </dt>
+      <dd class="order-payment_state" id='payment_status'>
+        <span class="pill pill-<%= @order.payment_state %>">
+          <%= Spree.t(@order.payment_state, scope: :payment_states) %>
+        </span>
+      </dd>
+    <% end %>
 
     <% if @order.completed? %>
       <dt data-hook='admin_order_tab_date_completed_title'><%= Spree::Order.human_attribute_name(:completed_at) %>:</dt>

data/app/views/spree/admin/shared/_refunds.html.erb

@@ -14,13 +14,13 @@
   </thead>
   <tbody>
     <% refunds.each do |refund| %>
-      <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">
+      <tr id="<%= dom_id(refund) %>" data-hook="refunds_row">
         <td><%= pretty_time(refund.created_at) %></td>
-        <td class="align-center"><%= refund.payment.identifier %></td>
-        <td class="align-center amount"><%= refund.display_amount %></td>
-        <td class="align-center"><%= payment_method_name(refund.payment) %></td>
-        <td class="align-center"><%= refund.transaction_id %></td>
-        <td class="align-center"><%= truncate(refund.reason.name, length: 100) %></td>
+        <td><%= refund.payment.number %></td>
+        <td class="amount"><%= refund.display_amount %></td>
+        <td><%= payment_method_name(refund.payment) %></td>
+        <td><%= refund.transaction_id %></td>
+        <td><%= truncate(refund.reason.name, length: 100) %></td>
         <% if show_actions %>
           <td class="actions">
             <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true %>

data/app/views/spree/admin/shared/_settings_sub_menu.html.erb

@@ -7,10 +7,6 @@
     <%= tab :payments, url: spree.admin_payment_methods_path %>
   <% end %>
 
-  <% if can?(:display, Spree::Zone) || can?(:display, Spree::Country) || can?(:display, Spree::State) %>
-    <%= tab :areas, url: spree.admin_zones_path %>
-  <% end %>
-
   <% if can?(:display, Spree::TaxCategory) || can?(:display, Spree::TaxRate) %>
     <%= tab :taxes, url: spree.admin_tax_categories_path %>
   <% end %>
@@ -23,4 +19,8 @@
   <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>
     <%= tab :shipping, url: spree.admin_shipping_methods_path, match_path: %r(shipping_methods|shipping_categories|stock_locations) %>
   <% end %>
+
+  <% if can?(:display, Spree::Zone) %>
+    <%= tab :zones, url: spree.admin_zones_path %>
+  <% end %>
 </ul>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -25,18 +25,20 @@
     <thead>
       <tr data-hook="named_types_header">
         <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:active) %></th>
+        <th><%= Spree.t(:state) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
     <tbody>
       <% @collection.each do |named_type| %>
-        <tr id="<%= spree_dom_id named_type %>" data-hook="named_type_row" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center">
+        <tr id="<%= spree_dom_id named_type %>" data-hook="named_type_row">
+          <td>
             <%= named_type.name %>
           </td>
-          <td class="align-center">
-            <%= Spree.t(named_type.active? ? :say_yes : :say_no) %>
+          <td>
+            <span class="pill pill-<%= named_type.active? ? 'active' : 'inactive' %>">
+              <%= Spree.t(named_type.active? ? :active : :inactive) %>
+            </span>
           </td>
           <td class="actions">
             <% if named_type.mutable? && can?(:update, named_type) %>

data/app/views/spree/admin/shared/preference_fields/_boolean.html.erb

@@ -0,0 +1,13 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = local_assigns[:html_options] || {} %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.check_box attribute, html_options %>
+    <%= form.label attribute, label %>
+  <% else %>
+    <%= hidden_field_tag name, 0 %>
+    <%= check_box_tag name, 1, value, html_options %>
+    <%= label_tag name, label %>
+  <% end %>
+</div>

data/app/views/spree/admin/shared/preference_fields/_decimal.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_decimal fullwidth'}.update(local_assigns[:html_options] || {}) %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_field_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/spree/admin/shared/preference_fields/_integer.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_integer fullwidth'}.update(local_assigns[:html_options] || {}) %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.number_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= number_field_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/spree/admin/shared/preference_fields/_password.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'password_string fullwidth'}.update(local_assigns[:html_options] || {}) %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.password_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= password_field_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/spree/admin/shared/preference_fields/_string.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_string fullwidth'}.update(local_assigns[:html_options] || {}) %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_field_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/spree/admin/shared/preference_fields/_text.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {cols: 85, rows: 15}.update(local_assigns[:html_options] || {}) %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_area attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_area_tag name, value, html_options %>
+  <% end %>
+</div>

data/app/views/spree/admin/shipping_categories/index.html.erb

@@ -27,8 +27,8 @@
   </thead>
   <tbody>
     <% @shipping_categories.each do |shipping_category|%>
-    <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row" class="<%= cycle('odd', 'even')%>">
-      <td class="align-center" style="width:350px;"><%= shipping_category.name %></td>
+    <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
+      <td><%= shipping_category.name %></td>
       <td class="actions">
         <% if can?(:udpate, shipping_category) %>
           <%= link_to_edit shipping_category, no_text: true %>

data/app/views/spree/admin/shipping_methods/index.html.erb

@@ -33,11 +33,11 @@
     </thead>
     <tbody>
       <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
-        <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center"><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
-          <td class="align-center"><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
-          <td class="align-center"><%= shipping_method.calculator.description %></td>
-          <td class="align-center"><%= shipping_method.available_to_users? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+        <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
+          <td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
+          <td><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
+          <td><%= shipping_method.calculator.description %></td>
+          <td><%= shipping_method.available_to_users? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions">
             <% if can?(:update, shipping_method) %>
               <%= link_to_edit shipping_method, no_text: true %>

data/app/views/spree/admin/stock_items/_stock_management.html.erb

@@ -25,7 +25,7 @@
     <%- row_count = @stock_item_stock_locations.count + 2 %>
     <tbody class="variant-stock-items">
       <tr id="<%= spree_dom_id variant %>">
-        <td class="align-center no-padding" rowspan="<%= row_count %>">
+        <td class="no-padding" rowspan="<%= row_count %>">
           <div class='variant-container'>
             <div class='variant-image'>
               <%= render 'spree/admin/shared/image', image: variant.display_image(fallback: false), size: :small %>
@@ -46,7 +46,7 @@
             </div>
           </div>
         </td>
-        <td class="align-center" rowspan="<%= row_count %>">
+        <td rowspan="<%= row_count %>">
           <table class='stock-variant-field-table'>
             <% variant.option_values.sort_by(&:option_type_name).each do |option_value| %>
               <tr>
@@ -78,7 +78,7 @@
             <%= number_field_tag :count_on_hand, "", class: 'fullwidth', id: "variant-count-on-hand-#{variant.id}" %>
           </td>
           <td class="actions">
-            <%= link_to_with_icon 'plus', Spree.t('actions.create'), '#', no_text: true, data: {action: 'green' }, class: "submit" %>
+            <%= link_to_with_icon 'plus', Spree.t('actions.create'), '#', no_text: true, data: { action: 'add' }, class: "submit" %>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/stock_locations/index.html.erb

@@ -32,7 +32,7 @@
     </colgroup>
     <thead>
       <tr data-hook="stock_locations_header">
-        <th class="no-border"></th>
+        <th></th>
         <th><%= Spree::StockLocation.human_attribute_name(:name) %></th>
         <th><%= Spree::StockLocation.human_attribute_name(:state_id) %></th>
         <th><%= plural_resource_name(Spree::StockMovement) %></th>
@@ -44,21 +44,19 @@
            @edit_url = edit_admin_stock_location_path(stock_location)
            @delete_url = admin_stock_location_path(stock_location)
       %>
-        <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row" class="<%= cycle('odd', 'even')%>">
-          <td class="no-border">
+        <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row">
+          <td>
             <% if can?(:update_positions, Spree::StockLocation) %>
               <span class="handle"></span>
             <% end %>
           </td>
-          <td class="align-center"><%= admin_stock_location_display_name(stock_location) %></td>
-          <td class="align-center">
-            <% if stock_location.active? %>
-              <span class="state active"><%= Spree.t('active') %></span>
-            <% else %>
-              <span class="state inactive"><%= Spree.t('inactive') %></span>
-            <% end %>
+          <td><%= admin_stock_location_display_name(stock_location) %></td>
+          <td>
+            <span class="pill pill-<%= stock_location.active? ? 'active' : 'inactive' %>">
+              <%= Spree.t(stock_location.active? ? :active : :inactive) %>
+            </span>
           </td>
-          <td class="align-center">
+          <td>
             <% if can?(:display, Spree::StockMovement) %>
               <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(stock_location.id) %>
             <% else %>

data/app/views/spree/admin/stock_movements/index.html.erb

@@ -27,12 +27,12 @@
   </thead>
   <tbody>
     <% @stock_movements.each do |stock_movement|%>
-      <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center">
+      <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows">
+        <td>
           <%= display_variant(stock_movement) %>
         </td>
-        <td class="align-center"><%= stock_movement.quantity %></td>
-        <td class="align-center"><%= pretty_originator(stock_movement) %></td>
+        <td><%= stock_movement.quantity %></td>
+        <td><%= pretty_originator(stock_movement) %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/spree/admin/stock_transfers/_transfer_item_actions.html.erb

@@ -5,5 +5,5 @@
     <%= link_to_with_icon 'trash', Spree.t('actions.delete'), '#', no_text: true, data: { action: 'remove', id: item.id } if quantity_type == 'expected' && can?(:destroy, item) %>
   </td>
 <% else %>
-  <td class='align-center'><%= item.send("#{quantity_type}_quantity") %></td>
+  <td><%= item.send("#{quantity_type}_quantity") %></td>
 <% end %>

data/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb

@@ -19,7 +19,7 @@
       <% transfer_items.each do |item| %>
         <%- variant = item.variant %>
         <tr data-transfer-item-id="<%= item.id %>" class='<%= "deleted" if variant.deleted? %>'>
-          <td class="align-center no-padding">
+          <td class="no-padding">
             <div class='variant-container' data-variant-id="<%= variant.id %>">
               <div class='variant-image'>
                 <%= render 'spree/admin/shared/image', image: variant.display_image(fallback: false), size: :small %>
@@ -49,7 +49,7 @@
               </div>
             </div>
           </td>
-          <td class="align-center">
+          <td>
             <table class='stock-variant-field-table'>
               <% variant.option_values.sort_by(&:option_type_name).each do |option_value| %>
                 <tr>

data/app/views/spree/admin/stock_transfers/index.html.erb

@@ -87,21 +87,25 @@
     </thead>
     <tbody>
       <% @stock_transfers.each do |stock_transfer| %>
-        <tr id="<%= spree_dom_id stock_transfer %>" class="<%= cycle('odd', 'even') %>">
+        <tr id="<%= spree_dom_id stock_transfer %>">
           <td><%= handle_stock_transfer(stock_transfer) %></td>
           <td><%= stock_transfer.source_location.name %></td>
           <td><%= stock_transfer.destination_location.try(:name) %></td>
-          <td class="align-center"><%= stock_transfer.expected_item_count %></td>
-          <td class="align-center"><%= stock_transfer.received_item_count %></td>
+          <td><%= stock_transfer.expected_item_count %></td>
+          <td><%= stock_transfer.received_item_count %></td>
           <td><%= stock_transfer.shipped_at.try(:to_date) %></td>
-          <td><%= stock_transfer_status(stock_transfer) %></td>
+          <td>
+            <span class="pill pill-<%= stock_transfer.closed? ? 'complete' : 'pending' %>">
+              <%= Spree.t(stock_transfer.closed? ? :closed : :open) %>
+            </span>
+          </td>
           <td class="actions">
             <% if stock_transfer.receivable? && can?(:edit, stock_transfer) %>
-              <%= link_to_with_icon 'download', Spree.t('actions.receive'), receive_admin_stock_transfer_path(stock_transfer), no_text: true, data: { action: 'green' } %>
+              <%= link_to_with_icon 'download', Spree.t('actions.receive'), receive_admin_stock_transfer_path(stock_transfer), no_text: true, data: { action: 'receive' } %>
             <% elsif !stock_transfer.closed? && can?(:edit, stock_transfer) %>
               <%= link_to_with_icon 'edit', Spree.t('actions.edit'), stock_transfer_edit_or_ship_path(stock_transfer), no_text: true, data: { action: 'edit' } %>
             <% elsif can?(:show, stock_transfer) %>
-              <%= link_to_with_icon 'eye', Spree.t(:show), admin_stock_transfer_path(stock_transfer), no_text: true, data: { action: 'green' } %>
+              <%= link_to_with_icon 'eye', Spree.t(:show), admin_stock_transfer_path(stock_transfer), no_text: true, data: { action: 'show' } %>
             <% end %>
           </td>
         </tr>

data/app/views/spree/admin/stock_transfers/tracking_info.html.erb

@@ -25,7 +25,7 @@
 <fieldset>
   <legend align='center'><%= Spree.t(:tracking_info) %></legend>
     <%= form_for [:admin, @stock_transfer] do |f| %>
-    <div class='field-block alpha'>
+    <div class='field-block'>
       <div class='field'>
         <%= f.label :tracking_number %>
         <%= f.text_field :tracking_number, value: @stock_transfer.tracking_number, maxlength: 255, size: 0, class: 'fullwidth' %>

data/app/views/spree/admin/store_credits/index.html.erb

@@ -12,56 +12,60 @@
 <% end %>
 
 <% if @store_credits.any? %>
-<fieldset id='sc-current-balance'>
-  <legend>
-    <%= Spree.t("admin.store_credits.current_balance") %>
-    <%= @user.display_total_available_store_credit %>
-  </legend>
+  <% @store_credits.group_by(&:currency).each do |currency, credits| %>
+    <fieldset class="sc-current-balance">
+      <legend>
+        <%= currency %> <%= Spree.t("admin.store_credits.current_balance") %>
+        <% total = credits.sum(&:amount_remaining) %>
+        <%= Spree::Money.new(total, currency: currency) %>
+      </legend>
 
-  <table id="sc-table">
-    <thead>
-      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_credited) %></th>
-      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_used) %></th>
-      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_authorized) %></th>
-      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:category_id) %></th>
-      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %></th>
-      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:created_at) %></th>
-      <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:invalidated_at) %></th>
-      <th data-hook="admin_store_credits_index_header_actions" class="actions"></th>
-    <thead>
-    <tbody>
-      <% @store_credits.each do |store_credit| %>
-        <tr>
-          <td class='align-center'>
-            <span><%= store_credit.display_amount.to_html %></span>
-          </td>
-          <td class='align-center'>
-            <span><%= store_credit.display_amount_used.to_html %></span>
-          </td>
-          <td class='align-center'>
-            <span><%= store_credit.display_amount_authorized.to_html %></span>
-          </td>
-          <td class='align-center'>
-            <span><%= store_credit.category_name %></span>
-          </td>
-          <td>
-            <span><%= store_credit.created_by_email %></span>
-          </td>
-          <td class='align-center'>
-            <span><%= l store_credit.created_at.to_date %></span>
-          </td>
-          <td class='align-center'>
-            <span><%= store_credit.invalidated? %></span>
-          </td>
-          <td class="actions" data-hook="admin_store_credits_index_row_actions">
-            <% if can?(:show, store_credit) %>
-              <%= link_to_edit_url admin_user_store_credit_path(@user, store_credit), { no_text: true, class: 'edit' } %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+      <table class="sc-table">
+        <thead>
+          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_credited) %></th>
+          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_used) %></th>
+          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:amount_authorized) %></th>
+          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:category_id) %></th>
+          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:created_by_id) %></th>
+          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:created_at) %></th>
+          <th class="wrap-text"><%= Spree::StoreCredit.human_attribute_name(:invalidated_at) %></th>
+          <th data-hook="admin_store_credits_index_header_actions" class="actions"></th>
+        <thead>
+        <tbody>
+          <% credits.each do |store_credit| %>
+            <tr>
+              <td>
+                <span><%= store_credit.display_amount.to_html %></span>
+              </td>
+              <td>
+                <span><%= store_credit.display_amount_used.to_html %></span>
+              </td>
+              <td>
+                <span><%= store_credit.display_amount_authorized.to_html %></span>
+              </td>
+              <td>
+                <span><%= store_credit.category_name %></span>
+              </td>
+              <td>
+                <span><%= store_credit.created_by_email %></span>
+              </td>
+              <td>
+                <span><%= l store_credit.created_at.to_date %></span>
+              </td>
+              <td>
+                <span><%= store_credit.invalidated? %></span>
+              </td>
+              <td class="actions" data-hook="admin_store_credits_index_row_actions">
+                <% if can?(:show, store_credit) %>
+                  <%= link_to_edit_url admin_user_store_credit_path(@user, store_credit), { no_text: true, class: 'edit' } %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </fieldset>
+  <% end %>
 <% else %>
   <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
@@ -69,4 +73,3 @@
                  new_resource_url: new_object_url %>
   </div>
 <% end %>
-</fieldset>

data/app/views/spree/admin/store_credits/show.html.erb

@@ -49,7 +49,7 @@
     <td class='js-memo-text'>
       <%= @store_credit.memo %>
     </td>
-    <td class='actions align-center'>
+    <td class='actions'>
       <% if can?(:update, @store_credit) %>
         <%= link_to '', '#', class: 'js-edit-memo edit-method fa fa-edit no-text with-tip', data: { action: 'edit' }, title: Spree.t('actions.edit') %>
       <% end %>
@@ -64,10 +64,10 @@
         <%= text_area_tag 'store_credit[memo]', @store_credit.memo  %>
       <% end %>
     </td>
-    <td class='actions align-center'>
+    <td class='actions'>
       <% if can?(:update, @store_credit) %>
         <%= link_to '', '#', class: 'js-save-memo fa fa-check no-text with-tip', data: { user_id: @user.id, store_credit_id: @store_credit.id, action: 'save' }, title: Spree.t('actions.save') %>
-        <%= link_to '', '#', class: 'js-cancel-memo fa fa-void no-text with-tip', data: { action: 'void' }, title: Spree.t('actions.cancel') %>
+        <%= link_to '', '#', class: 'js-cancel-memo fa fa-cancel no-text with-tip', data: { action: 'cancel' }, title: Spree.t('actions.cancel') %>
       <% end %>
     </td>
   </tr>
@@ -101,9 +101,9 @@
             <%= pretty_time(event.created_at) %>
           </td>
           <td><%= store_credit_event_admin_action_name(event) %></td>
-          <td class='align-right'><%= event.display_amount %></td>
+          <td><%= event.display_amount %></td>
           <td><%= store_credit_event_originator_link(event) %></td>
-          <td class='align-right'><%= event.display_user_total_amount %></td>
+          <td><%= event.display_user_total_amount %></td>
           <td><%= event.update_reason.try!(:name) %></td>
         </tr>
       <% end %>

data/app/views/spree/admin/stores/_form.html.erb

@@ -40,6 +40,15 @@
   <%= f.error_message_on :mail_from_address %>
 <% end %>
 
+<%= f.field_container :default_currency do %>
+  <%= f.label :default_currency %>
+  <%= f.select :default_currency,
+    ::Money::Currency.all.map(&:iso_code),
+    { include_blank: true },
+    { class: 'select2 fullwidth' } %>
+  <%= f.error_message_on :default_currency %>
+<% end %>
+
 <%= f.field_container :cart_tax_country_iso do %>
   <%= f.label :cart_tax_country_iso %>
   <%= f.field_hint :cart_tax_country_iso %>

data/app/views/spree/admin/style_guide/topics/components/_modals.html.erb

@@ -0,0 +1,50 @@
+<p>
+  Bootstrap modals are ready to use by rendering the shared partial and creating
+  a trigger.
+</p>
+
+<p>The partial requires three locals:</p>
+
+<ul>
+  <li>
+    <code>target</code>: this should match the <code>data-target</code> in your
+    trigger
+  </li>
+  <li>
+    <code>title</code>: this will appear in the modal's header
+  </li>
+  <li>
+    <code>content</code>: this will appear in the modal's body. This content can
+    be whatever you like – even another partial.
+  </li>
+</ul>
+
+<%- snippet = capture do %>
+  <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#your-target">
+    Launch demo modal
+  </button>
+
+  &lt;%= render(
+    "spree/admin/shared/modal",
+    target: "your-target",
+    title: "Your Title",
+    content: "The modal's content, could be another partial"
+  ) %&gt;
+<%- end %>
+
+<div class="style-guide-code half">
+  <pre><code class="language-html"><%= escape_once snippet %></code></pre>
+</div>
+
+<div class="style-guide-result half">
+  <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#your-target">
+    Demo Modal
+  </button>
+
+  <%= render(
+    "spree/admin/shared/modal",
+    target: "your-target",
+    title: "Your Title",
+    content: "The modal's content, could be another partial"
+  ) %>
+</div>