flowcommerce-solidus 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0101a0d46954d016cd3dac32a96708081c02d77
-  data.tar.gz: 7311c515495ab8d4f004c641619e590c17c70a2d
+  metadata.gz: 7dc5caf05326a4cca8e512be102b74b784f48145
+  data.tar.gz: 42063f71e4af7586d9989627a78eeeb2cbd5e9ea
 SHA512:
-  metadata.gz: e6a81592b490a7ea0b8efe4f1a9673eb1e3a606798d81c862a7cf8eb66595bf03be586504dc2986bce2cc184fe9aeaacb0016a3b02306d52be5ae72d67d34747
-  data.tar.gz: 7c2ba0914d7c8d5e39435e9711b1daf15dec210eca659d244caae85fa0719b1a9968c61064107281f694d90a83373833b979120b27c51af94fb980e45fe8173d
+  metadata.gz: df425ba922fce210fcee1bad090af046bacb685be895a563d85fa67d98c5284c1669d97f41c257252c7a556989222095c78f866a7ab7ef84005ffb369105638c
+  data.tar.gz: 1e2efbe81e86efa045ae51db86d038b9a6abaf0b2388333e2fe70f463419736b00939329999077733052f9e15bbce587f005c06465c027a56fc17c99610f4a0d

data/.version

@@ -1 +1 @@
-0.1.11
+0.1.12

data/static/app/flow/decorators/spree_product_decorator.rb

@@ -3,12 +3,13 @@
 Spree::Product.class_eval do
 
   # returns price tied to local experience from master variant
-  def flow_local_price(flow_exp)
-    variants.first.flow_local_price(flow_exp)
+  def flow_local_price flow_exp
+    variants.first.flow_local_price flow_exp
   end
 
-  def flow_included?(flow_exp)
+  def flow_included? flow_exp
     return true unless flow_exp
+
     flow_data['%s.excluded' % flow_exp.key].to_i == 1 ? false : true
   end
 

data/static/app/flow/flow.rb

@@ -2,13 +2,14 @@
 # for now all in same class
 
 require 'logger'
+require 'awesome_print'
 
 module Flow
-  extend self
+  mattr_accessor :organization
+  mattr_accessor :base_country
+  mattr_accessor :api_key
 
-  def organization() ENV.fetch('FLOW_ORGANIZATION') end
-  def base_country() ENV.fetch('FLOW_BASE_COUNTRY') end
-  def api_key()      ENV.fetch('FLOW_API_KEY') end
+  extend self
 
   # builds curl command and gets remote data
   def api action, path, params={}, body=nil
@@ -40,12 +41,9 @@ module Flow
 
     data = JSON.load `#{command}`
 
-    if data.kind_of?(Hash) && data['code'] == 'generic_error'
-      ap data
-      data
-    else
-      data
-    end
+    ap data if data.kind_of?(Hash) && data['code'] == 'generic_error'
+
+    data
   end
 
   def log_api_error

data/static/app/flow/flow/experience.rb

@@ -34,7 +34,7 @@ module Flow::Experience
   def get_from_flow
     return cached_experinces if cache_valid?
 
-    experiences = FlowCommerce.instance.experiences.get(Flow.organization)
+    experiences = FlowCommerce.instance.experiences.get Flow.organization
     @cache = [experiences, Time.now]
     experiences
   end

data/static/app/flow/flow/simple_gateway.rb

@@ -102,10 +102,10 @@ class Flow::SimpleGateway
 
   # gets credit card token
   def cc_get_token
-    cards = @order.credit_cards.select{ |cc| cc[:flow_data]['cc_token'] }
-    raise StandarError.new('Credit card not found') unless cards.first
+    cards = @order.credit_cards.select{ |cc| cc.gateway_customer_profile_id }
+    raise StandarError.new('Credit card with token not found') unless cards.first
 
-    cards.first.flow_data['cc_token'] || raise(StandardError.new 'Flow credit card token not found')
+    cards.first.gateway_customer_profile_id
   end
 
   # we want to return errors in standardized format

data/static/app/flow/lib/spree_flow_gateway.rb

@@ -1,8 +1,6 @@
 # Flow.io (2017)
 # adapter for Solidus/Spree that talks to activemerchant_flow
 
-# load '/Users/dux/dev/org/flow.io/activemerchant_flow/lib/active_merchant/billing/gateways/flow.rb'
-
 module Spree
   class Gateway::Flow < Gateway
     def provider_class
@@ -19,7 +17,7 @@ module Spree
     end
 
     def payment_profiles_supported?
-      false
+      true
     end
 
     def method_type
@@ -30,32 +28,22 @@ module Spree
       {}
     end
 
-    # def create_profile(payment)
-    #   # binding.pry
-    #   # ActiveMerchant::Billing::FlowGateway.new(token: Flow.api_key, organization: Flow.organization)
-
-    #   case payment.order.state
-    #     when 'payment'
-    #     when 'confirm'
-    #   end
-    # end
-
-    def supports?(source)
+    def supports? source
       # flow supports credit cards
       source.class == Spree::CreditCard
     end
 
-    def authorize(amount, payment_method, options={})
+    def authorize amount, payment_method, options={}
       order = load_order options
       order.cc_authorization
     end
 
-    def capture(amount, payment_method, options={})
+    def capture amount, payment_method, options={}
       order = load_order options
       order.cc_capture
     end
 
-    def purchase(amount, payment_method, options={})
+    def purchase amount, payment_method, options={}
       order = load_order options
       flow_auth = order.cc_authorization
 
@@ -66,18 +54,57 @@ module Spree
       end
     end
 
-    def refund(money, authorization_key, options={})
+    def refund money, authorization_key, options={}
       order = load_order options
       order.cc_refund
     end
 
-    def void(money, authorization_key, options={})
+    def void money, authorization_key, options={}
+      # binding.pry
+    end
+
+    def create_profile payment
       # binding.pry
+
+      # payment.order.state
+      @credit_card = payment.source
+
+      profile_ensure_payment_method_is_present!
+      create_flow_cc_profile!
     end
 
     private
 
-    def load_order(options)
+    # hard inject Flow as payment method unless defined
+    def profile_ensure_payment_method_is_present!
+      return if @credit_card.payment_method_id
+
+      flow_payment = Spree::PaymentMethod.where(active: true, type:'Spree::Gateway::Flow').first
+      @credit_card.payment_method_id = flow_payment.id if flow_payment
+    end
+
+    # create payment profile with Flow and tokenize Credit Card
+    def create_flow_cc_profile!
+      return if @credit_card.gateway_customer_profile_id
+      return unless @credit_card.verification_value
+
+      # build credit card hash
+      data = {}
+      data[:number]           = @credit_card.number
+      data[:name]             = @credit_card.name
+      data[:cvv]              = @credit_card.verification_value
+      data[:expiration_year]  = @credit_card.year.to_i
+      data[:expiration_month] = @credit_card.month.to_i
+
+      # tokenize with Flow
+      # rescue Io::Flow::V0::HttpClient::ServerError
+      card_form = ::Io::Flow::V0::Models::CardForm.new(data)
+      result    = FlowCommerce.instance.cards.post(::Flow.organization, card_form)
+
+      @credit_card.update_column :gateway_customer_profile_id, result.token
+    end
+
+    def load_order options
       order_number = options[:order_id].split('-').first
       spree_order  = Spree::Order.find_by number: order_number
       ::Flow::SimpleGateway.new spree_order

data/static/lib/tasks/flow.rake

@@ -20,6 +20,7 @@ task :flow do |t|
   puts '    -'
   print 'Task number: '
   task = $stdin.gets.to_i
+  exit if task == 0
   task = tasks[task - 1].to_s.split(/\s+/)[1]
 
   if task.present?
@@ -227,7 +228,6 @@ namespace :flow do
   desc 'Ensure we have DB prepared for flow'
   task :migrate => :environment do |t|
     migrate = []
-    migrate.push [:spree_credit_cards, :flow_data, :jsonb, default: {}]
     migrate.push [:spree_products,     :flow_data, :jsonb, default: {}]
     migrate.push [:spree_variants,     :flow_data, :jsonb, default: {}]
     migrate.push [:spree_orders,       :flow_data, :jsonb, default: {}]
@@ -244,5 +244,11 @@ namespace :flow do
       end
     end
   end
+
+  desc 'Pretty print flow_data of last updated product variant'
+  task :sync_check => :environment do |t|
+    data = Spree::Variant.order('updated_at desc').first.flow_data
+    puts JSON.pretty_generate(data).gsub(/"(\w+)":/) { '"%s":' % $1.yellow }
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce-solidus
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Flow.io (Dino Reic)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,6 @@ files:
 - "./static/app/flow/SOLIDUS_FLOW.md"
 - "./static/app/flow/decorators/admin_decorators.rb"
 - "./static/app/flow/decorators/localized_coupon_code_decorator.rb"
-- "./static/app/flow/decorators/spree_credit_card_decorator.rb"
 - "./static/app/flow/decorators/spree_order_decorator.rb"
 - "./static/app/flow/decorators/spree_product_decorator.rb"
 - "./static/app/flow/decorators/spree_user_decorator.rb"
@@ -124,7 +123,6 @@ files:
 - "./static/app/flow/flow/webhook.rb"
 - "./static/app/flow/lib/flow_api_refresh.rb"
 - "./static/app/flow/lib/spree_flow_gateway.rb"
-- "./static/app/flow/lib/spree_stripe_gateway.rb"
 - "./static/app/views/spree/admin/payments/index.html.erb"
 - "./static/app/views/spree/admin/promotions/edit.html.erb"
 - "./static/app/views/spree/admin/shared/_order_summary.html.erb"

data/static/app/flow/decorators/spree_credit_card_decorator.rb

@@ -1,35 +0,0 @@
-# added flow specific methods to Spree::CreditCard
-
-Spree::CreditCard.class_eval do
-
-  validate :flow_fetch_cc_token
-
-  def flow_fetch_cc_token
-    return false unless respond_to?(:flow_data) # Flow not installed
-    return false if flow_data['cc_token']
-    return false unless number
-    return errors.add(:verification_value, 'CVV verification value is required') unless verification_value.present?
-
-    # build cc hash
-    data = {}
-    data[:number]           = number
-    data[:name]             = name
-    data[:cvv]              = verification_value
-    data[:expiration_year]  = year.to_i
-    data[:expiration_month] = month.to_i
-
-    card_form = ::Io::Flow::V0::Models::CardForm.new(data)
-    result    = FlowCommerce.instance.cards.post(Flow.organization, card_form)
-
-    # cache the result
-    flow_data['cc_token'] = result.token
-
-    true
-  rescue Io::Flow::V0::HttpClient::ServerError
-    puts $!.message
-    flow_error = $!.message.split(':', 2).first
-    errors.add(:base, flow_error)
-  end
-
-end
-

data/static/app/flow/lib/spree_stripe_gateway.rb

@@ -1,142 +0,0 @@
-# require 'flowcommerce-activemerchant'
-
-# module Spree
-#   class Gateway::StripeGateway < Gateway
-#     # https://dashboard.stripe.com/account/apikeys
-
-#     preference :secret_key, :string
-#     preference :publishable_key, :string
-
-#     CARD_TYPE_MAPPING = {
-#       'American Express' => 'american_express',
-#       'Diners Club' => 'diners_club',
-#       'Visa' => 'visa'
-#     }
-
-#     def method_type
-#       'gateway'
-#     end
-
-#     def provider_class
-#       ActiveMerchant::Billing::FlowGatewaya
-#     end
-
-#     def payment_profiles_supported?
-#       true
-#     end
-
-#     def purchase(money, creditcard, gateway_options)
-#       ap [:purchase, money, creditcard, gateway_options]
-#       binding.pry
-#       provider.purchase(*options_for_purchase_or_auth(money, creditcard, gateway_options))
-#     end
-
-#     def authorize(money, creditcard, gateway_options)
-#       ap [:authorize, money, creditcard, gateway_options]
-#       binding.pry
-#       provider.authorize(*options_for_purchase_or_auth(money, creditcard, gateway_options))
-#     end
-
-#     def capture(money, response_code, gateway_options)
-#       ap [:capture, money, response_code, gateway_options]
-#       binding.pry
-#       provider.capture(money, response_code, gateway_options)
-#     end
-
-#     def credit(money, creditcard, response_code, gateway_options)
-#       ap [:credit, money, creditcard, response_code, gateway_options]
-#       binding.pry
-#       provider.refund(money, response_code, {})
-#     end
-
-#     def void(response_code, creditcard, gateway_options)
-#       ap [:void, response_code, creditcard, gateway_options]
-#       binding.pry
-#       provider.void(response_code, {})
-#     end
-
-#     def cancel(response_code)
-#       ap [:cancel, response_code]
-#       provider.void(response_code, {})
-#     end
-
-#     def create_profile(payment)
-#       ap [:create_profile, payment]
-#       return unless payment.source.gateway_customer_profile_id.nil?
-#       options = {
-#         email: payment.order.email,
-#         login: preferred_secret_key,
-#       }.merge! address_for(payment)
-
-#       source = update_source!(payment.source)
-#       if source.number.blank? && source.gateway_payment_profile_id.present?
-#         creditcard = source.gateway_payment_profile_id
-#       else
-#         creditcard = source
-#       end
-
-#       response = provider.store(creditcard, options)
-#       if response.success?
-#         payment.source.update_attributes!({
-#           cc_type: payment.source.cc_type, # side-effect of update_source!
-#           gateway_customer_profile_id: response.params['id'],
-#           gateway_payment_profile_id: response.params['default_source'] || response.params['default_card']
-#         })
-
-#       else
-#         payment.send(:gateway_error, response.message)
-#       end
-#     end
-
-#     private
-
-#     # In this gateway, what we call 'secret_key' is the 'login'
-#     def options
-#       options = super
-#       options.merge(:login => preferred_secret_key)
-#     end
-
-#     def options_for_purchase_or_auth(money, creditcard, gateway_options)
-#       options = {}
-#       options[:description] = "Spree Order ID: #{gateway_options[:order_id]}"
-#       options[:currency] = gateway_options[:currency]
-
-#       if customer = creditcard.gateway_customer_profile_id
-#         options[:customer] = customer
-#       end
-#       if token_or_card_id = creditcard.gateway_payment_profile_id
-#         # The Stripe ActiveMerchant gateway supports passing the token directly as the creditcard parameter
-#         # The Stripe ActiveMerchant gateway supports passing the customer_id and credit_card id
-#         # https://github.com/Shopify/active_merchant/issues/770
-#         creditcard = token_or_card_id
-#       end
-#       return money, creditcard, options
-#     end
-
-#     def address_for(payment)
-#       {}.tap do |options|
-#         if address = payment.order.bill_address
-#           options.merge!(address: {
-#             address1: address.address1,
-#             address2: address.address2,
-#             city: address.city,
-#             zip: address.zipcode
-#           })
-
-#           if country = address.country
-#             options[:address].merge!(country: country.name)
-#           end
-
-#           if state = address.state
-#             options[:address].merge!(state: state.name)
-#           end
-#         end
-#       end
-#     end
-
-#     def update_source!(source)
-#       source.cc_type = CARD_TYPE_MAPPING[source.cc_type] if CARD_TYPE_MAPPING.include?(source.cc_type)
-#       source
-#     end
-#   end
-# end