ba_spree_loyalty_points 1.0.0 → 1.0.2

data/db/migrate/20140117062720_add_timestamps_to_loyalty_points_transaction.rb

@@ -1,4 +1,4 @@
-class AddTimestampsToLoyaltyPointsTransaction < ActiveRecord::Migration[7.1]
+class AddTimestampsToLoyaltyPointsTransaction < ActiveRecord::Migration[8.0]
   def change
     change_table :spree_loyalty_points_transactions do |t|
       t.timestamps

data/db/migrate/20140117065314_add_fields_to_spree_loyalty_points_transaction.rb

@@ -1,4 +1,4 @@
-class AddFieldsToSpreeLoyaltyPointsTransaction < ActiveRecord::Migration[7.1]
+class AddFieldsToSpreeLoyaltyPointsTransaction < ActiveRecord::Migration[8.0]
   def change
     add_column :spree_loyalty_points_transactions, :source_type, :string
     rename_column :spree_loyalty_points_transactions, :order_id, :source_id

data/db/migrate/20140122084005_add_comment_to_spree_loyalty_points_transaction.rb

@@ -1,4 +1,4 @@
-class AddCommentToSpreeLoyaltyPointsTransaction < ActiveRecord::Migration[7.1]
+class AddCommentToSpreeLoyaltyPointsTransaction < ActiveRecord::Migration[8.0]
   def change
     add_column :spree_loyalty_points_transactions, :comment, :string
   end

data/db/migrate/20140123092709_add_paid_at_to_spree_order.rb

@@ -1,4 +1,4 @@
-class AddPaidAtToSpreeOrder < ActiveRecord::Migration[7.1]
+class AddPaidAtToSpreeOrder < ActiveRecord::Migration[8.0]
   def change
     add_column :spree_orders, :paid_at, :datetime
   end

data/db/migrate/20140123120355_add_loyalty_points_to_spree_return_authorization.rb

@@ -1,4 +1,4 @@
-class AddLoyaltyPointsToSpreeReturnAuthorization < ActiveRecord::Migration[7.1]
+class AddLoyaltyPointsToSpreeReturnAuthorization < ActiveRecord::Migration[8.0]
   def change
     add_column :spree_return_authorizations, :loyalty_points, :integer, default: 0, null: false
     add_column :spree_return_authorizations, :loyalty_points_transaction_type, :string

data/db/migrate/20140124121728_add_loyalty_points_awarded_to_spree_order.rb

@@ -1,4 +1,4 @@
-class AddLoyaltyPointsAwardedToSpreeOrder < ActiveRecord::Migration[7.1]
+class AddLoyaltyPointsAwardedToSpreeOrder < ActiveRecord::Migration[8.0]
   def change
     add_column :spree_orders, :loyalty_points_awarded, :boolean, default: false, null: false
   end

data/db/migrate/20140130131957_rename_fields_in_spree_loyalty_points_transaction.rb

@@ -1,4 +1,4 @@
-class RenameFieldsInSpreeLoyaltyPointsTransaction < ActiveRecord::Migration[7.1]
+class RenameFieldsInSpreeLoyaltyPointsTransaction < ActiveRecord::Migration[8.0]
   def change
     rename_column :spree_loyalty_points_transactions, :updated_balance, :balance
     rename_column :spree_loyalty_points_transactions, :transaction_type, :type

data/db/migrate/20140131072702_remove_loyalty_points_awarded_from_spree_order.rb

@@ -1,4 +1,4 @@
-class RemoveLoyaltyPointsAwardedFromSpreeOrder < ActiveRecord::Migration[7.1]
+class RemoveLoyaltyPointsAwardedFromSpreeOrder < ActiveRecord::Migration[8.0]
   def change
     remove_column :spree_orders, :loyalty_points_awarded, :boolean, default: false, null: false
   end

data/db/migrate/20140203063433_add_indexing_to_spree_loyalty_points_transaction.rb

@@ -1,4 +1,4 @@
-class AddIndexingToSpreeLoyaltyPointsTransaction < ActiveRecord::Migration[7.1]
+class AddIndexingToSpreeLoyaltyPointsTransaction < ActiveRecord::Migration[8.0]
   def change
     add_index :spree_loyalty_points_transactions, [:source_type, :source_id], name: 'by_source'
     add_index :spree_loyalty_points_transactions, :user_id

data/db/migrate/20140205111553_add_transaction_id_to_spree_loyalty_points_transactions.rb

@@ -1,4 +1,4 @@
-class AddTransactionIdToSpreeLoyaltyPointsTransactions < ActiveRecord::Migration[7.1]
+class AddTransactionIdToSpreeLoyaltyPointsTransactions < ActiveRecord::Migration[8.0]
   def change
     add_column :spree_loyalty_points_transactions, :transaction_id, :string
   end

data/db/migrate/20140207055836_add_lock_version_to_spree_user.rb

@@ -1,4 +1,4 @@
-class AddLockVersionToSpreeUser < ActiveRecord::Migration[7.1]
+class AddLockVersionToSpreeUser < ActiveRecord::Migration[8.0]
   def change
     users_table_name = Spree.user_class.present? ? Spree.user_class.table_name : :spree_users
     add_column users_table_name, :lock_version, :integer, default: 0, null: false unless column_exists?(users_table_name, :lock_version)

data/db/migrate/20251210070500_remove_lock_version_from_spree_user.rb

@@ -0,0 +1,11 @@
+class RemoveLockVersionFromSpreeUser < ActiveRecord::Migration[8.0]
+  def change
+    # Remove lock_version column that was added by 20140207055836_add_lock_version_to_spree_user.rb
+    # This column is not actually used by the loyalty points engine and causes
+    # ActiveRecord::StaleObjectError when User is touched by related models
+    users_table_name = Spree.user_class.present? ? Spree.user_class.table_name : :spree_users
+    if table_exists?(users_table_name) && column_exists?(users_table_name, :lock_version)
+      remove_column users_table_name, :lock_version, :integer, default: 0, null: false
+    end
+  end
+end

data/lib/ba_spree_loyalty_points.rb

@@ -1,2 +1,3 @@
 require 'spree_core'
+require 'deface'
 require 'spree_loyalty_points/engine'

data/lib/spree_loyalty_points/engine.rb

@@ -15,6 +15,7 @@ module SpreeLoyaltyPoints
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
+      Rails.application.config.paths["app/views"].unshift([Spree::Storefront::Engine.root, 'app/views/themes/default'].join('/'))
 
       Spree.user_class.class_eval do
         validates :loyalty_points_balance, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
@@ -26,7 +27,7 @@ module SpreeLoyaltyPoints
         end
 
         def loyalty_points_balance_sufficient?
-          loyalty_points_balance >= Spree::Store.default.loyalty_points_redeeming_balance
+          loyalty_points_balance >= Spree::Store.default.preferred_loyalty_points_redeeming_balance
         end
 
         def has_sufficient_loyalty_points?(order)
@@ -34,7 +35,7 @@ module SpreeLoyaltyPoints
         end
 
         def loyalty_points_equivalent_currency
-          loyalty_points_balance * Spree::Store.default.loyalty_points_conversion_rate
+          loyalty_points_balance * Spree::Store.default.preferred_loyalty_points_conversion_rate
         end
 
       end

data/lib/spree_loyalty_points/version.rb

@@ -1,3 +1,3 @@
 module SpreeLoyaltyPoints
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ba_spree_loyalty_points
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - be agile Co., Ltd.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2026-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.1
+        version: 5.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.1
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
-  name: spree_backend
+  name: spree_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 5.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 5.3.6
 - !ruby/object:Gem::Dependency
-  name: spree_frontend
+  name: spree_storefront
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.3.6
+- !ruby/object:Gem::Dependency
+  name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.13
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: gem_override_marker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: To award loyalty points and add loyalty points payment method to spree.  Compatible
   with Ruby 3.1, Rails 7.1 and Spree 4.10.
 email: develop@be-agile.jp
@@ -236,8 +278,8 @@ files:
 - app/controllers/spree/admin/loyalty_points_transactions_controller.rb
 - app/controllers/spree/admin/resource_controller_decorator.rb
 - app/controllers/spree/admin/return_authorizations_controller_decorator.rb
-- app/controllers/spree/checkout_controller_decorator.rb
 - app/controllers/spree/loyalty_points_controller.rb
+- app/controllers/spree_loyalty_points/checkout_controller_decorator.rb
 - app/models/concerns/spree/loyalty_points.rb
 - app/models/concerns/spree/order/loyalty_points.rb
 - app/models/concerns/spree/payment/loyalty_points.rb
@@ -245,15 +287,14 @@ files:
 - app/models/spree/loyalty_points_credit_transaction.rb
 - app/models/spree/loyalty_points_debit_transaction.rb
 - app/models/spree/loyalty_points_transaction.rb
-- app/models/spree/order_decorator.rb
-- app/models/spree/payment_decorator.rb
 - app/models/spree/payment_method/loyalty_points.rb
-- app/models/spree/payment_method_decorator.rb
 - app/models/spree/return_authorization_decorator.rb
-- app/models/spree/store_decorator.rb
-- app/overrides/add_condition_to_amount_on_return_authorization_page.rb
-- app/overrides/add_loyalty_points_balance_to_account_page.rb
+- app/models/spree_loyalty_points/order_decorator.rb
+- app/models/spree_loyalty_points/payment_decorator.rb
+- app/models/spree_loyalty_points/payment_method_decorator.rb
+- app/models/spree_loyalty_points/store_decorator.rb
 - app/overrides/add_loyalty_points_debiting_to_return_authorization_page.rb
+- app/overrides/add_loyalty_points_to_account_nav.rb
 - app/overrides/add_loyalty_points_to_admin_user_show_page.rb
 - app/overrides/add_loyalty_points_to_cart_page.rb
 - app/overrides/add_loyalty_points_to_order_checkout_page.rb
@@ -286,16 +327,15 @@ files:
 - db/migrate/20140203063433_add_indexing_to_spree_loyalty_points_transaction.rb
 - db/migrate/20140205111553_add_transaction_id_to_spree_loyalty_points_transactions.rb
 - db/migrate/20140207055836_add_lock_version_to_spree_user.rb
+- db/migrate/20251210070500_remove_lock_version_from_spree_user.rb
 - lib/ba_spree_loyalty_points.rb
 - lib/generators/spree_loyalty_points/install/install_generator.rb
 - lib/spree_loyalty_points/engine.rb
-- lib/spree_loyalty_points/factories.rb
 - lib/spree_loyalty_points/version.rb
 - lib/tasks/loyalty_points/award.rake
 homepage: https://github.com/be-agile/ba_spree_loyalty_points
 licenses:
 - AGPL-3.0-or-later
-- BSD-3-Clause
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -313,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.2.33
+rubygems_version: 3.4.9
 signing_key:
 specification_version: 4
 summary: Add loyalty points to spree (be agile fork)

data/app/models/spree/store_decorator.rb

@@ -1,23 +0,0 @@
-module Spree
-  module StoreDecorator
-    def self.prepended(base)
-      existing_settings = base.typed_stores[:settings]&.fields || {}
-      base.typed_store :settings, coder: ActiveRecord::TypedStore::IdentityCoder do |s|
-        existing_settings.each do |name, field|
-          s.send(field.type_sym, name, **field.instance_variables.each_with_object({}) { |var, hash|
-            hash[var.to_s.delete("@").to_sym] = field.instance_variable_get(var) unless var == :@type
-          })
-        end
-        unless existing_settings.key?(:loyalty_points_awarding_unit)
-          s.decimal :loyalty_points_awarding_unit, default: 0.01, null: false
-          s.decimal :loyalty_points_redeeming_balance, default: 0.0, null: false
-          s.decimal :loyalty_points_conversion_rate, default: 1.0, null: false
-          s.integer :loyalty_points_award_period, default: 12, null: false
-          s.decimal :min_amount_required_to_get_loyalty_points, default: 0.0, null: false
-        end
-      end
-    end
-  end
-end
-
-Spree::Store.prepend Spree::StoreDecorator

