effective_orders 5.4.2 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfd2223bf4174301697911662e02c29a03994f21b40e51e00cd0d1f0634982d0
-  data.tar.gz: 2fae7688c156279f71ae1cd4cb2555389cd18160adb5e638245ce76eaca06bb1
+  metadata.gz: 9c608a4f1f72b5f82b0afe786bcc71ba8b951ff22e121ae2e2492afa08410966
+  data.tar.gz: fd836b344d52cb4cc9047aecc243dc2bf43d2b7b69bc0524331449e005e49789
 SHA512:
-  metadata.gz: 2c7541e2b7135d8e7e0a84aa02b933e5adf8b78eaf18634675a488c8eb1eb709ecc357b6228e745342728d40199e2380f39f03ae9a5956ae59a32aa01aaace34
-  data.tar.gz: 573805f2bef985cba327539b5661756d1ca002ff139f7a9983cf215db90cda0db08e31646c1138859e9e8079539402782ad1ca3042bb2f7f5dd35a15d2bca907
+  metadata.gz: 4b7a575224a3cfbcbc271dcbce0f6e4b8d4943995696a3a57372356747faea7b454df6a2202d6c0b9a1ec55b8296ae78511665111841117066f4d2f4366881a4
+  data.tar.gz: d84ada9221fb3c57d2d92254e9925641a53a5bf772b143373616e239f22c4d52b88d131d9983d94a2d57e81cbdccf761a33e0e99d5da0941c7f462eff78307a1

data/app/controllers/admin/orders_controller.rb

@@ -15,7 +15,7 @@ module Admin
     submit :save, 'Checkout', redirect: -> { effective_orders.checkout_admin_order_path(resource) }
 
     def create
-      @user = current_user.class.find_by_id(order_params[:user_id])
+      @user = current_user.class.find_by_id(permitted_params[:user_id])
       @order = Effective::Order.new(user: @user)
 
       authorize_effective_order!
@@ -23,12 +23,12 @@ module Admin
 
       Effective::Order.transaction do
         begin
-          (order_params[:order_items_attributes] || {}).each do |_, item_attrs|
+          (permitted_params[:order_items_attributes] || {}).each do |_, item_attrs|
             purchasable = Effective::Product.new(item_attrs[:purchasable_attributes])
             @order.add(purchasable, quantity: item_attrs[:quantity])
           end
 
-          @order.attributes = order_params.except(:order_items_attributes, :user_id)
+          @order.attributes = permitted_params.except(:order_items_attributes, :user_id)
           @order.pending!
 
           message = 'Successfully created order'
@@ -123,7 +123,7 @@ module Admin
 
     private
 
-    def order_params
+    def permitted_params
       params.require(:effective_order).permit(:user_id, :user_type, :cc,
         :send_payment_request_to_buyer, :note_internal, :note_to_buyer,
         :payment_provider, :payment_card, :payment, :send_mark_as_paid_email_to_buyer,

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

@@ -26,7 +26,7 @@ module Effective
       def mark_as_paid_params
         params.require(:effective_order).permit(
           :purchased_at, :payment, :payment_provider, :payment_card,
-          :note_to_buyer, :send_mark_as_paid_email_to_buyer
+          :note_to_buyer, :note_internal, :send_mark_as_paid_email_to_buyer
         )
       end
 

data/app/datatables/admin/effective_orders_datatable.rb

@@ -72,7 +72,7 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
 
     col :total, as: :price
 
-    col :payment_provider, label: 'Provider', visible: false, search: { collection: EffectiveOrders.payment_providers }
+    col :payment_provider, label: 'Provider', visible: false, search: { collection: EffectiveOrders.admin_payment_providers }
     col :payment_card, label: 'Card', visible: false
 
     if EffectiveOrders.collect_note

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

@@ -120,7 +120,7 @@ module Effective
       validates :payment_provider, presence: true
 
       validate do
-        self.errors.add(:payment_provider, "unknown payment provider") unless EffectiveOrders.payment_providers.include?(payment_provider)
+        self.errors.add(:payment_provider, "unknown payment provider") unless (EffectiveOrders.payment_providers + EffectiveOrders.admin_payment_providers).include?(payment_provider)
       end
 
       validates :payment_card, presence: true
@@ -323,6 +323,8 @@ module Effective
     def payment_method
       return nil unless purchased?
 
+      provider = payment_provider if ['cheque', 'phone'].include?(payment_provider)
+
       # Normalize payment card
       card = case payment_card.to_s.downcase.gsub(' ', '').strip
         when '' then nil
@@ -331,7 +333,19 @@ module Effective
         when 'a', 'ax', 'american', 'americanexpress' then 'American Express'
         when 'd', 'discover' then 'Discover'
         else payment_card.to_s
-      end unless payment_provider == 'free'
+      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]
@@ -340,7 +354,7 @@ module Effective
       # stripe, moneris, moneris_checkout
       last4 ||= (payment['f4l4'] || payment['first6last4']).to_s.last(4)
 
-      [card, '-', last4].compact.join(' ')
+      [provider.presence, card.presence, last4.presence].compact.join(' - ')
     end
 
     def duplicate
@@ -484,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/mark_as_paid/_form.html.haml

@@ -7,20 +7,21 @@
     = effective_form_with(model: order, url: effective_orders.mark_as_paid_order_path(order), method: :post) do |f|
       = f.hidden_field :purchased_at, value: Time.zone.now
 
-      = f.select :payment_provider, EffectiveOrders.payment_providers, required: true
+      = f.select :payment_provider, EffectiveOrders.admin_payment_providers, required: true
 
       = f.text_field :payment_card,
         label: 'Payment card type, cheque or transaction number',
         hint: 'Do not enter credit card numbers here, or anywhere.'
 
-      = f.text_area :payment,
-        label: 'Additional payment details',
-        input_html: { value: f.object.payment.kind_of?(Hash) ? f.object.payment[:details] : f.object.payment.presence }
+      .row
+        .col
+          = f.text_area :note_to_buyer, hint: 'This message will be displayed to the buyer on the receipt.'
+        .col
+          = f.text_area :note_internal, hint: 'For or internal admin use only. This note will never be displayed to the buyer.'
 
       = f.check_box :send_mark_as_paid_email_to_buyer,
         label: 'Yes, send a receipt email to the buyer.',
         input_html: { checked: (f.object.send_mark_as_paid_email_to_buyer.nil? ? EffectiveOrders.send_order_receipts_when_mark_as_paid : f.object.send_mark_as_paid_email_to_buyer?) }
 
-      = f.text_area :note_to_buyer, hint: 'This message will be displayed on the receipt.'
 
-      = f.submit 'Admin: ' + order_checkout_label(order.refund? ? :refund : :mark_as_paid)
+      = f.submit order_checkout_label(order.refund? ? :refund : :mark_as_paid)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.4.2'.freeze
+  VERSION = '5.5.0'.freeze
 end

data/lib/effective_orders.rb

@@ -142,6 +142,24 @@ module EffectiveOrders
     ].compact
   end
 
+  # For the Admin Mark as Paid screen
+  def self.admin_payment_providers
+    [
+      ('cheque' if mark_as_paid?),
+      ('credit card' if mark_as_paid?),
+      #('free' if free?),
+      ('moneris' if moneris?),
+      ('moneris_checkout' if moneris_checkout?),
+      ('paypal' if paypal?),
+      ('phone' if mark_as_paid?),
+      #('pretend' if pretend?),
+      #('refund' if refund?),
+      ('stripe' if stripe?),
+      ('other' if mark_as_paid?),
+      'none'
+    ].compact
+  end
+
   def self.deferred_providers
     [('cheque' if cheque?), ('phone' if phone?)].compact
   end

metadata

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