solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -1,13 +0,0 @@
-.number-field-update-table {
-  td.actions {
-    a.fa-cancel,
-    a.fa-check {
-      display: none;
-    }
-  }
-  .js-number-update-input { display: none; }
-
-  input[type='number'] {
-    min-width: 65px;
-  }
-}

data/app/assets/stylesheets/spree/backend/sections/_stock_transfers.scss

@@ -1,7 +0,0 @@
-#stock-transfer-edit-variants {
-  margin-top: 60px;
-}
-
-#stock-transfer-transfer-items {
-  margin-top: 80px;
-}

data/app/assets/stylesheets/spree/backend/sections/_transfer_items.scss

@@ -1,49 +0,0 @@
-#stock_transfer_summary {
-  margin: 20px 0px;
-  display: inline-block;
-
-  .location,
-  .count-summary {
-    float: left;
-    font-size: 15px;
-  }
-  .location {
-    width: 70%;
-  }
-  .count-summary {
-    width: 30%;
-    text-align: right;
-    &:after {
-      content: "";
-      clear: both;
-      display: table;
-    }
-  }
-  .summary-field {
-    font-weight: 600;
-    font-size: 105%;
-  }
-  .arrow {
-    margin: 0px 5px;
-  }
-}
-
-#received-transfer-items,
-#stock-transfer-transfer-items {
-  margin-top: 70px;
-  .new-row {
-    display: none;
-  }
-}
-
-#listing_transfer_items {
-  > tbody {
-    tr {
-      &:hover {
-        td {
-          background-color: $color-1;
-        }
-      }
-    }
-  }
-}

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

@@ -1,151 +0,0 @@
-module Spree
-  module Admin
-    class StockTransfersController < ResourceController
-      class_attribute :variant_display_attributes
-      self.variant_display_attributes = [
-        { translation_key: :sku, attr_name: :sku },
-        { translation_key: :name, attr_name: :name }
-      ]
-
-      before_action :load_viewable_stock_locations, only: :index
-      before_action :load_variant_display_attributes, only: [:receive, :edit, :show, :tracking_info]
-      before_action :load_source_stock_locations, only: :new
-      before_action :load_destination_stock_locations, only: :edit
-      before_action :ensure_access_to_stock_location, only: :create
-      before_action :ensure_receivable_stock_transfer, only: :receive
-
-      create.before :authorize_transfer_attributes!
-
-      def receive
-        @received_items = @stock_transfer.transfer_items.received
-      end
-
-      def finalize
-        if @stock_transfer.finalize(try_spree_current_user)
-          redirect_to tracking_info_admin_stock_transfer_path(@stock_transfer)
-        else
-          flash[:error] = @stock_transfer.errors.full_messages.join(", ")
-          redirect_to edit_admin_stock_transfer_path(@stock_transfer)
-        end
-      end
-
-      def close
-        Spree::StockTransfer.transaction do
-          if @stock_transfer.close(try_spree_current_user)
-            adjust_inventory
-            redirect_to admin_stock_transfers_path
-          else
-            flash[:error] = @stock_transfer.errors.full_messages.join(", ")
-            redirect_to receive_admin_stock_transfer_path(@stock_transfer)
-          end
-        end
-      end
-
-      def ship
-        if @stock_transfer.transfer
-          @stock_transfer.ship(shipped_at: DateTime.current)
-          flash[:success] = Spree.t(:stock_transfer_complete)
-          redirect_to admin_stock_transfers_path
-        else
-          flash[:error] = @stock_transfer.errors.full_messages.join(", ")
-          redirect_to tracking_info_admin_stock_transfer_path(@stock_transfer)
-        end
-      end
-
-      private
-
-      def collection
-        params[:q] = params[:q] || {}
-        @show_only_open = if params[:q][:closed_at_null].present?
-          params[:q][:closed_at_null] == '1'
-        else
-          true
-        end
-        params[:q].delete(:closed_at_null) unless @show_only_open
-        @search = super.ransack(params[:q])
-        @search.sorts = 'created_at desc'
-        @search.result.
-          page(params[:page]).
-          per(params[:per_page] || Spree::Config[:orders_per_page])
-      end
-
-      def permitted_resource_params
-        resource_params = super
-        if action == :create
-          resource_params[:created_by] = try_spree_current_user
-        end
-        resource_params
-      end
-
-      def find_resource
-        model_class.find_by(number: params[:id])
-      end
-
-      def render_after_create_error
-        load_source_stock_locations
-        super
-      end
-
-      def location_after_save
-        if action == :create
-          edit_admin_stock_transfer_path(@stock_transfer)
-        else
-          # redirect back, or to fallback if referer not provided
-          request.headers["Referer"] || admin_stock_transfers_path
-        end
-      end
-
-      def authorize_transfer_attributes!
-        duplicate = @object.dup
-        duplicate.assign_attributes(permitted_resource_params)
-        authorize! :create, duplicate
-      end
-
-      def load_viewable_stock_locations
-        @stock_locations = Spree::StockLocation.accessible_by(current_ability, :read)
-      end
-
-      def load_source_stock_locations
-        @source_stock_locations ||= Spree::StockLocation.accessible_by(current_ability, :transfer_from)
-      end
-
-      def load_destination_stock_locations
-        @destination_stock_locations ||= Spree::StockLocation.accessible_by(current_ability, :transfer_to).where.not(id: @stock_transfer.source_location_id)
-      end
-
-      def load_variant_display_attributes
-        @variant_display_attributes = self.class.variant_display_attributes
-      end
-
-      def ensure_receivable_stock_transfer
-        unless @stock_transfer.receivable?
-          flash[:error] = Spree.t(:stock_transfer_must_be_receivable)
-          redirect_to(admin_stock_transfers_path) && return
-        end
-      end
-
-      def ensure_access_to_stock_location
-        return unless permitted_resource_params[:source_location_id].present?
-        authorize! :read, Spree::StockLocation.find(permitted_resource_params[:source_location_id])
-      end
-
-      def source_location
-        @source_location ||= if params.key?(:transfer_receive_stock)
-                               nil
-                             else
-                               Spree::StockLocation.find(params[:transfer_source_location_id])
-                             end
-      end
-
-      def destination_location
-        @destination_location ||= Spree::StockLocation.find(params[:transfer_destination_location_id])
-      end
-
-      def adjust_inventory
-        @stock_movements = @stock_transfer.transfer_items.received.map do |transfer_item|
-          @stock_transfer.destination_location.move(transfer_item.variant, transfer_item.received_quantity, @stock_transfer)
-        end
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module Spree
-  module Admin
-    module GeneralSettingsHelper
-      def currency_options
-        currencies = ::Money::Currency.table.map do |_code, details|
-          iso = details[:iso_code]
-          [iso, "#{details[:name]} (#{iso})"]
-        end
-        options_from_collection_for_select(currencies, :first, :last, Spree::Config[:currency])
-      end
-    end
-  end
-end

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

@@ -1,9 +0,0 @@
-module Spree
-  module Admin
-    module InventorySettingsHelper
-      def show_not(true_or_false)
-        true_or_false ? '' : Spree.t(:not)
-      end
-    end
-  end
-end

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

@@ -1,35 +0,0 @@
-module Spree
-  module Admin
-    module StockTransfersHelper
-      def handle_stock_transfer(stock_transfer)
-        if can?(:show, stock_transfer)
-          link_to stock_transfer.number, admin_stock_transfer_path(stock_transfer)
-        else
-          stock_transfer.number
-        end
-      end
-
-      def stock_transfer_edit_or_ship_path(stock_transfer)
-        if stock_transfer.finalized?
-          tracking_info_admin_stock_transfer_path(stock_transfer)
-        else
-          edit_admin_stock_transfer_path(stock_transfer)
-        end
-      end
-
-      def deleted_variant_admin_hint(variant)
-        newer_variant_with_same_sku = Spree::Variant.find_by(sku: variant.sku)
-        hint_type = newer_variant_with_same_sku ? :deleted_explanation_with_replacement : :deleted_explanation
-        hint_text = I18n.t(
-          hint_type,
-          scope: [:spree, :hints, "spree/variant"],
-          date: variant.deleted_at
-        )
-        admin_hint(
-          I18n.t(:deleted, scope: [:spree, :hints, "spree/variant"]),
-          hint_text
-        )
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module Spree
-  module Admin
-    module TablesHelper
-      # Adds class 'active' to <th> & <td> tags
-      # for better tables styling
-      def sort_by_active_class(row)
-        if params[:q][:s] && params[:q][:s].include?(row)
-          return "sort-active"
-        end
-      end
-    end
-  end
-end

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

@@ -1,9 +0,0 @@
-module Spree
-  module Admin
-    module TaxonsHelper
-      def taxon_path(taxon)
-        taxon.ancestors.reverse.collect(&:name).join( " >> ")
-      end
-    end
-  end
-end

data/app/views/spree/admin/products/new.js.erb

@@ -1,4 +0,0 @@
-$("#new_product_wrapper").html('<%= escape_javascript(render template: "spree/admin/products/new", formats: [:html], handlers: [:erb]) %>');
-handle_date_picker_fields();
-$("#table-filter").hide();
-$("#admin_new_product").parent().hide();

data/app/views/spree/admin/promotions/rules/_landing_page.html.erb

@@ -1,7 +0,0 @@
-<div class="col-12">
-  <div class="field">
-    <label for="<%= "#{param_prefix}_preferred_path" %>"><%= Spree::Promotion::Rules::LandingPage.human_attribute_name(:description) %>:</label>
-    <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, class: 'fullwidth' %>  
-    <span class="info"><%= Spree.t('landing_page_rule.must_have_visited_path') %></span>
-  </div>
-</div>

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

