effective_orders 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3c5dc28f41342a9aaa1a3bb051ffba863a967ad6ffc29f4b7e314b699a8a840
-  data.tar.gz: a79cb8afd1238efee7e12fd2817900e6f68244bd420b5d0fa0a41d4bad634193
+  metadata.gz: 8cf23a88730117604f503a6f3e21faba53a1c476dbbd4195ef966b2aa87a0c85
+  data.tar.gz: 90920a87a7d90d46bac4cf459f3010a1e7d95899e5fd6c69c0ca8990a58acc53
 SHA512:
-  metadata.gz: 86af0e572fc9e7dbfec253786dd984f342bd926e5b4ecf5edc7ed7cc90a29478c8de6ee353c936aa0b87c9602cdbb99e136f53ed28da3a3818e260c7293f2e12
-  data.tar.gz: 2cafc367de7ffaedd679581bc969e3a98637ce4125ad3641b52c721743ef0b89a2c3abedd3fa31a73173cea2b04727d2bdcc866ac7c29eed63e56d06588b8248
+  metadata.gz: 199027ed41a806c19cfd3a7762b6c75d2ea6f1ce26f1545a90a7e8b2c3425d357ff99a9eae1cde269f66a40a7ee4fd4cda9a5a14728cb072bf477482b69d3d20
+  data.tar.gz: 717ee3e9b5c79c3ca741037ca5a39e8560ed5f8f545ffec60177e7139511080fbcad6fd11e760f8288aa57efc4cfafe581ec24d9ddb346a6ce655d680f287593

data/app/controllers/effective/concerns/purchase.rb

@@ -27,7 +27,7 @@ module Effective
       end
 
       def order_declined(payment:, provider:, card: 'none', message: nil, declined_url: nil)
-        @order.decline!(payment: payment, provider: provider, card: card) rescue nil
+        @order.decline!(payment: payment, provider: provider, card: card)
 
         flash[:danger] = message.presence || 'Payment was unsuccessful. Your credit card was declined by the payment processor. Please try again.'
 

data/app/models/effective/order.rb

@@ -84,11 +84,6 @@ module Effective
       validates :tax_rate, presence: { message: "can't be determined based on billing address" }
       validates :tax, presence: true
 
-      unless EffectiveOrders.skip_user_validation
-        validates :billing_name, presence: true
-        validates :user, associated: true
-      end
-
       if EffectiveOrders.billing_address
         validates :billing_address, presence: true
       end

data/app/models/effective/order_item.rb

@@ -5,9 +5,6 @@ module Effective
     belongs_to :order, class_name: 'Effective::Order'
     belongs_to :purchasable, polymorphic: true
 
-    delegate :purchased_download_url, to: :purchasable
-    delegate :purchased?, :declined?, to: :order
-
     # Attributes
     # name                  :string
     # quantity              :integer
@@ -30,6 +27,10 @@ module Effective
       (quantity || 0) > 1 ? "#{quantity}x #{name}" : name
     end
 
+    def purchased_download_url
+      purchasable&.purchased_download_url
+    end
+
     def subtotal
       price * quantity
     end

data/app/views/effective/orders/_fields.html.haml

@@ -9,9 +9,6 @@
   .effective-order-change-items
     = link_to 'Change Items', effective_orders.cart_path, rel: :nofollow, class: 'btn btn-secondary'
 
-- if EffectiveOrders.collect_user_fields.present? && form.object.user.present?
-  = render 'effective/orders/order_user_fields', form: form, user: form.object.user
-
 - num_addresses = [EffectiveOrders.billing_address, EffectiveOrders.shipping_address].count(true)
 
 - if num_addresses > 0

data/app/views/effective/orders/_order_items.html.haml

@@ -1,4 +1,4 @@
-- include_download_column = order.purchased? && order.order_items.any? { |order_item| order_item.purchased_download_url.present? rescue false }
+- include_download_column = order.purchased? && order.order_items.any? { |order_item| order_item.purchased_download_url.present? }
 - include_quantity_column = order.order_items.any? { |order_item| order_item.quantity > 1 }
 
 .effective-order-items
@@ -19,7 +19,7 @@
             %td.quantity= item.quantity
           - if include_download_column
             %td.download
-              - if item.purchased? && (item.purchased_download_url rescue nil).present?
+              - if item.purchased_download_url.present?
                 = link_to 'download', item.purchased_download_url
               - else
                 = '-'

data/app/views/effective/orders/_order_payment_details.html.haml

@@ -1,4 +1,4 @@
-- if order.purchased? && (EffectiveOrders.authorized?(controller, :show, :payment_details) rescue false)
+- if order.purchased? && EffectiveOrders.authorized?(controller, :show, :payment_details)
   .effective-order-payment-details
     %h2 Payment Details
     %table.table

data/app/views/effective/orders/_order_terms_and_conditions_fields.html.haml

@@ -2,6 +2,7 @@
   %h2 Terms and Conditions
 
   - terms = EffectiveOrders.terms_and_conditions_label
+  - label = terms.respond_to?(:call) ? instance_exec(form.object, &terms) : terms
 
   = form.check_box :terms_and_conditions, required: true,
-    label: ((terms.respond_to?(:call) ? instance_exec(form.object, &terms) : terms).presence || 'I accept the terms and conditions.').html_safe
+    label: (label.presence || 'I accept the terms and conditions.').html_safe

data/app/views/effective/orders/mark_as_paid/_form.html.haml

@@ -9,11 +9,10 @@
 
       = f.text_field :payment_card,
         label: 'Payment card type, cheque or transaction number',
-        placeholder: 'visa card',
-        hint: 'Full credit card numbers should not be entered here, or anywhere.'
+        hint: 'Do not enter credit card numbers here, or anywhere.'
 
       = f.text_area :payment,
-        label: 'Additional details',
+        label: 'Additional payment details',
         input_html: { value: f.object.payment.kind_of?(Hash) ? f.object.payment[:details] : f.object.payment.presence }
 
       = f.check_box :send_mark_as_paid_email_to_buyer,
@@ -22,5 +21,5 @@
 
       = f.text_area :note_to_buyer, hint: 'This message will be displayed on the receipt.'
 
-      = f.submit order_checkout_label(:mark_as_paid)
+      = f.submit order_checkout_label(:mark_as_paid), center: true
 

data/config/effective_orders.rb

@@ -54,14 +54,6 @@ EffectiveOrders.setup do |config|
   # Use effective_obfuscation gem to change order.id into a seemingly random 10-digit number
   config.obfuscate_order_ids = false
 
-  # If set, the orders#new screen will render effective/orders/_order_user_fields to capture this User Info
-  # The partial can be overridden to customize the form, but the following fields are also fed into strong_paramters
-  config.collect_user_fields = []
-  #config.collect_user_fields = [:first_name, :last_name] # Must be valid fields on the User object
-
-  # Don't validate_associated :user when saving an Order
-  config.skip_user_validation = false
-
   # If set, the orders#new screen will render effective/orders/_order_note_fields to capture any Note info
   config.collect_note = false
   config.collect_note_required = false

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.4.0'.freeze
+  VERSION = '4.4.1'.freeze
 end

data/lib/effective_orders.rb

@@ -39,9 +39,6 @@ module EffectiveOrders
   mattr_accessor :shipping_address
   mattr_accessor :use_address_full_name
 
-  mattr_accessor :collect_user_fields
-  mattr_accessor :skip_user_validation
-
   mattr_accessor :collect_note
   mattr_accessor :collect_note_required
   mattr_accessor :collect_note_message
@@ -92,7 +89,6 @@ module EffectiveOrders
       :note, :terms_and_conditions, :confirmed_checkout,
       billing_address: EffectiveAddresses.permitted_params,
       shipping_address: EffectiveAddresses.permitted_params,
-      user_attributes: (EffectiveOrders.collect_user_fields || []),
       subscripter: [:stripe_plan_id, :stripe_token]
     ]
   end
@@ -138,20 +134,20 @@ module EffectiveOrders
   end
 
   def self.single_payment_processor?
-    [cheque?, moneris?, paypal?, stripe?].select { |enabled| enabled }.length == 1
+    [moneris?, paypal?, stripe?].select { |enabled| enabled }.length == 1
   end
 
   # The Effective::Order.payment_provider value must be in this collection
   def self.payment_providers
     [
       ('cheque' if cheque? || mark_as_paid?),
+      ('credit card' if mark_as_paid?),
       ('free' if free?),
       ('moneris' if moneris?),
       ('paypal' if paypal?),
       ('pretend' if pretend?),
       ('refund' if refund?),
       ('stripe' if stripe?),
-      ('credit card' if mark_as_paid?),
       ('other' if mark_as_paid?),
       'none'
     ].compact
@@ -162,7 +158,6 @@ module EffectiveOrders
     return false if require_shipping_address
     return false if collect_note
     return false if terms_and_conditions
-    return false if collect_user_fields.present?
     true
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -201,7 +201,6 @@ files:
 - app/views/effective/orders/_order_payment_details.html.haml
 - app/views/effective/orders/_order_shipping.html.haml
 - app/views/effective/orders/_order_terms_and_conditions_fields.html.haml
-- app/views/effective/orders/_order_user_fields.html.haml
 - app/views/effective/orders/_orders_table.html.haml
 - app/views/effective/orders/cheque/_form.html.haml
 - app/views/effective/orders/cheque/pay_by_cheque.html.haml

data/app/views/effective/orders/_order_user_fields.html.haml

@@ -1,5 +0,0 @@
-.effective-order-user-fields
-  %h2 User Information
-  = form.fields_for :user, user do |fu|
-    - Array(EffectiveOrders.collect_user_fields).select { |field| fu.object.respond_to?(field) }.each do |field|
-      = fu.text_field field, required: true