effective_orders 3.2.3 → 4.0.0beta1

data/app/models/effective/order_item.rb

@@ -4,7 +4,6 @@ module Effective
 
     belongs_to :order, class_name: 'Effective::Order'
     belongs_to :purchasable, polymorphic: true
-    belongs_to :seller, class_name: 'User', optional: true
 
     delegate :purchased_download_url, to: :purchasable
     delegate :purchased?, :declined?, to: :order
@@ -24,9 +23,7 @@ module Effective
     validates :price, presence: true
     validates :tax_exempt, inclusion: { in: [true, false] }
 
-    validates :seller_id, presence: true, if: -> { EffectiveOrders.stripe_connect_enabled }
-
-    scope :sold, -> { joins(:order).where(orders: { purchase_state: EffectiveOrders::PURCHASED }) }
+    scope :sold, -> { joins(:order).where(orders: { state: EffectiveOrders::PURCHASED }) }
     scope :sold_by, lambda { |user| sold().where(seller_id: user.id) }
 
     def to_s
@@ -52,26 +49,10 @@ module Effective
     def price=(value)
       if value.kind_of?(Integer)
         super
-      elsif value.kind_of?(String) && !value.include?('.') # Looks like an integer
-        super
-      else # Could be Float, BigDecimal, or String like 9.99
+      else
         raise 'expected price to be an Integer representing the number of cents.'
       end
     end
 
-    # This is going to return an Effective::Customer object that matches the purchasable.user
-    # And is the Customer representing who is selling the product
-    # This is really only used for StripeConnect
-    def seller
-      @seller ||= Effective::Customer.for_buyer(purchasable.seller)
-    end
-
-    def stripe_connect_application_fee
-      @stripe_connect_application_fee ||= (
-        self.instance_exec(self, &EffectiveOrders.stripe_connect_application_fee_method).to_i.tap do |fee|
-          raise "expected EffectiveOrders.stripe_connect_application_fee_method to return a value between 0 and the order_item total (#{self.total}). Received #{fee}." if (fee > total || fee < 0)
-        end
-      )
-    end
   end
 end

data/app/views/admin/customers/index.html.haml

@@ -3,7 +3,4 @@
 %p.text-right.effective-admin-actions
   = link_to 'Stripe Customers', "https://dashboard.stripe.com/#{'test/' if Rails.env.development?}customers", class: 'btn btn-primary'
 
-- if @datatable.present?
-  = render_datatable @datatable
-- else
-  %p There are no customers present
+= render_datatable(@datatable)

data/app/views/admin/order_items/index.html.haml

@@ -1,6 +1,3 @@
 %h1.effective-admin-heading= @page_title
 
-- if @datatable.present?
-  = render_datatable @datatable
-- else
-  %p There are no order items present
+= render_datatable(@datatable)

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

@@ -1,11 +1,20 @@
-- if datatable.admin_namespace?
-  - if order.purchased? == false
-    = link_to effective_orders.admin_order_path(order), title: 'Checkout' do
-      %span.glyphicon.glyphicon-usd
+= dropdown(variation: :dropleft) do
+  - if datatable.admin_namespace?
+    = dropdown_link_to 'View', effective_orders.admin_order_path(order)
+    = dropdown_link_to 'Edit', effective_orders.edit_admin_order_path(order)
 
-  = link_to effective_orders.edit_admin_order_path(order), title: 'Edit' do
-    %span.glyphicon.glyphicon-edit
+    - if order.purchased?
+      = dropdown_link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
+        data: { confirm: "Send receipt to #{order.user.email}?" }
 
-- else
-  = link_to effective_orders.order_path(order), title: 'View' do
-    %span.glyphicon.glyphicon-eye-open
+    - if order.pending? || order.confirmed?
+      = dropdown_link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
+        data: { method: :post, confirm: "Send request for payment to #{order.user.email}?" }
+
+      = dropdown_link_to 'Admin: Checkout', effective_orders.checkout_admin_order_path(order)
+
+      = dropdown_link_to "Delete #{order}", effective_orders.admin_order_path(order),
+        data: { method: :delete, confirm: "Really delete #{order}?" }
+
+  - else
+    = dropdown_link_to 'View', effective_orders.order_path(order)

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

@@ -1,33 +1,31 @@
-= simple_form_for [:admin, order], (EffectiveOrders.admin_simple_form_options || {}).merge(url: (order.persisted? ? effective_orders.admin_order_path(order) : effective_orders.admin_orders_path)) do |f|
+= 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?
-    = f.association :user,
-      label: 'Buyer',
-      required: true,
-      as: :effective_select,
-      collection: @users || User.all.to_a.sort { |user1, user2| user1.to_s <=> user2.to_s }
+    = f.select :user_id, @users || User.all.to_a.sort { |user1, user2| user1.to_s <=> user2.to_s }, label: 'Buyer', required: true
 
     %h2 Order Items
     .order_items
       - f.object.order_items.build unless f.object.order_items.present?
-      = f.simple_fields_for :order_items do |order_item|
+      = f.fields_for :order_items, f.object.order_items do |order_item|
         = render 'order_item_fields', f: order_item
 
       .links
-        = link_to_add_association '+ Add line item', f, :order_items, partial: 'order_item_fields'
+        = link_to_add_association "Add line item".html_safe, f, :order_items, class: 'btn btn-success', partial: 'order_item_fields'
 
-    = f.input :send_payment_request_to_buyer,
-      as: :boolean,
+    %hr
+
+    = f.check_box :send_payment_request_to_buyer,
       label: 'Yes, send a payment request email to the buyer.',
       value: (f.object.send_payment_request_to_buyer.nil? ? EffectiveOrders.mailer[:send_payment_request_to_buyer] : f.object.send_payment_request_to_buyer?)
 
   .row
-    .col-sm-6.effective-order-note-to-buyer
+    .col-md-6.effective-order-note-to-buyer
       %h2 Note to Buyer
-      = f.input :note_to_buyer, disabled: f.object.purchased?, label: false,
+      = f.text_area :note_to_buyer, disabled: f.object.purchased?, label: false,
         hint: (f.object.purchased? ? 'This message was displayed to the buyer during checkout and appears on the receipt.' : 'This message will be displayed to the buyer during checkout and will appear on the receipt.')
 
-    .col-sm-6.effective-order-internal-note
+    .col-md-6.effective-order-internal-note
       %h2 Internal Note
-      = f.input :note_internal, label: false, hint: 'For internal admin use only. This note will never be displayed to the buyer.'
+      = f.text_area :note_internal, label: false,
+        hint: 'For internal admin use only. This note will never be displayed to the buyer.'
 
   = render partial: '/admin/orders/order_actions', locals: { order: @order, form: f, f: f }

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

@@ -1,7 +1,7 @@
 .effective-order-internal-note-form
   %h2 Internal Note
 
-  = simple_form_for [:admin, order], (EffectiveOrders.admin_simple_form_options || {}).merge(url: effective_orders.admin_order_path(order)) do |f|
-    = f.input :note_internal, label: false, hint: 'For internal admin use only.  This note will never be displayed to the buyer.'
+  = effective_form_with(model: [:admin, order] ,url: effective_orders.admin_order_path(order)) do |f|
+    = f.text_area :note_internal, label: false, hint: 'For internal admin use only. This note will never be displayed to the buyer.'
 
     = render partial: '/admin/orders/order_actions', locals: { order: @order, form: f, f: f }

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

@@ -1,5 +1,8 @@
-%p.text-right
-  = form.button :submit, 'Save', data: { disable_with: 'Saving...' }
-  = form.button :submit, 'Save and Continue', data: { disable_with: 'Saving...' }
-  = form.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
-  = form.button :submit, 'Save and Duplicate', data: { disable_with: 'Saving...' }
+= effective_save(form) do
+  = form.save 'Save', class: 'btn btn-primary'
+  = form.save 'Duplicate', class: 'btn btn-primary'
+  - unless form.object.purchased?
+    = form.save 'Checkout', class: 'btn btn-success'
+
+  = form.save 'Continue', class: 'btn btn-secondary'
+  = form.save 'Add New', class: 'btn btn-secondary'

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

@@ -1,9 +1,10 @@
 .nested-fields.order-item
-  .row
-    - f.object.purchasable ||= Effective::Product.new
-    = f.simple_fields_for :purchasable do |purchasable|
-      .col-sm-2= f.input :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
-      .col-sm-4= purchasable.input :title, input_html: { maxlength: 255 }
-      .col-sm-2= purchasable.input :price, as: :effective_price
-      .col-sm-2= purchasable.input :tax_exempt, label: 'Tax Exempt', input_html: { title: 'When checked, tax will not be applied to this item' }
-      .col-sm-2.remove-nested-fields= link_to_remove_association('Remove line item', f)
+  .row.align-items-center
+    = f.fields_for :purchasable, (f.object.purchasable || Effective::Product.new) do |pf|
+      .col-md-1= f.number_field :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
+      .col-md-5= pf.text_field :title, maxlength: 255
+      .col-md-2= pf.price_field :price
+      .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.mt-4
+        = link_to_remove_association(f, 'data-confirm': 'Really remove this item?') do
+          = icon('x', class: 'btn-danger')

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

@@ -0,0 +1,3 @@
+%h1.effective-admin-heading= @page_title
+
+= render_checkout(@order, namespace: :admin, purchased_url: effective_orders.admin_order_path(@order), declined_url: effective_orders.admin_order_path(@order))

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

@@ -1,4 +1,6 @@
 %h1.effective-admin-heading= @page_title
 
 = render partial: 'effective/orders/order', locals: { order: @order }
-.effective-order= render partial: 'form', locals: { order: @order }
+
+.effective-order
+  = render partial: 'form', locals: { order: @order }

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

@@ -1,3 +1,4 @@
 %h1.effective-admin-heading= @page_title
 
-.effective-order= render partial: 'form', locals: { order: @order }
+.effective-order
+  = render partial: 'form', locals: { order: @order }

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

@@ -1,7 +1,4 @@
 %h1.effective-admin-heading= @page_title
 
-- if @order.purchased?
-  = render partial: 'effective/orders/order', locals: { order: @order }
-  = render partial: 'admin/orders/form_note_internal', locals: { order: @order }
-- else
-  = render_checkout_step2(@order, namespace: :admin, purchased_url: effective_orders.admin_order_path(@order), declined_url: effective_orders.admin_order_path(@order))
+= render partial: 'effective/orders/order', locals: { order: @order }
+= render partial: 'admin/orders/form_note_internal', locals: { order: @order }

data/app/views/effective/carts/_cart.html.haml

@@ -1,4 +1,4 @@
-.effective-order
+.effective-cart
   %table.table
     %thead
       %tr

data/app/views/effective/carts/_cart_actions.html.haml

@@ -1,4 +1,3 @@
-.effective-order-actions.pull-right
-  %p
-    = link_to_checkout
-    = link_to_empty_cart
+.effective-cart-actions.form-actions
+  = link_to_checkout
+  = link_to_empty_cart

data/app/views/effective/carts/show.html.haml

@@ -2,16 +2,16 @@
 
 - if @cart.blank?
   %p No items in cart.
-- else
+
+- if @cart.present?
   %p Your cart has #{@cart.cart_items.length} items.
 
   = render_cart(@cart)
-  %hr
   = render partial: '/effective/carts/cart_actions', locals: { cart: @cart }
 
 - if @pending_orders.present?
   %h2 Pending Orders
   = render_orders(@pending_orders)
 
-- if EffectiveOrders.show_order_history_button
-  = link_to_my_purchases(label: 'Order History')
+- if @cart.user && Effective::Order.purchased.where(user: @cart.user).exists?
+  = link_to 'Order History', effective_orders.orders_path, rel: :nofollow, class: 'btn btn-secondary'

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

@@ -0,0 +1,3 @@
+- if (order.pending? || order.confirmed?) && current_cart.present? && order.user == current_user
+  .effective-order-change-items
+    = link_to 'Change Items', effective_orders.cart_path, rel: :nofollow, class: 'btn btn-secondary'

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

@@ -1,35 +1,29 @@
 .effective-order
-  = simple_form_for(order, (EffectiveOrders.simple_form_options || {}).merge(url: checkout_step1_form_url(order, namespace))) do |f|
-    = hidden_field_tag(:purchased_url, purchased_url) if defined?(:purchased_url)
-    = hidden_field_tag(:declined_url, declined_url) if defined?(:declined_url)
+  = effective_form_with(model: order, url: checkout_step1_form_url(order, namespace)) do |f|
+    = render partial: 'effective/orders/order_notes', locals: { order: order }
+    = render partial: 'effective/orders/order_items', locals: { order: order }
 
-    = render partial: 'effective/orders/order_items', locals: { order: order, form: f }
+    - if current_cart.present?
+      .effective-order-change-items
+        = link_to 'Change Items', effective_orders.cart_path, rel: :nofollow, class: 'btn btn-secondary'
 
-    - unless f.object.pending? || (current_cart && current_cart.blank?)
-      = link_to 'Change Items', effective_orders.cart_path, rel: :nofollow, class: 'btn btn-default'
-
-    - if order.errors[:order_items].present?
-      %p.inline-errors= order.errors[:order_items].first
-
-    - if order.errors[:total].present?
-      %p.inline-errors= order.errors[:total].first
-
-    - if EffectiveOrders.collect_user_fields.present? && (f.object.user rescue nil).present?
+    - if EffectiveOrders.collect_user_fields.present? && f.object.user.present?
       = render partial: 'effective/orders/order_user_fields', locals: { form: f, user: f.object.user }
 
-    - num_addresses = [EffectiveOrders.require_billing_address, EffectiveOrders.require_shipping_address].count(true)
+    - num_addresses = [EffectiveOrders.billing_address, EffectiveOrders.shipping_address].count(true)
 
     - if num_addresses > 0
-      .row
-        - if EffectiveOrders.require_billing_address
-          %div{class: "col-sm-#{12 / num_addresses}"}
-            %h2 Billing Address
-            = effective_address_fields(f, :billing_address)
-
-        - if EffectiveOrders.require_shipping_address
-          %div{class: "col-sm-#{12 / num_addresses}"}
-            %h2 Shipping Address
-            = effective_address_fields(f, :shipping_address)
+      .effective-order-addresses
+        .row
+          - if EffectiveOrders.billing_address
+            %div{class: "col-md-#{12 / num_addresses}"}
+              %h2 Billing Address
+              = effective_address_fields(f, :billing_address)
+
+          - if EffectiveOrders.shipping_address
+            %div{class: "col-md-#{12 / num_addresses}"}
+              %h2 Shipping Address
+              = effective_address_fields(f, :shipping_address)
 
     - if EffectiveOrders.collect_note
       = render partial: 'effective/orders/order_note_fields', locals: { form: f }
@@ -37,5 +31,4 @@
     - if EffectiveOrders.terms_and_conditions
       = render partial: 'effective/orders/order_terms_and_conditions_fields', locals: { form: f }
 
-    %p.text-right
-      = f.submit 'Save and Continue', class: 'btn btn-primary', rel: :nofollow, data: { disable_with: 'Saving...' }
+    = effective_save(f, 'Proceed to Checkout')

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

@@ -1,47 +1,43 @@
 = render partial: 'effective/orders/order', locals: { order: order }
-- form_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-.effective-order.effective-order-purchase-actions
-  - if EffectiveOrders.allow_free_orders && order.free?
-    = render partial: '/effective/orders/free/form', locals: form_locals
+- if order.persisted? && order.user == current_user
+  .effective-order-change-items
+    = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow, class: 'btn btn-secondary'
 
-  - elsif EffectiveOrders.allow_refunds && order.refund?
-    -# Nothing
-
-  - else
-    - if EffectiveOrders.allow_pretend_purchase_in_development && !Rails.env.production?
-      = render partial: '/effective/orders/pretend/form', locals: form_locals
+.effective-order.effective-order-purchase-actions.form-actions
+  - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-    - if EffectiveOrders.allow_pretend_purchase_in_production && Rails.env.production?
-      = render partial: '/effective/orders/pretend/form', locals: form_locals
+  - if EffectiveOrders.free? && order.free?
+    = render partial: '/effective/orders/free/form', locals: provider_locals
 
-    - if EffectiveOrders.moneris_enabled
-      = render partial: '/effective/orders/moneris/form', locals: form_locals
+  - elsif EffectiveOrders.refunds? && order.refund?
+    -# Nothing
 
-    - if EffectiveOrders.paypal_enabled
-      = render partial: '/effective/orders/paypal/form', locals: form_locals
+  - else
+    - if EffectiveOrders.pretend?
+      = render partial: '/effective/orders/pretend/form', locals: provider_locals
 
-    - if EffectiveOrders.stripe_enabled
-      = render partial: '/effective/orders/stripe/form', locals: form_locals
+    - if EffectiveOrders.moneris?
+      = render partial: '/effective/orders/moneris/form', locals: provider_locals
 
-    - if EffectiveOrders.ccbill_enabled
-      = render partial: '/effective/orders/ccbill/form', locals: form_locals
+    - if EffectiveOrders.paypal?
+      = render partial: '/effective/orders/paypal/form', locals: provider_locals
 
-    - if EffectiveOrders.app_checkout_enabled && EffectiveOrders.authorized?(controller, :app_checkout, order)
-      = render partial: '/effective/orders/app_checkout/form', locals: form_locals
+    - if EffectiveOrders.stripe?
+      = render partial: '/effective/orders/stripe/form', locals: provider_locals
 
-    - if EffectiveOrders.cheque_enabled && order.user == current_user
-      = render partial: '/effective/orders/cheque/form', locals: form_locals
+    - if EffectiveOrders.cheque? && order.user == current_user
+      = render partial: '/effective/orders/cheque/form', locals: provider_locals
 
-  - if EffectiveOrders.allow_pretend_purchase_in_production && Rails.env.production? && EffectiveOrders.allow_pretend_purchase_in_production_message.present?
+  - if EffectiveOrders.pretend? && Rails.env.production? && EffectiveOrders.pretend_purchase_in_production_message.present?
     %br
-    %p= EffectiveOrders.allow_pretend_purchase_in_production_message
+    %p= EffectiveOrders.pretend_purchase_in_production_message
 
 - if EffectiveOrders.authorized?(controller, :admin, :effective_orders) && order.user != current_user
-  - if EffectiveOrders.allow_refunds && order.refund?
+  - if EffectiveOrders.refunds? && order.refund?
     .effective-order.effective-order-admin-purchase-actions
-      = render partial: '/effective/orders/refund/form', locals: form_locals
-  - elsif EffectiveOrders.mark_as_paid_enabled
+      = render partial: '/effective/orders/refund/form', locals: provider_locals
+  - elsif EffectiveOrders.mark_as_paid?
     .effective-order.effective-order-admin-purchase-actions
-      = render partial: '/effective/orders/mark_as_paid/form', locals: form_locals
+      = render partial: '/effective/orders/mark_as_paid/form', locals: provider_locals
 

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

@@ -4,8 +4,7 @@
 
   = render partial: 'effective/orders/order_header', locals: { order: order }
   = render partial: 'effective/orders/order_shipping', locals: { order: order }
-  = render partial: 'effective/orders/order_note', locals: { order: order }
-  = render partial: 'effective/orders/order_note_to_buyer', locals: { order: order }
+  = render partial: 'effective/orders/order_notes', locals: { order: order }
   = render partial: 'effective/orders/order_items', locals: { order: order }
   = render partial: 'effective/orders/order_payment_details', locals: { order: order }
   = render partial: 'effective/orders/order_footer', locals: { order: order }

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

@@ -1,10 +1,18 @@
 .effective-order-actions
-  = link_to 'Print', '#', class: 'btn btn-default print-button', data: { role: 'print-button' }, onClick: 'window.print(); false;'
+  - if order.persisted?
+    = link_to 'Print', '#', class: 'btn btn-primary print-button', data: { role: 'print-button' }, onClick: 'window.print(); false;'
 
   - if order.purchased?
-    = link_to 'Resend Receipt', effective_orders.send_buyer_receipt_order_path(order), class: 'btn btn-default', data: { confirm: 'This action will email the buyer a copy of the original email receipt.  Send receipt now?', disable_with: 'Resending...' }
+    = link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
+      class: 'btn btn-secondary',
+      data: { confirm: "Send receipt to #{order.user.email}?" }
 
-  - elsif EffectiveOrders.authorized?(controller, :admin, :effective_orders) && order.user != current_user
-    - if order.pending?
-      = link_to 'Admin: Send Payment Request', effective_orders.send_payment_request_admin_order_path(order), class: 'btn btn-default', data: { method: :post, confirm: 'This action will email buyer a payment request. Send it now?', disable_with: 'Sending...' }
-    = link_to 'Admin: Delete', effective_orders.admin_order_path(order), class: 'btn btn-default', data: { method: :delete, confirm: 'Are you sure you want to delete? This cannot be undone.', disable_with: 'Deleting...' }
+  - if order.persisted? && EffectiveOrders.authorized?(controller, :admin, :effective_orders)
+    - if order.pending? || order.confirmed?
+      = link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
+        class: 'btn btn-secondary',
+        data: { method: :post, confirm: "Send request for payment to #{order.user.email}?" }
+
+      = link_to 'Delete', effective_orders.admin_order_path(order),
+        class: 'btn btn-danger',
+        data: { method: :delete, confirm: "Really delete #{order}?" }

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

@@ -14,7 +14,7 @@
     .col-sm-6
       - if order.purchased?
         %p Receipt: ##{order.to_param}
-        %p Purchased at: #{order.purchased_at.strftime("%Y-%m-%d %H:%M")}
+        %p Purchased at: #{order.purchased_at.strftime("%F %H:%M")}
       - elsif order.persisted?
         %p Order: ##{order.to_param}
-        %p Date: #{Time.zone.now.strftime("%Y-%m-%d %H:%M")}
+        %p Date: #{Time.zone.now.strftime("%F %H:%M")}