effective_orders 1.8.1 → 2.0.0

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

@@ -0,0 +1,33 @@
+= render(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_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}
+
+  - 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}
+
+  - if EffectiveOrders.paypal_enabled
+    = render partial: '/effective/orders/paypal/form', locals: {order: order}
+
+  - if EffectiveOrders.stripe_enabled
+    = render partial: '/effective/orders/stripe/form', locals: {order: order}
+
+  - if EffectiveOrders.ccbill_enabled
+    = render partial: '/effective/orders/ccbill/form', locals: {order: order}
+
+  - 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.cheque_enabled
+    = render partial: '/effective/orders/cheque/form', locals: {order: order}
+
+  - if EffectiveOrders.allow_pretend_purchase_in_production
+    %br
+    %p= EffectiveOrders.allow_pretend_purchase_in_production_message

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

@@ -4,7 +4,9 @@
 
   = 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_items', locals: {order: order}
+  = render partial: 'effective/orders/order_footer', locals: {order: order}
 
   - if (EffectiveOrders.authorized?(controller, :show, :payment_details) rescue false)
     = render partial: 'effective/orders/order_payment_details', locals: {order: order}

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

@@ -1,5 +1,10 @@
-- if order.purchased?
-  .effective-order-actions.pull-right
-    %p
-      = link_to 'Print', '#', :class => 'btn btn-default print-button', 'data-role' => 'print-button', :onClick => "window.print(); false;"
-      = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(order), :class => 'btn btn-default resend-receipt-button', :data => {'confirm' => 'This action will email you a copy of the original email receipt.  Send receipt now?', 'disable_with' => 'Resending...'}
+.effective-order-actions.pull-right
+  %p
+    = link_to 'Print', '#', class: 'btn btn-default print-button', data: { role: 'print-button' }, onClick: 'window.print(); false;'
+
+    - if order.purchased?
+      = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_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...' }
+
+    - elsif (EffectiveOrders.authorized?(controller, :admin, :effective_orders) rescue false)
+      = link_to 'Mark as Paid', effective_orders.mark_as_paid_admin_order_path(order), class: 'btn btn-default', method: :post, data: { confirm: 'Are you sure you want to mark this order as paid?', disable_with: 'Marking as paid...' }
+      = link_to 'Send Payment Request', effective_orders.send_payment_request_admin_order_path(order), class: 'btn btn-default', method: :post, data: { confirm: 'This action will email buyer a payment request. Send it now?', disable_with: 'Sending...' }

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

@@ -0,0 +1 @@
+- # intentionally left blank

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

@@ -31,7 +31,7 @@
           %td.price= price_to_currency(item.price)
 
     %tfoot
-      - if order.tax > 0
+      - if order.tax.to_i > 0 || order.tax_rate == nil
         %tr
           - if include_quantity_column
             %th.quantity
@@ -39,17 +39,19 @@
             %th.download
           %th.subtotal Subtotal
           %td.price.subtotal-price= price_to_currency(order.subtotal)
+      - if order.tax.to_i > 0
         %tr
           - if include_quantity_column
             %th.quantity
           - if include_download_column
             %th.download
-          %th.tax Tax
+          %th.tax Tax (#{tax_rate_to_percentage(order.tax_rate)})
           %td.price.tax-price= price_to_currency(order.tax)
-      %tr
-        - if include_quantity_column
-          %th.quantity
-        - if include_download_column
-          %th.download
-        %th.total Total Due
-        %td.price.total-price= price_to_currency(order.total)
+      - if order.tax_rate.present?
+        %tr
+          - if include_quantity_column
+            %th.quantity
+          - if include_download_column
+            %th.download
+          %th.total Total Due
+          %td.price.total-price= price_to_currency(order.total)

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

@@ -0,0 +1,8 @@
+- if order.note.present?
+  %table.table
+    %thead
+      %tr
+        %th Note
+    %tbody
+      %tr
+        %td= order.note

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

@@ -0,0 +1,5 @@
+%h3 Note
+- if EffectiveOrders.collect_note_message.present?
+  %p= EffectiveOrders.collect_note_message
+
+= form.input :note, :required => (EffectiveOrders.collect_note_required == true)

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

@@ -3,20 +3,20 @@
     %thead
       %tr
         %th= "#{order.purchased? ? 'Sold to' : 'Bill to'}"
-        - if order.shipping_address.present? && !order.shipping_address.empty?
+        - if order.shipping_address.present?
           %th Ship to
 
     %tbody
       %tr
         %td
-          - if order.billing_address.present? && !order.billing_address.empty?
-            = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address, :email => order.user.email}
+          - if order.billing_address.present?
+            = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address}
           - else
             = order.billing_name
             %br
             = mail_to(order.user.email)
             %br
 
-        - if order.shipping_address.present? && !order.shipping_address.empty?
+        - if order.shipping_address.present?
           %td
             = render :partial => 'effective/addresses/address', :locals => {:address => order.shipping_address}

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

@@ -1,3 +1,4 @@
+%h3 User Information
 = form.simple_fields_for :user, user do |fa|
   - if (EffectiveOrders.collect_user_fields || []).include?(:salutation) && fa.object.respond_to?(:salutation)
     - if defined?(fa.object.class::SALUTATIONS)

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

@@ -0,0 +1,27 @@
+%table.table
+  %thead
+    %tr
+      %th Order
+      %th Date
+      %th Description
+      %th
+  %tbody
+    - orders.each do |order|
+      %tr
+        %td ##{order.to_param}
+        %td
+          - if order.purchased?
+            Purchased
+            = order.purchased_at.strftime("%Y-%m-%d %H:%M")
+          - else
+            Created
+            = order.created_at.strftime("%Y-%m-%d %H:%M")
+        %td= order_summary(order)
+        %td
+          - if order.pending?
+            = link_to_checkout(order: order)
+          - else
+            = link_to 'View', effective_orders.order_path(order)
+
+- unless orders.present?
+  %p You have no orders

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

@@ -0,0 +1,24 @@
+= form_tag('https://bill.ccbill.com/jpost/signup.cgi', :method => :post) do
+  = hidden_field_tag(:clientAccnum, EffectiveOrders.ccbill[:client_accnum])
+  = hidden_field_tag(:clientSubacc, EffectiveOrders.ccbill[:client_subacc])
+  = hidden_field_tag(:formName, EffectiveOrders.ccbill[:form_name])
+  = hidden_field_tag(:formPrice, ccbill_price(order.total))
+  = hidden_field_tag(:formPeriod, EffectiveOrders.ccbill[:form_period])
+  = hidden_field_tag(:currencyCode, EffectiveOrders.ccbill[:currency_code])
+  = hidden_field_tag(:formDigest, ccbill_form_digest(order))
+
+  -# CCBill 'Webhooks' (pre-filled form data)
+  = hidden_field_tag(:customer_fname, ccbill_customer_name(order, :first_name))
+  = hidden_field_tag(:customer_lname, ccbill_customer_name(order, :last_name))
+  = hidden_field_tag(:email, order.user.try(:email))
+  = hidden_field_tag(:address1, order.billing_address.try(:address1))
+  = hidden_field_tag(:city, order.billing_address.try(:city))
+  = hidden_field_tag(:state, order.billing_address.try(:state_code))
+  = hidden_field_tag(:zipcode, order.billing_address.try(:postal_code))
+  = hidden_field_tag(:country, order.billing_address.try(:country_code))
+
+  -# custom fields
+  = hidden_field_tag(:order_id, order.to_param)
+
+  = submit_tag(order_checkout_label(:ccbill), :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' })
+

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

@@ -0,0 +1,3 @@
+%h2.effective-orders-page-title= (@page_title || 'Checkout')
+
+= render_checkout_step1(@order)

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

@@ -0,0 +1,3 @@
+%h2.effective-orders-page-title= (@page_title || 'Checkout')
+
+= render_checkout_step2(@order)

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

@@ -0,0 +1,2 @@
+= form_tag(effective_orders.pay_by_cheque_path(order), method: :post) do
+  = submit_tag order_checkout_label(:cheque), class: 'btn btn-primary', data: { confirm: EffectiveOrders.cheque[:confirm].presence, disable_with: 'Continuing...' }

data/app/views/effective/orders/cheque/pay_by_cheque.html.haml

@@ -0,0 +1,9 @@
+%h2.effective-orders-page-title= (@page_title || 'Payment Required')
+
+%p.effective-orders-page-content
+  Thank you!
+  You have indicated that this order will be purchased by cheque.
+  Please send us a cheque at your earliest convenience.
+  We will mark this order purchased upon receiving your payment.
+
+= render @order

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

@@ -1,5 +1,7 @@
-%h2.effective-orders-page-title Payment Declined
+%h2.effective-orders-page-title= (@page_title || 'Payment Declined')
 
-%p Your #{link_to_current_cart(label: 'Shopping Cart')} items have been saved.  Please try again.
+%p= flash[:danger]
+
+%p Your #{link_to_current_cart(label: 'Cart')} items have been saved.  Please try again.
 
 

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

@@ -1,3 +1,3 @@
-%h2.effective-orders-page-title Order History
+%h2.effective-orders-page-title= (@page_title || 'Order History')
 
 = render_order_history(@orders)

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

@@ -1,4 +1,4 @@
-%h2.effective-orders-page-title My Sales
+%h2.effective-orders-page-title= (@page_title || 'Sales History')
 
 %table.table
   %thead

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

@@ -1,5 +1,6 @@
-%h2.effective-orders-page-title Thank You
+%h2.effective-orders-page-title= (@page_title || 'Thank You')
 
-%p You have successfully purchased the following:
+%p.effective-orders-page-content
+  You have successfully purchased the following:
 
 = render @order

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

@@ -1,3 +1,3 @@
-%h2.effective-orders-page-title= (@order.purchased? ? 'Receipt' : 'Order')
+%h2.effective-orders-page-title= (@page_title || 'Order')
 
 = render @order

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

@@ -1,7 +1,7 @@
 = javascript_include_tag "https://checkout.stripe.com/checkout.js"
 
-#effective-orders-new-charge-form{:data => {'stripe-publishable-key' => EffectiveOrders.stripe[:publishable_key], 'site-title' => EffectiveOrders.stripe[:site_title], 'site-image' => EffectiveOrders.stripe[:site_image], 'user-email' => current_user.try(:email), 'amount' => order.total, 'description' => "#{order.num_items} items (#{price_to_currency(order.total)})"}}
-  = simple_form_for(@stripe_charge || Effective::StripeCharge.new(order), (EffectiveOrders.simple_form_options || {}).merge(:url => effective_orders.stripe_charges_path)) do |f|
-    = f.input :effective_order_id, :as => :hidden
-    = f.input :token, :as => :hidden
-    = f.submit order_checkout_label(:stripe), :class => 'stripe-button', :data => {'disable_with' => 'Continuing...' }
+#effective-orders-new-charge-form{data: {'stripe-publishable-key' => EffectiveOrders.stripe[:publishable_key], 'site-title' => EffectiveOrders.stripe[:site_title], 'site-image' => EffectiveOrders.stripe[:site_image], 'user-email' => current_user.try(:email), 'amount' => order.total, 'description' => "#{order.num_items} items (#{price_to_currency(order.total)})"}}
+  = simple_form_for(@stripe_charge || Effective::Providers::StripeCharge.new(order), (EffectiveOrders.simple_form_options || {}).merge(url: effective_orders.stripe_charges_path)) do |f|
+    = f.input :effective_order_id, as: :hidden
+    = f.input :token, as: :hidden
+    = f.submit order_checkout_label(:stripe), class: 'stripe-button', data: {'disable_with' => 'Continuing...' }

data/app/views/effective/orders_mailer/order_error.html.haml

@@ -0,0 +1,11 @@
+%p.effective-orders-receipt-info
+  - if @order.present?
+    An error occurred with the following order:
+  - else
+    An order error occurred:
+
+- if @error.present?
+  %p Error: #{@error}
+
+- if @order.present?
+  = render(@order, no_order_actions: true)

data/app/views/effective/orders_mailer/payment_request_to_buyer.html.haml

@@ -0,0 +1,13 @@
+%p.effective-orders-receipt-info Request for Payment
+
+%p
+  An order has been created on your behalf for the following items.
+  Please remit payment at your earliest convenience.
+
+%p #{link_to('Click here', effective_orders.order_url(@order))} to review your order and pay online with a credit card.
+
+- if EffectiveOrders.cheque_enabled
+  %p We also accept cheques via the mail, and we will manually mark your order paid upon receiving it.
+
+= render(@order, no_order_actions: true)
+

data/app/views/effective/orders_mailer/pending_order_invoice_to_buyer.html.haml

@@ -0,0 +1,13 @@
+%p.effective-orders-receipt-info Pending order created
+
+%p We have received notice of your intention to purchase the following items.
+
+%p Please remit payment at your earliest convenience.
+
+%p #{link_to('Click here', effective_orders.order_url(@order))} to review your order online.
+
+- if EffectiveOrders.cheque_enabled
+  %p When we receive your cheque in the mail we will mark your order paid.
+
+= render(@order, no_order_actions: true)
+

data/app/views/layouts/effective_orders_mailer_layout.html.haml

@@ -16,12 +16,12 @@
       %tr
         %td
           %table{style: 'max-width: 650px; margin: 4px auto 30px;'}
-            %thead{style: 'border-bottom: 2px solid transparent; width: 100%;'}
-              %tr{style: 'background: #000; color: #fff;'}
-                %th{style: 'padding-top: 2px;'}
-            %tbody{style: 'background: #fff; width: 100%; margin-bottom: 4px;'}
+            %thead{style: 'width: 100%;'}
+              %tr
+                %th
+            %tbody{style: 'width: 100%'}
               %tr
                 %td= yield
-            %tfoot{style: 'border-bottom: 2px solid transparent; width: 100%;'}
-              %tr{style: 'background: #000; color: #fff;'}
-                %th{style: 'padding-top: 2px;'}
+            %tfoot{style: 'width: 100%;'}
+              %tr
+                %th

data/config/routes.rb

@@ -1,61 +1,76 @@
 Rails.application.routes.draw do
-  mount EffectiveOrders::Engine => '/', :as => 'effective_orders'
+  unless EffectiveOrders.skip_mount_engine
+    mount EffectiveOrders::Engine => '/', as: 'effective_orders'
+  end
 end
 
 EffectiveOrders::Engine.routes.draw do
-  scope :module => 'effective' do
+  scope module: 'effective' do
+
+    match 'orders/(:id)/purchased', to: 'orders#purchased', as: 'order_purchased', via: :get
+    match 'orders/:id/declined', to: 'orders#declined', as: 'order_declined', via: :get
+    match 'orders/:id/resend_buyer_receipt', to: 'orders#resend_buyer_receipt', via: :get, as: 'resend_buyer_receipt'
+    match 'orders/my_purchases', to: 'orders#my_purchases', as: 'my_purchases', via: :get
 
-    match 'orders/:id/purchased', :to => 'orders#purchased', :as => 'order_purchased', :via => :get
-    match 'orders/:id/declined', :to => 'orders#declined', :as => 'order_declined', :via => :get
-    match 'orders/:id/resend_buyer_receipt', :to => 'orders#resend_buyer_receipt', :via => :get, :as => 'resend_buyer_receipt'
-    match 'orders/my_purchases', :to => 'orders#my_purchases', :as => 'my_purchases', :via => :get
+    if EffectiveOrders.cheque_enabled
+      match 'orders/:id/pay_by_cheque', to: 'orders#pay_by_cheque', via: :post, as: 'pay_by_cheque'
+    end
 
     if EffectiveOrders.paypal_enabled
-      match 'orders/paypal_postback', :to => 'orders#paypal_postback', :as => 'paypal_postback', :via => :post
+      match 'orders/paypal_postback', to: 'orders#paypal_postback', as: 'paypal_postback', via: :post
     end
 
     if EffectiveOrders.moneris_enabled
-      match 'orders/moneris_postback', :to => 'orders#moneris_postback', :as => 'moneris_postback', :via => :post
+      match 'orders/moneris_postback', to: 'orders#moneris_postback', as: 'moneris_postback', via: :post
     end
 
     if EffectiveOrders.stripe_enabled
-      match 'orders/stripe_charge', :to => 'orders#stripe_charge', :as => 'stripe_charges', :via => :post
+      match 'orders/stripe_charge', to: 'orders#stripe_charge', as: 'stripe_charges', via: :post
     end
 
     if EffectiveOrders.stripe_subscriptions_enabled
-      resources :subscriptions, :only => [:index, :show, :new, :create, :destroy]
+      resources :subscriptions, only: [:index, :show, :new, :create, :destroy]
     end
 
     if EffectiveOrders.stripe_connect_enabled
-      match 'orders/stripe_connect_redirect_uri', :to => 'orders#stripe_connect_redirect_uri', :as => 'stripe_connect_redirect_uri', :via => :get
-      match 'orders/my_sales', :to => 'orders#my_sales', :as => 'my_sales', :via => :get
+      match 'orders/stripe_connect_redirect_uri', to: 'orders#stripe_connect_redirect_uri', as: 'stripe_connect_redirect_uri', via: :get
+      match 'orders/my_sales', to: 'orders#my_sales', as: 'my_sales', via: :get
+    end
+
+    if EffectiveOrders.ccbill_enabled
+      match 'orders/ccbill_postback', to: 'orders#ccbill_postback', as: 'ccbill_postback', via: :post
     end
 
     if EffectiveOrders.app_checkout_enabled
-      match 'orders/:id/app_checkout', :to => 'orders#app_checkout', :as => 'app_checkout', :via => :post
+      match 'orders/:id/app_checkout', to: 'orders#app_checkout', as: 'app_checkout', via: :post
     end
 
     if (Rails.env.development? || Rails.env.test?) || EffectiveOrders.allow_pretend_purchase_in_production
-      match 'orders/:id/pretend_purchase', :to => 'orders#pretend_purchase', :as => 'pretend_purchase', :via => [:get, :post]
+      match 'orders/:id/pretend_purchase', to: 'orders#pretend_purchase', as: 'pretend_purchase', via: [:get, :post]
     end
 
-    resources :orders, :only => [:new, :create, :show, :index]
+    resources :orders, except: [:destroy]
 
-    match 'cart', :to => 'carts#show', :as => 'cart', :via => :get
-    match 'cart', :to => 'carts#destroy', :via => :delete
+    match 'cart', to: 'carts#show', as: 'cart', via: :get
+    match 'cart', to: 'carts#destroy', via: :delete
 
     # If you Tweak this route, please update EffectiveOrdersHelper too
-    match 'cart/:purchasable_type/:purchasable_id', :to => 'carts#add_to_cart', :via => [:get, :post], :as => 'add_to_cart'
-    match 'cart/:id', :to => 'carts#remove_from_cart', :via => [:delete], :as => 'remove_from_cart'
+    match 'cart/:purchasable_type/:purchasable_id', to: 'carts#add_to_cart', via: [:get, :post], as: 'add_to_cart'
+    match 'cart/:id', to: 'carts#remove_from_cart', via: [:delete], as: 'remove_from_cart'
 
-    match 'webhooks/stripe', :to => 'webhooks#stripe', :via => [:post, :put]
+    match 'webhooks/stripe', to: 'webhooks#stripe', via: [:post, :put]
   end
 
-  if defined?(EffectiveDatatables) && !EffectiveOrders.use_active_admin?
+  if !EffectiveOrders.use_active_admin? || Rails.env.test?
     namespace :admin do
-      resources :customers, :only => [:index]
-      resources :orders, :only => [:index, :show]
-      resources :order_items, :only => [:index]
+      resources :customers, only: [:index]
+      resources :orders, only: [:index, :show, :new, :create] do
+        member do
+          post :send_payment_request
+          post :mark_as_paid
+        end
+      end
+      resources :order_items, only: [:index]
     end
   end
 end