effective_orders 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f1bc7ba763ebd70710187ba1e1399277b761b3
-  data.tar.gz: 7d988714cd65169a91b79b43b10451467ef03f32
+  metadata.gz: 8a3ae1b1bfe46285c18de3ac2cd0c61390b61ff2
+  data.tar.gz: b68649dfb3abaf5fe2b622486ccd73fa936cf9e8
 SHA512:
-  metadata.gz: d9d05850771be5513ce171927c6421876cc6c0a1aa16600eb1e7994b6526797366ae41f51479859b8b507e475954b2155cf4774db9e4444a2ac8807cbd835896
-  data.tar.gz: 64eaaba7b0991417169b8bd34d9ffc120221eeab56ca09674d9e9293df7834bd5db489955a64f8e9bcc6f5e57559bb1ef80460dc4930cdae075122e6eb968b4d
+  metadata.gz: d5bc0e026ef2836d9b313e3a4be35b28121f7bc90755c71852b7aca41dff746867c1c1f9163eb20b1558aa5240d87fdf627e35f30e264536d7b608fc825daa16
+  data.tar.gz: f70043ddaf98f476cad272d82145a5499586ff50d8fd10a016328dd61e8d8cacf4ddbe7574c798541ff9698a228bcf7c48908bfd8781c33564d4ff611322872e

data/app/helpers/effective_carts_helper.rb

@@ -40,7 +40,7 @@ module EffectiveCartsHelper
   def link_to_add_to_cart(purchasable, opts = {})
     raise ArgumentError.new('expecting an acts_as_purchasable object') unless purchasable.respond_to?(:is_effectively_purchasable?)
 
-    options = {:class => 'btn', :rel => :nofollow, 'data-disable-with' => 'Add to Cart...'}.merge(opts)
+    options = {:class => 'btn', :rel => :nofollow, 'data-disable-with' => 'Adding...'}.merge(opts)
     options[:class] = ((options[:class] || '') + ' btn-add-to-cart')
 
     link_to (options.delete(:label) || 'Add to Cart'), effective_orders.add_to_cart_path(:purchasable_type => purchasable.class.name, :purchasable_id => purchasable.id.to_i), options
@@ -51,9 +51,13 @@ module EffectiveCartsHelper
 
     options = {
       :rel => :nofollow,
-      :data => {:confirm => 'Are you sure? This cannot be undone!'},
+      :data => {
+        :confirm => 'Are you sure? This cannot be undone!',
+        :disable_with => 'Removing...'
+      },
       :method => :delete
     }.merge(opts)
+
     options[:class] = ((options[:class] || '') + ' btn-remove-from-cart')
 
     link_to (options.delete(:label) || 'Remove'), effective_orders.remove_from_cart_path(cart_item), options
@@ -63,16 +67,25 @@ module EffectiveCartsHelper
     options = {
       :rel => :nofollow,
       :class => 'btn',
-      :data => {:confirm => 'This will clear your entire cart.  Are you sure?  This cannot be undone!'},
+      :data => {
+        :confirm => 'This will clear your entire cart.  Are you sure?  This cannot be undone!',
+        :disable_with => 'Emptying...'
+      },
       :method => :delete
     }.merge(opts)
+
     options[:class] = ((options[:class] || '') + ' btn-empty-cart btn-danger')
 
     link_to (options.delete(:label) || 'Empty Cart'), effective_orders.cart_path, options
   end
 
   def link_to_checkout(opts = {})
-    options = {:class => 'btn', :rel => :nofollow}.merge(opts)
+    options = {
+      :class => 'btn',
+      :rel => :nofollow,
+      :disable_with => 'Proceeding...'
+    }.merge(opts)
+
     options[:class] = ((options[:class] || '') + ' btn-checkout')
 
     link_to (options.delete(:label) || 'Proceed to Checkout'), effective_orders.new_order_path, options

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

@@ -1,7 +1,10 @@
 %h2 Customers
 
+%p.text-right= link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'
+
 = render_datatable @datatable do
   %p There are no customers
 
-%hr
-%p= link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'
+- if @datatable.present?
+  %p.text-right= link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'
+

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

@@ -38,6 +38,6 @@
 
     .text-right
       - if order.total == 0 && EffectiveOrders.allow_free_orders
-        = f.submit 'Checkout', :class => 'btn btn-primary pull-right', :rel => :nofollow, 'data-disable-with' => 'Continuing...'
+        = f.submit 'Checkout', :class => 'btn btn-primary pull-right', :rel => :nofollow, :data => {'disable_with' => 'Processing...' }
       - else
-        = f.submit 'Continue to Checkout Confirmation', :class => 'btn btn-primary pull-right', :rel => :nofollow, 'data-disable-with' => 'Continuing...'
+        = f.submit 'Save and Continue', :class => 'btn btn-primary pull-right', :rel => :nofollow, :data => {'disable_with' => 'Saving...' }

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

@@ -11,8 +11,8 @@
     = render :partial => '/effective/orders/stripe/form', :locals => {:order => order}
 
   - if EffectiveOrders.allow_pretend_purchase_in_production
-    = link_to 'Process Order', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary'
+    = link_to 'Purchase Order', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary', :data => {'disable_with' => 'Purchasing...' }
     %p= EffectiveOrders.allow_pretend_purchase_in_production_message
   - elsif Rails.env.development?
-    = link_to 'Process Order (development only)', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary'
+    = link_to 'Purchase Order (development only)', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary', :data => {'disable_with' => 'Purchasing...' }
 

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

@@ -34,4 +34,4 @@
     = hidden_field_tag(:bill_postal_code, address.postal_code)
     = hidden_field_tag(:bill_country, address.country)
 
-  = submit_tag 'Checkout with Moneris', :class => 'btn btn-primary'
+  = submit_tag 'Checkout with Moneris', :class => 'btn btn-primary', :data => {'disable_with' => 'Proceeding to Moneris...' }

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

@@ -2,4 +2,4 @@
   = hidden_field_tag :cmd, '_s-xclick'
   = hidden_field_tag :encrypted, paypal_encrypted_payload(order)
 
-  = submit_tag 'Checkout with PayPal', :class => 'btn btn-primary'
+  = submit_tag 'Checkout with PayPal', :class => 'btn btn-primary', :data => {'disable_with' => 'Proceeding to PayPal...' }

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

@@ -7,7 +7,7 @@
 %p.pull-right
   %a.btn.btn-default{'data-role' => 'print-button', :class => 'print-button', :onClick => "window.print(); false;"} Print
   - if @order.purchased?
-    = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(@order), 'data-confirm' => 'This action will email you a copy of the original email receipt.  Send receipt now?', :class => 'btn btn-default'
+    = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(@order), :data => {'confirm' => 'This action will email you a copy of the original email receipt.  Send receipt now?', 'disable_with' => 'Resending...'}, :class => 'btn btn-default'
 
 = render @order
 

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

@@ -13,4 +13,5 @@
         = ')'
 - else
   %p You have no subscriptions
-%p= link_to 'New Subscription', effective_orders.new_subscription_path
+
+%p.text-right= link_to 'New Subscription', effective_orders.new_subscription_path

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

@@ -46,4 +46,4 @@
 
 %h3 Cancel Subscription
 
-= link_to 'Unsubscribe', effective_orders.subscription_path(@plan.id), :data => {:method => :delete, :confirm => 'This will cancel your subscription. Are you sure? This cannot be undone.'}
+= link_to 'Unsubscribe', effective_orders.subscription_path(@plan.id), :data => {:method => :delete, :confirm => 'This will cancel your subscription. Are you sure? This cannot be undone.', :disable_with => 'Unsubscribing...'}

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails