effective_orders 5.4.4 → 5.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d5d843d5364c956719f1e8a7dcc07425bb70cc04420e73e519dd4445fec4c7
-  data.tar.gz: 64e70e869ab4150b7ee68954403b0f028fe6cabf650656f22ecc49f42b3d904e
+  metadata.gz: 496c6b24100359c7121e1903130d345ed5b13fabf41cf1a1e78be20be3d638c8
+  data.tar.gz: a2451ac65694daa46c2386dd13754d6ed43ae2e9b8b34ff16903ec6c9591e888
 SHA512:
-  metadata.gz: 591f04007fc784eacc6ed40ed74daf242de37930a9738dda370ce56edf6e21df8670cf5fc04765987970f69c2006841c2f9bcbb16fefb4e9412fb93da6443c75
-  data.tar.gz: 017b2cee8f4425ced8d0ba7e375653816bb74bfb24b78e4b26ec8862e8ffa78dab0d04212466a11cee1de10bc1a953782ff95c76a3c53f91d815a7f20534bd10
+  metadata.gz: 24a8a97d2bc9c2b45680fc4e9f8c751245d5e83d69ff085a744f1e16709219cafb04c13c55fd88eda8a2b2707eaeea0dea48a2c9f66c682187720ef334aab1b7
+  data.tar.gz: 14af91d8e9a56efe0e65d07348f4de7c2fc83a14df32d06b3e3cb40306b4469b575dfaf9c629a9f67369226da089b464d46c0be0cda1d3a5ca15a68b3693d6a4

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

@@ -70,6 +70,9 @@ module EffectiveStripeHelper
 
     token_required = customer.token_required?
 
+    # Always prompt them for a card unless remember card
+    token_required = true unless EffectiveOrders.stripe[:remember_card]
+
     intent = begin
       Rails.logger.info "[STRIPE] create payment intent : #{payment}"
       Stripe::PaymentIntent.create(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/app/views/effective/orders/stripe/_form.html.haml

@@ -9,7 +9,7 @@
       %em This checkout is powered by stripe.
 
     .my-4.text-center
-      = link_to(image_tag('effective_orders/stripe.png'), 'https://www.stripe.com', target: '_blank')
+      = image_tag('effective_orders/stripe.png', alt: 'Stripe.com Logo')
 
     = effective_form_with(scope: :stripe, url: effective_orders.stripe_order_path(order), data: { 'stripe-form': stripe.to_json }) do |f|
       = f.hidden_field :purchased_url, value: purchased_url

data/config/effective_orders.rb

@@ -210,6 +210,7 @@ EffectiveOrders.setup do |config|
   #     secret_key: 'sk_xxx',
   #     publishable_key: 'pk_xxx',
   #     currency: 'usd',
+  #     remember_card: true,
   #     site_title: 'My Site',
   #     site_image: 'logo.png' # A relative or absolute URL pointing to a square image of your brand or product. The recommended minimum size is 128x128px.
   #   }
@@ -218,6 +219,7 @@ EffectiveOrders.setup do |config|
   #     secret_key: 'sk_test_xxx',
   #     publishable_key: 'pk_test_xxx',
   #     currency: 'usd',
+  #     remember_card: true,
   #     site_title: 'My Site',
   #     site_image: 'logo.png' # A relative or absolute URL pointing to a square image of your brand or product. The recommended minimum size is 128x128px.
   #   }

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.4.4'.freeze
+  VERSION = '5.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.4.4
+  version: 5.5.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails