ba_spree_loyalty_points 1.0.0 → 1.0.2

data/README.md

@@ -14,7 +14,7 @@ This extension allows only Loyalty Points payment method for making a purchase a
 
 * Supports Ruby 3.1
 * Supports Rails 7.1
-* Supports Spree 4.10
+* Supports Spree 5.3
 * Japanese translations included
 * Actively maintained with contributions back to the original project
 

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

@@ -40,6 +40,10 @@ module Spree
           params.require(:loyalty_points_transaction).permit(:loyalty_points, :type, :comment, :source_id, :source_type)
         end
 
+        def permitted_resource_params
+          loyalty_points_transaction_params
+        end
+
         def build_resource
           if params[:loyalty_points_transaction].present? && params[:loyalty_points_transaction][:type].present?
             parent.send(association_name(params[:loyalty_points_transaction][:type])).build
@@ -63,7 +67,7 @@ module Spree
         def set_ordered_transactions
           @loyalty_points_transactions = @loyalty_points_transactions.order(updated_at: :desc).
                                            page(params[:page]).
-                                           per(params[:per_page] || Spree::Backend::Config[:admin_orders_per_page])
+                                           per(params[:per_page] || 25)
         end
     end
   end

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

@@ -3,6 +3,8 @@ module Spree
     module ResourceControllerDecorator
       protected
 
+      # @gem-override spree_admin-5.3.6/app/controllers/spree/admin/resource_controller.rb#parent
+      # @see https://github.com/be-agile/giga-repeat/commit/7c6b01c098e0003527926b1c221d4a586fe76a23
       def parent
         if parent_data.is_a?(Hash) && parent_data[:model_class].present?
           @parent ||= parent_data[:model_class].send("find_by_#{parent_data[:find_by]}", params["#{resource.model_name}_id"])
@@ -13,6 +15,8 @@ module Spree
         end
       end
 
+      # @gem-override spree_admin-5.3.6/app/controllers/spree/admin/resource_controller.rb#resource_not_found
+      # @see https://github.com/be-agile/giga-repeat/commit/7c6b01c098e0003527926b1c221d4a586fe76a23
       def resource_not_found
         flash[:error] = flash_message_for(model_class.new, :not_found)
         flash[:error] = flash_message_for(parent_data[:model_class].new, :not_found) if parent_data.present? && @parent.nil?

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

@@ -8,9 +8,17 @@ module Spree
       private
 
       def set_loyalty_points_transactions
-        @loyalty_points_transactions = @return_authorization.order.loyalty_points_transactions.
+        # new アクションでは @return_authorization がまだ build されておらず、
+        # 親注文の instance var もこの before_action 時点では未設定
+        # (Spree 5.3.6 の load_resource は member_action 以外で resource を組み立てない)。
+        # ネストルートの :order_id (注文番号) から注文を解決してフォールバックする (#1253)。
+        order = @return_authorization&.order ||
+                (params[:order_id].present? && Spree::Order.find_by(number: params[:order_id]))
+        return if order.blank?
+
+        @loyalty_points_transactions = order.loyalty_points_transactions.
           page(params[:page]).
-          per(params[:per_page] || Spree::Backend::Config[:admin_orders_per_page])
+          per(params[:per_page] || 25)
       end
     end
   end

data/app/controllers/spree/loyalty_points_controller.rb

@@ -4,7 +4,7 @@ module Spree
     def index
       @loyalty_points_transactions = spree_current_user.loyalty_points_transactions.includes(:source).order(updated_at: :desc).
                                        page(params[:page]).
-                                       per(params[:per_page] || Spree::Backend::Config[:admin_orders_per_page])
+                                       per(params[:per_page] || 25)
     end
 
   end

data/app/controllers/{spree → spree_loyalty_points}/checkout_controller_decorator.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeLoyaltyPoints
   module CheckoutControllerDecorator
     def self.prepended(base)
       base.before_action :sufficient_loyalty_points, only: [:update], if: -> { params[:state] == 'payment' }
@@ -12,10 +12,12 @@ module Spree
       end
       if Spree::PaymentMethod.loyalty_points_id_included?(payment_method_ids) && !@order.user.has_sufficient_loyalty_points?(@order)
         flash[:error] = Spree.t(:insufficient_loyalty_points)
-        redirect_to spree.checkout_state_path(@order.state)
+        redirect_to Spree::Core::Engine.routes.url_helpers.checkout_state_path(@order.token, @order.state)
       end
     end
   end
 end
 
-Spree::CheckoutController.prepend Spree::CheckoutControllerDecorator if Spree::CheckoutController.included_modules.exclude?(Spree::CheckoutControllerDecorator)
+if Spree::CheckoutController.included_modules.exclude?(SpreeLoyaltyPoints::CheckoutControllerDecorator)
+  Spree::CheckoutController.prepend SpreeLoyaltyPoints::CheckoutControllerDecorator
+end

data/app/models/concerns/spree/loyalty_points.rb

@@ -6,16 +6,16 @@ module Spree
 
     def loyalty_points_for(amount, purpose = 'award')
       loyalty_points = if purpose == 'award' && eligible_for_loyalty_points?(amount)
-        (amount * Spree::Store.default.loyalty_points_awarding_unit).floor
+        (amount * Spree::Store.default.preferred_loyalty_points_awarding_unit).floor
       elsif purpose == 'redeem'
-        (amount / Spree::Store.default.loyalty_points_conversion_rate).ceil
+        (amount / Spree::Store.default.preferred_loyalty_points_conversion_rate).ceil
       else
         0
       end
     end
 
     def eligible_for_loyalty_points?(amount)
-      amount >= Spree::Store.default.min_amount_required_to_get_loyalty_points
+      amount >= Spree::Store.default.preferred_min_amount_required_to_get_loyalty_points
     end
 
   end

data/app/models/concerns/spree/order/loyalty_points.rb

@@ -27,7 +27,7 @@ module Spree
       module ClassMethods
 
         def credit_loyalty_points_to_user
-          points_award_period = Spree::Store.default.loyalty_points_award_period
+          points_award_period = Spree::Store.default.preferred_loyalty_points_award_period
           uncredited_orders = Spree::Order.with_uncredited_loyalty_points(points_award_period)
           uncredited_orders.each do |order|
             order.award_loyalty_points

data/app/models/concerns/spree/payment/loyalty_points.rb

@@ -6,43 +6,43 @@ module Spree
       extend ActiveSupport::Concern
 
       included do
-        scope :by_loyalty_points, -> { joins(:payment_method).readonly(false).where(spree_payment_methods: { type: 'Spree::PaymentMethod::LoyaltyPoints'}) }
+        scope :by_loyalty_points, -> { joins(:payment_method).readonly(false).where(spree_payment_methods: { type: 'Spree::PaymentMethod::LoyaltyPoints' }) }
       end
 
-        module ClassMethods
-
-          def any_with_loyalty_points?
-            by_loyalty_points.size != 0
-          end
+      module ClassMethods
+        def any_with_loyalty_points?
+          by_loyalty_points.size != 0
         end
+      end
 
       private
 
-        def redeem_loyalty_points
-          loyalty_points_redeemed = loyalty_points_for(amount, 'redeem')
-          order.create_debit_transaction(loyalty_points_redeemed)
-        end
+      def redeem_loyalty_points
+        loyalty_points_redeemed = loyalty_points_for(amount, 'redeem')
+        order.create_debit_transaction(loyalty_points_redeemed)
+      end
 
-        def return_loyalty_points
-          loyalty_points_redeemed = loyalty_points_for(amount, 'redeem')
-          order.create_credit_transaction(loyalty_points_redeemed)
-        end
+      def return_loyalty_points
+        loyalty_points_redeemed = loyalty_points_for(amount, 'redeem')
+        order.create_credit_transaction(loyalty_points_redeemed)
+      end
 
-        def by_loyalty_points?
-          payment_method.type == "Spree::PaymentMethod::LoyaltyPoints"
-        end
+      def by_loyalty_points?
+        payment_method&.type == "Spree::PaymentMethod::LoyaltyPoints"
+      end
 
-        def redeemable_loyalty_points_balance?
-          order.user.loyalty_points_balance >= Spree::Store.default.loyalty_points_redeeming_balance
-        end
+      def redeemable_loyalty_points_balance?
+        order.user.loyalty_points_balance >= Spree::Store.default.preferred_loyalty_points_redeeming_balance
+      end
 
-        def redeemable_user_balance
-          unless redeemable_loyalty_points_balance?
-            min_balance = Spree::Store.default.loyalty_points_redeeming_balance
-            errors.add :loyalty_points_balance, "should be atleast #{ min_balance.to_s + " " + "point".pluralize(min_balance) } for redeeming Loyalty Points"
-          end
+      def redeemable_user_balance
+        if order&.user.blank?
+          errors.add :loyalty_points_balance, " not available for guest user"
+        elsif !redeemable_loyalty_points_balance?
+          min_balance = Spree::Store.default.preferred_loyalty_points_redeeming_balance
+          errors.add :loyalty_points_balance, "should be at least #{min_balance.to_s + " " + "point".pluralize(min_balance)} for redeeming Loyalty Points"
         end
-
+      end
     end
   end
-end
+end

data/app/models/spree/loyalty_points_transaction.rb

@@ -4,7 +4,7 @@ module Spree
     TRANSACTION_TYPES = ['Spree::LoyaltyPointsCreditTransaction', 'Spree::LoyaltyPointsDebitTransaction']
     CLASS_TO_TRANSACTION_TYPE = { 'Spree::LoyaltyPointsCreditTransaction' => 'Credit', 'Spree::LoyaltyPointsDebitTransaction' => 'Debit'}
     belongs_to :user, class_name: "::#{Spree.user_class}"
-    belongs_to :source, polymorphic: true
+    belongs_to :source, polymorphic: true, optional: true
 
     validates :loyalty_points, numericality: { only_integer: true, message: Spree.t('validation.must_be_int'), greater_than: 0 }
     validates :type, inclusion: { in: TRANSACTION_TYPES }
@@ -16,6 +16,17 @@ module Spree
 
     before_create :generate_transaction_id
 
+    # Spree 5.2(Ransack 4.x)は検索・ソート対象を明示的に allowlist することを要求する。
+    # ActiveRecord::Base 継承で Spree::Core::Ransackable を含まないため、Ransack 標準の
+    # ransackable_attributes / ransackable_associations をオーバーライドして許可する。
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id loyalty_points type user_id source_id source_type balance comment transaction_id created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[user source]
+    end
+
     def transaction_type
       CLASS_TO_TRANSACTION_TYPE[type]
     end

data/app/models/{spree → spree_loyalty_points}/order_decorator.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeLoyaltyPoints
   module OrderDecorator
     def self.prepended(base)
       base.include Spree::LoyaltyPoints
@@ -30,4 +30,4 @@ module Spree
   end
 end
 
-Spree::Order.prepend(Spree::OrderDecorator)
+Spree::Order.prepend(SpreeLoyaltyPoints::OrderDecorator)

data/app/models/{spree → spree_loyalty_points}/payment_decorator.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeLoyaltyPoints
   module PaymentDecorator
     def self.prepended(base)
       base.include Spree::LoyaltyPoints
@@ -16,6 +16,9 @@ module Spree
 
     private
 
+    # @gem-override spree_core-5.3.6/app/models/spree/payment.rb#invalidate_old_payments
+    # @see https://github.com/be-agile/giga-repeat/commit/7c6b01c098e0003527926b1c221d4a586fe76a23
+    # ロイヤリティポイント決済を無効化対象から除外する。
     def invalidate_old_payments
       return if store_credit? || by_loyalty_points?
       order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
@@ -35,4 +38,4 @@ module Spree
   end
 end
 
-Spree::Payment.prepend Spree::PaymentDecorator if Spree::Payment.included_modules.exclude?(Spree::PaymentDecorator)
+Spree::Payment.prepend SpreeLoyaltyPoints::PaymentDecorator

data/app/models/{spree → spree_loyalty_points}/payment_method_decorator.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeLoyaltyPoints
   module PaymentMethodDecorator
     def self.prepended(base)
       base.scope :loyalty_points_type, -> { where(type: 'Spree::PaymentMethod::LoyaltyPoints') }
@@ -13,4 +13,4 @@ module Spree
   end
 end
 
-Spree::PaymentMethod.prepend(Spree::PaymentMethodDecorator)
+Spree::PaymentMethod.prepend(SpreeLoyaltyPoints::PaymentMethodDecorator)

data/app/models/spree_loyalty_points/store_decorator.rb

@@ -0,0 +1,13 @@
+module SpreeLoyaltyPoints
+  module StoreDecorator
+    def self.prepended(base)
+      base.preference :loyalty_points_awarding_unit, :decimal, default: 0.01
+      base.preference :loyalty_points_redeeming_balance, :decimal, default: 0.0
+      base.preference :loyalty_points_conversion_rate, :decimal, default: 1.0
+      base.preference :loyalty_points_award_period, :integer, default: 12
+      base.preference :min_amount_required_to_get_loyalty_points, :decimal, default: 0.0
+    end
+  end
+end
+
+Spree::Store.prepend SpreeLoyaltyPoints::StoreDecorator

data/app/overrides/add_loyalty_points_debiting_to_return_authorization_page.rb

@@ -1,9 +1,9 @@
-Deface::Override.new(virtual_path: 'spree/admin/return_authorizations/_form',
+Deface::Override.new(virtual_path: 'spree/admin/orders/return_authorizations/_form',
   name: 'add_loyalty_points_to_return_authorization_page',
-  insert_before: "erb[loud]:contains('field_container :reason')",
+  insert_before: "erb[loud]:contains('spree_select :return_authorization_reason_id')",
   text: "
   <% if !@order.loyalty_points_used? && @order.eligible_for_loyalty_points?(@order.item_total) %>
-    <%= f.field_container :loyalty_points do %>
+    <div class='form-group'>
       <%= label :loyalty_points, Spree.t(:loyalty_points_debit) %> <span class='required'>*</span><br />
       <% if @return_authorization.received? %>
         <%= @return_authorization.loyalty_points %> points Debited <br />
@@ -12,9 +12,9 @@ Deface::Override.new(virtual_path: 'spree/admin/return_authorizations/_form',
         <%= f.hidden_field :loyalty_points_transaction_type, { value: :Debit } %>
         <br /> User's Loyalty Points Balance: <%= @order.user.loyalty_points_balance %> <br /> Net Loyalty Points Credited for this Order: <%= @order.loyalty_points_total %>
       <% end %>
-    <% end %>
+    </div>
   <% elsif @order.loyalty_points_used? %>
-    <%= f.field_container :loyalty_points do %>
+    <div class='form-group'>
       <br /><%= label :loyalty_points, Spree.t(:loyalty_points_credit) %> <span class='required'>*</span><br />
       <% if @return_authorization.received? %>
         <%= @return_authorization.loyalty_points %> points Credited <br />
@@ -23,6 +23,6 @@ Deface::Override.new(virtual_path: 'spree/admin/return_authorizations/_form',
         <%= f.hidden_field :loyalty_points_transaction_type, { value: :Credit } %>
         <br /> User's Loyalty Points Balance: <%= @order.user.loyalty_points_balance %> <br /> Net Loyalty Points Debited for this Order: <%= -@order.loyalty_points_total %>
       <% end %>
-    <% end %>
+    </div>
   <% end %>
   ")

data/app/overrides/add_loyalty_points_to_account_nav.rb

@@ -0,0 +1,13 @@
+Deface::Override.new(
+  virtual_path: "spree/account/_account_nav",
+  name: "add_loyalty_points_to_account_nav",
+  insert_after: "erb[loud]:contains('account_wishlist_path')",
+  text: <<-HTML
+  <% if LoyaltyPointsService.enabled? %>
+  <%= link_to Spree.t(:loyalty_points), spree.loyalty_points_path,
+    data: { active: current == "loyalty_points" },
+    class: "shrink-0 block lg:px-4 lg:py-3 px-3 py-4 border-b lg:border-b-0 text-neutral-700 hover:border-accent-100 hover:bg-accent-100 hover:text-black \#{current == "loyalty_points" ? "lg:bg-accent border-text lg:border-b-0 lg:border-l-[1.5px]" : "border-accrent lg:border-l"}"
+  %>
+  <% end %>
+  HTML
+)

data/app/overrides/add_loyalty_points_to_admin_user_show_page.rb

@@ -1,15 +1,17 @@
-Deface::Override.new(virtual_path: 'spree/admin/users/edit',
+Deface::Override.new(
+  virtual_path: 'spree/admin/users/_form',
   name: 'add_loyalty_points_to_admin_user_show_page',
-  insert_after: "[data-hook=admin_user_edit_general_settings]",
-  text: "
-    <div class='panel panel-default' data-hook='loyalty-points'>
-      <div class=panel-heading><%= Spree.t(:loyalty_points_balance) %></div>
-      <div class=panel-body>
+  insert_bottom: "div.card-body",
+  text: <<-HTML
+    <div class="form-group">
+      <%= f.label :loyalty_points_balance, Spree.t(:loyalty_points_balance) %>
+      <div>
         <% if @user.loyalty_points_balance.present? %>
-          <%= link_to @user.loyalty_points_balance, spree.admin_user_loyalty_points_path(@user) %>
+          <%= link_to @user.loyalty_points_balance, spree.admin_user_loyalty_points_path(@user), class: 'btn btn-sm btn-outline-secondary' %>
         <% else %>
-          <%= 'No loyalty points yet' %>
-        <% end %
+          <%= Spree.t(:no_loyalty_points_yet) %>
+        <% end %>
       </div>
     </div>
-  ")
+  HTML
+)

data/app/overrides/add_loyalty_points_to_cart_page.rb

@@ -1,8 +1,12 @@
-Deface::Override.new(virtual_path: 'spree/orders/edit',
+Deface::Override.new(
+  virtual_path: 'spree/orders/_summary',
   name: 'add_loyalty_points_to_cart_page',
-  insert_before: ".shopping-cart-buttons",
+  insert_before: "erb[loud]:contains('link_to Spree.t(:checkout)')",
   text: "
-    <% if @order.loyalty_points_for(@order.item_total) > 0 %>
-      <h5><%= Spree.t(:loyalty_points_earnable, quantity: \"<span class='order-total'> \#{@order.loyalty_points_for(@order.item_total)}</span>\").html_safe %></h5>
+    <% if LoyaltyPointsService.enabled? && order.loyalty_points_for(order.item_total) > 0 %>
+      <div class='text-center lg:text-right my-4 text-sm'>
+        <%= Spree.t(:loyalty_points_earnable, quantity: \"<span class='font-medium'>\#{order.loyalty_points_for(order.item_total)}</span>\").html_safe %>
+      </div>
     <% end %>
-  ")
+  "
+)

data/app/overrides/add_loyalty_points_to_order_checkout_page.rb

@@ -1,12 +1,16 @@
-Deface::Override.new(virtual_path: 'spree/shared/_order_details',
+Deface::Override.new(
+  virtual_path: 'spree/shared/_order_details',
   name: 'add_loyalty_points_to_order_checkout_page',
-  insert_after: "#checkout-summary",
+  insert_bottom: "div.bg-accent.mb-24",
   text: "
-    <div class='mt-5'>
-    <% if @order.loyalty_points_awarded? %>
-      <span><%= @order.loyalty_points_for(@order.item_total) %></span> <b><%= Spree.t(:loyalty_points) %> have been credited to your account.</b>
+    <% if LoyaltyPointsService.enabled? %>
+    <div class='p-4 lg:p-6 text-sm border-t border-default'>
+    <% if order.loyalty_points_awarded? %>
+      <span class='font-medium'><%= order.loyalty_points_for(order.item_total) %></span> <b><%= Spree.t(:loyalty_points) %></b> <%= Spree.t('loyalty_points.have_been_credited') %>
     <% else %>
-      <span><%= @order.loyalty_points_for(@order.item_total) %></span> <b><%= Spree.t(:loyalty_points) %> will be credited to your account  soon.</b>
+      <span class='font-medium'><%= order.loyalty_points_for(order.item_total) %></span> <b><%= Spree.t(:loyalty_points) %></b> <%= Spree.t('loyalty_points.will_be_credited_soon') %>
     <% end %>
     </div>
-  ")
+    <% end %>
+  "
+)

data/app/overrides/add_loyalty_points_to_return_authorization_index_page.rb

@@ -1,13 +1,27 @@
-Deface::Override.new(virtual_path: 'spree/admin/return_authorizations/index',
-  name: 'add_loyalty_points_to_return_authorization_index_page_head',
-  insert_after: "thead[data-hook='rma_header'] th:contains('amount')",
+# Spree 5.2.0: return_authorizations/index now uses _table_header and _table_row partials
+Deface::Override.new(
+  virtual_path: 'spree/admin/return_authorizations/_table_header',
+  name: 'add_loyalty_points_to_return_authorization_table_header',
+  insert_before: "th:contains('Spree.t(:status)')",
   text: "
-    <th><%= Spree.t(:loyalty_points) %></th>
-  ")
+  <th scope=\"col\"><%= Spree.t(:loyalty_points) %></th>
+"
+)
 
-Deface::Override.new(virtual_path: 'spree/admin/return_authorizations/index',
-  name: 'add_loyalty_points_to_return_authorization_index_page_row',
-  insert_after: "tr[data-hook='rma_row'] td:contains('display_amount')",
+Deface::Override.new(
+  virtual_path: 'spree/admin/return_authorizations/_table_row',
+  name: 'add_loyalty_points_to_return_authorization_table_row',
+  insert_before: "td:contains('return_authorization.state')",
   text: "
-    <td><%= return_authorization.loyalty_points %> pts <%= return_authorization.loyalty_points_transaction_type %></td>
-  ")
+  <td data-action=\"click->row-link#openLink\">
+    <% if return_authorization.loyalty_points.present? %>
+      <%= return_authorization.loyalty_points %> pts
+      <% if return_authorization.loyalty_points_transaction_type.present? %>
+        (<%= return_authorization.loyalty_points_transaction_type %>)
+      <% end %>
+    <% else %>
+      -
+    <% end %>
+  </td>
+"
+)

data/app/overrides/add_loyalty_points_transaction_table_to_return_authorization_form.rb

@@ -1,6 +1,16 @@
-Deface::Override.new(virtual_path: 'spree/admin/return_authorizations/_form',
+Deface::Override.new(virtual_path: 'spree/admin/orders/return_authorizations/_form',
   name: 'add_loyalty_points_transaction_table_to_return_authorization_form',
-  insert_after: "div[data-hook='admin_return_authorization_form_fields']",
+  insert_after: "div.card.mb-6:contains('spree_text_area :memo')",
   text: "
-    <%= render partial: 'spree/loyalty_points/transaction_table' %>
+
+  <div class=\"card mb-6\">
+    <div class=\"card-header\">
+      <h5 class=\"card-title\">
+        <%= Spree.t(:loyalty_points_transactions) %>
+      </h5>
+    </div>
+    <div class=\"card-body\">
+      <%= render partial: 'spree/loyalty_points/transaction_table' %>
+    </div>
+  </div>
   ")

data/app/overrides/spree/admin/stores/add_loyalty_points_settings.rb

@@ -1,6 +1,9 @@
+# Updated for Spree 5.2.0 - form split into multiple partials
+# Now targeting spree/admin/stores/form/_basic instead of _form
+# Using render_admin_partials hook for reliable insertion
 Deface::Override.new(
-  virtual_path: "spree/admin/stores/_form",
+  virtual_path: "spree/admin/stores/form/_basic",
   name: "add_loyalty_points_settings",
-  insert_bottom: "[data-hook='admin_store_form_fields']",
+  insert_before: "erb[loud]:contains('render_admin_partials')",
   partial: "spree/admin/stores/loyalty_points_settings"
 )

data/app/views/spree/admin/loyalty_points_transactions/new.html.erb

@@ -19,11 +19,9 @@
     <div data-hook="update_loyalty_points_attrs" class="row">
 
       <div class="col-md-4 form-group">
-        <%= f.field_container :loyalty_points do %>
-          <%= f.label :loyalty_points, Spree.t(:loyalty_points) %> <span class="required">*</span><br />
-          <%= f.text_field :loyalty_points, class: 'fullwidth title form-control' %>
-          <%= f.error_message_on :loyalty_points %>
-        <% end %>
+        <%= f.label :loyalty_points, Spree.t(:loyalty_points) %> <span class="required">*</span><br />
+        <%= f.text_field :loyalty_points, class: 'fullwidth title form-control' %>
+        <%= f.error_message_on :loyalty_points %>
       </div>
 
       <div class="field col-md-4">
@@ -43,11 +41,9 @@
     <div data-hook="comment_row" class="row">
 
       <div class="col-md-4 form-group">
-        <%= f.field_container :comment do %>
-          <%= f.label :comment, Spree.t(:comment) %> <span class="required">*</span><br />
-          <%= f.text_area :comment, class: 'fullwidth form-control', rows: '3' %>
-          <%= f.error_message_on :comment %>
-        <% end %>
+        <%= f.label :comment, Spree.t(:comment) %> <span class="required">*</span><br />
+        <%= f.text_area :comment, class: 'fullwidth form-control', rows: '3' %>
+        <%= f.error_message_on :comment %>
       </div>
 
     </div>

data/app/views/spree/admin/stores/_loyalty_points_settings.html.erb

@@ -7,39 +7,39 @@
   <div class="card-body">
     <div class="row">
       <div class="col-12 col-md-6">
-        <%= f.field_container :loyalty_points_awarding_unit do %>
-          <%= f.label :loyalty_points_awarding_unit, Spree.t('admin.store.loyalty_points_awarding_unit') %>
-          <%= f.number_field :loyalty_points_awarding_unit, class: 'form-control', min: 0, step: 0.01 %>
-        <% end %>
+        <div class="form-group">
+          <%= f.label :preferred_loyalty_points_awarding_unit, Spree.t('admin.store.loyalty_points_awarding_unit') %>
+          <%= f.number_field :preferred_loyalty_points_awarding_unit, class: 'form-control', min: 0, step: 0.01 %>
+        </div>
       </div>
       <div class="col-12 col-md-6">
-        <%= f.field_container :loyalty_points_redeeming_balance do %>
-          <%= f.label :loyalty_points_redeeming_balance, Spree.t('admin.store.loyalty_points_redeeming_balance') %>
-          <%= f.number_field :loyalty_points_redeeming_balance, class: 'form-control', min: 0, step: 0.01 %>
-        <% end %>
+        <div class="form-group">
+          <%= f.label :preferred_loyalty_points_redeeming_balance, Spree.t('admin.store.loyalty_points_redeeming_balance') %>
+          <%= f.number_field :preferred_loyalty_points_redeeming_balance, class: 'form-control', min: 0, step: 0.01 %>
+        </div>
       </div>
     </div>
     <div class="row mt-3">
       <div class="col-12 col-md-6">
-        <%= f.field_container :loyalty_points_conversion_rate do %>
-          <%= f.label :loyalty_points_conversion_rate, Spree.t('admin.store.loyalty_points_conversion_rate') %>
-          <%= f.number_field :loyalty_points_conversion_rate, class: 'form-control', min: 0, step: 0.01 %>
-        <% end %>
+        <div class="form-group">
+          <%= f.label :preferred_loyalty_points_conversion_rate, Spree.t('admin.store.loyalty_points_conversion_rate') %>
+          <%= f.number_field :preferred_loyalty_points_conversion_rate, class: 'form-control', min: 0, step: 0.01 %>
+        </div>
       </div>
       <div class="col-12 col-md-6">
-        <%= f.field_container :loyalty_points_award_period do %>
-          <%= f.label :loyalty_points_award_period, Spree.t('admin.store.loyalty_points_award_period') %>
-          <%= f.number_field :loyalty_points_award_period, class: 'form-control', min: 0 %>
-        <% end %>
+        <div class="form-group">
+          <%= f.label :preferred_loyalty_points_award_period, Spree.t('admin.store.loyalty_points_award_period') %>
+          <%= f.number_field :preferred_loyalty_points_award_period, class: 'form-control', min: 0 %>
+        </div>
       </div>
     </div>
     <div class="row mt-3">
       <div class="col-12">
-        <%= f.field_container :min_amount_required_to_get_loyalty_points do %>
-          <%= f.label :min_amount_required_to_get_loyalty_points, Spree.t('admin.store.min_amount_required_to_get_loyalty_points') %>
-          <%= f.number_field :min_amount_required_to_get_loyalty_points, class: 'form-control', min: 0, step: 0.01 %>
-        <% end %>
+        <div class="form-group">
+          <%= f.label :preferred_min_amount_required_to_get_loyalty_points, Spree.t('admin.store.min_amount_required_to_get_loyalty_points') %>
+          <%= f.number_field :preferred_min_amount_required_to_get_loyalty_points, class: 'form-control', min: 0, step: 0.01 %>
+        </div>
       </div>
     </div>
   </div>
-</div>
+</div>

data/app/views/spree/checkout/payment/_loyaltypoints.html.erb

@@ -1,8 +1,8 @@
-<%- lp_balance = spree_current_user.loyalty_points_balance %>
-<%- equivalent_currency_balance = spree_current_user.loyalty_points_equivalent_currency %>
+<%- lp_balance = spree_current_user&.loyalty_points_balance %>
+<%- equivalent_currency_balance = spree_current_user&.loyalty_points_equivalent_currency %>
 Loyalty Points Balance: <%= lp_balance %><%= "($" + equivalent_currency_balance.to_s + ")" %>
 <%- lp_needed = @order.loyalty_points_for(@order.total, 'redeem') %>
 <br/>Loyalty Points Needed: <%= lp_needed %>
-<% if lp_needed > lp_balance %>
+<% if lp_balance.nil? || lp_needed > lp_balance %>
   <br/><b>Insufficient Balance!</b>
 <% end %>

data/app/views/spree/loyalty_points/_transaction_table.html.erb

@@ -1,4 +1,4 @@
-<%= paginate @loyalty_points_transactions %>
+<%= paginate @loyalty_points_transactions if @loyalty_points_transactions.respond_to?(:total_pages) %>
 
 <% if @loyalty_points_transactions.present? %>
   <table class="loyalty-points-summary table table-striped table-hover">
@@ -41,4 +41,4 @@
   <p><%= Spree.t(:you_have_not_earned_any_loyalty_points_yet) %></p>
 <% end %>
 
-<%= paginate @loyalty_points_transactions %>
+<%= paginate @loyalty_points_transactions if @loyalty_points_transactions.respond_to?(:total_pages) %>

data/db/migrate/20140116090042_add_loyalty_points_balance_to_spree_user.rb

@@ -1,4 +1,4 @@
-class AddLoyaltyPointsBalanceToSpreeUser < ActiveRecord::Migration[7.1]
+class AddLoyaltyPointsBalanceToSpreeUser < 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, :loyalty_points_balance, :integer, default: 0, null: false

data/db/migrate/20140116110437_create_loyalty_points_transactions.rb

@@ -1,4 +1,4 @@
-class CreateLoyaltyPointsTransactions < ActiveRecord::Migration[7.1]
+class CreateLoyaltyPointsTransactions < ActiveRecord::Migration[8.0]
   def change
     create_table :spree_loyalty_points_transactions do |t|
       t.integer :loyalty_points