solidus_backend 2.8.6 → 2.9.0.rc.1

data/app/assets/stylesheets/spree/backend/shared/_header.scss

@@ -2,8 +2,9 @@
   display: flex;
   align-items: center;
   padding: 15px $grid-gutter-width;
-  background-color: very-light($color-3, 4);
+  background-color: $color-header-bg;
   border-bottom: 1px solid $color-border;
+  border-top: 4px solid $color-primary;
   height: $main-header-height;
 
   @media print { display: none }
@@ -17,7 +18,7 @@
   -moz-osx-font-smoothing: grayscale;
 
   i {
-    color: $color-2;
+    color: $color-primary;
   }
 }
 

data/app/assets/stylesheets/spree/backend/shared/_icons.scss

@@ -14,6 +14,10 @@
   }
 }
 
+.btn.fa {
+  font: normal normal $btn-font-weight #{$font-size-base}/#{$btn-line-height} "FontAwesome";
+}
+
 .fa-email     { @extend .fa-envelope }
 .fa-resume    { @extend .fa-refresh  }
 .fa-approve   { @extend .fa-check    }
@@ -26,7 +30,7 @@
 
 .fa-trash     { @extend .fa-trash-o  }
 
-.fa-capture   { @extend .fa-check    }
+.fa-capture   { @extend .fa-thumbs-up }
 .fa-credit    { @extend .fa-check    }
 .fa-approve   { @extend .fa-check    }
 .fa-icon-cogs { @extend .fa-cogs     }

data/app/assets/stylesheets/spree/backend/shared/_layout.scss

@@ -8,6 +8,10 @@ body {
   padding-left: $width-sidebar;
 }
 
+.admin {
+  background-color: $admin-body-bg;
+}
+
 .admin-nav {
   position: absolute;
   top: 0;
@@ -18,6 +22,7 @@ body {
 }
 
 .content-wrapper {
+  background-color: $content-wrapper-bg;
   padding-top: 1rem;
   padding-left: $grid-gutter-width;
   padding-right: $grid-gutter-width;
@@ -29,10 +34,6 @@ body {
   }
 }
 
-.content-main {
-  overflow-x: hidden; // makes sure that the tabs are able to resize
-}
-
 #content {
   position: relative;
   padding: 0;

data/app/assets/stylesheets/spree/backend/shared/_tables.scss

@@ -47,12 +47,12 @@ table {
 
       button[class*='fa-'] {
         color: $link-color;
-        background-color: transparent;
+        background: transparent;
         border: 0 none;
         padding: 0 !important;
 
         &:hover {
-          background-color: transparent;
+          background: transparent;
         }
       }
 
@@ -61,7 +61,7 @@ table {
         padding-left: 0px;
 
         &:hover {
-          color: $color-3;
+          color: $color-dark-light;
         }
       }
 
@@ -108,7 +108,7 @@ table {
   }
 
   th a {
-    color: $color-4;
+    color: $color-dark;
   }
 
   tbody {
@@ -123,4 +123,9 @@ table {
       border-top: none;
     }
   }
+
+  pre {
+    font-size: 100%;
+    margin-bottom: 0;
+  }
 }

data/app/assets/stylesheets/spree/backend/shared/_typography.scss

@@ -7,7 +7,7 @@ html {
 
 body {
   padding: 0;
-  font-weight: 400;
+  font-weight: $font-weight-normal;
   text-rendering: optimizeLegibility;
 }
 
@@ -17,6 +17,11 @@ hr {
   border-left: none;
 }
 
+strong,
+b {
+  font-weight: $font-weight-bold;
+}
+
 // Headings
 //--------------------------------------------------------------
 
@@ -68,7 +73,6 @@ dl {
     width: 40%;
     font-weight: $font-weight-bold;
     padding-left: 0;
-    font-size: 85%;
     clear: left;
   }
 
@@ -93,10 +97,10 @@ dl {
 
 .uppercase     { text-transform: uppercase }
 
-.green  { color: $color-2 }
-.blue   { color: $color-3 }
-.red    { color: $color-5 }
-.yellow { color: $color-6 }
+.green  { color: $color-green }
+.blue   { color: $color-primary }
+.red    { color: $color-red }
+.yellow { color: $color-yellow }
 
 .negative { color: $red }
 input[type="number"].negative { color: $red } // needed to override blue style that is more specific than '.negative'

data/app/assets/stylesheets/spree/backend/spree_admin.scss

@@ -2,12 +2,14 @@
 @import 'spree/backend/globals/deprecation';
 @import 'spree/backend/globals/variables_override';
 @import 'spree/backend/globals/variables';
+@import 'spree/backend/globals/deprecated_variables';
 
 @import 'bootstrap_custom';
 @import 'solidus_admin/bootstrap/bootstrap';
 
 @import 'spree/backend/globals/mixins';
 
+@import 'spree/backend/shared/fonts';
 @import 'spree/backend/shared/typography';
 @import 'spree/backend/shared/images';
 @import 'spree/backend/shared/tables';
@@ -20,6 +22,7 @@
 @import 'spree/backend/components/states';
 @import 'spree/backend/components/actions';
 @import 'spree/backend/components/breadcrumb';
+@import 'spree/backend/components/buttons';
 @import 'spree/backend/components/number_with_currency';
 @import 'spree/backend/components/hint';
 @import 'spree/backend/components/image_placeholder';

data/app/controllers/spree/admin/customer_returns_controller.rb

@@ -10,6 +10,7 @@ module Spree
       before_action :load_form_data, only: [:new, :edit]
       before_action :build_return_items_from_params, only: [:create]
       create.fails  :load_form_data
+      create.after :order_process_return
 
       def edit
         @pending_return_items = @customer_return.return_items.select(&:pending?)
@@ -23,6 +24,10 @@ module Spree
 
       private
 
+      def order_process_return
+        @customer_return.process_return!
+      end
+
       def location_after_save
         url_for([:edit, :admin, @order, @customer_return])
       end
@@ -60,11 +65,13 @@ module Spree
 
       def build_return_items_from_params
         return_items_params = permitted_resource_params.delete(:return_items_attributes).values
-
         @customer_return.return_items = return_items_params.map do |item_params|
           next unless item_params.delete('returned') == '1'
           return_item = item_params[:id] ? Spree::ReturnItem.find(item_params[:id]) : Spree::ReturnItem.new
           return_item.assign_attributes(item_params)
+
+          return_item.skip_customer_return_processing = true
+
           if item_params[:reception_status_event].blank?
             return redirect_to(new_object_url, flash: { error: 'Reception status choice required' })
           end

data/app/controllers/spree/admin/log_entries_controller.rb

@@ -6,6 +6,9 @@ module Spree
       before_action :find_order_and_payment
 
       def index
+        Spree::Deprecation.warn 'Using a dedicated route for payment log entries ' \
+          'has been deprecated in favor of displaying the log entries on ' \
+          'the payment screen itself.', caller_locations(0)
         @log_entries = @payment.log_entries
       end
 

data/app/controllers/spree/admin/orders_controller.rb

@@ -14,7 +14,6 @@ module Spree
       respond_to :html
 
       def index
-        query_present = params[:q]
         params[:q] ||= {}
         params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
         @show_only_completed = params[:q][:completed_at_not_null] == '1'

data/app/controllers/spree/admin/users_controller.rb

@@ -71,24 +71,26 @@ module Spree
 
       def items
         params[:q] ||= {}
+
         @search = Spree::Order.includes(
           line_items: {
             variant: [:product, { option_values: :option_type }]
           }
 ).ransack(params[:q].merge(user_id_eq: @user.id))
+
         @orders = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
 
       def generate_api_key
         if @user.generate_spree_api_key!
-          flash[:success] = t('spree.api.key_generated')
+          flash[:success] = t('spree.admin.api.key_generated')
         end
         redirect_to edit_admin_user_path(@user)
       end
 
       def clear_api_key
         if @user.clear_spree_api_key!
-          flash[:success] = t('spree.api.key_cleared')
+          flash[:success] = t('spree.admin.api.key_cleared')
         end
         redirect_to edit_admin_user_path(@user)
       end

data/app/helpers/spree/admin/base_helper.rb

@@ -30,10 +30,16 @@ module Spree
         end
       end
 
-      def datepicker_field_value(date)
-        unless date.blank?
-          l(date, format: t('spree.date_picker.format', default: '%Y/%m/%d'))
+      def datepicker_field_value(date, with_time: false)
+        return if date.blank?
+
+        format = if with_time
+          t('spree.date_picker.format_with_time', default: '%Y/%m/%d %H:%M')
+        else
+          t('spree.date_picker.format', default: '%Y/%m/%d')
         end
+
+        l(date, format: format)
       end
 
       # @deprecated Render `spree/admin/shared/preference_fields/\#{preference_type}' instead

data/app/helpers/spree/admin/promotions_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    module PromotionsHelper
+      def admin_promotion_status(promotion)
+        return :active if promotion.active?
+        return :not_started if promotion.not_started?
+        return :expired if promotion.expired?
+
+        :inactive
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Image) %>
-    <li><%= link_to_with_icon('plus', t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'button') %></li>
+    <li><%= link_to_with_icon('plus', t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'btn btn-primary') %></li>
   <% end %>
 <% end %>
 

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

@@ -8,22 +8,4 @@
   <li><%= link_to t('spree.back_to_payment'), spree.admin_order_payment_url(@order, @payment), class: 'btn btn-primary' %></li>
 <% end %>
 
-<table class='index' id='listing_log_entries'>
-  <% @log_entries.each do |entry| %>
-      <thead>
-        <tr class="log_entry <%= entry.parsed_details.success? ? 'success' : 'fail' %>">
-          <td colspan='2'>
-            <h4><i class='fa fa-<%= entry.parsed_details.success? ? 'check' : 'remove' %>'></i> <%= pretty_time(entry.created_at) %></h4>
-          </td>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td><%= Spree::LogEntry.human_attribute_name(:details) %></td>
-          <td>
-            <pre><%= entry.parsed_details.message %></pre>
-          </td>
-        </tr>
-      </tbody>
-  <% end %>
-</table>
+<%= render 'spree/admin/payments/log_entries', log_entries: @log_entries %>

data/app/views/spree/admin/option_types/edit.html.erb

@@ -6,7 +6,7 @@
 <% content_for :page_actions do %>
   <li>
     <span id="new_add_option_value" data-hook>
-      <%= link_to_add_fields t('spree.add_option_value'), "tbody#option_values", class: 'button' %>
+      <%= link_to_add_fields t('spree.add_option_value'), "tbody#option_values", class: 'btn btn-primary' %>
     </span>
   </li>
   <% end %>

data/app/views/spree/admin/orders/_line_items_edit_form.html.erb

@@ -6,7 +6,7 @@
   <%= render partial: "spree/admin/orders/line_items", locals: { order: order } %>
 
   <% if can?(:update, @order) && can?(:create, Spree::LineItem) %>
-    <button class="js-add-line-item" disabled><%= t('spree.add_line_item') %></button>
+    <button class="js-add-line-item btn btn-primary" disabled><%= t('spree.add_line_item') %></button>
   <% end %>
 
   <%= render "spree/admin/orders/order_details", { order: order } %>

data/app/views/spree/admin/payments/_capture_events.html.erb

@@ -1,19 +1,16 @@
-<% if @payment.capture_events.exists? %>
-  <h3><%= plural_resource_name(Spree::PaymentCaptureEvent) %></h3>
-  <table class="index" id="capture_events">
-    <thead>
-      <tr data-hook="payments_header">
-        <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-        <th><%= t('spree.amount') %></th>
+<table class="index" id="capture_events">
+  <thead>
+    <tr data-hook="payments_header">
+      <th><%= Spree::PaymentCaptureEvent.human_attribute_name(:created_at) %></th>
+      <th class="text-right"><%= Spree::PaymentCaptureEvent.human_attribute_name(:amount) %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @payment.capture_events.each do |capture_event| %>
+      <tr id="<%= dom_id(capture_event) %>" data-hook="capture_events_row">
+        <td><%= pretty_time(capture_event.created_at) %></td>
+        <td class="text-right"><%= capture_event.display_amount %></td>
       </tr>
-    </thead>
-    <tbody>
-      <% @payment.capture_events.each do |capture_event| %>
-        <tr id="<%= dom_id(capture_event) %>" data-hook="capture_events_row">
-          <td><%= pretty_time(capture_event.created_at) %></td>
-          <td><%= capture_event.display_amount %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% end %>
+    <% end %>
+  </tbody>
+</table>

data/app/views/spree/admin/payments/_list.html.erb

@@ -48,7 +48,7 @@
         </td>
         <td class="actions">
           <div class="editing-show">
-            <%= link_to_with_icon 'save', t('spree.actions.save'), nil, no_text: true, class: "js-save", data: {action: 'save'} %>
+            <%= link_to_with_icon 'ok', t('spree.actions.save'), nil, no_text: true, class: "js-save", data: {action: 'save'} %>
             <%= link_to_with_icon 'cancel', t('spree.actions.cancel'), nil, no_text: true, class: "js-cancel", data: {action: 'cancel'} %>
           </div>
           <div class="editing-hide">

data/app/views/spree/admin/payments/_log_entries.html.erb

@@ -0,0 +1,29 @@
+<table class='index' id='listing_log_entries'>
+  <colgroup>
+    <col style="width: 30%" />
+    <col style="width: 60%" />
+    <col style="width: 10%" />
+  </colgroup>
+  <thead>
+    <tr>
+      <th><%= Spree::LogEntry.human_attribute_name(:created_at) %></th>
+      <th><%= Spree::LogEntry.human_attribute_name(:details) %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+  <% log_entries.each do |entry| %>
+    <tr class="log_entry <%= entry.parsed_details.success? ? 'success' : 'fail' %>">
+      <td>
+        <%= pretty_time(entry.created_at) %>
+      </td>
+      <td>
+        <pre><%= entry.parsed_details.message %></pre>
+      </td>
+      <td class="text-right">
+        <i class='fa fa-<%= entry.parsed_details.success? ? 'check' : 'remove' %>'></i>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>

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

@@ -8,15 +8,22 @@
   </span>
 <% end %>
 
-
-<% content_for :page_actions do %>
-  <li><%= link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment), class: 'btn btn-primary' %></li>
-<% end %>
-
 <%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.partial_name}", locals: { payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
 
 <div data-hook="amount" class="align-center">
   <h5><%= label_tag nil, Spree::Payment.human_attribute_name(:amount) %>: <span class="green"><%= @payment.display_amount.to_html %></span> </h5>
 </div>
 
-<%= render 'spree/admin/payments/capture_events' %>
+<% if @payment.capture_events.any? %>
+  <fieldset class="no-border-bottom">
+    <legend><%= plural_resource_name(Spree::PaymentCaptureEvent) %></legend>
+    <%= render 'spree/admin/payments/capture_events' %>
+  </fieldset>
+<% end %>
+
+<% if @payment.log_entries.any? %>
+  <fieldset class="no-border-bottom">
+    <legend><%= plural_resource_name(Spree::LogEntry) %></legend>
+    <%= render 'spree/admin/payments/log_entries', log_entries: @payment.log_entries %>
+  </fieldset>
+<% end %>