solidus_backend 2.7.4 → 2.8.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.8.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-01-29 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.7.4
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,33 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
-- !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: handlebars_assets
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +160,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/solidus_backend_manifest.js
+- app/assets/images/favicon.ico
 - app/assets/images/solidus-style-guide-logo.png
 - app/assets/javascripts/spree/backend.js
 - app/assets/javascripts/spree/backend/addresses.js
@@ -365,7 +352,6 @@ files:
 - app/controllers/spree/admin/refunds_controller.rb
 - app/controllers/spree/admin/reimbursement_types_controller.rb
 - app/controllers/spree/admin/reimbursements_controller.rb
-- app/controllers/spree/admin/reports_controller.rb
 - app/controllers/spree/admin/resource_controller.rb
 - app/controllers/spree/admin/return_authorizations_controller.rb
 - app/controllers/spree/admin/return_items_controller.rb
@@ -377,6 +363,7 @@ files:
 - app/controllers/spree/admin/stock_items_controller.rb
 - app/controllers/spree/admin/stock_locations_controller.rb
 - app/controllers/spree/admin/stock_movements_controller.rb
+- app/controllers/spree/admin/store_credit_reasons_controller.rb
 - app/controllers/spree/admin/store_credits_controller.rb
 - app/controllers/spree/admin/stores_controller.rb
 - app/controllers/spree/admin/style_guide_controller.rb
@@ -505,6 +492,7 @@ files:
 - app/views/spree/admin/promotion_code_batches/new.html.erb
 - app/views/spree/admin/promotion_codes/index.csv.ruby
 - app/views/spree/admin/promotion_codes/index.html.erb
+- app/views/spree/admin/promotion_codes/new.html.erb
 - app/views/spree/admin/promotion_rules/create.js.erb
 - app/views/spree/admin/promotion_rules/destroy.js.erb
 - app/views/spree/admin/promotions/_actions.html.erb
@@ -555,8 +543,6 @@ files:
 - app/views/spree/admin/reimbursements/edit.html.erb
 - app/views/spree/admin/reimbursements/index.html.erb
 - app/views/spree/admin/reimbursements/show.html.erb
-- app/views/spree/admin/reports/index.html.erb
-- app/views/spree/admin/reports/sales_total.html.erb
 - app/views/spree/admin/return_authorizations/_form.html.erb
 - app/views/spree/admin/return_authorizations/edit.html.erb
 - app/views/spree/admin/return_authorizations/index.html.erb
@@ -597,7 +583,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_order_criteria.html.erb
 - app/views/spree/admin/shared/_settings_checkout_tabs.html.erb
 - app/views/spree/admin/shared/_settings_sub_menu.html.erb
 - app/views/spree/admin/shared/_shipping_tabs.html.erb
@@ -633,8 +618,12 @@ files:
 - 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/store_credit_reasons/edit.html.erb
+- app/views/spree/admin/store_credit_reasons/index.html.erb
+- app/views/spree/admin/store_credit_reasons/new.html.erb
+- app/views/spree/admin/store_credit_reasons/shared/_form.html.erb
 - app/views/spree/admin/store_credits/_form.html.erb
-- app/views/spree/admin/store_credits/_update_reason_field.html.erb
+- app/views/spree/admin/store_credits/_store_credit_reason_field.html.erb
 - app/views/spree/admin/store_credits/edit_amount.html.erb
 - app/views/spree/admin/store_credits/edit_validity.html.erb
 - app/views/spree/admin/store_credits/index.html.erb
@@ -740,7 +729,6 @@ files:
 - spec/controllers/spree/admin/promotions_controller_spec.rb
 - spec/controllers/spree/admin/refunds_controller_spec.rb
 - spec/controllers/spree/admin/reimbursements_controller_spec.rb
-- spec/controllers/spree/admin/reports_controller_spec.rb
 - spec/controllers/spree/admin/resource_controller_spec.rb
 - spec/controllers/spree/admin/return_authorizations_controller_spec.rb
 - spec/controllers/spree/admin/return_items_controller_spec.rb
@@ -772,6 +760,7 @@ files:
 - spec/features/admin/orders/listing_spec.rb
 - spec/features/admin/orders/log_entries_spec.rb
 - spec/features/admin/orders/new_order_spec.rb
+- spec/features/admin/orders/new_refund_spec.rb
 - spec/features/admin/orders/order_details_spec.rb
 - spec/features/admin/orders/payments_spec.rb
 - spec/features/admin/orders/return_authorizations_spec.rb
@@ -796,7 +785,6 @@ files:
 - spec/features/admin/promotions/tiered_calculator_spec.rb
 - spec/features/admin/promotions/user_rule_spec.rb
 - spec/features/admin/reimbursements_spec.rb
-- spec/features/admin/reports_spec.rb
 - spec/features/admin/store_credits_spec.rb
 - spec/features/admin/stores_spec.rb
 - spec/features/admin/style_guide_spec.rb
@@ -816,6 +804,8 @@ files:
 - spec/javascripts/support/with_translations.js
 - spec/javascripts/translation_spec.js
 - spec/javascripts/views/number_with_currency_spec.js
+- spec/models/spree/backend_configuration/menu_item_spec.rb
+- spec/models/spree/backend_configuration_spec.rb
 - spec/spec_helper.rb
 - spec/support/appear_before_matcher.rb
 - spec/support/feature/base_feature_helper.rb
@@ -848,6 +838,7 @@ files:
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_da.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_de.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_el.js
+- vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-US.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es-MX.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es.js
 - vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_et.js
@@ -993,7 +984,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.

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

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module Admin
-    class ReportsController < Spree::Admin::BaseController
-      respond_to :html
-
-      class << self
-        def available_reports
-          @@available_reports
-        end
-
-        def add_available_report!(report_key, report_description_key = nil)
-          if report_description_key.nil?
-            report_description_key = "#{report_key}_description"
-          end
-
-          @@available_reports[report_key] = {
-            name: report_key,
-            description: report_description_key,
-          }
-        end
-      end
-
-      def initialize
-        super
-        ReportsController.add_available_report!(:sales_total)
-      end
-
-      def index
-        @reports = ReportsController.available_reports
-      end
-
-      def sales_total
-        params[:q] = search_params
-
-        @search = Order.complete.not_canceled.ransack(params[:q])
-        @orders = @search.result
-
-        @totals = {}
-        @orders.each do |order|
-          unless @totals[order.currency]
-            @totals[order.currency] = {
-              item_total: ::Money.new(0, order.currency),
-              adjustment_total: ::Money.new(0, order.currency),
-              sales_total: ::Money.new(0, order.currency)
-            }
-          end
-
-          @totals[order.currency][:item_total] += order.display_item_total.money
-          @totals[order.currency][:adjustment_total] += order.display_adjustment_total.money
-          @totals[order.currency][:sales_total] += order.display_total.money
-        end
-      end
-
-      @@available_reports = {}
-
-      private
-
-      def search_params
-        params.fetch(:q, {}).tap do |q|
-          q[:completed_at_gt] = adjust_start_date q[:completed_at_gt]
-          q[:completed_at_lt] = adjust_end_date(q[:completed_at_lt]) if q[:completed_at_lt].present?
-          q[:s] ||= 'completed_at desc'
-        end
-      end
-
-      def adjust_start_date(string_date = nil)
-        return Time.current.beginning_of_month if string_date.blank?
-        Time.zone.parse(string_date).beginning_of_day
-      rescue ArgumentError
-        Time.current.beginning_of_month
-      end
-
-      def adjust_end_date(string_date)
-        Time.zone.parse(string_date).end_of_day
-      rescue ArgumentError
-        ""
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-<% admin_breadcrumb(t('spree.reports')) %>
-
-
-<table class="index">
-  <thead>
-    <tr data-hook="reports_header">
-      <th><%= t('spree.name') %></th>
-      <th><%= t('spree.description') %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @reports.each do |key, value| %>
-    <tr data-hook="reports_row">
-      <td><%= link_to t(value[:name], scope: 'spree'), send("#{key}_admin_reports_url".to_sym) %></td>
-      <td><%= t(value[:description], scope: 'spree') %></td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -1,35 +0,0 @@
-<% admin_breadcrumb(link_to t('spree.reports'), spree.admin_reports_path) %>
-<% admin_breadcrumb(t('spree.sales_total')) %>
-
-<% content_for :page_actions do %>
-<% end %>
-
-
-<% content_for :table_filter_title do %>
-  <%= t('spree.date_range') %>
-<% end %>
-
-<% content_for :table_filter do %>
-  <%= render partial: 'spree/admin/shared/report_order_criteria', locals: { action: :sales_total } %>
-<% end %>
-
-<table class="admin-report" data-hook="sales_total">
-  <thead>
-    <tr>
-      <th><%= t('spree.currency') %></th>
-      <th><%= t('spree.item_total') %></th>
-      <th><%= t('spree.adjustment_total') %></th>
-      <th><%= t('spree.sales_total') %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @totals.each do |key, row| %>
-      <tr>
-        <td><%= key %></td>
-        <td><%= row[:item_total].format %></td>
-        <td><%= row[:adjustment_total].format %></td>
-        <td><%= row[:sales_total].format %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>

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

@@ -1,19 +0,0 @@
-<%= search_form_for @search, url: spree.url_for(controller: 'admin/reports', action: action)  do |s| %>
-  <div class="date-range-filter field">
-    <div class="date-range-fields input-group">
-      <%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:completed_at_gt]), placeholder: t('spree.start') %>
-
-      <div class="input-group-prepend input-group-append">
-        <span class="input-group-text range-divider">
-          <i class="fa fa-arrow-right"></i>
-        </span>
-      </div>
-
-      <%= s.text_field :completed_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:completed_at_lt]), placeholder: t('spree.end') %>
-    </div>
-  </div>
-
-  <div class="actions filter-actions">
-    <%= button_tag t('spree.search'), class: 'btn btn-primary' %>
-  </div>
-<% end %>

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

@@ -1,7 +0,0 @@
-<%= f.field_container :reason do %>
-  <%= f.label :reason, t('spree.reason'), class: 'required' %>
-  <%= select_tag :update_reason_id, options_from_collection_for_select(@update_reasons, :id, :name),
-    include_blank: t('spree.choose_reason'), class: 'custom-select fullwidth',
-    placeholder: t('spree.admin.store_credits.select_amount_update_reason') %>
-  <%= f.error_message_on :reason %>
-<% end %>

data/spec/controllers/spree/admin/reports_controller_spec.rb

@@ -1,133 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Spree::Admin::ReportsController, type: :controller do
-  stub_authorization!
-
-  describe 'ReportsController.available_reports' do
-    it 'should contain sales_total' do
-      expect(Spree::Admin::ReportsController.available_reports.keys.include?(:sales_total)).to be true
-    end
-  end
-
-  describe 'ReportsController.add_available_report!' do
-    context 'when adding the report name' do
-      it 'should contain the report' do
-        Spree::Admin::ReportsController.add_available_report!(:some_report)
-        expect(Spree::Admin::ReportsController.available_reports.keys.include?(:some_report)).to be true
-        expect(Spree::Admin::ReportsController.available_reports[:some_report]).to eq(
-          name: :some_report,
-          description: 'some_report_description'
-        )
-      end
-    end
-  end
-
-  describe 'GET sales_total' do
-    let!(:order_complete_start_of_month) { create(:completed_order_with_totals) }
-    let!(:order_complete_mid_month) { create(:completed_order_with_totals) }
-    let!(:order_non_complete) { create(:order, completed_at: nil) }
-
-    before do
-      # can't set completed_at during factory creation
-      order_complete_start_of_month.completed_at = Time.current.beginning_of_month + 1.minute
-      order_complete_start_of_month.save!
-
-      order_complete_mid_month.completed_at = Time.current.beginning_of_month + 15.days
-      order_complete_mid_month.save!
-    end
-
-    subject { get :sales_total, params: params }
-
-    shared_examples 'sales total report' do
-      it 'should respond with success' do
-        expect(response).to be_successful
-      end
-
-      it 'should set search to be a ransack search' do
-        subject
-        expect(assigns(:search)).to be_a Ransack::Search
-      end
-
-      it 'should set orders correctly for date parameters' do
-        subject
-        expect(assigns(:orders)).to eq expected_returned_orders
-      end
-
-      it 'does not include non-complete orders' do
-        subject
-        expect(assigns(:orders)).to_not include(order_non_complete)
-      end
-
-      it 'should correctly set the totals hash' do
-        subject
-        expect(assigns(:totals)).to eq expected_totals
-      end
-    end
-
-    context 'when no dates are specified' do
-      let(:params) { {} }
-
-      it_behaves_like 'sales total report' do
-        let(:expected_returned_orders) { [order_complete_mid_month, order_complete_start_of_month] }
-        let(:expected_totals) {
-          {
-            'USD' => {
-              item_total: Money.new(2000, 'USD'),
-              adjustment_total: Money.new(0, 'USD'),
-              sales_total: Money.new(22_000, 'USD')
-            }
-          }
-        }
-      end
-    end
-
-    context 'when params has a completed_at_gt' do
-      let(:params) { { q: { completed_at_gt: Time.current.beginning_of_month + 1.day } } }
-
-      it_behaves_like 'sales total report' do
-        let(:expected_returned_orders) { [order_complete_mid_month] }
-        let(:expected_totals) {
-          {
-            'USD' => {
-              item_total: Money.new(1000, 'USD'),
-              adjustment_total: Money.new(0, 'USD'),
-              sales_total: Money.new(11_000, 'USD')
-            }
-          }
-        }
-      end
-    end
-
-    context 'when params has a compeleted_at_lt' do
-      let(:params) { { q: { completed_at_lt: Time.current.beginning_of_month } } }
-
-      it_behaves_like 'sales total report' do
-        let(:expected_returned_orders) { [order_complete_start_of_month] }
-        let(:expected_totals) {
-          {
-            'USD' => {
-              item_total: Money.new(1000, 'USD'),
-              adjustment_total: Money.new(0, 'USD'),
-              sales_total: Money.new(11_000, 'USD')
-            }
-          }
-        }
-      end
-    end
-  end
-
-  describe 'GET index' do
-    it 'should be ok' do
-      get :index
-      expect(response).to be_ok
-    end
-  end
-
-  after(:each) do
-    Spree::Admin::ReportsController.available_reports.delete_if do |key, _value|
-      key != :sales_total
-    end
-  end
-end