effective_orders 2.2.4 → 3.0.0

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

@@ -1,12 +1,11 @@
 .effective-order
   - unless defined?(no_order_actions)
-    = render partial: 'effective/orders/order_actions', locals: {order: order}
-
-  = 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_items', locals: {order: order}
-  = render partial: 'effective/orders/order_payment_details', locals: {order: order}
-  = render partial: 'effective/orders/order_footer', locals: {order: order}
+    = render partial: 'effective/orders/order_actions', locals: { order: order }
 
+  = 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_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,11 +1,10 @@
-.effective-order-actions.pull-right
-  %p
-    = link_to 'Print', '#', class: 'btn btn-default print-button', data: { role: 'print-button' }, onClick: 'window.print(); false;'
+.effective-order-actions
+  = 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...' }
+  - 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...' }
 
-    - elsif (EffectiveOrders.authorized?(controller, :admin, :effective_orders) rescue false)
-      = link_to 'Admin: Mark as Paid', effective_orders.mark_as_paid_admin_order_path(order), class: 'btn btn-default'
+  - elsif EffectiveOrders.authorized?(controller, :admin, :effective_orders)
+    - 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...' }
+    = 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...' }

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

@@ -1,5 +1,5 @@
 .effective-order-header
-  %h3 Acme Industries Inc.
+  %h2 Acme Industries Inc.
   .row
     .col-sm-6
       - email_address = EffectiveOrders.mailer[:admin_email] || 'info@acmeindustries.com'

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

@@ -25,13 +25,11 @@
                 = '-'
           %td.item
             = item.title.html_safe
-            - if order.new_record? && item.purchasable.kind_of?(Effective::Subscription)
-              = render :partial => 'effective/orders/stripe/subscription_fields', :locals => {:form => form, :subscription => item.purchasable }
 
           %td.price= price_to_currency(item.subtotal)
 
     %tfoot
-      - if order.tax.to_i > 0 || order.tax_rate == nil
+      - if order.tax.to_i != 0 || order.tax_rate == nil
         %tr
           - if include_quantity_column
             %th.quantity
@@ -39,7 +37,7 @@
             %th.download
           %th.subtotal Subtotal
           %td.price.subtotal-price= price_to_currency(order.subtotal)
-      - if order.tax.to_i > 0
+      - if order.tax.to_i != 0
         %tr
           - if include_quantity_column
             %th.quantity
@@ -53,5 +51,13 @@
             %th.quantity
           - if include_download_column
             %th.download
-          %th.total Total Due
+
+          %th.total
+            - if order.pending?
+              Amount Due
+            - elsif order.purchased?
+              Amount Paid
+            - else
+              Total
+
           %td.price.total-price= price_to_currency(order.total)

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

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

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

@@ -1,27 +1,27 @@
-%table.table
-  %thead
-    %tr
-      %th Order
-      %th Date
-      %th Description
-      %th
-  %tbody
-    - orders.each do |order|
+- if orders.present?
+  %table.table
+    %thead
       %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
+        %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)
+- else
+  %p No previous orders.

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

@@ -1,2 +1,2 @@
-= form_tag(effective_orders.app_checkout_path(order), method: :post) do
-  = submit_tag order_checkout_label(:app_checkout), :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }
+= form_tag(effective_orders.app_checkout_order_path(order), method: :post) do
+  = submit_tag order_checkout_label(:app_checkout), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }

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

@@ -20,5 +20,5 @@
   -# custom fields
   = hidden_field_tag(:order_id, order.to_param)
 
-  = submit_tag(order_checkout_label(:ccbill), :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' })
+  = submit_tag order_checkout_label(:ccbill), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }
 

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

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

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

@@ -2,6 +2,6 @@
 
 %p= flash[:danger]
 
-%p Your #{link_to_current_cart(label: 'Cart')} items have been saved.  Please try again.
+%p Your #{link_to_current_cart(label: 'Cart')} items have been saved. Please try again.
 
 

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

@@ -0,0 +1,4 @@
+= form_tag(effective_orders.free_order_path(order), method: :post) do
+  = hidden_field_tag(:purchased_url, purchased_url)
+  = hidden_field_tag(:declined_url, declined_url)
+  = submit_tag order_checkout_label(:free), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }

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

@@ -1,13 +1,11 @@
 %h1.effective-heading= @page_title
 
-%h2 Pending Orders
 - if @pending_orders.present?
+  %h2 Pending Orders
   = render_orders(@pending_orders)
-- else
-  %p You have no pending orders.
 
-%h2 Purchased Orders
 - if @orders.present?
+  %h2 Purchased Orders
   = render_orders(@orders)
 - else
   %p You have no purchased orders.

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

@@ -0,0 +1,32 @@
+.panel.panel-default
+  .panel-body
+    %h2 Admin: Offline Payment
+
+    = simple_form_for order, (EffectiveOrders.simple_form_options || {}).merge(url: effective_orders.mark_as_paid_order_path(order), method: :post) do |f|
+      = hidden_field_tag(:purchased_url, purchased_url)
+      = hidden_field_tag(:declined_url, declined_url)
+      = f.input :payment_provider,
+        as: :effective_select,
+        collection: (EffectiveOrders.payment_providers + EffectiveOrders.other_payment_providers).sort,
+        required: true
+
+      = f.input :payment_card,
+        label: 'Payment card type, cheque or transaction number',
+        placeholder: 'visa',
+        hint: 'Full credit card numbers should not be entered here, or anywhere.'
+
+      = f.input :payment,
+        as: :text,
+        label: 'Additional details',
+        input_html: { value: f.object.payment.kind_of?(Hash) ? f.object.payment[:details] : f.object.payment.presence }
+
+      = f.input :send_mark_as_paid_email_to_buyer,
+        as: :boolean,
+        label: 'Yes, send a receipt email to the buyer.',
+        input_html: { checked: (f.object.send_mark_as_paid_email_to_buyer.nil? ? EffectiveOrders.mailer[:send_order_receipts_when_mark_as_paid] : f.object.send_mark_as_paid_email_to_buyer?) }
+
+      = f.input :note_to_buyer, hint: 'This message will be displayed on the receipt.'
+
+      .text-right
+        = f.submit order_checkout_label(:mark_as_paid), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }
+

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

@@ -1,14 +1,14 @@
-= form_tag(EffectiveOrders.moneris[:hpp_url], :method => 'post') do
+= form_tag(EffectiveOrders.moneris[:hpp_url], method: :post) do
   = hidden_field_tag(:ps_store_id, EffectiveOrders.moneris[:ps_store_id])
   = hidden_field_tag(:hpp_key, EffectiveOrders.moneris[:hpp_key])
   = hidden_field_tag(:lang, 'en-ca')
   = hidden_field_tag(:rvar_authenticity_token, form_authenticity_token)
 
-  - if purchased_redirect_url.present?
-    = hidden_field_tag(:rvar_purchased_redirect_url, purchased_redirect_url)
+  - if purchased_url.present?
+    = hidden_field_tag(:rvar_purchased_url, purchased_url)
 
-  - if declined_redirect_url.present?
-    = hidden_field_tag(:rvar_declined_redirect_url, declined_redirect_url)
+  - if declined_url.present?
+    = hidden_field_tag(:rvar_declined_url, declined_url)
 
   = hidden_field_tag(:email, order.user.try(:email))
   = hidden_field_tag(:cust_id, order.user.to_param)
@@ -44,4 +44,4 @@
     = hidden_field_tag(:ship_postal_code, address.postal_code)
     = hidden_field_tag(:ship_country, address.country)
 
-  = submit_tag order_checkout_label(:moneris), :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }
+  = submit_tag order_checkout_label(:moneris), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }

data/app/views/effective/orders/{checkout_step2.html.haml → new.html.haml}

@@ -1,3 +1,3 @@
 %h1.effective-heading= @page_title
 
-= render_checkout_step2(@order)
+= render_checkout_step1(@order)

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

@@ -1,5 +1,5 @@
-= form_tag(EffectiveOrders.paypal[:paypal_url], :method => 'post') do
+= form_tag(EffectiveOrders.paypal[:paypal_url], method: :post) do
   = hidden_field_tag :cmd, '_s-xclick'
   = hidden_field_tag :encrypted, paypal_encrypted_payload(order)
 
-  = submit_tag order_checkout_label(:paypal), :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }
+  = submit_tag order_checkout_label(:paypal), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }

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

@@ -1,2 +1,2 @@
-= form_tag(effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), method: :post) do
-  = submit_tag order_checkout_label(:pretend), :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }
+= form_tag(effective_orders.pretend_order_path(order, purchased_url: purchased_url, declined_url: declined_url), method: :post) do
+  = submit_tag order_checkout_label(:pretend), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }

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

@@ -1,5 +1,8 @@
 %h1.effective-heading= @page_title
 
+%p.effective-orders-page-content
+  = link_to 'Home', root_path, class: 'btn btn-primary'
+
 %p.effective-orders-page-content
   You have successfully purchased the following:
 

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

@@ -0,0 +1,32 @@
+.panel.panel-default
+  .panel-body
+    %h2 Admin: Complete Refund
+
+    = simple_form_for order, (EffectiveOrders.simple_form_options || {}).merge(url: effective_orders.refund_order_path(order), method: :post) do |f|
+      = hidden_field_tag(:purchased_url, purchased_url)
+      = hidden_field_tag(:declined_url, declined_url)
+      = f.input :payment_provider,
+        as: :effective_select,
+        collection: (EffectiveOrders.payment_providers + EffectiveOrders.other_payment_providers).sort,
+        required: true
+
+      = f.input :payment_card,
+        label: 'Payment card type, cheque or transaction number',
+        placeholder: 'visa',
+        hint: 'Full credit card numbers should not be entered here, or anywhere.'
+
+      = f.input :payment,
+        as: :text,
+        label: 'Additional details',
+        input_html: { value: f.object.payment.kind_of?(Hash) ? f.object.payment[:details] : f.object.payment.presence }
+
+      = f.input :send_mark_as_paid_email_to_buyer,
+        as: :boolean,
+        label: 'Yes, send an refund receipt email to the buyer.',
+        input_html: { checked: (f.object.send_mark_as_paid_email_to_buyer.nil? ? EffectiveOrders.mailer[:send_order_receipts_when_mark_as_paid] : f.object.send_mark_as_paid_email_to_buyer?) }
+
+      = f.input :note_to_buyer, hint: 'This is displayed to the buyer on all order receipts.'
+
+      .text-right
+        = f.submit order_checkout_label(:refund), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }
+

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

@@ -1,3 +1,6 @@
 %h1.effective-heading= @page_title
 
-= render @order
+- if (@order.purchased? == false) && (@order.user == current_user)
+  = render_checkout_step2(@order)
+- else
+  = render @order

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

@@ -1,7 +1,7 @@
-= javascript_include_tag "https://checkout.stripe.com/checkout.js"
+= 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::Providers::StripeCharge.new(order), (EffectiveOrders.simple_form_options || {}).merge(url: effective_orders.stripe_charges_path)) do |f|
+#effective-orders-new-charge-form{data: stripe_charge_data(order) }
+  = simple_form_for(@stripe_charge || Effective::Providers::StripeCharge.new(order: order), url: effective_orders.stripe_charge_orders_path) do |f|
+    = f.input :stripe_token, as: :hidden, input_html: { value: nil }
     = f.input :effective_order_id, as: :hidden
-    = f.input :token, as: :hidden
-    = f.submit order_checkout_label(:stripe), class: 'btn btn-primary stripe-button', data: {'disable_with' => 'Continuing...' }
+    = f.submit order_checkout_label(:stripe), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }

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

@@ -0,0 +1,9 @@
+%p.effective-orders-receipt-info Subscription canceled
+
+%p We will no longer charge your credit card.
+
+%p Thank you for trying our app.
+
+%p If you would like to continue, please click the following link to update your card settings:
+
+%p= link_to(effective_orders.customer_settings_url, effective_orders.customer_settings_url)

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

@@ -0,0 +1,9 @@
+%p.effective-orders-receipt-info Payment failed
+
+%p We were unable to charge your credit card #{@customer.active_card}.
+
+%p We will attempt to charge your credit card again in a few days for 3 total attempts.
+
+%p Please click the following link to update your card settings:
+
+%p= link_to(effective_orders.customer_settings_url, effective_orders.customer_settings_url)

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

@@ -0,0 +1,9 @@
+%p.effective-orders-receipt-info Payment succeeded
+
+%p Thank you for your payment.
+
+%p We have charged your credit card #{@customer.active_card}.
+
+%p Please click the following link to view past invoices or update your card settings:
+
+%p= link_to(effective_orders.customer_settings_url, effective_orders.customer_settings_url)

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

@@ -0,0 +1,5 @@
+%p.effective-orders-receipt-info Trial expired
+
+%p Your trial for #{@subscribable} has expired. To continue, please choose a paid plan.
+
+%p= link_to(root_url, root_url)

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

@@ -0,0 +1,7 @@
+%p.effective-orders-receipt-info Trial expiring
+
+%p Your trial for #{@subscribable} expires on #{@subscribable.trial_expires_at.strftime('%F')}.
+
+%p Please upgrade to a paid plan before your trial expires.
+
+%p= link_to(root_url, root_url)

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

@@ -0,0 +1,16 @@
+= javascript_include_tag 'https://checkout.stripe.com/checkout.js'
+
+= form.simple_fields_for :subscripter, form.object.subscripter do |fs|
+  = fs.input :stripe_token, as: :hidden, input_html: { value: nil }
+
+  - fs.object.stripe_plan_id ||= (fs.object.current_plan || {})[:id]
+
+  = fs.input :stripe_plan_id, as: :radio_buttons, collection: stripe_plans_collection(fs, include_trial: include_trial, selected_class: selected_class),
+    label: label,
+    required: required,
+    wrapper_html: { class: "effective-orders-stripe-plans #{wrapper_class}", data: { selected_class: selected_class, stripe: stripe } },
+    item_wrapper_class: "effective-orders-stripe-plan #{item_wrapper_class}",
+    item_wrapper_tag: 'div'
+
+  - if fs.object.customer.persisted?
+    = effective_customer_fields(fs)

data/app/views/effective/subscriptions/_plan.html.haml

@@ -0,0 +1,21 @@
+.panel.panel-default{class: (selected_class if selected)}
+  .panel-heading.text-center
+    %h3= plan[:name]
+    %p= plan[:description]
+  .panel-body
+    %p Includes features
+
+    - if plan[:amount] == 0
+      %p Free plan
+
+    %hr
+    .visible-when-unselected.text-center
+      = link_to 'Select', '#', class: 'btn btn-default btn-select-plan'
+
+    .visible-when-selected.text-center
+      - if subscribed
+        %p
+          %strong Your current plan
+      - else
+        %p This is #{['an amazing', 'a great', 'an excellent', 'an exceptional', 'a marvelous', 'a wonderful'].sample} plan
+