flowcommerce_spree 0.0.15 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ed3330958e03459888c682dd28c10106da11922d09009f661d3e8d1a29d32a4
-  data.tar.gz: ae942f91846355379eac2fb8a54b8ca6156c749b20732137250c35e3a2cc605f
+  metadata.gz: 3a818d7d94ee9e8fa767079ae2553e7d9c707b488c4c442ce9a57e217dd94a3f
+  data.tar.gz: 72f1daf2d3ccbad727ef67b36757457b35c77dd4de77e841345edc2538e66577
 SHA512:
-  metadata.gz: cc69d6f4e090cf11bdd80f95f7534451ae060b862f896ac0fbeff276f51b98a672cb7132245408fe97393c8cc118cba8917ee570f530d20534d0a375697e423e
-  data.tar.gz: 73b06be7f5ef0d6db3532e992f7f3daba0eb71e9a65e3d72b25ba5a4044630213781979cc74e768689f1f729180f46064e41d581ff4ab50f3957100319ed6e32
+  metadata.gz: b13a78323e67a21361d34a7779a1699830df83c04dea839b623004c0bdd4792b904e0b06a470bb340c0d46adf9aeed9f9117a17002e3d11ee268c38a029cc57a
+  data.tar.gz: b217a92590b3b515bfb9ae2afc82ec8cb3bef6809f00c3ec20a052c9cfb605e190e442cdd545f2355d8891f3ce37358b3fd7f25758b57d0ac05f8cf96903bd29

data/app/helpers/spree/core/controller_helpers/flow_io_order_helper_decorator.rb

@@ -26,8 +26,8 @@ module Spree
 
           attrs_to_update = {}
 
-          # Update last_ip_address only for a new request_id
-          attrs_to_update = { last_ip_address: ip_address } if @request_id != request_id
+          # Update last_ip_address only when last_ip_address is different.
+          attrs_to_update = { last_ip_address: ip_address } if @current_order.last_ip_address != ip_address
 
           # :meta is a jsonb column costly to update every time, especially with all the flow.io data, that's why
           # here it is updated only if no zone_id there was inside :meta

data/app/models/spree/calculator/shipping/flow_io.rb

@@ -6,6 +6,7 @@ module Spree
       class FlowIo < ShippingCalculator
         preference :lower_boundary, :decimal, default: 100
         preference :charge_default, :decimal, default: 15
+        preference :sample_product_cost, :decimal, default: 9
 
         def self.description
           'FlowIO Calculator'
@@ -26,6 +27,10 @@ module Spree
           preferred_lower_boundary
         end
 
+        def default_sample_charge
+          preferred_sample_product_cost
+        end
+
         private
 
         def flow_order(package)

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

@@ -61,13 +61,17 @@ module Spree
         ActiveMerchant::Billing::Response.new(false, e.to_s, {}, {})
       end
 
-      def void(authorization_id, _source, options = {})
+      def void(authorization_id, options = {})
         amount = (options[:subtotal] + options[:shipping]) * 0.01
-        reversal_form = Io::Flow::V0::Models::ReversalForm.new(key: options[:order_id],
-                                                               authorization_id: authorization_id,
-                                                               amount: amount,
-                                                               currency: options[:currency])
-        FlowcommerceSpree.client.reversals.post(FlowcommerceSpree::ORGANIZATION, reversal_form)
+        order = Spree::Order.find_by(number: options[:order_id].split('-').first)
+        refund_form = Io::Flow::V0::Models::RefundForm.new(order_number: order.number,
+                                                           amount: amount,
+                                                           currency: options[:currency],
+                                                           authorization_id: authorization_id)
+        response = FlowcommerceSpree.client.refunds.post(FlowcommerceSpree::ORGANIZATION, refund_form)
+        validate_flow_refund_response(response, order)
+
+        ActiveMerchant::Billing::Response.new(true, 'flow-payment-void', {}, {})
       end
 
       def create_profile(payment)
@@ -91,6 +95,11 @@ module Spree
                                                            amount: amount,
                                                            currency: order.currency)
         response = FlowcommerceSpree.client.refunds.post(FlowcommerceSpree::ORGANIZATION, refund_form)
+        result = validate_flow_refund_response(response, order)
+        result
+      end
+
+      def validate_flow_refund_response(response, order)
         response_status = response.status.value
         if REFUND_VALID_STATES.include? response_status
           add_refund_to_order(response, order)

data/app/services/flowcommerce_spree/order_sync.rb

@@ -120,13 +120,33 @@ module FlowcommerceSpree
     def add_item(line_item)
       variant    = line_item.variant
       price_root = variant.flow_data&.dig('exp', @experience, 'prices')&.[](0) || {}
-
+      discount_data = map_discounts(line_item)
       # create flow order line item
-      { center: FLOW_CENTER,
-        number: variant.sku,
-        quantity: line_item.quantity,
-        price: { amount: price_root['amount'] || variant.price,
-                 currency: price_root['currency'] || variant.cost_currency } }
+      res = { center: FLOW_CENTER,
+              number: variant.sku,
+              quantity: line_item.quantity,
+              price: { amount: price_root['amount'] || variant.price,
+                       currency: price_root['currency'] || variant.cost_currency },
+              discounts: {
+                discounts: discount_data
+              } }
+      res
+    end
+
+    def map_discounts(line_item)
+      line_item.adjustments.promotion.eligible.map do |adjustment|
+        {
+          offer: {
+            discriminator: 'discount_offer_fixed',
+            money: {
+              amount: adjustment.amount.to_f,
+              currency: line_item.currency
+            }
+          },
+          target: 'item',
+          label: adjustment.label
+        }
+      end
     end
 
     def write_response_to_order

data/app/services/flowcommerce_spree/order_updater.rb

@@ -63,7 +63,8 @@ module FlowcommerceSpree
         payment.update_column(:identifier, p['id'])
       end
 
-      return if @order.payments.sum(:amount) < @order.amount || @order.state == 'complete'
+      return if @order.completed?
+      return if @order.payments.sum(:amount) < @order.flow_io_total_amount || @order.flow_io_balance_amount > 0
 
       @order.state = 'confirm'
       @order.save!

data/lib/flowcommerce_spree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.19
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers