solidus_core 1.0.0.pre → 1.0.0.pre2

data/db/migrate/20150622144655_add_update_reason_to_store_credit_events.rb

@@ -0,0 +1,5 @@
+class AddUpdateReasonToStoreCreditEvents < ActiveRecord::Migration
+  def change
+    add_column :spree_store_credit_events, :update_reason_id, :integer
+  end
+end

data/db/migrate/20150623194316_add_return_authorization_reason_id_to_return_items.rb

@@ -0,0 +1,7 @@
+class AddReturnAuthorizationReasonIdToReturnItems < ActiveRecord::Migration
+  def change
+    rename_table :spree_return_authorization_reasons, :spree_return_reasons
+    rename_column :spree_return_authorizations, :return_authorization_reason_id, :return_reason_id
+    add_column :spree_return_items, :return_reason_id, :integer
+  end
+end

data/db/migrate/20150623214058_seed_store_credit_update_reasons.rb

@@ -0,0 +1,9 @@
+class SeedStoreCreditUpdateReasons < ActiveRecord::Migration
+  def up
+    Spree::StoreCreditUpdateReason.create!(name: 'Credit Given In Error')
+  end
+
+  def down
+    Spree::StoreCreditUpdateReason.find_by(name: 'Credit Given In Error').try!(:destroy)
+  end
+end

data/db/migrate/20150626200816_remove_shipping_method_id_from_spree_orders.rb

@@ -0,0 +1,9 @@
+class RemoveShippingMethodIdFromSpreeOrders < ActiveRecord::Migration
+  def up
+    remove_column :spree_orders, :shipping_method_id, :integer
+  end
+
+  def down
+    add_column :spree_orders, :shipping_method_id, :integer
+  end
+end

data/db/seeds.rb

@@ -3,3 +3,12 @@ default_path = File.join(File.dirname(__FILE__), 'default')
 
 Rake::Task['db:load_dir'].reenable
 Rake::Task['db:load_dir'].invoke(default_path)
+
+Spree::PaymentMethod.find_or_create_by(type: "Spree::PaymentMethod::StoreCredit", name: "Store Credit", description: "Store credit.", active: true, environment: Rails.env, display_on: 'back_end')
+
+Spree::StoreCreditType.find_or_create_by(name: 'Expiring', priority: 1)
+Spree::StoreCreditType.find_or_create_by(name: 'Non-expiring', priority: 2)
+
+Spree::StoreCreditCategory.find_or_create_by(name: 'Gift Card')
+
+Spree::StoreCreditUpdateReason.find_or_create_by(name: 'Credit Given In Error')

data/lib/spree/core.rb

@@ -19,10 +19,6 @@ require 'responders'
 # invalid state of a Payment. In the future this should be removed.
 StateMachines::Machine.ignore_method_conflicts = true
 
-# This is required because ActiveModel::Validations#invalid? conflicts with the
-# invalid state of a Payment. In the future this should be removed.
-StateMachines::Machine.ignore_method_conflicts = true
-
 module Spree
 
   mattr_accessor :user_class
@@ -93,3 +89,4 @@ require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/unreturned_item_charger'
+require 'spree/core/role_configuration'

data/lib/spree/core/controller_helpers/auth.rb

@@ -4,12 +4,25 @@ module Spree
       module Auth
         extend ActiveSupport::Concern
 
+        # @!attribute [rw] unauthorized_redirect
+        #   @!scope class
+        #   Extension point for overriding behaviour of access denied errors.
+        #   Default behaviour is to redirect to "/unauthorized" with a flash
+        #   message.
+        #   @return [Proc] action to take when access denied error is raised.
+
         included do
           before_filter :set_guest_token
           helper_method :try_spree_current_user
 
-          rescue_from CanCan::AccessDenied do |exception|
-            redirect_unauthorized_access
+          class_attribute :unauthorized_redirect
+          self.unauthorized_redirect = -> do
+            flash[:error] = Spree.t(:authorization_failure)
+            redirect_to "/unauthorized"
+          end
+
+          rescue_from CanCan::AccessDenied do
+            instance_exec &unauthorized_redirect
           end
         end
 
@@ -59,24 +72,6 @@ module Spree
             nil
           end
         end
-
-        # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
-        # Override this method in your controllers if you want to have special behavior in case the user is not authorized
-        # to access the requested action.  For example, a popup window might simply close itself.
-        def redirect_unauthorized_access
-          if try_spree_current_user
-            flash[:error] = Spree.t(:authorization_failure)
-            redirect_to '/unauthorized'
-          else
-            store_location
-            if respond_to?(:spree_login_path)
-              redirect_to spree_login_path
-            else
-              redirect_to '/unauthorized'
-            end
-          end
-        end
-
       end
     end
   end

data/lib/spree/core/engine.rb

@@ -36,6 +36,7 @@ module Spree
         app.config.spree.payment_methods = [
             Spree::Gateway::Bogus,
             Spree::Gateway::BogusSimple,
+            Spree::PaymentMethod::StoreCredit,
             Spree::PaymentMethod::Check ]
       end
 

data/lib/spree/core/importer/order.rb

@@ -22,17 +22,20 @@ module Spree
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
             create_payments_from_params(params.delete(:payments_attributes), order)
 
-            if completed_at = params.delete(:completed_at)
-              order.completed_at = completed_at
-              order.state = 'complete'
-            end
-
             params.delete(:user_id) unless user.try(:has_spree_role?, "admin") && params.key?(:user_id)
 
+            completed_at = params.delete(:completed_at)
+
             order.update_attributes!(params)
 
             order.create_proposed_shipments unless shipments_attrs.present?
 
+            if completed_at
+              order.completed_at = completed_at
+              order.state = 'complete'
+              order.save!
+            end
+
             # Really ensure that the order totals & states are correct
             order.updater.update
             if shipments_attrs.present?

data/lib/spree/core/role_configuration.rb

@@ -0,0 +1,70 @@
+require 'singleton'
+
+module Spree
+  # A class responsible for associating {Spree::Role} with a list of permission sets.
+  #
+  # @see Spree::PermissionSets
+  #
+  # @example Adding order, product, and user display to customer service users.
+  #   Spree::RoleConfiguration.configure do |config|
+  #     config.assign_permissions :customer_service, [
+  #       Spree::PermissionSets::OrderDisplay,
+  #       Spree::PermissionSets::UserDisplay,
+  #       Spree::PermissionSets::ProductDisplay
+  #     ]
+  #   end
+  class RoleConfiguration
+    # An internal structure for the association between a role and a
+    # set of permissions.
+    Role = Struct.new(:name, :permission_sets)
+
+    include Singleton
+    attr_accessor :roles
+
+    # Yields the instance of the singleton, used for configuration
+    # @yield_param instance [Spree::RoleConfiguration]
+    def self.configure
+      yield(instance)
+    end
+
+    # Given a CanCan::Ability, and a user, determine what permissions sets can
+    # be activated on the ability, then activate them.
+    #
+    # This performs can/cannot declarations on the ability, and can modify its
+    # internal permissions.
+    #
+    # @param ability [CanCan::Ability] the ability to invoke declarations on
+    # @param user [#spree_roles] the user that holds the spree_roles association.
+    def activate_permissions! ability, user
+      spree_roles = user.spree_roles.pluck(:name)
+      applicable_permissions = Set.new
+
+      spree_roles.each do |role_name|
+        applicable_permissions |= roles[role_name].permission_sets
+      end
+
+      applicable_permissions.each do |permission_set|
+        permission_set.new(ability).activate!
+      end
+    end
+
+    # Not public due to the fact this class is a Singleton
+    # @!visibility private
+    def initialize
+      @roles = Hash.new do |h, name|
+        h[name] = Role.new(name, Set.new)
+      end
+    end
+
+    # Assign permission sets for a {Spree::Role} that has the name of role_name
+    # @param role_name [Symbol, String] The name of the role to associate permissions with
+    # @param permission_sets [Array<Spree::PermissionSets::Base>, Set<Spree::PermissionSets::Base>]
+    #   A list of permission sets to activate if the user has the role indicated by role_name
+    def assign_permissions role_name, permission_sets
+      name = role_name.to_s
+
+      roles[name].permission_sets |= permission_sets
+      roles[name]
+    end
+  end
+end

data/lib/spree/permitted_attributes.rb

@@ -69,7 +69,7 @@ module Spree
 
     @@property_attributes = [:name, :presentation]
 
-    @@return_authorization_attributes = [:memo, :stock_location_id, :return_authorization_reason_id, return_items_attributes: [:inventory_unit_id, :exchange_variant_id]]
+    @@return_authorization_attributes = [:memo, :stock_location_id, :return_reason_id, return_items_attributes: [:inventory_unit_id, :exchange_variant_id, :return_reason_id]]
 
     @@shipment_attributes = [
       :order, :special_instructions, :stock_location_id, :id,

data/lib/spree/testing_support/factories/adjustment_reason_factory.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :adjustment_reason, class: Spree::AdjustmentReason do
+    sequence(:name) { |n| "Refund for return ##{n}" }
+    sequence(:code) { |n| "Code #{n}"}
+  end
+end

data/lib/spree/testing_support/factories/order_factory.rb

@@ -2,6 +2,7 @@ FactoryGirl.define do
   factory :order, class: Spree::Order do
     user
     bill_address
+    ship_address
     completed_at nil
     email { user.try(:email) }
     store
@@ -69,10 +70,22 @@ FactoryGirl.define do
           end
 
           factory :shipped_order do
-            after(:create) do |order|
+            transient do
+              with_cartons true
+            end
+            after(:create) do |order, evaluator|
               order.shipments.each do |shipment|
                 shipment.inventory_units.update_all state: 'shipped'
                 shipment.update_columns(state: 'shipped', shipped_at: Time.now)
+                if evaluator.with_cartons
+                  Spree::Carton.create!(
+                    stock_location: shipment.stock_location,
+                    address: shipment.address,
+                    shipping_method: shipment.shipping_method,
+                    inventory_units: shipment.inventory_units,
+                    shipped_at: Time.now,
+                  )
+                end
               end
               order.reload
             end

data/lib/spree/testing_support/factories/promotion_factory.rb

@@ -47,10 +47,8 @@ FactoryGirl.define do
       after(:create) do |promotion, evaluator|
         rule = Spree::Promotion::Rules::ItemTotal.create!(
           promotion: promotion,
-          preferred_operator_min: 'gte',
-          preferred_operator_max: 'lte',
-          preferred_amount_min: evaluator.item_total_threshold_amount,
-          preferred_amount_max: evaluator.item_total_threshold_amount + 100
+          preferred_operator: 'gte',
+          preferred_amount: evaluator.item_total_threshold_amount
         )
         promotion.rules << rule
         promotion.save!

data/lib/spree/testing_support/factories/return_authorization_factory.rb

@@ -2,17 +2,17 @@ FactoryGirl.define do
   factory :return_authorization, class: Spree::ReturnAuthorization do
     association(:order, factory: :shipped_order)
     association(:stock_location, factory: :stock_location)
-    association(:reason, factory: :return_authorization_reason)
+    association(:reason, factory: :return_reason)
     memo 'Items were broken'
   end
 
   factory :new_return_authorization, class: Spree::ReturnAuthorization do
     association(:order, factory: :shipped_order)
     association(:stock_location, factory: :stock_location)
-    association(:reason, factory: :return_authorization_reason)
+    association(:reason, factory: :return_reason)
   end
 
-  factory :return_authorization_reason, class: Spree::ReturnAuthorizationReason do
+  factory :return_reason, class: Spree::ReturnReason do
     sequence(:name) { |n| "Defect ##{n}" }
   end
 end

data/lib/spree/testing_support/factories/return_item_factory.rb

@@ -1,6 +1,7 @@
 FactoryGirl.define do
   factory :return_item, class: Spree::ReturnItem do
     association(:inventory_unit, factory: :inventory_unit, state: :shipped)
+    association(:return_reason, factory: :return_reason)
     return_authorization do |return_item|
       build(:return_authorization, order: inventory_unit.order)
     end

data/lib/spree/testing_support/factories/store_credit_event_factory.rb

@@ -11,5 +11,15 @@ FactoryGirl.define do
     factory :store_credit_capture_event do
       action             { Spree::StoreCredit::CAPTURE_ACTION }
     end
+
+    factory :store_credit_adjustment_event do
+      action             { Spree::StoreCredit::ADJUSTMENT_ACTION }
+      update_reason      { create(:store_credit_update_reason) }
+    end
+
+    factory :store_credit_invalidate_event do
+      action             { Spree::StoreCredit::INVALIDATE_ACTION }
+      update_reason      { create(:store_credit_update_reason) }
+    end
   end
 end

data/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :store_credit_update_reason, class: Spree::StoreCreditUpdateReason do
+    name "Input error"
+  end
+end

data/lib/spree/testing_support/factories/store_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :store, class: Spree::Store do
     sequence(:code) { |i| "spree_#{i}" }
-    name 'Spree Test Store'
+    sequence(:name) { |i| "Spree Test Store #{i}" }
     sequence(:url) { |i| "www.example#{i}.com" }
     mail_from_address 'spree@example.org'
   end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,10 +1,5 @@
 class OrderWalkthrough
   def self.up_to(state)
-    # A payment method must exist for an order to proceed through the Address state
-    unless Spree::PaymentMethod.exists?
-      FactoryGirl.create(:check_payment_method)
-    end
-
     # Need to create a valid zone too...
     zone = FactoryGirl.create(:zone)
     country = FactoryGirl.create(:country)
@@ -56,8 +51,8 @@ class OrderWalkthrough
   end
 
   def self.payment(order)
-    FactoryGirl.create(:credit_card) unless Spree::CreditCard.exists?
-    order.payments.create!(:payment_method => Spree::PaymentMethod.first, :amount => order.total, source: Spree::CreditCard.first)
+    credit_card = FactoryGirl.create(:credit_card)
+    order.payments.create!(:payment_method => credit_card.payment_method, :amount => order.total, source: credit_card)
     # TODO: maybe look at some way of making this payment_state change automatic
     order.payment_state = 'paid'
     order.next!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -352,14 +352,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: The bare bones necessary for Spree.
+description: Essential models, mailers, and classes for the Solidus e-commerce project.
 email: contact@solidus.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- app/assets/images/logo/solidus.png
 - app/assets/images/logo/solidus_logo.png
 - app/assets/images/noimage/large.png
 - app/assets/images/noimage/mini.png
@@ -385,11 +384,13 @@ files:
 - app/models/concerns/spree/named_type.rb
 - app/models/concerns/spree/user_address.rb
 - app/models/concerns/spree/user_api_authentication.rb
+- app/models/concerns/spree/user_methods.rb
 - app/models/concerns/spree/user_payment_source.rb
 - app/models/concerns/spree/user_reporting.rb
 - app/models/spree/ability.rb
 - app/models/spree/address.rb
 - app/models/spree/adjustment.rb
+- app/models/spree/adjustment_reason.rb
 - app/models/spree/app_configuration.rb
 - app/models/spree/asset.rb
 - app/models/spree/base.rb
@@ -423,7 +424,6 @@ files:
 - app/models/spree/image.rb
 - app/models/spree/inventory_unit.rb
 - app/models/spree/item_adjustments.rb
-- app/models/spree/item_adjustments.rb.orig
 - app/models/spree/legacy_user.rb
 - app/models/spree/line_item.rb
 - app/models/spree/line_item_action.rb
@@ -450,6 +450,21 @@ files:
 - app/models/spree/payment_method.rb
 - app/models/spree/payment_method/check.rb
 - app/models/spree/payment_method/store_credit.rb
+- app/models/spree/permission_sets/base.rb
+- app/models/spree/permission_sets/configuration_display.rb
+- app/models/spree/permission_sets/configuration_management.rb
+- app/models/spree/permission_sets/dashboard_display.rb
+- app/models/spree/permission_sets/order_display.rb
+- app/models/spree/permission_sets/order_management.rb
+- app/models/spree/permission_sets/product_display.rb
+- app/models/spree/permission_sets/product_management.rb
+- app/models/spree/permission_sets/promotion_display.rb
+- app/models/spree/permission_sets/promotion_management.rb
+- app/models/spree/permission_sets/report_display.rb
+- app/models/spree/permission_sets/stock_display.rb
+- app/models/spree/permission_sets/stock_management.rb
+- app/models/spree/permission_sets/user_display.rb
+- app/models/spree/permission_sets/user_management.rb
 - app/models/spree/preference.rb
 - app/models/spree/preferences/configuration.rb
 - app/models/spree/preferences/preferable.rb
@@ -503,7 +518,6 @@ files:
 - app/models/spree/reimbursement_type/reimbursement_helpers.rb
 - app/models/spree/reimbursement_type/store_credit.rb
 - app/models/spree/return_authorization.rb
-- app/models/spree/return_authorization_reason.rb
 - app/models/spree/return_item.rb
 - app/models/spree/return_item/eligibility_validator/base_validator.rb
 - app/models/spree/return_item/eligibility_validator/default.rb
@@ -514,6 +528,7 @@ files:
 - app/models/spree/return_item/eligibility_validator/time_since_purchase.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_product.rb
+- app/models/spree/return_reason.rb
 - app/models/spree/returns_calculator.rb
 - app/models/spree/role.rb
 - app/models/spree/role_user.rb
@@ -526,7 +541,6 @@ files:
 - app/models/spree/shipping_rate.rb
 - app/models/spree/state.rb
 - app/models/spree/state_change.rb
-- app/models/spree/static_model_preferences.rb
 - app/models/spree/stock/adjuster.rb
 - app/models/spree/stock/availability_validator.rb
 - app/models/spree/stock/content_item.rb
@@ -552,6 +566,7 @@ files:
 - app/models/spree/store_credit_category.rb
 - app/models/spree/store_credit_event.rb
 - app/models/spree/store_credit_type.rb
+- app/models/spree/store_credit_update_reason.rb
 - app/models/spree/tax_category.rb
 - app/models/spree/tax_rate.rb
 - app/models/spree/taxon.rb
@@ -559,6 +574,7 @@ files:
 - app/models/spree/tracker.rb
 - app/models/spree/transfer_item.rb
 - app/models/spree/unit_cancel.rb
+- app/models/spree/user_class_handle.rb
 - app/models/spree/user_stock_location.rb
 - app/models/spree/validations/db_maximum_length_validator.rb
 - app/models/spree/variant.rb
@@ -582,10 +598,11 @@ files:
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/friendly_id.rb
 - config/initializers/premailer_assets.rb
-- config/initializers/user_class_extensions.rb
+- config/initializers/spree_user.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/default/spree/countries.rb
+- db/default/spree/return_reasons.rb
 - db/default/spree/roles.rb
 - db/default/spree/states.rb
 - db/default/spree/store_credit.rb
@@ -832,6 +849,12 @@ files:
 - db/migrate/20150611200247_add_frontend_viewable_to_spree_orders.rb
 - db/migrate/20150612205731_remove_spree_configurations.rb
 - db/migrate/20150618191713_remove_credit_card_address_id.rb
+- db/migrate/20150618212517_create_spree_store_credit_update_reasons.rb
+- db/migrate/20150619160613_create_adjustment_reason.rb
+- db/migrate/20150622144655_add_update_reason_to_store_credit_events.rb
+- db/migrate/20150623194316_add_return_authorization_reason_id_to_return_items.rb
+- db/migrate/20150623214058_seed_store_credit_update_reasons.rb
+- db/migrate/20150626200816_remove_shipping_method_id_from_spree_orders.rb
 - db/migrate/20150626214817_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -873,6 +896,7 @@ files:
 - lib/spree/core/permalinks.rb
 - lib/spree/core/product_duplicator.rb
 - lib/spree/core/product_filters.rb
+- lib/spree/core/role_configuration.rb
 - lib/spree/core/routes.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/search/variant.rb
@@ -899,6 +923,7 @@ files:
 - lib/spree/testing_support/factories.rb
 - lib/spree/testing_support/factories/address_factory.rb
 - lib/spree/testing_support/factories/adjustment_factory.rb
+- lib/spree/testing_support/factories/adjustment_reason_factory.rb
 - lib/spree/testing_support/factories/calculator_factory.rb
 - lib/spree/testing_support/factories/carton_factory.rb
 - lib/spree/testing_support/factories/country_factory.rb
@@ -939,6 +964,7 @@ files:
 - lib/spree/testing_support/factories/store_credit_event_factory.rb
 - lib/spree/testing_support/factories/store_credit_factory.rb
 - lib/spree/testing_support/factories/store_credit_type_factory.rb
+- lib/spree/testing_support/factories/store_credit_update_reason_factory.rb
 - lib/spree/testing_support/factories/store_factory.rb
 - lib/spree/testing_support/factories/tax_category_factory.rb
 - lib/spree/testing_support/factories/tax_rate_factory.rb
@@ -986,8 +1012,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: The bare bones necessary for Spree.
+summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []