effective_orders 5.4.4 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d5d843d5364c956719f1e8a7dcc07425bb70cc04420e73e519dd4445fec4c7
-  data.tar.gz: 64e70e869ab4150b7ee68954403b0f028fe6cabf650656f22ecc49f42b3d904e
+  metadata.gz: 9c608a4f1f72b5f82b0afe786bcc71ba8b951ff22e121ae2e2492afa08410966
+  data.tar.gz: fd836b344d52cb4cc9047aecc243dc2bf43d2b7b69bc0524331449e005e49789
 SHA512:
-  metadata.gz: 591f04007fc784eacc6ed40ed74daf242de37930a9738dda370ce56edf6e21df8670cf5fc04765987970f69c2006841c2f9bcbb16fefb4e9412fb93da6443c75
-  data.tar.gz: 017b2cee8f4425ced8d0ba7e375653816bb74bfb24b78e4b26ec8862e8ffa78dab0d04212466a11cee1de10bc1a953782ff95c76a3c53f91d815a7f20534bd10
+  metadata.gz: 4b7a575224a3cfbcbc271dcbce0f6e4b8d4943995696a3a57372356747faea7b454df6a2202d6c0b9a1ec55b8296ae78511665111841117066f4d2f4366881a4
+  data.tar.gz: d84ada9221fb3c57d2d92254e9925641a53a5bf772b143373616e239f22c4d52b88d131d9983d94a2d57e81cbdccf761a33e0e99d5da0941c7f462eff78307a1

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.4'.freeze
+  VERSION = '5.5.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.4.4
+  version: 5.5.0
 platform: ruby
 authors:
 - Code and Effect