effective_orders 2.2.4 → 3.0.0

data/app/models/effective/tax_rate_calculator.rb

@@ -1,6 +1,6 @@
 module Effective
   class TaxRateCalculator
-    attr_reader :order
+    attr_reader :order, :country_code, :state_code
 
     RATES = {
       'CA' => {         # Canada
@@ -20,15 +20,18 @@ module Effective
       }
     }
 
-    def initialize(order:)
+    def initialize(order: nil, country_code: nil, state_code: nil)
       @order = order
+      @country_code = country_code
+      @state_code = state_code
+
+      raise 'expected an order, or a country and state code' unless (order || country_code)
+      raise 'expected an order OR a country and state code. Not both.' if (order && country_code)
     end
 
     def tax_rate
-      return nil unless order.billing_address.try(:country_code).present?
-
-      country = order.billing_address.country_code
-      state = order.billing_address.state_code
+      country = country_code || (order.billing_address.country_code if order.billing_address.present?)
+      state = state_code || (order.billing_address.state_code if order.billing_address.present?)
 
       rate = RATES[country]
       return rate if rate.kind_of?(Numeric)
@@ -38,7 +41,7 @@ module Effective
     end
 
     def unknown_tax_rate
-      order.skip_buyer_validations? ? nil : 0
+      (order && order.skip_buyer_validations?) ? nil : 0
     end
 
   end

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

@@ -1,2 +1 @@
-- if customer.stripe_customer_id.present?
-  = link_to 'Manage', "https://manage.stripe.com/customers/#{customer.stripe_customer_id}"
+= link_to 'Manage', "https://dashboard.stripe.com/#{'test/' if Rails.env.development?}customers/#{customer.stripe_customer_id}"

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

@@ -1,7 +1,7 @@
 %h1.effective-admin-heading= @page_title
 
 %p.text-right.effective-admin-actions
-  = link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'
+  = link_to 'Stripe Customers', "https://dashboard.stripe.com/#{'test/' if Rails.env.development?}customers", class: 'btn btn-primary'
 
 - if @datatable.present?
   = render_datatable @datatable

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

@@ -0,0 +1,6 @@
+%h1.effective-admin-heading= @page_title
+
+%p.text-right.effective-admin-actions
+  = link_to 'Stripe Customer', "https://dashboard.stripe.com/#{'test/' if Rails.env.development?}customers/#{@customer.stripe_customer_id}", class: 'btn btn-primary'
+
+= render 'effective/customers/customer', customer: @customer

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

@@ -1,9 +1,11 @@
-= link_to (datatable.try(:admin_namespace?) ? effective_orders.admin_order_path(order) : effective_orders.order_path(order)), title: 'View' do
-  %span.glyphicon.glyphicon-eye-open
+- if datatable.admin_namespace?
+  - if order.purchased? == false
+    = link_to effective_orders.admin_order_path(order), title: 'Checkout' do
+      %span.glyphicon.glyphicon-usd
 
-- if (order.purchased? == false) && (EffectiveOrders.authorized?(controller, :admin, :effective_orders) rescue false)
-  = link_to effective_orders.mark_as_paid_admin_order_path(order), title: 'Mark as Paid' do
-    %span.glyphicon.glyphicon-usd
+  = link_to effective_orders.edit_admin_order_path(order), title: 'Edit' do
+    %span.glyphicon.glyphicon-edit
 
-  = link_to effective_orders.admin_order_path(order), title: 'Delete', data: { method: :delete, confirm: 'Are you sure you want to delete? This cannot be undone.' } do
-    %span.glyphicon.glyphicon-trash
+- else
+  = link_to effective_orders.order_path(order), title: 'View' do
+    %span.glyphicon.glyphicon-eye-open

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

@@ -1,11 +1,9 @@
-- unless defined?(Cocoon)
-  Please install #{link_to 'cocoon', 'https://github.com/nathanvda/cocoon'} to see this page.
-- else
-  = simple_form_for [:admin, order], (EffectiveOrders.admin_simple_form_options || {}).merge(url: effective_orders.admin_orders_path) do |f|
+= 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|
+  - if f.object.new_record?
     = f.association :user,
       label: 'Buyer',
       required: true,
-      as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
+      as: :effective_select,
       collection: @users || User.all.to_a.sort { |user1, user2| user1.to_s <=> user2.to_s }
 
     %h2 Order Items
@@ -22,8 +20,14 @@
       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?)
 
-    .effective-order-internal-note
+  .row
+    .col-sm-6.effective-order-note-to-buyer
+      %h2 Note to Buyer
+      = f.input :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
       %h2 Internal Note
       = f.input :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 }
+  = render partial: '/admin/orders/order_actions', locals: { order: @order, form: f, f: f }

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

@@ -1,4 +1,5 @@
 %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...' }
-  = link_to 'Cancel', effective_orders.admin_orders_path
+  = form.button :submit, 'Save and Duplicate', data: { disable_with: 'Saving...' }

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

@@ -4,6 +4,6 @@
     = 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: (defined?(EffectiveFormInputs) ? :effective_price : :price)
+      .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)

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

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

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

@@ -3,7 +3,4 @@
 %p.text-right.effective-admin-actions
   = link_to 'New Order', effective_orders.new_admin_order_path, class: 'btn btn-primary'
 
-- if @datatable.present?
-  = render_datatable @datatable
-- else
-  %p There are no orders present
+= render_datatable @datatable

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

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

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

@@ -1,8 +1,7 @@
-%h1.effective-admin-heading= (@order.purchased? ? 'Receipt' : 'Order')
+%h1.effective-admin-heading= @page_title
 
-= render partial: 'effective/orders/order', locals: {order: @order}
-
-- if (EffectiveOrders.authorized?(controller, :admin, :effective_orders) rescue false)
+- if @order.purchased?
+  = render partial: 'effective/orders/order', locals: { order: @order }
   = render partial: 'admin/orders/form_note_internal', locals: { order: @order }
-
-= render partial: 'admin/orders/order_payment_details', 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))

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

@@ -16,10 +16,10 @@
             = link_to_remove_from_cart(item)
           %td.price
             = price_to_currency(item.price)
-      - if cart.empty?
+      - if cart.blank?
         %tr
           %td.quantity
-          %td.item Your cart is empty.
+          %td.item No items in cart.
           %td.price
     %tfoot
       %tr

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

@@ -1,7 +1,7 @@
 %h1.effective-heading= @page_title
 
-- if @cart.empty?
-  %p Your cart is empty.
+- if @cart.blank?
+  %p No items in cart.
 - else
   %p Your cart has #{@cart.cart_items.length} items.
 

data/app/views/effective/customers/_customer.html.haml

@@ -0,0 +1,152 @@
+%h3.effective-heading Customer
+
+%table.table
+  %tbody
+    %tr
+      %th Id
+      %td= customer.stripe_customer.id
+    %tr
+      %th Email
+      %td= customer.stripe_customer.email
+    %tr
+      %th Card
+      %td
+        - if customer.stripe_customer.default_source.present?
+          - card = customer.stripe_customer.sources.retrieve(customer.stripe_customer.default_source)
+          = "**** **** **** #{card.last4} #{card.brand} #{card.exp_month}/#{card.exp_year}"
+        - else
+          None
+
+    - if customer.stripe_customer.currency.present?
+      %tr
+        %th Currency
+        %td= customer.stripe_customer.currency.to_s.upcase
+
+    - if customer.stripe_customer.account_balance.to_i > 0
+      %tr
+        %th Balance
+        %td= price_to_currency(customer.stripe_customer.account_balance.to_i)
+
+= yield if block_given?
+
+- if customer.stripe_subscription.present?
+  %h3.effective-heading Subscription
+
+  %table.table
+    %tbody
+      %tr
+        %th Status
+        %td= customer.stripe_subscription.status.presence || 'unknown'
+
+      - if customer.stripe_subscription.discount.present?
+        %tr
+          %th Coupon
+          %td= stripe_coupon_description(customer.stripe_subscription.discount.coupon)
+
+      - if customer.stripe_subscription.start.present?
+        %tr
+          %th Started
+          %td= Time.zone.at(customer.stripe_subscription.start).strftime('%F')
+
+      - if customer.stripe_subscription.ended_at.present?
+        %tr
+          %th Ended
+          %td= Time.zone.at(customer.stripe_subscription.ended_at).strftime('%F')
+
+      - if customer.stripe_subscription.canceled_at.present?
+        %tr
+          %th Cancelled
+          %td= Time.zone.at(customer.stripe_subscription.canceled_at).strftime('%F')
+
+      - if customer.stripe_subscription.current_period_start.present?
+        %tr
+          %th Current Period Start
+          %td= Time.zone.at(customer.stripe_subscription.current_period_start).strftime('%F')
+
+      - if customer.stripe_subscription.current_period_end.present?
+        %tr
+          %th Current Period End
+          %td= Time.zone.at(customer.stripe_subscription.current_period_end).strftime('%F')
+
+      - if customer.stripe_subscription.metadata.present? && false
+        %tr
+          %th Metadata
+          %td= tableize_hash(customer.stripe_subscription.metadata.to_h, th: false)
+
+      - if customer.stripe_subscription.items.present?
+        %tr
+          %th Plans
+          %td= tableize_hash(customer.stripe_subscription.items.inject({}) { |h, item| h[item.plan.name] = item.quantity; h }, th: false)
+
+  - if customer.subscriptions.present?
+    %table.table
+      %thead
+        %tr
+          %th Subscribed
+          %th Plan
+          %th
+      %tbody
+        - customer.subscriptions.each do |sub|
+          %tr
+            %td= sub.subscribable
+            %td= sub
+            %td= link_to 'change', edit_polymorphic_path(sub.subscribable)
+
+- if customer.stripe_subscription.blank?
+  %h3.effective-heading Subscription
+  %p No current subscriptions
+
+- if customer.stripe_customer.invoices.present?
+  %h3.effective-heading Invoices
+
+  %table.table
+    %thead
+      %tr
+        %th Date
+        %th Number
+        %th Period
+        %th Items
+        %th Total
+    %tbody
+      - customer.stripe_customer.invoices.each do |invoice|
+        %tr
+          %td= Time.zone.at(invoice.date).strftime('%F')
+          %td= invoice.id
+          %td
+            = Time.zone.at(invoice.lines.first.period.start).strftime('%F')
+            to
+            = Time.zone.at(invoice.lines.first.period.end).strftime('%F')
+          %td
+            - invoice.lines.each do |line|
+              %p #{line.quantity}x #{line.plan.try(:name)} #{line.description}
+
+          %td= price_to_currency(invoice.total)
+
+- if customer.upcoming_invoice.present?
+  %p Upcoming Invoice:
+
+  %table.table
+    %tbody
+      %tr
+        %th Date
+        %td= Time.zone.at(customer.upcoming_invoice.date).strftime('%F')
+      %tr
+        %th Period
+        %td
+          = Time.zone.at(customer.upcoming_invoice.period_start).strftime('%F')
+          to
+          = Time.zone.at(customer.upcoming_invoice.period_end).strftime('%F')
+      %tr
+        %th Items
+        %td
+          %table.table
+            %tbody
+              - customer.upcoming_invoice.lines.each do |line|
+                %tr
+                  %td #{line.quantity}x #{line.plan.name}
+                  %td #{Time.zone.at(line.period.start).strftime('%F')} to #{Time.zone.at(line.period.end).strftime('%F')}
+                  %td= line.description
+                  %td= price_to_currency(line.amount)
+      %tr
+        %th Total
+        %td= price_to_currency(customer.upcoming_invoice.total)

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

@@ -0,0 +1,12 @@
+.effective-orders-customer{ data: { stripe: stripe.to_json, submit: submit.to_json } }
+  - if f.object.token_required?
+    = f.input :stripe_token, as: :effective_static_control, label: 'Credit Card', required: true,
+      value: f.object.customer.payment_status + ' ' + content_tag(:span, '', class: 'active-card')
+
+    %p= link_to 'Update Card Details', '#', class: 'btn btn-primary btn-change-card'
+
+  - else
+    = f.input :stripe_token, as: :effective_static_control, label: 'Credit Card', required: false,
+      value: f.object.customer.payment_status + ' ' + content_tag(:span, f.object.customer.active_card, class: 'active-card')
+
+    %p= link_to 'Update Card Details', '#', class: 'btn btn-default btn-change-card'

data/app/views/effective/customers/_form.html.haml

@@ -0,0 +1,13 @@
+= javascript_include_tag 'https://checkout.stripe.com/checkout.js'
+
+= simple_form_for(subscripter, (EffectiveOrders.simple_form_options || {}).merge(url: effective_orders.customer_settings_path, method: :put)) do |f|
+  = f.input :stripe_token, as: :hidden, input_html: { value: nil }
+
+  = render(f.object.customer) do
+    %h3.effective-heading Card
+    = effective_customer_fields(f)
+
+  .form-actions
+    = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
+
+

data/app/views/effective/customers/edit.html.haml

@@ -0,0 +1,3 @@
+%h1.effective-heading= @page_title
+
+= render 'effective/customers/form', subscripter: @subscripter

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

@@ -1,15 +1,18 @@
 .effective-order
-  = simple_form_for(order, (EffectiveOrders.simple_form_options || {}).merge(url: (order.new_record? ? effective_orders.orders_path : effective_orders.order_path(order)))) do |f|
-    = render partial: 'effective/orders/order_items', locals: {order: order, form: f}
+  = simple_form_for(order, (EffectiveOrders.simple_form_options || {}).merge(url: checkout_step1_form_url(order, namespace))) do |f|
+    = render partial: 'effective/orders/order_items', locals: { order: order, form: f }
+
+    - 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.gsub(EffectiveOrders.minimum_charge.to_i.to_s, price_to_currency(EffectiveOrders.minimum_charge.to_i))
+      %p.inline-errors= order.errors[:total].first
 
     - if EffectiveOrders.collect_user_fields.present? && (f.object.user rescue nil).present?
-      = render partial: 'effective/orders/order_user_fields', locals: {form: f, user: f.object.user }
+      = 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)
 
@@ -19,15 +22,11 @@
           %div{class: "col-sm-#{12 / num_addresses}"}
             %h2 Billing Address
             = effective_address_fields(f, :billing_address)
-            - if f.object.user.respond_to?(:billing_address=)
-              = f.input :save_billing_address, as: :boolean, label: 'Save as my default billing address', required: false
 
         - if EffectiveOrders.require_shipping_address
           %div{class: "col-sm-#{12 / num_addresses}"}
             %h2 Shipping Address
             = effective_address_fields(f, :shipping_address)
-            - if f.object.user.respond_to?(:shipping_address=)
-              = f.input :save_shipping_address, as: :boolean, label: 'Save as my default shipping address', required: false
 
     - if EffectiveOrders.collect_note
       = render partial: 'effective/orders/order_note_fields', locals: { form: f }
@@ -36,10 +35,4 @@
       = render partial: 'effective/orders/order_terms_and_conditions_fields', locals: { form: f }
 
     %p.text-right
-      - unless f.object.pending? || current_cart.try(:empty?)
-        = link_to_current_cart(label: 'Change Items')
-
-      - if order.total == 0 && EffectiveOrders.allow_free_orders
-        = f.submit order_checkout_label(:free), class: 'btn btn-primary', rel: :nofollow, data: {'disable_with' => 'Processing...' }
-      - else
-        = f.submit 'Save and Continue', class: 'btn btn-primary', rel: :nofollow, data: {'disable_with' => 'Saving...' }
+      = f.submit 'Save and Continue', class: 'btn btn-primary', rel: :nofollow, data: { disable_with: 'Saving...' }

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

@@ -1,33 +1,46 @@
-= render(order)
+= render partial: 'effective/orders/order', locals: { order: order }
 
 .effective-order.effective-order-purchase-actions
-  - if EffectiveOrders.allow_pretend_purchase_in_development
-    - if Rails.env.production? == false
-      = render partial: '/effective/orders/pretend/form', locals: {order: order, purchased_redirect_url: purchased_redirect_url, declined_redirect_url: declined_redirect_url}
+  - if EffectiveOrders.allow_free_orders && order.free?
+    = render partial: '/effective/orders/free/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-  - if EffectiveOrders.allow_pretend_purchase_in_production
-    - if Rails.env.production?
-      = render partial: '/effective/orders/pretend/form', locals: {order: order, purchased_redirect_url: purchased_redirect_url, declined_redirect_url: declined_redirect_url}
+  - elsif EffectiveOrders.allow_refunds && order.refund?
+    -# Nothing
 
-  - if EffectiveOrders.moneris_enabled
-    = render partial: '/effective/orders/moneris/form', locals: {order: order, purchased_redirect_url: purchased_redirect_url, declined_redirect_url: declined_redirect_url}
+  - else
+    - if EffectiveOrders.allow_pretend_purchase_in_development && !Rails.env.production?
+      = render partial: '/effective/orders/pretend/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-  - if EffectiveOrders.paypal_enabled
-    = render partial: '/effective/orders/paypal/form', locals: {order: order}
+    - if EffectiveOrders.allow_pretend_purchase_in_production && Rails.env.production?
+      = render partial: '/effective/orders/pretend/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-  - if EffectiveOrders.stripe_enabled
-    = render partial: '/effective/orders/stripe/form', locals: {order: order}
+    - if EffectiveOrders.moneris_enabled
+      = render partial: '/effective/orders/moneris/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-  - if EffectiveOrders.ccbill_enabled
-    = render partial: '/effective/orders/ccbill/form', locals: {order: order}
+    - if EffectiveOrders.paypal_enabled
+      = render partial: '/effective/orders/paypal/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-  - if EffectiveOrders.app_checkout_enabled
-    - if (EffectiveOrders.authorized?(controller, :app_checkout, order) rescue false)
-      = render partial: '/effective/orders/app_checkout/form', locals: {order: order}
+    - if EffectiveOrders.stripe_enabled
+      = render partial: '/effective/orders/stripe/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-  - if EffectiveOrders.cheque_enabled
-    = render partial: '/effective/orders/cheque/form', locals: {order: order}
+    - if EffectiveOrders.ccbill_enabled
+      = render partial: '/effective/orders/ccbill/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-  - if EffectiveOrders.allow_pretend_purchase_in_production
+    - if EffectiveOrders.app_checkout_enabled && EffectiveOrders.authorized?(controller, :app_checkout, order)
+      = render partial: '/effective/orders/app_checkout/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
+
+    - if EffectiveOrders.cheque_enabled && order.user == current_user
+      = render partial: '/effective/orders/cheque/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
+
+  - if EffectiveOrders.allow_pretend_purchase_in_production && Rails.env.production? && EffectiveOrders.allow_pretend_purchase_in_production_message.present?
     %br
     %p= EffectiveOrders.allow_pretend_purchase_in_production_message
+
+- if EffectiveOrders.authorized?(controller, :admin, :effective_orders) && order.user != current_user
+  - if EffectiveOrders.allow_refunds && order.refund?
+    .effective-order.effective-order-admin-purchase-actions
+      = render partial: '/effective/orders/refund/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
+  - elsif EffectiveOrders.mark_as_paid_enabled
+    .effective-order.effective-order-admin-purchase-actions
+      = render partial: '/effective/orders/mark_as_paid/form', locals: { order: order, purchased_url: purchased_url, declined_url: declined_url }
+