effective_orders 5.4.3 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93201b2a28d118f01d4404c0a1b1e7ce9cfccfa17e5449923d827f804297146f
-  data.tar.gz: 33c7e7c0b13f149bbea2c46d4f3aa70dbf3d4157c73be9dfe0b84f965e17bd13
+  metadata.gz: c85d15408b6f15085acae0e838a73738f06b302c1730a2d5dd63bfc14aeab232
+  data.tar.gz: 3ef013aef146e28669878e441b942bb9f4b0dc19e1871ced2097a2367fad9ab5
 SHA512:
-  metadata.gz: b6e7b680b06ac025f6b4b8bad7845f95f92f04ab952479ee8cc66025b55da853a4c8871c910f322fdb4062860c66695fb8f9c3b52b3e56bc041bc243078d076b
-  data.tar.gz: 4750b01b2d298736a05e6f9290146695816f9c0a15dcd80701c2c0a04c1516cf4ebedd790ec334674aaf335abc77a7f58241274b1812897bc6b5b408650dff80
+  metadata.gz: bdbb7867bd6336373a78ee7a601fc5866b90e8dce68f2ca19d8e47c90a88a0b18ada917e4fa485a416cabc75fb0c95fab37bd65c069c0b30e030b6761f1675f6
+  data.tar.gz: e30f27c7a2801feae282487ed6e1d5414c78b94e1f50dbb800f016782299ed02afa329164585af50d7933ae7269f4fb3ebf9eda0eb94ad68a6cfd22b8a13b1b6

data/app/controllers/effective/providers/mark_as_paid.rb

@@ -11,10 +11,10 @@ module Effective
         EffectiveResources.authorize!(self, :update, @order)
         EffectiveResources.authorize!(self, :admin, :effective_orders)
 
-        @order.assign_attributes(mark_as_paid_params.except(:payment, :payment_provider, :payment_card))
+        @order.assign_attributes(mark_as_paid_params.except(:payment_provider, :payment_card))
 
         order_purchased(
-          payment: mark_as_paid_params[:payment],
+          payment: 'mark as paid',
           provider: mark_as_paid_params[:payment_provider],
           card: mark_as_paid_params[:payment_card],
           email: @order.send_mark_as_paid_email_to_buyer?,
@@ -25,7 +25,7 @@ module Effective
 
       def mark_as_paid_params
         params.require(:effective_order).permit(
-          :purchased_at, :payment, :payment_provider, :payment_card,
+          :purchased_at, :payment_provider, :payment_card,
           :note_to_buyer, :note_internal, :send_mark_as_paid_email_to_buyer
         )
       end

data/app/helpers/effective_stripe_helper.rb

@@ -47,6 +47,16 @@ module EffectiveStripeHelper
 
   def stripe_payment_intent(order)
     customer = Effective::Customer.for_user(order.user)
+
+    begin
+      stripe_payment_intent_payload(order, customer)
+    rescue => e
+      raise unless Rails.env.development?
+      stripe_payment_intent_payload(order, Effective::Customer.new(user: order.user))
+    end
+  end
+
+  def stripe_payment_intent_payload(order, customer)
     customer.create_stripe_customer! # Only creates if customer not already present
 
     payment = {

data/app/models/effective/order.rb

@@ -335,6 +335,18 @@ module Effective
         else payment_card.to_s
       end
 
+      # Try again
+      if card == 'none' && payment['card_type'].present?
+        card = case payment['card_type'].to_s.downcase.gsub(' ', '').strip
+          when '' then nil
+          when 'v', 'visa' then 'Visa'
+          when 'm', 'mc', 'master', 'mastercard' then 'MasterCard'
+          when 'a', 'ax', 'american', 'americanexpress' then 'American Express'
+          when 'd', 'discover' then 'Discover'
+          else payment_card.to_s
+        end
+      end
+
       last4 = if payment[:active_card] && payment[:active_card].include?('**** **** ****')
         payment[:active_card][15,4]
       end
@@ -486,14 +498,18 @@ module Effective
 
     # Effective::Order.new(items: Product.first, user: User.first).purchase!(email: false)
     def purchase!(payment: 'none', provider: 'none', card: 'none', email: true, skip_buyer_validations: false, skip_quickbooks: false)
+      return true if purchased?
+
       # Assign attributes
-      self.state = EffectiveOrders::PURCHASED
-      self.skip_buyer_validations = skip_buyer_validations
+      assign_attributes(
+        state: EffectiveOrders::PURCHASED,
+        skip_buyer_validations: skip_buyer_validations,
 
-      self.payment_provider ||= provider
-      self.payment_card ||= (card.presence || 'none')
-      self.purchased_at ||= Time.zone.now
-      self.payment = payment_to_h(payment) if self.payment.blank?
+        payment_provider: provider,
+        payment_card: (card.presence || 'none'),
+        purchased_at: Time.zone.now,
+        payment: payment_to_h(payment)
+      )
 
       begin
         Effective::Order.transaction do

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.4.3'.freeze
+  VERSION = '5.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.4.3
+  version: 5.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails