effective_orders 4.6.1 → 4.6.2

data/app/models/concerns/acts_as_purchasable.rb

@@ -4,6 +4,17 @@ module ActsAsPurchasable
   module Base
     def acts_as_purchasable(*options)
       @acts_as_purchasable = options || []
+
+      # if table_exists?
+      #   instance = new()
+      #   raise 'must respond_to price' unless instance.respond_to?(:price)
+      #   raise 'must respond_to purchased_order_id' unless instance.respond_to?(:purchased_order_id)
+
+      #   if defined?(EffectiveQbSync)
+      #     raise 'must respond to qb_item_name' unless instance.respond_to?(:qb_item_name)
+      #   end
+      # end
+
       include ::ActsAsPurchasable
     end
   end

data/app/models/concerns/acts_as_subscribable.rb

@@ -7,6 +7,12 @@ module ActsAsSubscribable
     def acts_as_subscribable(*options)
       @acts_as_subscribable = options || []
 
+      # if table_exists?
+      #   instance = new()
+      #   raise 'must respond to trialing_until' unless instance.respond_to?(:trialing_until) || !EffectiveOrders.trial?
+      #   raise 'must respond to subscription_status' unless instance.respond_to?(:subscription_status)
+      # end
+
       include ::ActsAsSubscribable
       (ActsAsSubscribable.descendants ||= []) << self
     end

data/app/models/effective/access_denied.rb

@@ -0,0 +1,17 @@
+unless defined?(Effective::AccessDenied)
+  module Effective
+    class AccessDenied < StandardError
+      attr_reader :action, :subject
+
+      def initialize(message = nil, action = nil, subject = nil)
+        @message = message
+        @action = action
+        @subject = subject
+      end
+
+      def to_s
+        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
+      end
+    end
+  end
+end

data/app/models/effective/cart.rb

@@ -2,16 +2,14 @@ module Effective
   class Cart < ActiveRecord::Base
     self.table_name = EffectiveOrders.carts_table_name.to_s
 
-    belongs_to :user, polymorphic: true, optional: true  # Optional. We want non-logged-in users to have carts too.
+    belongs_to :user, optional: true    # Optional. We want non-logged-in users to have carts too.
+    has_many :cart_items, -> { order(:id) }, dependent: :delete_all, class_name: 'Effective::CartItem'
 
-    has_many :cart_items, -> { order(:id) }, inverse_of: :cart, dependent: :delete_all
     accepts_nested_attributes_for :cart_items
 
-    effective_resource do
-      cart_items_count        :integer
-
-      timestamps
-    end
+    # Attributes
+    # cart_items_count        :integer
+    # timestamps
 
     scope :deep, -> { includes(cart_items: :purchasable) }
 

data/app/models/effective/cart_item.rb

@@ -2,15 +2,12 @@ module Effective
   class CartItem < ActiveRecord::Base
     self.table_name = EffectiveOrders.cart_items_table_name.to_s
 
-    belongs_to :cart, counter_cache: true
+    belongs_to :cart, counter_cache: true, class_name: 'Effective::Cart'
     belongs_to :purchasable, polymorphic: true
 
-    effective_resource do
-      unique      :string
-      quantity    :integer
-
-      timestamps
-    end
+    # Attributes
+    # quantity    :integer
+    # timestamps
 
     validates :purchasable, presence: true
     validates :quantity, presence: true

data/app/models/effective/customer.rb

@@ -4,17 +4,16 @@ module Effective
 
     attr_accessor :stripe_customer
 
-    belongs_to :user, polymorphic: true
+    belongs_to :user
     has_many :subscriptions, -> { includes(:subscribable) }, class_name: 'Effective::Subscription', foreign_key: 'customer_id'
     accepts_nested_attributes_for :subscriptions
 
-    effective_resource do
-      stripe_customer_id            :string  # cus_xja7acoa03
-      payment_method_id             :string  # Last payment method used
-      active_card                   :string  # **** **** **** 4242 Visa 05/12
+    # Attributes
+    # stripe_customer_id            :string  # cus_xja7acoa03
+    # payment_method_id             :string  # Last payment method used
+    # active_card                   :string  # **** **** **** 4242 Visa 05/12
 
-      timestamps
-    end
+    # timestamps
 
     scope :deep, -> { includes(subscriptions: :subscribable) }
 

data/app/models/effective/order.rb

@@ -31,41 +31,35 @@ module Effective
     # If we want to use orders in a has_many way
     belongs_to :parent, polymorphic: true, optional: true
 
-    belongs_to :user, polymorphic: true, validate: false  # This is the buyer/user of the order. We validate it below.
-    has_many :order_items, -> { order(:id) }, inverse_of: :order, dependent: :delete_all
-
-    if defined?(EffectiveQbSync)
-      has_one :qb_order_item
-    end
+    belongs_to :user, validate: false  # This is the buyer/user of the order. We validate it below.
+    has_many :order_items, -> { order(:id) }, inverse_of: :order, class_name: 'Effective::OrderItem', dependent: :delete_all
 
     accepts_nested_attributes_for :order_items, allow_destroy: false, reject_if: :all_blank
     accepts_nested_attributes_for :user, allow_destroy: false, update_only: true
 
     # Attributes
-    effective_resource do
-      state             :string
-      purchased_at      :datetime
-
-      note              :text   # From buyer to admin
-      note_to_buyer     :text   # From admin to buyer
-      note_internal     :text   # Internal admin only
-
-      billing_name      :string   # name of buyer
-      email             :string   # same as user.email
-      cc                :string   # can be set by admin
-
-      payment           :text     # serialized hash containing all the payment details.
-      payment_provider  :string
-      payment_card      :string
-
-      tax_rate          :decimal, precision: 6, scale: 3
-
-      subtotal          :integer
-      tax               :integer
-      total             :integer
-
-      timestamps
-    end
+    # state             :string
+    # purchased_at      :datetime
+    #
+    # note              :text   # From buyer to admin
+    # note_to_buyer     :text   # From admin to buyer
+    # note_internal     :text   # Internal admin only
+    #
+    # billing_name      :string   # name of buyer
+    # email             :string   # same as user.email
+    # cc                :string   # can be set by admin
+    #
+    # payment           :text     # serialized hash containing all the payment details.
+    # payment_provider  :string
+    # payment_card      :string
+    #
+    # tax_rate          :decimal, precision: 6, scale: 3
+    #
+    # subtotal          :integer
+    # tax               :integer
+    # total             :integer
+    #
+    # timestamps
 
     serialize :payment, Hash
 
@@ -78,6 +72,10 @@ module Effective
       self.state = EffectiveOrders::CONFIRMED if pending?
     end
 
+    before_save(if: -> { state_was == EffectiveOrders::PURCHASED }) do
+      raise Exception.new('cannot change state of purchased order') unless purchased?
+    end
+
     # Order validations
     validates :user_id, presence: true
     validates :email, presence: true, email: true  # email and cc validators are from effective_resources
@@ -261,12 +259,6 @@ module Effective
       end
     end
 
-    # first or build
-    def qb_item_name
-      raise('expected EffectiveQbSync gem') unless defined?(EffectiveQbSync)
-      (qb_order_item || build_qb_order_item(name: purchasable.qb_item_name)).name
-    end
-
     def pending?
       state == EffectiveOrders::PENDING
     end
@@ -322,15 +314,15 @@ module Effective
     end
 
     def send_payment_request_to_buyer?
-      EffectiveResources.truthy?(send_payment_request_to_buyer) && !free? && !refund?
+      truthy?(send_payment_request_to_buyer) && !free? && !refund?
     end
 
     def send_mark_as_paid_email_to_buyer?
-      EffectiveResources.truthy?(send_mark_as_paid_email_to_buyer)
+      truthy?(send_mark_as_paid_email_to_buyer)
     end
 
     def skip_buyer_validations?
-      EffectiveResources.truthy?(skip_buyer_validations)
+      truthy?(skip_buyer_validations)
     end
 
     # This is called from admin/orders#create
@@ -482,7 +474,7 @@ module Effective
     end
 
     def skip_qb_sync!
-      EffectiveOrders.use_effective_qb_sync ? EffectiveQbSync.skip_order!(self) : true
+      defined?(EffectiveQbSync) ? EffectiveQbSync.skip_order!(self) : true
     end
 
     protected
@@ -549,23 +541,22 @@ module Effective
       order_items.each { |oi| oi.purchasable.public_send(name, self, oi) if oi.purchasable.respond_to?(name) }
     end
 
-    def send_email(email, *args)
-      raise('expected args to be an Array') unless args.kind_of?(Array)
-
-      if defined?(Tenant)
-        tenant = Tenant.current || raise('expected a current tenant')
-        args << { tenant: tenant }
-      end
-
-      deliver_method = EffectiveOrders.mailer[:deliver_method] || EffectiveResources.deliver_method
-
+    def send_email(email, *mailer_args)
       begin
-        EffectiveOrders.mailer_klass.send(email, *args).send(deliver_method)
+        Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
       rescue => e
         raise if Rails.env.development? || Rails.env.test?
       end
     end
 
+    def truthy?(value)
+      if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails <5
+        ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+      else
+        ::ActiveRecord::Type::Boolean.new.cast(value)
+      end
+    end
+
     def payment_to_h(payment)
       if payment.respond_to?(:to_unsafe_h)
         payment.to_unsafe_h.to_h

data/app/models/effective/order_item.rb

@@ -2,17 +2,15 @@ module Effective
   class OrderItem < ActiveRecord::Base
     self.table_name = EffectiveOrders.order_items_table_name.to_s
 
-    belongs_to :order
+    belongs_to :order, class_name: 'Effective::Order'
     belongs_to :purchasable, polymorphic: true
 
-    effective_resource do
-      name                  :string
-      quantity              :integer
-      price                 :integer
-      tax_exempt            :boolean
-
-      timestamps
-    end
+    # Attributes
+    # name                  :string
+    # quantity              :integer
+    # price                 :integer, default: 0
+    # tax_exempt            :boolean
+    # timestamps
 
     validates :purchasable, associated: true, presence: true
     accepts_nested_attributes_for :purchasable
@@ -26,7 +24,7 @@ module Effective
     scope :purchased_by, lambda { |user| where(order_id: Effective::Order.purchased_by(user)) }
 
     def to_s
-      ((quantity || 0) > 1 ? "#{quantity}x #{name}" : name) || 'order item'
+      (quantity || 0) > 1 ? "#{quantity}x #{name}" : name
     end
 
     def purchased_download_url

data/app/models/effective/product.rb

@@ -4,15 +4,12 @@ module Effective
 
     acts_as_purchasable
 
-    effective_resource do
-      name          :string
-      qb_item_name  :string
-
-      price         :integer
-      tax_exempt    :boolean
-
-      timestamps
-    end
+    # Attributes
+    # name          :string
+    # price         :integer, default: 0
+    # tax_exempt    :boolean, default: false
+    #
+    # timestamps
 
     validates :name, presence: true
     validates :price, presence: true

data/app/models/effective/subscription.rb

@@ -4,21 +4,20 @@ module Effective
 
     attr_accessor :stripe_subscription
 
-    belongs_to :customer, counter_cache: true
+    belongs_to :customer, class_name: 'Effective::Customer', counter_cache: true
     belongs_to :subscribable, polymorphic: true
 
-    effective_resource do
-      stripe_plan_id            :string
-      stripe_subscription_id    :string
-      name                      :string
-      description               :string
-      interval                  :string
-      quantity                  :integer
-
-      status                    :string
-
-      timestamps
-    end
+    # Attributes
+    # stripe_plan_id            :string
+    # stripe_subscription_id    :string
+    # name                      :string
+    # description               :string
+    # interval                  :string
+    # quantity                  :integer
+    #
+    # status                    :string
+    #
+    # timestamps
 
     before_validation(if: -> { plan && (stripe_plan_id_changed? || new_record?) }) do
       self.name = plan[:name]

data/app/views/admin/orders/_form.html.haml

@@ -1,15 +1,19 @@
 = effective_form_with(model: [:admin, order], url: (order.persisted? ? effective_orders.admin_order_path(order) : effective_orders.admin_orders_path)) do |f|
   - if f.object.new_record?
-    - user_collection = current_user.class.respond_to?(:sorted) ? current_user.class.sorted : current_user.class.all
-
-    = f.select :user_id, (@users || user_collection),
+    = f.select :user_id, @users || User.all.to_a.sort { |user1, user2| user1.to_s <=> user2.to_s },
       label: 'Buyer', required: true, hint: 'The user that should purchase this order.'
 
     = f.email_cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
 
     %h2 Order Items
-    = f.has_many :order_items do |fc|
-      = render 'order_item_fields', f: fc
+    .order_items
+      - f.object.order_items.build unless f.object.order_items.present?
+
+      = f.fields_for :order_items, f.object.order_items do |order_item|
+        = render 'order_item_fields', f: order_item
+
+      .links
+        = link_to_add_association (icon('plus') + 'Add item'), f, :order_items, class: 'btn btn-secondary', partial: 'order_item_fields'
 
     %hr
 

data/app/views/admin/orders/_order_item_fields.html.haml

@@ -1,10 +1,14 @@
-.row.align-items-center
-  = f.fields_for :purchasable, (f.object.purchasable || Effective::Product.new) do |pf|
-    .col= f.number_field :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
-    .col= pf.text_field :name
-    .col= pf.price_field :price
+.nested-fields.order-item
+  .row.align-items-center
+    = f.fields_for :purchasable, (f.object.purchasable || Effective::Product.new) do |pf|
+      .col-md-2= f.number_field :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
+      .col-md-4= pf.text_field :name, maxlength: 255
+      .col-md-2= pf.price_field :price
 
-    - if EffectiveOrders.use_effective_qb_sync
-      .col= pf.text_field :qb_item_name, label: 'Quickbooks Item'
+      - if defined?(EffectiveQbSync)
+        .col-md-2= pf.text_field :qb_item_name, maxlength: 255, label: 'Quickbooks Item'
 
-    .col= pf.check_box :tax_exempt, label: "Tax Exempt", title: 'When checked, tax will not be applied to this item'
+      .col-md-2.mt-4= pf.check_box :tax_exempt, label: "Tax Exempt", title: 'When checked, tax will not be applied to this item'
+      .col-md-1
+        = link_to_remove_association(f, 'data-confirm': 'Remove?') do
+          = icon('trash-2', class: 'text-danger')

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

@@ -30,7 +30,8 @@
       %p.my-4.text-center - or -
       = render partial: '/effective/orders/deferred/form', locals: provider_locals
 
-  - if EffectiveResources.authorized?(controller, :admin, :effective_orders) && order.user != current_user
+  - if EffectiveOrders.authorized?(controller, :admin, :effective_orders) && order.user != current_user
     - if EffectiveOrders.mark_as_paid?
       .effective-order-admin-purchase-actions
         = render partial: '/effective/orders/mark_as_paid/form', locals: provider_locals
+

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

@@ -7,7 +7,7 @@
       class: 'btn btn-secondary',
       data: { confirm: "Send receipt to #{order.emails_send_to}?" }
 
-  - if order.persisted? && EffectiveResources.authorized?(controller, :admin, :effective_orders)
+  - if order.persisted? && EffectiveOrders.authorized?(controller, :admin, :effective_orders)
     - if order.pending? || order.confirmed? || order.deferred?
       = link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
         class: 'btn btn-secondary',

data/config/effective_orders.rb

@@ -10,8 +10,38 @@ EffectiveOrders.setup do |config|
   config.subscriptions_table_name = :subscriptions
   config.products_table_name = :products
 
+  # Authorization Method
+  #
+  # This method is called by all controller actions with the appropriate action and resource
+  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
+  #
+  # Use via Proc (and with CanCan):
+  # config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
+  #
+  # Use via custom method:
+  # config.authorization_method = :my_authorization_method
+  #
+  # And then in your application_controller.rb:
+  #
+  # def my_authorization_method(action, resource)
+  #   current_user.is?(:admin)
+  # end
+  #
+  # Or disable the check completely:
+  # config.authorization_method = false
+  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
+
   # Layout Settings
-  # config.layout = { application: 'application', admin: 'admin' }
+  # Configure the Layout per controller, or all at once
+
+  # config.layout = 'application'   # All EffectiveOrders controllers will use this layout
+  config.layout = {
+    carts: 'application',
+    orders: 'application',
+    subscriptions: 'application',
+    admin_customers: 'admin',
+    admin_orders: 'admin'
+  }
 
   # Filter the @orders on admin/orders#index screen
   # config.orders_collection_scope = Proc.new { |scope| scope.where(...) }
@@ -24,9 +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
 
-  # Synchronize with Quickbooks
-  config.use_effective_qb_sync = 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
@@ -86,9 +113,6 @@ EffectiveOrders.setup do |config|
 
   # subject_for_subscription_trialing: Proc.new { |subscribable| "Pending Order #{order.to_param}"}
 
-  # Use this mailer class. You can extend.
-  config.mailer_class_name = 'Effective::OrdersMailer'
-
   config.mailer = {
     send_order_receipt_to_admin: true,
     send_order_receipt_to_buyer: true,
@@ -131,7 +155,7 @@ EffectiveOrders.setup do |config|
     default_from: 'info@example.com',
     admin_email: 'admin@example.com',   # Refund notifications will also be sent here
 
-    deliver_method: nil  # When nil, will try deliver_later and fallback to deliver_now
+    deliver_method: nil  # When nil, will use deliver_later if active_job is configured, otherwise deliver_now
   }
 
   #######################################