effective_orders 5.4.1 → 5.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1676b1a7b5f40851c951840a9eb371b1e54e3d99c48510b57fb88b5b75f8d2b5
-  data.tar.gz: 86b326329275200a2b260cb01cda9e2cbc573f372d6aae56001c1c91d59a3198
+  metadata.gz: 34d5d843d5364c956719f1e8a7dcc07425bb70cc04420e73e519dd4445fec4c7
+  data.tar.gz: 64e70e869ab4150b7ee68954403b0f028fe6cabf650656f22ecc49f42b3d904e
 SHA512:
-  metadata.gz: 36038ed587f95233a7bad620d60f9c007403033283bd6b0092ab3bbddaf162481a99a23c6b5928609582c3f9ae43d7aea351c551ca55636fbe69c44ae315c501
-  data.tar.gz: ca547aa3098e08492b727a32584b7817402c417375fb454a410e94058bccb7d686ea3239eacb99e018c8fca0eac69b38263e278c87e0b0d5b5db1c936df03f04
+  metadata.gz: 591f04007fc784eacc6ed40ed74daf242de37930a9738dda370ce56edf6e21df8670cf5fc04765987970f69c2006841c2f9bcbb16fefb4e9412fb93da6443c75
+  data.tar.gz: 017b2cee8f4425ced8d0ba7e375653816bb74bfb24b78e4b26ec8862e8ffa78dab0d04212466a11cee1de10bc1a953782ff95c76a3c53f91d815a7f20534bd10

data/app/assets/stylesheets/effective_orders/_order.scss

@@ -46,7 +46,7 @@ form.new_effective_order {
 }
 
 .effective-moneris-checkout {
-  height: 640px;
+  height: 720px;
 }
 
 @media print {

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,7 @@ 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
 
       last4 = if payment[:active_card] && payment[:active_card].include?('**** **** ****')
         payment[:active_card][15,4]
@@ -340,7 +342,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

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.1'.freeze
+  VERSION = '5.4.4'.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.1
+  version: 5.4.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails