flowcommerce_spree 0.0.14 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78bcd2ec2168ade147fb11d14e8a8f94a30133a0f6fa2df225c3abd0cbb7a7ff
-  data.tar.gz: fc255f7fc844d6209cd852c84a8f86db9cb97b3ad8d1e80586e5f692ec51a055
+  metadata.gz: a58357f2f4891679ea1b21bf15603d6d61964e1a07d3d4c5259b834207be4605
+  data.tar.gz: 16f2b8a0ba784bfeb3685178f0efe12fbd3ddd963d4e7058c84397f7b4d3ac5f
 SHA512:
-  metadata.gz: 15778423ce300091577ff41aad2c639da5ddb59421db10cf37e7844a9c74997220a0864788675a98d81c330f2fa800fe7ee38bcf703cb813333f2cf99af01687
-  data.tar.gz: 8b0795bf474136c0c7abd383933b2d809e6e1efc26e00b4c40164f389d707d50c75e7c6f950fc3285d3fc898a7442c2555dfc6d959b067b5a8851c7c9a56fc63
+  metadata.gz: 4fe235560e3132fcd9ed90d4b3e6577af09817f59a79564ad41b2a60477d08158e7fe52ed67eaea28749af87e59c192a5c98c16f360ea48d810dc97396a4fdde
+  data.tar.gz: 0beb3883f44c1b08f520e3a94490b03e960c87fa8be7c41f38399ddbc4ff3db9801e3f47adca93056d6e4e9b2b86c773dfcc670bad6b3954a41279ab6ac472a5

data/app/controllers/flowcommerce_spree/orders_controller.rb

@@ -5,6 +5,8 @@ module FlowcommerceSpree
     wrap_parameters false
 
     skip_before_action :setup_tracking, only: :order_completed
+    skip_before_action :prepare_order
+    skip_before_action :before_render
 
     # proxy enpoint between flow and thankyou page.
     # /flow/order_completed endpoint

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.14'
+  VERSION = '0.0.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.18
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Integration of Spree with Flow API