ba_spree_loyalty_points 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f6866802e9e83952b7ad7d6ca8b211afd04057198f122674790922e63a7e368
-  data.tar.gz: 6ecd351413370fc2c6e9fc00680bc683c854be9f8bdf31838bee0aa217f0e064
+  metadata.gz: 965b20980d2644cd0cb51ca7f3bf26c204e2bc3aaa94bf97902b6baa0ac5652f
+  data.tar.gz: 5c320797901114e822084ecd2bdd96ca2f2e7f5206bd56710e3977fdf62158d7
 SHA512:
-  metadata.gz: 59da86cdce5a6c27cdab6cdbfa30304c7d43f714ecb70e00921e7ecfe9ffcc9a5274906fd603b8163cb9994d018567dab54b01e53d8cfeb682b12d09ad589990
-  data.tar.gz: 13c74e5a58e0666f6be833259797be0cb3775a67494353ac081b607b769ccca1571f1177341b42e15ddcb66f2490318b14b4f4fc08f5254ab8f8dc990581e728
+  metadata.gz: e3e40af8824dee3c35a6c47b8f4de8b14eae28895a08b6551059eed64659e454a0b0cdc055d802a185b3f1fac9ba5cc3aeb689d9cdbd31b3db7d381f977500ee
+  data.tar.gz: a1889bcdb99bcd0ade33fc40bf455e577630246e1de1cd4df473ede3c699eb5758eadb16c386c9519a716960b693da85ed28e460290a38d6f4807972cd302f49

data/lib/spree_loyalty_points/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ba_spree_loyalty_points
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - be agile Co., Ltd.
@@ -278,7 +278,6 @@ 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
@@ -288,18 +287,12 @@ 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/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_condition_to_amount_on_return_authorization_page.rb
-- app/overrides/add_loyalty_points_balance_to_account_page.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
@@ -338,7 +331,6 @@ files:
 - 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

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -1,21 +0,0 @@
-module Spree
-  module CheckoutControllerDecorator
-    def self.prepended(base)
-      base.before_action :sufficient_loyalty_points, only: [:update], if: -> { params[:state] == 'payment' }
-    end
-
-    private
-
-    def sufficient_loyalty_points
-      payment_method_ids = params[:order][:payments_attributes].collect do |payment|
-        payment["payment_method_id"]
-      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)
-      end
-    end
-  end
-end
-
-Spree::CheckoutController.prepend Spree::CheckoutControllerDecorator if Spree::CheckoutController.included_modules.exclude?(Spree::CheckoutControllerDecorator)

data/app/models/spree/order_decorator.rb

@@ -1,33 +0,0 @@
-module Spree
-  module OrderDecorator
-    def self.prepended(base)
-      base.include Spree::LoyaltyPoints
-      base.include Spree::Order::LoyaltyPoints
-
-      base.has_many :loyalty_points_transactions, as: :source
-      base.has_many :loyalty_points_credit_transactions, as: :source
-      base.has_many :loyalty_points_debit_transactions, as: :source
-
-      base.scope :loyalty_points_not_awarded, -> {
-        includes(:loyalty_points_credit_transactions).where(spree_loyalty_points_transactions: { source_id: nil })
-      }
-
-      base.scope :with_hours_since_payment, ->(num) {
-        where('`spree_orders`.`paid_at` < ? ', num.hours.ago)
-      }
-
-      base.scope :with_uncredited_loyalty_points, ->(num) {
-        with_hours_since_payment(num).loyalty_points_not_awarded
-      }
-
-      # FSM transitions
-      base.state_machines[:state].after_transition(
-        from: base.state_machines[:state].states.map(&:name) - [:complete],
-        to: [:complete],
-        do: :complete_loyalty_points_payments
-      )
-    end
-  end
-end
-
-Spree::Order.prepend(Spree::OrderDecorator)

data/app/models/spree/payment_decorator.rb

@@ -1,38 +0,0 @@
-module Spree
-  module PaymentDecorator
-    def self.prepended(base)
-      base.include Spree::LoyaltyPoints
-      base.include Spree::Payment::LoyaltyPoints
-
-      base.validates :amount, numericality: { greater_than: 0 }, if: :by_loyalty_points?
-      base.validate :redeemable_user_balance, if: :by_loyalty_points?
-      base.scope :state_not, ->(s) { where('state != ?', s) }
-
-      fsm = base.state_machines[:state]
-      fsm.after_transition from: fsm.states.map(&:name) - [:completed], to: [:completed], do: :notify_paid_order
-      fsm.after_transition from: fsm.states.map(&:name) - [:completed], to: [:completed], do: :redeem_loyalty_points, if: :by_loyalty_points?
-      fsm.after_transition from: [:completed], to: fsm.states.map(&:name) - [:completed], do: :return_loyalty_points, if: :by_loyalty_points?
-    end
-
-    private
-
-    def invalidate_old_payments
-      return if store_credit? || by_loyalty_points?
-      order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
-        payment.invalidate! unless payment.store_credit?
-      end
-    end
-
-    def notify_paid_order
-      if all_payments_completed?
-        order.touch :paid_at
-      end
-    end
-
-    def all_payments_completed?
-      order.payments.state_not('invalid').all? { |payment| payment.completed? }
-    end
-  end
-end
-
-Spree::Payment.prepend Spree::PaymentDecorator if Spree::Payment.included_modules.exclude?(Spree::PaymentDecorator)

data/app/models/spree/payment_method_decorator.rb

@@ -1,16 +0,0 @@
-module Spree
-  module PaymentMethodDecorator
-    def self.prepended(base)
-      base.scope :loyalty_points_type, -> { where(type: 'Spree::PaymentMethod::LoyaltyPoints') }
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def loyalty_points_id_included?(method_ids)
-        loyalty_points_type.where(id: method_ids).size != 0
-      end
-    end
-  end
-end
-
-Spree::PaymentMethod.prepend(Spree::PaymentMethodDecorator)

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