effective_orders 2.1.15 → 2.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6da0e977e0e456567e46e5a8eab5f9c5e252fd
-  data.tar.gz: 54827af9c1c203e8ce15b9b2632fe910694e4e29
+  metadata.gz: c64d51c4326b5857b31313d877c0058c0c9b64e1
+  data.tar.gz: 926b603e981b5da23d2b13ffec658b4818180ab1
 SHA512:
-  metadata.gz: 7766acc4e55e0ebaf3373c5ed61265fba588e82ee3ab3fc0d864626f3c0f7a9560f8baaafbac9d9c74fabe8f0d5236b62524f3aabe2da22fc4d7fc53604fa1ce
-  data.tar.gz: 804471f7cb3c239c76825c1882731de30036fd9745da792cfd0c87964e44c21669be97056a5632fa9d1c345e9ae8dfa840d4c91fb3bdf7b57b08cad82fe60c4f
+  metadata.gz: 8d9c2b16a7977b527613b415ced35c1749e1ef256f183175f3ff6135f1f296750e64d36c7611831d236d8231bd5472608662469dbad85814d2c6e43b6beda3d8
+  data.tar.gz: 7a4a1957c65e0bcc72251903d1b1f8b62318bc0cbd461b31a3d8835840e8a283aa2bdc39f2870dfdd15ba0180a57dc7ec345d2cbf3c300ab71ae4f2a24e2edd0

data/README.md

@@ -12,11 +12,7 @@ Has Order History, My Purchases, My Sales and Admin screens.
 
 ## Getting Started
 
-Check your ruby version.  As of the 2.0 branch, effective_orders requires a minimum ruby version of `2.1`:
-
-```console
-ruby -v
-```
+Please first install the [effective_addresses](https://github.com/code-and-effect/effective_addresses) and [effective_datatables](https://github.com/code-and-effect/effective_datatables) gems.
 
 Add to your Gemfile:
 
@@ -645,6 +641,19 @@ and then in the view:
 render_datatable @datatable
 ```
 
+## Rake Tasks
+
+### Overwrite order item titles
+
+When an order is purchased, the `title()` of each `acts_as_purchasable` object is saved to the database.
+
+If you change the output of `acts_as_purchasable`.`title`, any existing order items will remain unchanged.
+
+Run this script to overwrite all saved order item titles with the current `acts_as_purchasable`.`title`.
+
+```ruby
+rake effective_orders:overwrite_order_item_titles
+```
 
 ## Testing in Development
 

data/app/controllers/admin/customers_controller.rb

@@ -1,6 +1,6 @@
 module Admin
   class CustomersController < ApplicationController
-    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
+    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
 
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:admin_customers] : EffectiveOrders.layout)
 

data/app/controllers/admin/order_items_controller.rb

@@ -1,6 +1,6 @@
 module Admin
   class OrderItemsController < ApplicationController
-    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
+    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
 
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:admin_orders] : EffectiveOrders.layout)
 

data/app/controllers/admin/orders_controller.rb

@@ -1,6 +1,6 @@
 module Admin
   class OrdersController < ApplicationController
-    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
+    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
 
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:admin_orders] : EffectiveOrders.layout)
 

data/app/controllers/effective/orders_controller.rb

@@ -16,10 +16,18 @@ module Effective
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:orders] : EffectiveOrders.layout)
 
     if defined?(Devise)
-      before_filter :authenticate_user!, except: [:paypal_postback, :ccbill_postback]
+      if respond_to?(:before_action)
+        before_action :authenticate_user!, except: [:paypal_postback, :ccbill_postback]
+      else
+        before_filter :authenticate_user!, except: [:paypal_postback, :ccbill_postback]
+      end
     end
 
-    before_filter :set_page_title, except: [:show]
+    if respond_to?(:before_action)
+      before_action :set_page_title, except: [:show]
+    else
+      before_filter :set_page_title, except: [:show]
+    end
 
     # This is the entry point for the "Checkout" buttons
     def new

data/app/controllers/effective/providers/ccbill.rb

@@ -4,7 +4,11 @@ module Effective
       extend ActiveSupport::Concern
 
       included do
-        skip_before_filter :verify_authenticity_token, only: [:ccbill_postback]
+        if respond_to?(:skip_before_action)
+          skip_before_action :verify_authenticity_token, only: [:ccbill_postback]
+        else
+          skip_before_filter :verify_authenticity_token, only: [:ccbill_postback]
+        end
       end
 
       def ccbill_postback

data/app/controllers/effective/providers/moneris.rb

@@ -4,7 +4,11 @@ module Effective
       extend ActiveSupport::Concern
 
       included do
-        prepend_before_filter :find_authenticity_token_from_moneris, only: [:moneris_postback]
+        if respond_to?(:prepend_before_action)
+          prepend_before_action :find_authenticity_token_from_moneris, only: [:moneris_postback]
+        else
+          prepend_before_filter :find_authenticity_token_from_moneris, only: [:moneris_postback]
+        end
       end
 
       def moneris_postback

data/app/controllers/effective/providers/paypal.rb

@@ -4,7 +4,11 @@ module Effective
       extend ActiveSupport::Concern
 
       included do
-        skip_before_filter :verify_authenticity_token, :only => [:paypal_postback]
+        if respond_to?(:skip_before_action)
+          skip_before_action :verify_authenticity_token, :only => [:paypal_postback]
+        else
+          skip_before_filter :verify_authenticity_token, :only => [:paypal_postback]
+        end
       end
 
       def paypal_postback

data/app/controllers/effective/providers/stripe_connect.rb

@@ -4,7 +4,11 @@ module Effective
       extend ActiveSupport::Concern
 
       included do
-        prepend_before_filter :set_stripe_connect_state_params, :only => [:stripe_connect_redirect_uri]
+        if respond_to?(:prepend_before_action)
+          prepend_before_action :set_stripe_connect_state_params, :only => [:stripe_connect_redirect_uri]
+        else
+          prepend_before_filter :set_stripe_connect_state_params, :only => [:stripe_connect_redirect_uri]
+        end
       end
 
       # So this is the postback after Stripe does its oAuth authentication

data/app/controllers/effective/subscriptions_controller.rb

@@ -5,8 +5,8 @@ module Effective
 
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:subscriptions] : EffectiveOrders.layout)
 
-    before_filter :authenticate_user!
-    before_filter :assign_customer
+    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
+    respond_to?(:before_action) ? before_action(:assign_customer) : before_filter(:assign_customer)
 
     # This is a 'My Subscriptions' page
     def index

data/app/models/effective/order.rb

@@ -274,23 +274,23 @@ module Effective
     end
 
     def save_billing_address?
-      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.save_billing_address)
+      truthy?(self.save_billing_address)
     end
 
     def save_shipping_address?
-      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.save_shipping_address)
+      truthy?(self.save_shipping_address)
     end
 
     def send_payment_request_to_buyer?
-      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.send_payment_request_to_buyer)
+      truthy?(self.send_payment_request_to_buyer)
     end
 
     def send_mark_as_paid_email_to_buyer?
-      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.send_mark_as_paid_email_to_buyer)
+      truthy?(self.send_mark_as_paid_email_to_buyer)
     end
 
     def skip_buyer_validations?
-      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.skip_buyer_validations)
+      truthy?(self.skip_buyer_validations)
     end
 
     def billing_name
@@ -457,5 +457,14 @@ module Effective
         return false
       end
     end
+
+    def truthy?(value)
+      if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails <5
+        ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+      else
+        ActiveRecord::Type::Boolean.new.cast(value)
+      end
+    end
+
   end
 end

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

@@ -1,6 +1,4 @@
 %p.text-right
   = form.button :submit, 'Save', data: { disable_with: 'Saving...' }
   = form.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
-  - unless params[:action] == 'mark_as_paid'
-    = form.button :submit, 'Save and Mark as Paid', data: { disable_with: 'Saving...' }
   = link_to 'Cancel', effective_orders.admin_orders_path

data/config/effective_orders.rb

@@ -45,7 +45,7 @@ EffectiveOrders.setup do |config|
   config.active_admin_namespace = :admin  # Passed internally to ActiveAdmin.register
 
   # Use effective_obfuscation gem to change order.id into a seemingly random 10-digit number
-  config.obfuscate_order_ids = true
+  config.obfuscate_order_ids = false
 
   # Silence the price deprecation warnings
   config.silence_deprecation_warnings = false

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '2.1.15'.freeze
+  VERSION = '2.1.16'.freeze
 end

data/lib/generators/effective_orders/install_generator.rb

@@ -15,6 +15,10 @@ module EffectiveOrders
         end
       end
 
+      def install_effective_addresses
+        run "rails generate effective_addresses:install"
+      end
+
       def copy_initializer
         template ('../' * 3) + 'config/effective_orders.rb', 'config/initializers/effective_orders.rb'
       end

data/lib/tasks/effective_orders_tasks.rake

@@ -0,0 +1,28 @@
+namespace :effective_orders do
+  desc 'Overwrite all order item titles with current acts_as_purchasable object title'
+  task overwrite_order_item_titles: :environment do
+    puts 'WARNING: this task will overwrite all existing order items with new titles. Proceed? (y/n)'
+    (puts 'Aborted' and exit) unless STDIN.gets.chomp.downcase == 'y'
+
+    Effective::OrderItem.transaction do
+      begin
+
+        Effective::OrderItem.includes(:purchasable).find_each do |order_item|
+          new_title = order_item.purchasable.title
+
+          unless new_title
+            raise "acts_as_purchasable object #{order_item.purchasable_type.try(:classify)}<#{order_item.purchasable_id}>.title() from Effective::OrderItem<#{order_item.id}> cannot be nil."
+          end
+
+          order_item.update_column(:title, new_title) # This intentionally skips validation
+        end
+
+        puts 'Successfully updated all order item titles.'
+      rescue => e
+        puts "An error has occurred: #{e.message}"
+        puts "(effective_orders) Rollback. No order item titles have been changed."
+        raise ActiveRecord::Rollback
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 2.1.15
+  version: 2.1.16
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -384,6 +384,7 @@ files:
 - lib/generators/effective_orders/upgrade_from1x_generator.rb
 - lib/generators/effective_orders/upgrade_price_column_generator.rb
 - lib/generators/templates/effective_orders_mailer_preview.rb
+- lib/tasks/effective_orders_tasks.rake
 - spec/controllers/admin/orders_controller_spec.rb
 - spec/controllers/carts_controller_spec.rb
 - spec/controllers/ccbill_orders_controller_spec.rb