@@ -1,5 +0,0 @@
-<% if can?(:update, resource) %>
-  <%= link_to_with_icon 'edit', Spree.t('actions.edit'), '#', no_text: true, data: { action: 'edit', id: resource.id } %>
-  <%= link_to_with_icon 'check', Spree.t('actions.update'), '#', no_text: true, data: update_data.merge(action: 'save', id: resource.id) %>
-  <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), '#', no_text: true, data: { action: 'cancel', id: resource.id } %>
-<% end %>

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

@@ -1,4 +0,0 @@
-<td id="number-update-<%= resource_id %>">
-  <span class="js-number-update-text"><%= number_value %></span>
-  <%= number_field_tag field_tag, number_value, id: "#{field_tag.to_s}_#{resource_id}", class: 'fullwidth js-number-update-input' %>
-</td>

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

@@ -1,8 +0,0 @@
-<ul class="admin-subnav" data-hook="admin_stock_transfer_sub_tabs">
-  <% if can? :admin, Spree::StockItem %>
-    <%= tab :stock_items, match_path: '/stock_items' %>
-  <% end %>
-  <% if can? :admin, Spree::StockTransfer %>
-    <%= tab :stock_transfers, match_path: '/stock_transfers' %>
-  <% end %>
-</ul>

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

@@ -1,7 +0,0 @@
-<div class='location'>
-  <h5>
-    <span><%= admin_stock_location_display_name(stock_transfer.source_location) %></span>
-    <span class='arrow'>&rarr;</span>
-    <span><%= admin_stock_location_display_name(stock_transfer.destination_location) if stock_transfer.destination_location %></span>
-  </h5>
-</div>

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

@@ -1,9 +0,0 @@
-<% if show_actions %>
-  <%= render partial: 'spree/admin/shared/number_field_update_cell', locals: { resource_id: item.id, field_tag: "#{quantity_type}_quantity", number_value: item.send("#{quantity_type}_quantity") } %>
-  <td class="actions">
-    <%= render partial: 'spree/admin/shared/number_field_update_actions', locals: { resource: item, update_data: {} } %>
-    <%= 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><%= item.send("#{quantity_type}_quantity") %></td>
-<% end %>

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

@@ -1,72 +0,0 @@
-  <table class="index stock-table number-field-update-table" <%= 'hidden' if @stock_transfer.transfer_items.empty? %> id="listing_transfer_items">
-    <colgroup>
-      <col style="width: 45%" />
-      <col style="width: 25%" />
-      <col style="width: 10%" />
-      <col style="width: 10%" />
-      <col style="width: 10%" />
-    </colgroup>
-    <thead>
-      <tr>
-        <th><%= Spree.t(:item) %></th>
-        <th><%= Spree.t(:options) %></th>
-        <% if show_expected %><th><%= Spree.t(:expected) %></th><% end %>
-        <% if show_received %><th><%= Spree.t(:received) %></th><% end %>
-        <% if show_actions %><th class='actions'></th><% end %>
-      </tr>
-    </thead>
-    <tbody>
-      <% transfer_items.each do |item| %>
-        <%- variant = item.variant %>
-        <tr data-transfer-item-id="<%= item.id %>" class='<%= "deleted" if variant.deleted? %>'>
-          <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 %>
-              </div>
-              <div class='variant-details'>
-
-                <table class='stock-variant-field-table'>
-                  <tbody>
-                    <% if variant.deleted? %>
-                      <tr>
-                        <td colspan="2">
-                          <%= I18n.t(:deleted, scope: [:spree, :hints, "spree/variant"]) %>
-                          <%= deleted_variant_admin_hint(variant) %>
-                        </td>
-                      </tr>
-                    <% end %>
-                    <% @variant_display_attributes.each do |display_attribute| %>
-                      <tr>
-                        <td><%= Spree.t(display_attribute[:translation_key]) %></td>
-                        <td class="fullwidth">
-                          <%= variant.send(display_attribute[:attr_name]) %>
-                        </td>
-                      </tr>
-                    <% end %>
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          </td>
-          <td>
-            <table class='stock-variant-field-table'>
-              <% variant.option_values.sort_by(&:option_type_name).each do |option_value| %>
-                <tr>
-                  <td>
-                    <%= option_value.option_type_presentation %>
-                  </td>
-                  <td><%= option_value.presentation %></td>
-                </tr>
-              <% end %>
-            </table>
-          </td>
-          <% if show_expected %><%= render partial: 'transfer_item_actions', locals: { item: item, show_actions: show_actions, quantity_type: 'expected'} %><% end %>
-          <% if show_received %><%= render partial: 'transfer_item_actions', locals: { item: item, show_actions: show_actions, quantity_type: 'received'} %><% end %>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-  <div class="no-objects-found" <%= 'hidden' if @stock_transfer.transfer_items.any? %>>
-    <%= Spree.t(:no_resource, resource: plural_resource_name(Spree::TransferItem)) %>
-  </div>