solidus_backend 3.1.5 → 3.2.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b088e16cfee1de5d36ce4f17da058e9f25be203a93c75cda6e7397694b118c
-  data.tar.gz: b4fad25b4fd46ce59a610ace192cedc106ba156cb079199f352e2c7bc5f7e0ad
+  metadata.gz: 7f40b6a70c46a2ad49195d9bfd9642172fea9ec7375b9253adab0f9eaf2bb3c0
+  data.tar.gz: 90b8118323724ba9953ca65dbf44139349a6dafdb59c4e9d7823a8fdff47ef92
 SHA512:
-  metadata.gz: 687f8770cb2e5498a34779685f4c701213572ea613e4410b914aec80f1d5f4c6a69037d1315c8676e165201e85379e8f42eb6837ef63f533888bc7807c4510d0
-  data.tar.gz: 87f18a8756ee2e06993499ea781f38c0d1fce8b75ea3e1b9f1e423edddbece8e44dbd07c5e420d460708c28c83ed48f57309d81b445d88eed533b521c4cecc08
+  metadata.gz: 2145cf1b419208c84b5a671b67eecde34b56c3cc9efdcd40d43271489855368dcf35268c64fe2d1c08e7977aa81b4eb6472c37eb184d86197b760a3b08a9be6a
+  data.tar.gz: c5e1b38dc22dc6a654dd8e05f3445e8c725ea7d6df2b27544f16dc95a25307e646f8d282e7139c925b83f07d72fc1b2d65c0f8050789e80230f3e91fe4db4ef6

data/README.md

@@ -8,12 +8,7 @@ Backend contains the controllers, views, and assets making up the admin interfac
 
 Can be found in [app/assets/javascripts/spree/backend/](./app/assets/javascripts/spree/backend/)
 
-Our scripts are written in a mix of CoffeeScript and JavaScript (ES5). We can't
-easily use a transpiler for ECMAScript >= 6 without adding additional steps for
-applications using solidus\_admin.
-
-Though we have existing CoffeeScript files, any new files should be in
-JavaScript (ES5).
+Any new files should be in JavaScript (ES5).
 
 ### Stylesheets
 

data/app/assets/javascripts/spree/backend/components/sortable_table.js

@@ -1,6 +1,14 @@
 //= require solidus_admin/Sortable
 /* eslint no-unused-vars: "off" */
 
+/* Check if string is valid UUID */
+function isAValidUUID(str) {
+  // https://stackoverflow.com/a/13653180/8170555
+  const regexExp = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+
+  return regexExp.test(str);
+}
+
 Spree.SortableTable = {
   refresh: function() {
     var sortable_tables = document.querySelectorAll('table.sortable');
@@ -16,7 +24,7 @@ Spree.SortableTable = {
             var idAttr = el.id;
             if (idAttr) {
               var objId = idAttr.split('_').slice(-1);
-              if (!isNaN(objId)) {
+              if (!isNaN(objId) || isAValidUUID(objId)) {
                 positions['positions['+objId+']'] = index + 1;
               }
             }

data/app/assets/javascripts/spree/backend/namespaces.js

@@ -8,6 +8,7 @@ _.extend(window.Spree, {
     Cart: {},
     Zones: {},
     Payment: {},
+    Product: {},
     Promotions: {},
     Stock: {},
     Tables: {}

data/app/assets/javascripts/spree/backend/products/index.js

@@ -0,0 +1,7 @@
+Spree.ready(function() {
+  if ($('[data-hook="admin_products_index_search"]').length) {
+    new Spree.Views.Product.Search({
+      el: $('[data-hook="admin_products_index_search"]')
+    })
+  }
+});

data/app/assets/javascripts/spree/backend/shipments.js

@@ -180,7 +180,7 @@ var ShipmentItemView = Backbone.View.extend({
     Spree.ajax({
       type: "GET",
       url: Spree.pathFor('api/variants/' + this.variant_id),
-    }).success(function(variant){
+    }).done(function(variant){
       var split = new ShipmentSplitItemView({
         shipmentItemView: _this,
         shipment_number: _this.shipment_number,

data/app/assets/javascripts/spree/backend/variant_autocomplete.js

@@ -31,9 +31,7 @@
         },
         data: function(term, page) {
           var searchData = {
-            q: {
-              product_name_or_sku_cont: term
-            },
+            variant_search_term: term,
             token: Spree.api_key
           };
           return _.extend(searchData, searchOptions);

data/app/assets/javascripts/spree/backend/views/index.js

@@ -21,6 +21,7 @@
 //= require 'spree/backend/views/payment/new'
 //= require 'spree/backend/views/payment/payment_row'
 //= require 'spree/backend/views/payment/edit_credit_card'
+//= require 'spree/backend/views/product/search'
 //= require 'spree/backend/views/promotions/option_values_rule'
 //= require 'spree/backend/views/tables/editable_table'
 //= require 'spree/backend/views/tables/editable_table_row'

data/app/assets/javascripts/spree/backend/views/product/search.js

@@ -0,0 +1,44 @@
+Spree.Views.Product.Search = Backbone.View.extend({
+  initialize: function() {
+    this.render();
+  },
+
+  events: {
+    "change .js-with-discarded-input": "onChange"
+  },
+
+  onChange: function(e) {
+    const withDiscarded = $(e.target).is(":checked");
+
+    var keptInput = this.$el.find(".js-kept-variant-sku-input input");
+    var allInput = this.$el.find(".js-all-variant-sku-input input");
+
+    if (withDiscarded) {
+      allInput.val(keptInput.val());
+      keptInput.val("");
+    } else {
+      keptInput.val(allInput.val());
+      allInput.val("");
+    }
+
+    allInput.prop("disabled", !withDiscarded)
+    keptInput.prop("disabled", withDiscarded)
+
+    this.render();
+  },
+
+  render: function() {
+    var withDiscarded = this.$el.find(".js-with-discarded-input").is(":checked");
+
+    var keptContainer = this.$el.find(".js-kept-variant-sku-input");
+    var allContainer = this.$el.find(".js-all-variant-sku-input");
+
+    if (withDiscarded) {
+      keptContainer.hide();
+      allContainer.show();
+    } else {
+      keptContainer.show();
+      allContainer.hide();
+    }
+  },
+});

data/app/assets/javascripts/spree/backend.js

@@ -47,6 +47,7 @@
 //= require spree/backend/orders
 //= require spree/backend/payments/edit
 //= require spree/backend/payments/new
+//= require spree/backend/products/index
 //= require spree/backend/product_picker
 //= require spree/backend/progress
 //= require spree/backend/promotions

data/app/assets/stylesheets/spree/backend/components/_number_with_currency.scss

@@ -1,5 +1,6 @@
 .number-with-currency {
   $currency-width: 5.5rem;
+  flex-wrap: nowrap;
 
   &-symbol {
     min-width: 2.5em;

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

@@ -147,16 +147,17 @@ span.info {
     }
   }
 
-  &.withError {
-    .field_with_errors {
-      label {
-        color: theme-color("danger");
-      }
+  .field_with_errors {
+    label {
+      color: theme-color("danger");
+    }
 
-      input {
-        border-color: theme-color("danger");
-      }
+    input {
+      border-color: theme-color("danger");
     }
+  }
+
+  &.withError {
     .formError {
       color: lighten(theme-color("danger"), 15);
       font-style: italic;

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

@@ -57,38 +57,6 @@ ul.text_list {
   padding-left: 0;
 }
 
-dl {
-  width: 100%;
-  overflow: hidden;
-  margin: 5px 0;
-  color: lighten($body-color, 15);
-
-  dt, dd {
-    float: left;
-    line-height: 16px;
-    padding: 5px;
-  }
-
-  dt {
-    width: 40%;
-    font-weight: $font-weight-bold;
-    padding-left: 0;
-    clear: left;
-  }
-
-  dd {
-    width: 60%;
-    padding-right: 0;
-    margin-left: 0;
-  }
-}
-
-.dl-collapse {
-  dt, dd {
-    width: auto;
-  }
-}
-
 // Helpers
 .align-center  { text-align: center  }
 .align-right   { text-align: right   }

data/app/concerns/spree/admin/sets_user_language_locale_key.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    module SetsUserLanguageLocaleKey
+      def set_user_language_locale_key
+        :admin_locale
+      end
+    end
+  end
+end

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

@@ -12,9 +12,7 @@ module Spree
 
       # Overrides ControllerHelpers::Common
       # We want the admin's locale selection to be different than that on the frontend
-      def set_user_language_locale_key
-        :admin_locale
-      end
+      include SetsUserLanguageLocaleKey
 
       def action
         params[:action].to_sym
@@ -33,7 +31,7 @@ module Spree
       # Need to generate an API key for a user due to some backend actions
       # requiring authentication to the Spree API
       def generate_admin_api_key
-        if (user = try_spree_current_user) && user.spree_api_key.blank?
+        if (user = spree_current_user) && user.spree_api_key.blank?
           user.generate_spree_api_key!
         end
       end

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

@@ -30,7 +30,7 @@ module Spree
       private
 
       def created_by
-        try_spree_current_user.try(:email)
+        spree_current_user.try(:email)
       end
 
       def load_order

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

@@ -3,6 +3,8 @@
 module Spree
   module Admin
     class LocaleController < Spree::Admin::BaseController
+      skip_before_action :authorize_admin, only: [:set]
+
       def set
         requested_locale = params[:switch_to_locale].to_s.presence
 

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -31,7 +31,7 @@ module Spree
             end
 
             unless @order.completed?
-              @order.next
+              @order.contents.advance
               @order.refresh_shipment_rates
             end
 

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

@@ -112,7 +112,7 @@ module Spree
       end
 
       def cancel
-        @order.canceled_by(try_spree_current_user)
+        @order.canceled_by(spree_current_user)
         flash[:success] = t('spree.order_canceled')
         redirect_to(spree.edit_admin_order_path(@order))
       end
@@ -124,7 +124,7 @@ module Spree
       end
 
       def approve
-        @order.contents.approve(user: try_spree_current_user)
+        @order.contents.approve(user: spree_current_user)
         flash[:success] = t('spree.order_approved')
         redirect_to(spree.edit_admin_order_path(@order))
       end
@@ -156,7 +156,7 @@ module Spree
 
       def order_params
         {
-          created_by_id: try_spree_current_user.try(:id),
+          created_by_id: spree_current_user.try(:id),
           frontend_viewable: false,
           store_id: current_store.try(:id)
         }.with_indifferent_access

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

@@ -18,7 +18,7 @@ module Spree
           .currently_valid
           .for_variant
           .order(:variant_id, :country_iso, :currency)
-          .page(params[:page]).per(Spree::Config.admin_variants_per_page)
+          .page(params[:variants_page]).per(Spree::Config.admin_variants_per_page)
       end
 
       def edit

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

@@ -14,7 +14,7 @@ module Spree
       rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
 
       def perform
-        @reimbursement.perform!(created_by: try_spree_current_user)
+        @reimbursement.perform!(created_by: spree_current_user)
         redirect_to location_after_save
       end
 
@@ -62,7 +62,7 @@ module Spree
       end
 
       def load_simulated_refunds
-        @reimbursement_objects = @reimbursement.simulate(created_by: try_spree_current_user)
+        @reimbursement_objects = @reimbursement.simulate(created_by: spree_current_user)
       end
 
       def spree_core_gateway_error(error)

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

@@ -18,7 +18,7 @@ module Spree
         variant = Spree::Variant.accessible_by(current_ability, :show).find(params[:variant_id])
         stock_location = Spree::StockLocation.accessible_by(current_ability, :show).find(params[:stock_location_id])
         stock_location.stock_movements.build(stock_movement_params).tap do |stock_movement|
-          stock_movement.originator = try_spree_current_user
+          stock_movement.originator = spree_current_user
           stock_movement.stock_item = stock_location.set_up_stock_item(variant)
         end
       end

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

@@ -17,8 +17,8 @@ module Spree
       def create
         @store_credit = @user.store_credits.build(
           permitted_resource_params.merge({
-            created_by: try_spree_current_user,
-            action_originator: try_spree_current_user
+            created_by: spree_current_user,
+            action_originator: spree_current_user
           })
         )
 
@@ -34,7 +34,7 @@ module Spree
 
       def update
         @store_credit.assign_attributes(permitted_resource_params)
-        @store_credit.created_by = try_spree_current_user
+        @store_credit.created_by = spree_current_user
 
         if @store_credit.save
           respond_to do |format|
@@ -50,7 +50,7 @@ module Spree
       def update_amount
         @store_credit = @user.store_credits.find(params[:id])
         amount = params.require(:store_credit).require(:amount)
-        if @store_credit.update_amount(amount, @store_credit_reason, try_spree_current_user)
+        if @store_credit.update_amount(amount, @store_credit_reason, spree_current_user)
           flash[:success] = flash_message_for(@store_credit, :successfully_updated)
           redirect_to admin_user_store_credit_path(@user, @store_credit)
         else
@@ -60,7 +60,7 @@ module Spree
 
       def invalidate
         @store_credit = @user.store_credits.find(params[:id])
-        if @store_credit.invalidate(@store_credit_reason, try_spree_current_user)
+        if @store_credit.invalidate(@store_credit_reason, spree_current_user)
           redirect_to admin_user_store_credit_path(@user, @store_credit)
         else
           render_edit_page
@@ -71,7 +71,7 @@ module Spree
 
       def permitted_resource_params
         params.require(:store_credit).permit([:amount, :currency, :category_id, :memo]).
-          merge(created_by: try_spree_current_user)
+          merge(created_by: spree_current_user)
       end
 
       def collection

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

@@ -12,6 +12,17 @@ module Spree
         @available_categories = Spree::TaxCategory.order(:name)
         @calculators = Rails.application.config.spree.calculators.tax_rates
       end
+
+      def collection
+        @search = Spree::TaxRate.ransack(params[:q])
+        @collection = @search.result
+        @collection = @collection
+          .includes(:tax_categories)
+          .order(:zone_id)
+        @collection = @collection
+          .page(params[:page])
+          .per(Spree::Config[:admin_products_per_page])
+      end
     end
   end
 end

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

@@ -92,7 +92,7 @@ module Spree
 
         @search = super.ransack(params[:q])
         @collection = @search.result.includes(:spree_roles)
-        @collection = @collection.includes(:spree_orders)
+        @collection = @collection.includes(:orders)
         @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
       end
 
@@ -121,11 +121,11 @@ module Spree
       # handling raise from Spree::Admin::ResourceController#destroy
       def user_destroy_with_orders_error
         invoke_callbacks(:destroy, :fails)
-        render status: :forbidden, text: t('spree.error_user_destroy_with_orders')
+        render status: :forbidden, plain: t("spree.error_user_destroy_with_orders")
       end
 
       def sign_in_if_change_own_password
-        if try_spree_current_user == @user && @user.password.present?
+        if spree_current_user == @user && @user.password.present?
           sign_in(@user, event: :authentication, bypass: true)
         end
       end

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

@@ -3,6 +3,10 @@
 module Spree
   module Admin
     module ProductsHelper
+      def frontend_product_path(product)
+        Spree::Backend::Config[:frontend_product_path].call(self, product)
+      end
+
       def show_rebuild_vat_checkbox?
         Spree::TaxRate.included_in_price.exists?
       end

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

@@ -4,9 +4,7 @@ module Spree
   module Admin
     module StockLocationsHelper
       def admin_stock_location_display_name(stock_location)
-        name_parts = [stock_location.admin_name, stock_location.name]
-        name_parts.delete_if(&:blank?)
-        name_parts.join(' / ')
+        [stock_location.admin_name, stock_location.name].reject(&:blank?).join(' / ')
       end
     end
   end

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

@@ -6,9 +6,11 @@
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
-    <li>
-      <%= link_to t('spree.new_adjustment_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
-    </li>
+    <% if can?(:create, Spree::AdjustmentReason) %>
+      <li>
+        <%= link_to t('spree.new_adjustment_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
+      </li>
+    <% end %>
   </ul>
 <% end %>
 
@@ -38,7 +40,9 @@
             </span>
           </td>
           <td class="actions">
-            <%= link_to_edit adjustment_reason, no_text: true %>
+            <% if can? :edit, adjustment_reason %>
+              <%= link_to_edit adjustment_reason, no_text: true %>
+            <% end %>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -13,12 +13,12 @@
     <tr data-hook="adjustment_buttons">
       <td class="align-right" colspan="2" style="width: 50%">
         <% if can? :update, Spree::Adjustment %>
-          <%= button_to t('spree.unfinalize_all_adjustments'), adjustments_unfinalize_admin_order_path(@order), method: :get %>
+          <%= button_to t('spree.unfinalize_all_adjustments'), adjustments_unfinalize_admin_order_path(@order), method: :put %>
         <% end %>
       </td>
       <td colspan="2" style="width: 50%">
         <% if can? :update, Spree::Adjustment %>
-          <%= button_to t('spree.finalize_all_adjustments'), adjustments_finalize_admin_order_path(@order), method: :get %>
+          <%= button_to t('spree.finalize_all_adjustments'), adjustments_finalize_admin_order_path(@order), method: :put %>
         <% end %>
       </td>
       <td class='actions'>&nbsp;</td>

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

@@ -12,7 +12,7 @@
 
 <%= render partial: 'adjustments_table' %>
 
-<% if @order.can_add_coupon? %>
+<% if @order.can_add_coupon? && can?(:update, @order) %>
   <div data-hook="adjustments_new_coupon_code">
     <%= text_field_tag "coupon_code", "", placeholder: t('spree.coupon_code') %>
     <%= button_tag t('spree.add_coupon_code'), id: "add_coupon_code", class: 'btn btn-primary' %>

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

@@ -7,7 +7,7 @@
   <li>
     <%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %>
   </li>
-<% end if can? :manage, Spree::Order %>
+<% end if can? :create, Spree::Order %>
 
 <% content_for :table_filter_title do %>
   <%= t('spree.filter') %>
@@ -70,8 +70,8 @@
 
             <div class="col-12 col-xl-6">
               <div class="field">
-                <%= label_tag :q_bill_address_name_start, t('spree.name_contains') %>
-                <%= f.text_field :bill_address_name_start, size: 25 %>
+                <%= label_tag :q_bill_address_name_cont, t('spree.name_contains') %>
+                <%= f.text_field :bill_address_name_cont, size: 25 %>
               </div>
             </div>
 
@@ -191,11 +191,9 @@
   </table>
 <% else %>
   <div class="no-objects-found">
-    <% if can? :manage, Spree::Order %>
-      <%= render 'spree/admin/shared/no_objects_found',
-                   resource: Spree::Order,
-                   new_resource_url: spree.new_admin_order_path %>
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+               resource: Spree::Order,
+               new_resource_url: spree.new_admin_order_path %>
   </div>
 <% end %>
 

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

@@ -58,7 +58,7 @@
             <% allowed_actions = payment.actions.select { |a| can?(a.to_sym, payment) } %>
             <% allowed_actions.each do |action| %>
               <% if action == 'credit' %>
-                <%= link_to_with_icon 'reply', t('spree.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
+                <%= link_to_with_icon 'mail-reply', t('spree.actions.refund'), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
               <% elsif action == 'capture' && !@order.completed? %>
                 <%# no capture prior to completion. payments get captured when the order completes. %>
               <% else %>

data/app/views/spree/admin/prices/_master_variant_table.html.erb

@@ -1,9 +1,9 @@
-<%= paginate master_prices, theme: "solidus_admin" %>
-
 <fieldset class="no-border-bottom <%= "no-border-top" if !variants %>">
   <% if variants %>
-    <legend align="center"><%= I18n.t(:master_variant, scope: :spree) %> <%= admin_hint I18n.t(:master_variant, scope: :spree), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
+    <legend align="center"><%= t(".master_variant") %> <%= admin_hint t(".master_variant"), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
   <% end %>
+
+  <%= paginate master_prices, theme: "solidus_admin" %>
   <table class="index master_prices">
     <colgroup>
       <col style="width: 30%">
@@ -25,7 +25,7 @@
         <td><%= price.currency %></td>
         <td><%= price.money.to_html %></td>
         <td class="actions">
-          <% if can?(:update, price) %>
+          <% if can?(:edit, price) %>
             <%= link_to_edit(price, no_text: true) unless price.discarded? %>
           <% end %>
           <% if can?(:destroy, price) %>
@@ -36,6 +36,5 @@
       </tr>
     <% end %>
   </table>
+  <%= paginate master_prices, theme: "solidus_admin" %>
 </fieldset>
-
-<%= paginate master_prices, theme: "solidus_admin" %>

data/app/views/spree/admin/prices/_table.html.erb

@@ -1,7 +1,7 @@
-<%= paginate variant_prices, theme: "solidus_admin" %>
+<fieldset class="no-border-bottom" data-hook="variant_prices_table">
+  <legend align="center"><%= t(".variant_pricing") %></legend>
 
-<fieldset class="no-border-bottom">
-  <legend align="center"><%= I18n.t(:variant_pricing, scope: :spree) %></legend>
+  <%= paginate variant_prices, theme: "solidus_admin", param_name: :variants_page %>
   <table class="index prices">
     <thead data-hook="prices_header">
       <tr>
@@ -20,7 +20,7 @@
           <td><%= price.currency %></td>
           <td><%= price.money.to_html %></td>
           <td class="actions">
-            <% if can?(:update, price) %>
+            <% if can?(:edit, price) %>
               <%= link_to_edit(price, no_text: true) unless price.discarded? %>
             <% end %>
             <% if can?(:destroy, price) %>
@@ -32,6 +32,5 @@
       <% end %>
     </tbody>
   </table>
+  <%= paginate variant_prices, theme: "solidus_admin", param_name: :variants_page %>
 </fieldset>
-
-<%= paginate variant_prices, theme: "solidus_admin" %>

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

@@ -4,9 +4,9 @@
       <%= link_to t('spree.new_product'), new_object_url, id: 'admin_new_product', class: 'btn btn-primary' %>
     </li>
   <% end %>
-  <% if defined?(Spree::Frontend::Engine) %>
+  <% if frontend_product_path(@product) %>
     <li id="view_product_link">
-      <%= link_to t('spree.view_product'), spree.product_path(@product), id: 'admin_view_product', class: 'btn btn-default ml-2' %>
+      <%= link_to t('spree.view_product'), frontend_product_path(@product), id: 'admin_view_product', class: 'btn btn-default ml-2' %>
     </li>
   <% end %>
 <% end %>