flowcommerce_spree 0.0.3 → 0.0.4

data/lib/flowcommerce_spree.rb

@@ -9,9 +9,11 @@ require 'flowcommerce_spree/logging_http_handler'
 require 'flowcommerce_spree/webhook_service'
 require 'flowcommerce_spree/session'
 require 'flow/simple_gateway'
-require 'request_store'
 
 module FlowcommerceSpree
+  API_KEY = ENV.fetch('FLOW_TOKEN', 'test_key')
+  ENV['FLOW_TOKEN'] = API_KEY
+
   def self.client(logger: FlowcommerceSpree.logger, **opts)
     FlowCommerce.instance(http_handler: LoggingHttpHandler.new(logger: logger), **opts)
   end

data/lib/flowcommerce_spree/engine.rb

@@ -24,7 +24,7 @@ module FlowcommerceSpree
 
       app.config.flowcommerce_spree[:mounted_path] = ENV.fetch('FLOW_MOUNT_PATH', '/flow')
 
-      app.routes.append do
+      app.routes.prepend do
         mount FlowcommerceSpree::Engine => app.config.flowcommerce_spree[:mounted_path]
       end
     end

data/lib/flowcommerce_spree/logging_http_client.rb

@@ -15,31 +15,47 @@ module FlowcommerceSpree
 
       start_time = Time.now.utc.round(10)
 
+      # Contrived example to show how client settings can be adjusted
       # if request.path.start_with?('/organizations')
-        # Contrived example to show how client settings can be adjusted
-        # client.open_timeout = 60
-        # client.read_timeout = 60
+      #   client.open_timeout = 60
+      #   client.read_timeout = 60
       # end
 
       begin
         response = super
       rescue Io::Flow::V0::HttpClient::ServerError => e
-        @error = { error: e }.to_json
+        @error = { error: Oj.load(e.body), code: e.code, status: e.details }
+        raise exception_to_raise(e), @error.dig(:error, 'messages')
       ensure
         # client.open_timeout = original_open
         # client.read_timeout = original_read
 
-        duration = ((Time.now.utc.round(10) - start_time) * 1000).round(0)
+        log_request(request, response, start_time)
+      end
+    end
+
+    private
+
+    def exception_to_raise(flow_io_exception)
+      resource = flow_io_exception.uri.split('/').last
+      exception = case resource
+                    when 'reversals', 'refunds'
+                      'Spree::Core::GatewayError'
+                    else
+                      'StandardError'
+                  end
+      exception.constantize
+    end
 
-        @logger.info(
-          "Started #{request.method} #{request.path}\n"\
-          "headers: #{request.instance_variable_get(:@header)}\nbody: #{request.body}\n"\
-          "response: #{response&.force_encoding('utf-8')}\n"\
-          "Completed #{request.method} #{request.path} #{duration} ms\n"
-        )
+    def log_request(request, response, start_time)
+      duration = ((Time.now.utc.round(10) - start_time) * 1000).round(0)
 
-        @logger.info "Error: #{e.inspect}" if e
-      end
+      @logger.info("Started #{request.method} #{request.path}\n"\
+                     "headers: #{request.instance_variable_get(:@header)}\nbody: #{request.body}\n"\
+                     "response: #{response&.force_encoding('utf-8')}\n"\
+                     "Completed #{request.method} #{request.path} #{duration} ms\n")
+
+      @logger.info "Error: #{@error.inspect}" if @error
     end
   end
 end

data/lib/flowcommerce_spree/session.rb

@@ -54,23 +54,5 @@ module FlowcommerceSpree
     def id
       @session.id
     end
-
-    # because we do not get full experience from session, we have to get from exp list
-    def delivered_duty_options
-      return nil unless experience
-
-      return unless (flow_experience = Flow::Experience.get(experience.key))
-
-      Hashie::Mash.new(flow_experience.settings.delivered_duty.to_hash)
-    end
-
-    # if we have more than one choice, we show choice popup
-    def offers_delivered_duty_choice?
-      if (options = delivered_duty_options)
-        options.available.length > 1
-      else
-        false
-      end
-    end
   end
 end

data/lib/flowcommerce_spree/version.rb

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

data/lib/flowcommerce_spree/webhook_service.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module FlowcommerceSpree
-  # communicates with flow api, responds to webhook events
+  # responds to webhook events from flow.io
   class WebhookService
     attr_accessor :errors
     alias full_messages errors
@@ -17,30 +17,28 @@ module FlowcommerceSpree
     end
 
     def process
-      discriminator = @data['discriminator']
-      hook_method = "hook_#{discriminator}"
+      hook_method = @data['discriminator']
       # If hook processing method registered an error, a self.object of WebhookService with this error will be
       # returned, else an ActiveRecord object will be returned
       return __send__(hook_method) if respond_to?(hook_method, true)
 
-      errors << { message: "No hook for #{discriminator}" }
+      errors << { message: "No hook for #{hook_method}" }
       self
     end
 
     private
 
-    def hook_capture_upserted_v2
-      capture = @data['capture']
+    def capture_upserted_v2
+      errors << { message: 'Capture param missing' } && (return self) unless (capture = @data['capture']&.to_hash)
+
       order_number = capture.dig('authorization', 'order', 'number')
       if (order = Spree::Order.find_by(number: order_number))
         order.flow_data['captures'] ||= []
         order_captures = order.flow_data['captures']
-        order_captures.delete_if do |c|
-          c['id'] == capture['id']
-        end
+        order_captures.delete_if { |c| c['id'] == capture['id'] }
         order_captures << capture
-
         order.update_column(:meta, order.meta.to_json)
+        map_payment_captures_to_spree(order) if order.flow_io_payments.present?
         order
       else
         errors << { message: "Order #{order_number} not found" }
@@ -48,21 +46,39 @@ module FlowcommerceSpree
       end
     end
 
-    def hook_experience_upserted_v2
-      experience = @data['experience']
-      Spree::Zones::Product.find_or_initialize_by(name: experience['key'].titleize).store_flow_io_data(experience)
-    end
-
-    def hook_fraud_status_changed
-      if (order_number = @data.dig('order', 'number'))
-        if @data['status'] == 'declined'
-          if (order = Spree::Order.find_by(number: order_number))
-            order.update_columns(fraudulent: true)
-            order.cancel!
-            return order
+    def card_authorization_upserted_v2
+      card_auth = @data['authorization']&.to_hash
+      errors << { message: 'Authorization param missing' } && (return self) unless card_auth
+
+      errors << { message: 'Card param missing' } && (return self) unless (flow_io_card = card_auth.delete('card'))
+
+      if (order_number = card_auth.dig('order', 'number'))
+        if (order = Spree::Order.find_by(number: order_number))
+          flow_io_card_expiration = flow_io_card.delete('expiration')
+
+          card = Spree::CreditCard.find_or_initialize_by(month: flow_io_card_expiration['month'].to_s,
+                                                         year: flow_io_card_expiration['year'].to_s,
+                                                         cc_type: flow_io_card.delete('type'),
+                                                         last_digits: flow_io_card.delete('last4'),
+                                                         name: flow_io_card.delete('name'),
+                                                         user_id: order.user&.id)
+          card.flow_data ||= {}
+          card.flow_data.merge!(flow_io_card.except('discriminator')) if card.new_record?
+          card_auth['method'].delete('images')
+          card.push_authorization(card_auth.except('discriminator'))
+          if card.new_record?
+            card.imported = true
+            card.save!
           else
-            errors << { message: "Order #{order_number} not found" }
+            card.update_column(:meta, card.meta.to_json)
           end
+
+          order.payments.where(response_code: card_auth['id'])
+               .update_all(source_id: card.id, source_type: 'Spree::CreditCard')
+
+          return card
+        else
+          errors << { message: "Order #{order_number} not found" }
         end
       else
         errors << { message: 'Order number param missing' }
@@ -71,7 +87,27 @@ module FlowcommerceSpree
       self
     end
 
-    def hook_local_item_upserted
+    def experience_upserted_v2
+      experience = @data['experience']
+      Spree::Zones::Product.find_or_initialize_by(name: experience['key'].titleize).store_flow_io_data(experience)
+    end
+
+    def fraud_status_changed
+      order_number = @data.dig('order', 'number')
+      errors << { message: 'Order number param missing' } && (return self) unless order_number
+
+      order = Spree::Order.find_by(number: order_number)
+      errors << { message: "Order #{order_number} not found" } && (return self) unless order
+
+      if @data['status'] == 'declined'
+        order.update_columns(fraudulent: true)
+        order.cancel!
+      end
+
+      order
+    end
+
+    def local_item_upserted
       errors << { message: 'Local item param missing' } && (return self) unless (local_item = @data['local_item'])
 
       errors << { message: 'SKU param missing' } && (return self) unless (flow_sku = local_item.dig('item', 'number'))
@@ -91,94 +127,28 @@ module FlowcommerceSpree
       self
     end
 
-    def hook_order_placed_v2
-      order_placed = @data['order_placed']
-      flow_order = order_placed['order']
-      flow_allocation = order_placed['allocation']
+    def map_payment_captures_to_spree(order)
+      payments = order.flow_data&.dig('order', 'payments')
+      order.flow_data['captures']&.each do |c|
+        next unless c['status'] == 'succeeded'
 
-      errors << { message: 'Order number param missing' } && (return self) unless (order_number = flow_order['number'])
+        auth = c.dig('authorization', 'id')
+        next unless payments&.find { |p| p['reference'] == auth }
 
-      if (order = Spree::Order.find_by(number: order_number))
-        order.flow_data['order'] = flow_order.to_hash
-        order.flow_data['allocations'] = flow_allocation.to_hash
-        order_flow_data = order.flow_data['order']
-        attrs_to_update = { meta: order.meta.to_json }
-        flow_data_submitted = order_flow_data['submitted_at'].present?
-        if flow_data_submitted && !order.complete?
-          if order_flow_data['payments'].present? && (order_flow_data.dig('balance', 'amount')&.to_i == 0)
-            attrs_to_update[:state] = 'complete'
-            attrs_to_update[:payment_state] = 'paid'
-            attrs_to_update[:completed_at] = Time.zone.now.utc
-            attrs_to_update[:email] = order.flow_customer_email
-          else
-            attrs_to_update[:state] = 'confirmed'
-          end
-        end
+        next unless (payment = Spree::Payment.find_by(response_code: auth))
 
-        attrs_to_update.merge!(order.prepare_flow_addresses) if order.complete? || attrs_to_update[:state] == 'complete'
+        next if Spree::PaymentCaptureEvent.where("meta -> 'flow_data' ->> 'id' = ?", c['id']).exists?
 
-        if flow_data_submitted
-          order.create_proposed_shipments
-          order.shipment.update_amounts
-          order.line_items.each(&:store_ets)
-        end
+        payment.capture_events.create!(amount: c['amount'], meta: { 'flow_data' => { 'id' => c['id'] } })
+        return if payment.completed? || payment.capture_events.sum(:amount) < payment.amount
 
-        order.update_columns(attrs_to_update)
-
-        # TODO: To be refactored once we have the capture_upserted_v2 webhook configured
-        if flow_data_submitted
-          order.create_tax_charge!
-          order.finalize!
-          order.update_totals
-          order.save
-        end
-
-        return order
-      else
-        errors << { message: "Order #{order_number} not found" }
+        payment.complete
       end
 
-      self
-    end
-
-    def hook_order_upserted_v2
-      errors << { message: 'Order param missing' } && (return self) unless (flow_order = @data['order'])
-
-      errors << { message: 'Order number param missing' } && (return self) unless (order_number = flow_order['number'])
-
-      if (order = Spree::Order.find_by(number: order_number))
-        order.flow_data['order'] = flow_order.to_hash
-        order_flow_data = order.flow_data['order']
-        attrs_to_update = { meta: order.meta.to_json }
-        flow_data_submitted = order_flow_data['submitted_at'].present?
-        if flow_data_submitted && !order.complete?
-          if order_flow_data['payments'].present? && (order_flow_data.dig('balance', 'amount')&.to_i == 0)
-            attrs_to_update[:state] = 'complete'
-            attrs_to_update[:payment_state] = 'paid'
-            attrs_to_update[:completed_at] = Time.zone.now.utc
-            attrs_to_update[:email] = order.flow_customer_email
-          else
-            attrs_to_update[:state] = 'confirmed'
-          end
-        end
-
-        attrs_to_update.merge!(order.prepare_flow_addresses) if order.complete? || attrs_to_update[:state] == 'complete'
-
-        order.update_columns(attrs_to_update)
-        order.create_tax_charge! if flow_data_submitted
-        return order
-      else
-        errors << { message: "Order #{order_number} not found" }
-      end
-
-      self
-    end
-
-    # send en email when order is refunded
-    def hook_refund_upserted_v2
-      Spree::OrderMailer.refund_complete_email(@data).deliver
+      return if order.completed?
+      return unless order.flow_io_captures_sum >= order.flow_io_total_amount && order.flow_io_balance_amount <= 0
 
-      'Email delivered'
+      FlowcommerceSpree::OrderUpdater.new(order: order).finalize_order
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -101,20 +101,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: request_store
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +145,8 @@ files:
 - app/assets/javascripts/flowcommerce_spree/application.js
 - app/assets/stylesheets/flowcommerce_spree/application.css
 - app/controllers/concerns/current_zone_loader_decorator.rb
+- app/controllers/flowcommerce_spree/inventory_controller.rb
+- app/controllers/flowcommerce_spree/orders_controller.rb
 - app/controllers/flowcommerce_spree/webhooks_controller.rb
 - app/controllers/users/sessions_controller_decorator.rb
 - app/helpers/flowcommerce_spree/application_helper.rb
@@ -169,12 +157,12 @@ files:
 - app/models/spree/address_decorator.rb
 - app/models/spree/calculator/flow_io.rb
 - app/models/spree/calculator/shipping/flow_io.rb
-- app/models/spree/credit_card_decorator.rb
+- app/models/spree/flow_io_credit_card_decorator.rb
+- app/models/spree/flow_io_order_decorator.rb
 - app/models/spree/flow_io_product_decorator.rb
 - app/models/spree/flow_io_variant_decorator.rb
 - app/models/spree/gateway/flow_io.rb
-- app/models/spree/line_item_decorator.rb
-- app/models/spree/order_decorator.rb
+- app/models/spree/payment_capture_event_decorator.rb
 - app/models/spree/promotion_decorator.rb
 - app/models/spree/promotion_handler/coupon_decorator.rb
 - app/models/spree/spree_user_decorator.rb
@@ -182,11 +170,14 @@ files:
 - app/models/spree/zone_decorator.rb
 - app/models/spree/zones/flow_io_product_zone_decorator.rb
 - app/models/tracking/setup_decorator.rb
+- app/serializers/api/v2/order_serializer_decorator.rb
 - app/services/flowcommerce_spree/import_experience_items.rb
 - app/services/flowcommerce_spree/import_experiences.rb
 - app/services/flowcommerce_spree/order_sync.rb
+- app/services/flowcommerce_spree/order_updater.rb
 - app/views/layouts/flowcommerce_spree/application.html.erb
 - app/views/spree/admin/payments/index.html.erb
+- app/views/spree/admin/payments/source_views/_flow_io_gateway.html.erb
 - 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

data/app/models/spree/line_item_decorator.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# Flow (2017)
-# Enable this modifications if you want to display flow localized line item
-# Example: https://i.imgur.com/7v2ix2G.png
-module Spree
-  LineItem.class_eval do
-    # admin show line item price
-    def single_money
-      price  = display_price.to_s
-      price += " (#{order.flow_line_item_price(self)})" if order.flow_order
-      price
-    end
-  end
-end