data/app/overrides/add_condition_to_amount_on_return_authorization_page.rb

@@ -1,8 +0,0 @@
-Deface::Override.new(virtual_path: 'spree/admin/return_authorizations/_form',
-  name: 'surround_amount_with_condition_in_return_authorization_form',
-  surround: "erb[loud]:contains('field_container :amount')",
-  text: "
-    <% if !@return_authorization.order.loyalty_points_used? %>
-      <%= render_original %>
-    <% end %>
-  ")

data/app/overrides/add_loyalty_points_balance_to_account_page.rb

@@ -1,9 +0,0 @@
-Deface::Override.new(virtual_path: 'spree/users/show',
-  name: 'add_loyalty_points_balance_to_account_page',
-  insert_after: ".account-page-user-info-item-store-credits",
-  text: "
-    <dl id='loyalty-points-info'>
-      <dt><%= Spree.t(:loyalty_points_balance) %></dt>
-      <dd><%= @user.loyalty_points_balance %> (<%= link_to Spree.t(:details), spree.loyalty_points_path %>)</dd>
-    </dl>
-  ")

data/lib/spree_loyalty_points/factories.rb

@@ -1,84 +0,0 @@
-FactoryGirl.define do
-  # Define your Spree extensions Factories within this file to enable applications, and other extensions to use and override them.
-  #
-  # Example adding this to your spec_helper will load these Factories for use:
-  # require 'spree_loyalty_points/factories'
-
-  factory :loyalty_points_transaction, class: Spree::LoyaltyPointsTransaction do
-    loyalty_points { (10..99).to_a.sample }
-    balance { (100..999).to_a.sample }
-    comment { FFaker::Lorem.words(3).join(' ') }
-    type "Spree::LoyaltyPointsCreditTransaction"
-
-    association :user, factory: :user_with_loyalty_points
-
-    factory :loyalty_points_credit_transaction, class: Spree::LoyaltyPointsCreditTransaction do
-      type "Spree::LoyaltyPointsCreditTransaction"
-    end
-
-    factory :loyalty_points_debit_transaction, class: Spree::LoyaltyPointsDebitTransaction do
-      type "Spree::LoyaltyPointsDebitTransaction"
-    end
-
-  end
-
-  factory :user_with_loyalty_points, parent: :user do
-    loyalty_points_balance { (100..999).to_a.sample }
-
-    transient do
-      transactions_count 5
-    end
-
-    after(:create) do |user, evaluator|
-      create_list(:loyalty_points_transaction, evaluator.transactions_count, user: user)
-    end
-  end
-
-  factory :order_with_loyalty_points, parent: :order do
-
-    association :user, factory: :user_with_loyalty_points
-
-    transient do
-      transactions_count 5
-    end
-
-    after(:create) do |order, evaluator|
-      create_list(:loyalty_points_transaction, evaluator.transactions_count, source: order)
-    end
-
-  factory :shipped_order_with_loyalty_points, parent: :shipped_order do
-      transient do
-        shipments_count 5
-      end
-
-      after(:create) do |order, evaluator|
-        create_list(:shipment, evaluator.shipments_count, order: order, state: "shipped")
-      end
-    end
-
-  end
-
-  factory :payment_with_loyalty_points, parent: :payment do
-
-    association :order, factory: :order_with_loyalty_points
-
-  end
-
-  factory :return_authorization_with_loyalty_points, parent: :return_authorization do
-    loyalty_points { (50..99).to_a.sample }
-    loyalty_points_transaction_type "Debit"
-
-    association :order, factory: :shipped_order_with_loyalty_points
-
-  end
-
-end
-
-FactoryGirl.modify do
-
-  factory :return_authorization, class: Spree::ReturnAuthorization do
-    loyalty_points { (50..99).to_a.sample }
-    loyalty_points_transaction_type "Debit"
-  end
-
-end