flowcommerce_spree 0.0.8 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c89d8869da7867a7ae0400dab1005c763c5c98f001336bf915f14743bd279c7a
-  data.tar.gz: f664b4f9f7380860b5c5eec7cf5aeda85d59c8b6d2753830f553ccc8734718c4
+  metadata.gz: 6cab2d22c877f0d20eff325cb6dc587b1632837052c49a72d08e2cbcca1c5a2b
+  data.tar.gz: 872d34b049b6fc265e53d4471a18338b3cde86a89ef887b9cdf971cde142d760
 SHA512:
-  metadata.gz: f32478dce9ed19e62ddb9955a0e0d8f7b7388eb9c5079be107282306c85ab524b49f83b35cff0d5835fc79c485d0dd3fc15cb924969ba250dd80182dfb6242c4
-  data.tar.gz: b1e68c45f17888c1d717001a2a352957e04a4fb32c47d2864349299d868e01e0cbfd138f7ed599cd5c1a06e3847b4e4745d8630b0472d104c7eceabe6177f518
+  metadata.gz: 0a838ec7ff7bfe0ffd5ea257726590a0a2f79c6c187db1318057886212510b11124e3d6f9b9b1c8a21f7964b2ad1a07d4e165bf43fd2540e881549ae1ce2a196
+  data.tar.gz: a23bce0c4414a93833812b4a4495021d0555979c04bf4efd351134c6cb47fb8fab1bc4b2c7f05ac2c938098c04c6816e4d0e1a2133133e5d5f47d907c8e9e644

data/app/controllers/users/sessions_controller_decorator.rb

@@ -11,7 +11,9 @@ module Users
         FlowcommerceSpree::OrderSync.new(order: current_order, flow_session_id: flow_session_id).synchronize!
       return render json: { error: :checkout_token_missing }, status: 422 if checkout_token.blank?
 
-      render json: { checkout_url: "https://checkout.flow.io/tokens/#{checkout_token}" }, status: 200
+      checkout_url = ENV['FLOW_CHECKOUT_URL'] || 'https://checkout.flow.io'
+
+      render json: { checkout_url: "#{checkout_url}/tokens/#{checkout_token}" }, status: 200
     end
 
     private

data/app/models/spree/flow_io_product_decorator.rb

@@ -28,9 +28,9 @@ module Spree
       flow_data["#{flow_exp.key}.excluded"].to_i != 1
     end
 
-    def price_range(product_zone)
+    def price_range(product_zone, currencies = [])
       prices = {}
-      master_prices.each do |p|
+      master_prices_with_currencies(currencies).each do |p|
         currency = p.currency
         min = nil
         max = nil
@@ -40,15 +40,15 @@ module Spree
             price = v.price_in(currency)
             next if price.nil? || price.amount.nil?
 
-            min = price if min.nil? || min.amount > price.amount
-            max = price if max.nil? || max.amount < price.amount
+            min = [price, min].compact.min { |a, b| a.amount <=> b.amount }
+            max = [price, max].compact.max { |a, b| a.amount <=> b.amount }
           end
         else
           min = max = master.price_in(currency)
         end
 
-        rmin = min&.amount&.to_s(:rounded, precision: 0) || 0
-        rmax = max&.amount&.to_s(:rounded, precision: 0) || 0
+        rmin = round_with_precision(min, 0)
+        rmax = round_with_precision(max, 0)
 
         prices[currency] = { min: rmin, max: rmax }
       end
@@ -56,6 +56,10 @@ module Spree
       add_flow_price_range(prices, product_zone)
     end
 
+    def round_with_precision(number, precision)
+      number&.amount&.to_s(:rounded, precision: precision) || 0
+    end
+
     def add_flow_price_range(prices, product_zone)
       flow_experience_key = product_zone&.flow_data&.[]('key')
       return prices if flow_experience_key.blank?
@@ -70,8 +74,8 @@ module Spree
           price = v.flow_local_price(flow_experience_key)
           next if price.amount.nil? || price.currency != currency
 
-          min = price if min.nil? || min.amount > price.amount
-          max = price if max.nil? || max.amount < price.amount
+          min = [price, min].compact.min { |a, b| a.amount <=> b.amount }
+          max = [price, max].compact.max { |a, b| a.amount <=> b.amount }
         end
       end
 
@@ -80,8 +84,8 @@ module Spree
         max ||= master_price
       end
 
-      rmin = min&.amount&.to_s(:rounded, precision: 0) || 0
-      rmax = max&.amount&.to_s(:rounded, precision: 0) || 0
+      rmin = round_with_precision(min, 0)
+      rmax = round_with_precision(max, 0)
 
       prices[currency] = { min: rmin, max: rmax }
       prices

data/app/models/spree/gateway/flow_io.rb

@@ -21,7 +21,7 @@ module Spree
       end
 
       def payment_profiles_supported?
-        true
+        false
       end
 
       def method_type
@@ -43,14 +43,18 @@ module Spree
       end
 
       def refund(payment, amount, _options = {})
-        request_refund_store_result(payment.order, amount)
+        response = request_refund_store_result(payment.order, amount)
+        map_refund_to_payment(response, payment.order) if response.success?
+        response
       rescue StandardError => e
         ActiveMerchant::Billing::Response.new(false, e.to_s, {}, {})
       end
 
       def cancel(authorization)
         original_payment = Spree::Payment.find_by(response_code: authorization)
-        request_refund_store_result(original_payment.order, original_payment.amount)
+        response = request_refund_store_result(original_payment.order, original_payment.amount)
+        map_refund_to_payment(response, original_payment.order) if response.success?
+        response
       rescue StandardError => e
         ActiveMerchant::Billing::Response.new(false, e.to_s, {}, {})
       end
@@ -72,6 +76,12 @@ module Spree
         create_flow_cc_profile!
       end
 
+      def credit(payment, credit_amount)
+        request_refund_store_result(payment.order, credit_amount)
+      rescue StandardError => e
+        ActiveMerchant::Billing::Response.new(false, e.to_s, {}, {})
+      end
+
       private
 
       def request_refund_store_result(order, amount)
@@ -82,8 +92,10 @@ module Spree
         response_status = response.status.value
         if response_status == REFUND_SUCCESS
           add_refund_to_order(response, order)
-          map_refund_to_payment(response, order)
-          ActiveMerchant::Billing::Response.new(true, REFUND_SUCCESS, {}, {})
+          ActiveMerchant::Billing::Response.new(true,
+                                                REFUND_SUCCESS,
+                                                response.to_hash,
+                                                authorization: response.authorization.id)
         else
           msg = "Partial refund fail. Details: #{response_status}"
           ActiveMerchant::Billing::Response.new(false, msg, {}, {})
@@ -100,18 +112,17 @@ module Spree
       end
 
       def map_refund_to_payment(response, order)
-        original_payment = Spree::Payment.find_by(response_code: response.authorization.id)
+        original_payment = Spree::Payment.find_by(response_code: response.authorization)
         payment = order.payments.create!(state: 'completed',
-                                         response_code: response.authorization.id,
+                                         response_code: response.authorization,
                                          payment_method_id: original_payment&.payment_method_id,
-                                         amount: - response.amount,
-                                         source_id: original_payment&.source_id,
-                                         source_type: original_payment&.source_type)
+                                         amount: - response.params['amount'].to_f,
+                                         source: original_payment)
 
         # For now this additional update is overwriting the generated identifier with flow.io payment identifier.
         # TODO: Check and possibly refactor in Spree 3.0, where the `before_create :set_unique_identifier`
         # has been removed.
-        payment.update_column(:identifier, response.id)
+        payment.update_column(:identifier, response.params['id'])
       end
 
       # hard inject Flow as payment method unless defined

data/app/services/flowcommerce_spree/order_sync.rb

@@ -124,7 +124,7 @@ module FlowcommerceSpree
       { center: FLOW_CENTER,
         number: variant.sku,
         quantity: line_item.quantity,
-        price: { amount: price_root['amount'] || variant.cost_price,
+        price: { amount: price_root['amount'] || variant.price,
                  currency: price_root['currency'] || variant.cost_currency } }
     end
 

data/app/services/flowcommerce_spree/webhooks/capture_upserted_v2.rb

@@ -22,16 +22,25 @@ module FlowcommerceSpree
         errors << { message: 'Order number param missing' } && (return self) unless order_number
 
         if (order = Spree::Order.find_by(number: order_number))
-          upsert_order_captures(order, capture)
-          payments = order.flow_io_payments
-          map_payment_captures_to_spree(order, payments) if payments.present?
-          order
+          if order.payments.any?
+            store_payment_capture(order, capture)
+          else
+            FlowcommerceSpree::UpdatePaymentCaptureWorker.perform_in(1.minute, order.number, capture)
+            order
+          end
         else
           errors << { message: "Order #{order_number} not found" }
           self
         end
       end
 
+      def store_payment_capture(order, capture)
+        upsert_order_captures(order, capture)
+        payments = order.flow_io_payments
+        map_payment_captures_to_spree(order, payments) if payments.present?
+        order
+      end
+
       private
 
       def upsert_order_captures(order, capture)

data/app/workers/flowcommerce_spree/flow_io_worker.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  class FlowIoWorker
+    include Sidekiq::Worker
+
+    sidekiq_retries_exhausted do |message, exception|
+      Rails.logger.warn("[!] #{self.class} max attempts reached: #{message} - #{exception}")
+      notification_setting = FlowcommerceSpree::Config.notification_setting
+      return unless notification_setting[:slack].present?
+
+      slack_message = "[#{Rails.env}] #{message}"
+      Slack_client.chat_postMessage(channel: notification_setting[:slack][:channel], text: slack_message)
+    end
+  end
+end

data/app/workers/flowcommerce_spree/import_item_worker.rb

@@ -1,19 +1,9 @@
 # frozen_string_literal: true
 
 module FlowcommerceSpree
-  class ImportItemWorker
-    include Sidekiq::Worker
+  class ImportItemWorker < FlowIoWorker
     sidekiq_options retry: 3, queue: :flow_io
 
-    sidekiq_retries_exhausted do |message, exception|
-      Rails.logger.warn("[!] FlowcommerceSpree::ImportItemWorker max attempts reached: #{message} - #{exception}")
-      notification_setting = FlowcommerceSpree::Config.notification_setting
-      return unless notification_setting[:slack].present?
-
-      slack_message = "[#{Rails.env}] #{message}"
-      Slack_client.chat_postMessage(channel: notification_setting[:slack][:channel], text: slack_message)
-    end
-
     def perform(variant_sku)
       variant = Spree::Variant.find_by sku: variant_sku
       return unless variant

data/app/workers/flowcommerce_spree/update_payment_capture_worker.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  class UpdatePaymentCaptureWorker < FlowIoWorker
+    sidekiq_options retry: 3, queue: :flow_io
+
+    def perform(order_number, capture = {})
+      order = Spree::Order.find_by number: order_number
+      raise 'Order has no payments' if order.payments.empty?
+
+      FlowcommerceSpree::Webhooks::CaptureUpsertedV2.new({ capture: capture }.as_json)
+                                                    .store_payment_capture(order, capture)
+    end
+  end
+end

data/lib/flowcommerce_spree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlowcommerceSpree
-  VERSION = '0.0.8'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.12
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -244,7 +244,9 @@ files:
 - app/views/spree/admin/promotions/edit.html.erb
 - app/views/spree/admin/shared/_order_summary.html.erb
 - app/views/spree/admin/shared/_order_summary_flow.html.erb
+- app/workers/flowcommerce_spree/flow_io_worker.rb
 - app/workers/flowcommerce_spree/import_item_worker.rb
+- app/workers/flowcommerce_spree/update_payment_capture_worker.rb
 - config/rails_best_practices.yml
 - config/routes.rb
 - db/migrate/20201021160159_add_type_and_meta_to_spree_zone.rb