solidus_backend 2.2.2 → 2.3.0.beta1

data/spec/helpers/admin/navigation_helper_spec.rb

@@ -110,4 +110,27 @@ describe Spree::Admin::NavigationHelper, type: :helper do
       expect(link).to include("data-confirm=\"Please confirm.\"")
     end
   end
+
+  describe "#solidus_icon" do
+    context "if given an icon_name" do
+      subject(:solidus_icon) { helper.solidus_icon('example-icon-name') }
+
+      it { is_expected.to eq "<i class=\"example-icon-name\"></i>" }
+    end
+
+    context "if not given nil icon_name" do
+      subject(:solidus_icon) { helper.solidus_icon(nil) }
+
+      it { is_expected.to eq "" }
+    end
+  end
+
+  describe "#icon" do
+    subject(:icon) { helper.icon('icon-name') }
+
+    it "is a deprecated way to use #solidus_icon" do
+      expect(Spree::Deprecation).to receive(:warn).with("icon is deprecated and will be removed from Solidus 3.0 (use solidus_icon instead)", instance_of(Array))
+      expect(subject).to eq helper.solidus_icon('icon-name')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0.beta1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0.beta1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,7 @@ files:
 - app/assets/javascripts/spree/backend/collections/index.js
 - app/assets/javascripts/spree/backend/collections/line_items.js
 - app/assets/javascripts/spree/backend/collections/states.js
+- app/assets/javascripts/spree/backend/components/editable_table.js.coffee
 - app/assets/javascripts/spree/backend/components/number_with_currency.js
 - app/assets/javascripts/spree/backend/components/tabs.coffee
 - app/assets/javascripts/spree/backend/components/tooltips.js
@@ -172,12 +173,13 @@ files:
 - app/assets/javascripts/spree/backend/gateway.js.coffee
 - app/assets/javascripts/spree/backend/handlebars_extensions.js
 - app/assets/javascripts/spree/backend/images/index.js.coffee
-- app/assets/javascripts/spree/backend/images/new.js.coffee
 - app/assets/javascripts/spree/backend/images/upload.js
 - app/assets/javascripts/spree/backend/models/address.js
+- app/assets/javascripts/spree/backend/models/image_upload.js
 - app/assets/javascripts/spree/backend/models/index.js
 - app/assets/javascripts/spree/backend/models/line_item.js
 - app/assets/javascripts/spree/backend/models/order.js
+- app/assets/javascripts/spree/backend/models/taxonomy.js
 - app/assets/javascripts/spree/backend/namespaces.js
 - app/assets/javascripts/spree/backend/navigation.coffee
 - app/assets/javascripts/spree/backend/number_field_updater.coffee
@@ -239,6 +241,8 @@ files:
 - app/assets/javascripts/spree/backend/views/cart/add_line_item_button.js
 - app/assets/javascripts/spree/backend/views/cart/line_item_row.js
 - app/assets/javascripts/spree/backend/views/cart/line_item_table.js
+- app/assets/javascripts/spree/backend/views/images/upload_progress.js
+- app/assets/javascripts/spree/backend/views/images/upload_zone.js
 - app/assets/javascripts/spree/backend/views/index.js
 - app/assets/javascripts/spree/backend/views/number_with_currency.js
 - app/assets/javascripts/spree/backend/views/order/address.js
@@ -247,7 +251,11 @@ files:
 - app/assets/javascripts/spree/backend/views/order/details_adjustments.js
 - app/assets/javascripts/spree/backend/views/order/details_total.js
 - app/assets/javascripts/spree/backend/views/order/summary.js
+- app/assets/javascripts/spree/backend/views/payment/edit_credit_card.js
+- app/assets/javascripts/spree/backend/views/payment/new.js
 - app/assets/javascripts/spree/backend/views/state_select.js
+- app/assets/javascripts/spree/backend/views/tables/editable_table.js.coffee
+- app/assets/javascripts/spree/backend/views/tables/editable_table_row.js.coffee
 - app/assets/javascripts/spree/backend/views/zones/form.js
 - app/assets/javascripts/spree/backend/zone.js
 - app/assets/stylesheets/spree/backend.css
@@ -255,6 +263,7 @@ files:
 - app/assets/stylesheets/spree/backend/components/_actions.scss
 - app/assets/stylesheets/spree/backend/components/_breadcrumb.scss
 - app/assets/stylesheets/spree/backend/components/_date-picker.scss
+- app/assets/stylesheets/spree/backend/components/_editable_table.scss
 - app/assets/stylesheets/spree/backend/components/_hint.scss
 - app/assets/stylesheets/spree/backend/components/_image_placeholder.scss
 - app/assets/stylesheets/spree/backend/components/_list_group.scss
@@ -282,7 +291,6 @@ files:
 - app/assets/stylesheets/spree/backend/sections/_image_settings.scss
 - app/assets/stylesheets/spree/backend/sections/_log_entries.scss
 - app/assets/stylesheets/spree/backend/sections/_orders.scss
-- app/assets/stylesheets/spree/backend/sections/_payments.scss
 - app/assets/stylesheets/spree/backend/sections/_products.scss
 - app/assets/stylesheets/spree/backend/sections/_promotions.scss
 - app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss
@@ -365,7 +373,6 @@ files:
 - app/helpers/spree/admin/base_helper.rb
 - app/helpers/spree/admin/customer_returns_helper.rb
 - app/helpers/spree/admin/general_settings_helper.rb
-- app/helpers/spree/admin/images_helper.rb
 - app/helpers/spree/admin/inventory_settings_helper.rb
 - app/helpers/spree/admin/navigation_helper.rb
 - app/helpers/spree/admin/orders_helper.rb
@@ -423,7 +430,6 @@ files:
 - app/views/spree/admin/option_types/index.html.erb
 - app/views/spree/admin/option_types/new.html.erb
 - app/views/spree/admin/option_types/new.js.erb
-- app/views/spree/admin/orders/_add_line_item.html.erb
 - app/views/spree/admin/orders/_add_product.html.erb
 - app/views/spree/admin/orders/_adjustments.html.erb
 - app/views/spree/admin/orders/_carton.html.erb
@@ -471,11 +477,9 @@ files:
 - app/views/spree/admin/prices/edit.html.erb
 - app/views/spree/admin/prices/index.html.erb
 - app/views/spree/admin/prices/new.html.erb
-- app/views/spree/admin/prices/new.js.erb
 - app/views/spree/admin/product_properties/_product_property_fields.html.erb
 - app/views/spree/admin/product_properties/index.html.erb
 - app/views/spree/admin/products/_form.html.erb
-- app/views/spree/admin/products/_properties_form.erb
 - app/views/spree/admin/products/edit.html.erb
 - app/views/spree/admin/products/index.html.erb
 - app/views/spree/admin/products/new.html.erb
@@ -500,13 +504,13 @@ files:
 - app/views/spree/admin/promotions/_promotion_action.html.erb
 - app/views/spree/admin/promotions/_promotion_rule.html.erb
 - app/views/spree/admin/promotions/_rules.html.erb
-- app/views/spree/admin/promotions/_tab.html.erb
 - app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
 - app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb
 - app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb
 - app/views/spree/admin/promotions/actions/_free_shipping.html.erb
 - app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb
 - app/views/spree/admin/promotions/calculators/_default_fields.html.erb
+- app/views/spree/admin/promotions/calculators/distributed_amount/_fields.html.erb
 - app/views/spree/admin/promotions/calculators/flat_rate/_fields.html.erb
 - app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb
 - app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb
@@ -583,7 +587,6 @@ files:
 - app/views/spree/admin/shared/_promotion_sub_menu.html.erb
 - app/views/spree/admin/shared/_rebuild_vat_prices_checkbox.html.erb
 - app/views/spree/admin/shared/_refunds.html.erb
-- app/views/spree/admin/shared/_report_criteria.html.erb
 - app/views/spree/admin/shared/_report_order_criteria.html.erb
 - app/views/spree/admin/shared/_settings_checkout_tabs.html.erb
 - app/views/spree/admin/shared/_settings_sub_menu.html.erb
@@ -608,7 +611,6 @@ files:
 - app/views/spree/admin/shipping_methods/index.html.erb
 - app/views/spree/admin/shipping_methods/new.html.erb
 - app/views/spree/admin/states/_form.html.erb
-- app/views/spree/admin/states/_new.html.erb
 - app/views/spree/admin/states/_state_list.html.erb
 - app/views/spree/admin/states/edit.html.erb
 - app/views/spree/admin/states/index.html.erb
@@ -617,13 +619,11 @@ files:
 - app/views/spree/admin/stock_items/destroy.js.erb
 - app/views/spree/admin/stock_items/index.html.erb
 - app/views/spree/admin/stock_locations/_form.html.erb
-- app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb
 - app/views/spree/admin/stock_locations/edit.html.erb
 - app/views/spree/admin/stock_locations/index.html.erb
 - app/views/spree/admin/stock_locations/new.html.erb
 - app/views/spree/admin/stock_movements/index.html.erb
 - app/views/spree/admin/stock_transfers/_location.html.erb
-- app/views/spree/admin/stock_transfers/_stock_movements.html.erb
 - app/views/spree/admin/stock_transfers/_transfer_item_actions.html.erb
 - app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb
 - app/views/spree/admin/stock_transfers/edit.html.erb
@@ -646,11 +646,19 @@ files:
 - app/views/spree/admin/style_guide/index.html.erb
 - app/views/spree/admin/style_guide/topics/components/_tabs.html.erb
 - app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb
+- app/views/spree/admin/style_guide/topics/forms/_buttons.html.erb
+- app/views/spree/admin/style_guide/topics/forms/_helper_text.html.erb
+- app/views/spree/admin/style_guide/topics/forms/_inputs.html.erb
+- app/views/spree/admin/style_guide/topics/forms/_labels.html.erb
 - app/views/spree/admin/style_guide/topics/forms/_validation.html.erb
+- app/views/spree/admin/style_guide/topics/layout/_full_width_table_layout.html.erb
+- app/views/spree/admin/style_guide/topics/layout/_helpful_layout.html.erb
+- app/views/spree/admin/style_guide/topics/layout/_sidebar_layout.html.erb
 - app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb
 - app/views/spree/admin/style_guide/topics/messaging/_loading.html.erb
 - app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb
 - app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb
+- app/views/spree/admin/style_guide/topics/tables/_forms_in_tables.html.erb
 - app/views/spree/admin/style_guide/topics/tables/_pagination.html.erb
 - app/views/spree/admin/style_guide/topics/typography/_colors.html.erb
 - app/views/spree/admin/style_guide/topics/typography/_fonts.html.erb
@@ -673,7 +681,6 @@ files:
 - app/views/spree/admin/taxonomies/index.html.erb
 - app/views/spree/admin/taxonomies/new.html.erb
 - app/views/spree/admin/taxons/_form.html.erb
-- app/views/spree/admin/taxons/_taxon_table.html.erb
 - app/views/spree/admin/taxons/edit.html.erb
 - app/views/spree/admin/taxons/index.html.erb
 - app/views/spree/admin/taxons/search.rabl
@@ -770,6 +777,7 @@ files:
 - spec/features/admin/orders/order_details_spec.rb
 - spec/features/admin/orders/payments_spec.rb
 - spec/features/admin/orders/return_authorizations_spec.rb
+- spec/features/admin/orders/return_payment_state_spec.rb
 - spec/features/admin/orders/risk_analysis_spec.rb
 - spec/features/admin/orders/shipments_spec.rb
 - spec/features/admin/payments/store_credits_spec.rb

data/app/assets/javascripts/spree/backend/images/new.js.coffee

@@ -1,7 +0,0 @@
-($ '#cancel_link').click (event) ->
-  event.preventDefault()
-
-  ($ '.no-objects-found').show()
-
-  ($ '#new_image_link').show()
-  ($ '#images').html('')

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

@@ -1,14 +0,0 @@
-/* hide and show elements based on editing */
-tr.payment {
-  .edit-payment-amount {
-    text-align: right;
-  }
-
-  &:not(.editing) .editing-show {
-    display: none;
-  }
-
-  &.editing .editing-hide {
-    display: none;
-  }
-}

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

@@ -1,17 +0,0 @@
-module Spree
-  module Admin
-    module ImagesHelper
-      def options_text_for(image)
-        if image.viewable.is_a?(Spree::Variant)
-          if image.viewable.is_master?
-            Spree.t(:all)
-          else
-            image.viewable.sku_and_options_text
-          end
-        else
-          Spree.t(:all)
-        end
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-<div id="add-line-item" data-hook>
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:add_product) %></legend>
-
-    <div class="col-9">
-      <div data-hook="add_product_name" class="field">
-        <%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
-        <%= text_field_tag :add_line_item_variant_id, "", class: "variant_autocomplete fullwidth" %>
-      </div>
-    </div>
-
-  </fieldset>
-
-  <div id="stock_details"></div>
-</div>

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

@@ -1,2 +0,0 @@
-$(".js-content-below-tabs").html('<%= escape_javascript(render template: 'spree/admin/prices/new', formats: [:html], handlers: [:erb]) %>');
-$(".js-content-below-tabs .select2").select2();

data/app/views/spree/admin/products/_properties_form.erb

@@ -1,10 +0,0 @@
-<% content_for :page_title do %>
-  <%= plural_resource_name(Spree::Property) %>
-<% end %>
-
-<% f.fields_for :product_properties do |properties_form| %>
-    <div data-hook="value">
-      <%= properties_form.label :value, properties_form.object.property.presentation %><br />
-      <%= properties_form.text_field :value %>
-    </div>
-<% end %>

data/app/views/spree/admin/promotions/_tab.html.erb

@@ -1 +0,0 @@
-<%= tab(:promotions) %>

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

@@ -1,17 +0,0 @@
-<%= search_form_for @search, url: spree.sales_total_admin_reports_path  do |s| %>
-    <div class="date-range-filter field">
-      <div class="date-range-fields input-group">
-        <%= s.text_field :created_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:created_at_gt]), placeholder:  Spree.t(:start) %>
-
-        <span class="range-divider input-group-addon">
-          <i class="fa fa-arrow-right"></i>
-        </span>
-
-        <%= s.text_field :created_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:created_at_lt]), placeholder: Spree.t(:end) %>
-      </div>
-    </div>
-
-    <div class="actions filter-actions">
-      <%= button Spree.t(:search) %>
-    </div>
-<% end %>

data/app/views/spree/admin/states/_new.html.erb

@@ -1,7 +0,0 @@
-<%= form_for [:admin, @country, @state] do |f| %>
-  <fieldset>
-    <legend><%= Spree.t(:new_state) %></legend>
-    <%= render partial: 'form', locals: { f: f } %>
-    <%= render partial: 'spree/admin/shared/new_resource_links' %>
-  </fieldset>
-<% end %>

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

@@ -1,38 +0,0 @@
-<%= form_tag transfer_stock_admin_stock_locations_path do %>
-  <fieldset>
-    <legend align="center"><%= Spree.t(:move_stock_between_locations)%></legend>
-    <div data-hook="admin_stock_movements_form_fields" class="row">
-      <div class="col-3">
-        <div class="field" id="stock_movement_transfer_from_field">
-          <%= label_tag :stock_location_from_id, Spree.t(:transfer_from_location) %>
-          <%= select_tag :stock_location_from_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2 fullwidth' %>
-        </div>
-      </div>
-      <div class="col-3">
-        <div class="field" id="stock_movement_transfer_to_field">
-          <%= label_tag :stock_location_to_id, Spree.t(:transfer_to_location) %>
-          <%= select_tag :stock_location_to_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2 fullwidth' %>
-        </div>
-      </div>
-
-      <div class="col-3">
-        <div class="field" id="stock_movement_variant_id_field">
-          <%= label_tag 'variant_id', Spree::Variant.model_name.human %>
-          <%= select_tag :variant_id, options_from_collection_for_select(@variants, :id, :name_and_sku), class: 'select2 fullwidth' %>
-        </div>
-      </div>
-
-      <div class="col-3">
-        <div class="field" id="stock_movement_quantity_field">
-          <%= label_tag 'quantity', Spree::StockMovement.human_attribute_name(:quantity) %>
-          <%= number_field_tag :quantity, 1, class: 'fullwidth' %>
-        </div>
-      </div>
-    </div>
-
-    <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:transfer_stock) %>
-      <%= link_to Spree.t('actions.cancel'), collection_url, class: 'button' %>
-    </div>
-  </fieldset>
-<% end %>

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

@@ -1,27 +0,0 @@
-<div id="source-movements-table" class="col-9">
-<table class="index sortable">
-  <colgroup>
-    <col style="width: 40%" />
-    <col style="width: 30%" />
-    <col style="width: 10%" />
-    <col style="width: 20%" />
-  </colgroup>
-  <thead data-hook="bulk_variants_header">
-    <tr>
-      <th><%= Spree::Variant.model_name.human %></th>
-      <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
-      <th><%= Spree::StockMovement.human_attribute_name(:quantity) %></th>
-      <th><%= Spree::StockItem.human_attribute_name(:count_on_hand) %></th>
-    </tr>
-  </thead>
-  <tbody id="bulk_variants_tbody">
-    <% stock_movements.each do |movement| %>
-    <tr>
-      <td><%= movement.stock_item.variant.name %></td>
-      <td class='align-center'><%= movement.stock_item.variant.sku %></td>
-      <td class='align-center'><%= movement.quantity %></td>
-      <td class='align-center'><%= movement.stock_item.count_on_hand %></td>
-      <% end %>
-    </tbody>
-  </table>
-</div>

data/app/views/spree/admin/taxons/_taxon_table.html.erb

@@ -1,23 +0,0 @@
-<table class="index">
-  <thead>
-    <tr data-hook="taxons_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:path) %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% taxons.each do |taxon| %>
-      <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= taxon.name %></td>
-        <td><%= taxon_path taxon %></td>
-        <td class="actions">
-          <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete') + ' ' + Spree.t('actions.remove') %>
-        </td>
-      </tr>
-    <% end %>
-    <% if taxons.empty? %>
-      <tr data-hook="taxons_none"><td colspan="3"><%= Spree.t(:none) %>.</td></tr>
-    <% end %>
-  </tbody>
-</table>