effective_orders 2.2.4 → 3.0.0

data/spec/dummy/db/schema.rb

@@ -46,6 +46,7 @@ ActiveRecord::Schema.define(:version => 4) do
 
   create_table "carts", :force => true do |t|
     t.integer  "user_id"
+    t.integer  "cart_items_count"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end

data/spec/dummy/log/test.log

@@ -55,3 +55,6 @@
    (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") FROM "orders"

data/spec/models/acts_as_purchasable_spec.rb

@@ -55,32 +55,6 @@ describe Product do
     end
   end
 
-  describe 'float prices' do
-    it 'should automatically convert float prices to integer' do
-      product_with_float_price.price = 20.00
-      product_with_float_price.tax_exempt = true
-
-      order = Effective::Order.new(product_with_float_price, user: user)
-      order.billing_address = FactoryGirl.create(:address, state_code: 'AB')
-
-      order.subtotal.should eq 2000
-      order.tax.should eq 0
-      order.total.should eq 2000
-    end
-
-    it 'should automatically convert tax floats to integers' do
-      product_with_float_price.price = 20.00
-      product_with_float_price.tax_exempt = false
-
-      order = Effective::Order.new(product_with_float_price, user: user)
-      order.billing_address = FactoryGirl.create(:address, state_code: 'AB')
-
-      order.subtotal.should eq 2000
-      order.tax.should eq 100
-      order.total.should eq 2100
-    end
-  end
-
   describe 'price=' do
     it 'should accept an integer price' do
       product = Product.new()
@@ -96,36 +70,6 @@ describe Product do
       product.price.should eq 1250
     end
 
-    it 'should convert a String that looks like a Float' do
-      product = Product.new()
-      product.price = '12.50'
-
-      product.price.should eq 1250
-    end
-
-    it 'should convert from a Float' do
-      product = Product.new()
-      product.price = 12.50
-      product.price.should eq 1250
-
-      product.price = Float(12.50)
-      product.price.should eq 1250
-    end
-
-    it 'should convert from a BigDecimal' do
-      product = Product.new()
-      product.price = BigDecimal.new(12.5, 4)
-
-      product.price.should eq 1250
-    end
-
-    it 'should treat nil as a zero' do
-      product = Product.new()
-      product.price = nil
-
-      product.price.should eq 0
-    end
-
   end
 
 end

data/spec/models/customer_spec.rb

@@ -7,9 +7,9 @@ describe Effective::Customer do
   let(:customer) { FactoryGirl.create(:customer) }
   let(:user) { FactoryGirl.create(:user) }
 
-  describe 'Customer.for_user' do
+  describe 'Customer.for' do
     it 'creates a new Customer when passed a new user' do
-      c = Effective::Customer.for_user(user)
+      c = Effective::Customer.for_buyer(user)
 
       c.kind_of?(Effective::Customer).should eq true
       c.persisted?.should eq true
@@ -18,7 +18,7 @@ describe Effective::Customer do
     end
 
     it 'returns an existing Customer when passed an existing user' do
-      c =  Effective::Customer.for_user(customer.user)
+      c =  Effective::Customer.for_buyer(customer.user)
       c.should eq customer
     end
   end

data/spec/models/order_spec.rb

@@ -47,8 +47,8 @@ describe Effective::Order, type: :model do
       order_item.quantity.should eq 1
     end
 
-    it 'throws an ArgumentError when passed something unexpected' do
-      expect { Effective::Order.new(Object.new()) }.to raise_error(ArgumentError)
+    it 'throws an Exception when passed something unexpected' do
+      expect { Effective::Order.new(Object.new()) }.to raise_error(Exception)
     end
   end
 

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ Dir[Rails.root.join("../../spec/support/**/*.rb")].each {|f| require f }
 RSpec.configure do |config|
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::Test::ControllerHelpers, :type => :controller
   config.include Shoulda::Matchers::ActiveModel, :type => :model
 
   Rails.logger.level = 4    # Output only minimal stuff to test.log

data/spec/support/factories.rb

@@ -51,9 +51,10 @@ FactoryGirl.define do
 
   factory :cart, class: Effective::Cart do
     association :user
+    cart_items_count 0
 
     before(:create) do |cart|
-      3.times { cart.cart_items << FactoryGirl.create(:cart_item, cart: cart) }
+      3.times { cart.cart_items << FactoryGirl.build(:cart_item, cart: cart) }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: stripe-ruby-mock
   requirement: !ruby/object:Gem::Requirement
@@ -259,29 +245,32 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- active_admin/effective_carts.rb
-- active_admin/effective_orders.rb
 - app/assets/images/effective_orders/stripe_connect.png
 - app/assets/javascripts/effective_orders.js
-- app/assets/javascripts/effective_orders/providers/stripe_charges.js.coffee
-- app/assets/javascripts/effective_orders/providers/stripe_subscriptions.js.coffee
+- app/assets/javascripts/effective_orders/customers.js.coffee
+- app/assets/javascripts/effective_orders/providers/stripe.js.coffee
+- app/assets/javascripts/effective_orders/subscriptions.js.coffee
 - app/assets/stylesheets/effective_orders.scss
 - app/assets/stylesheets/effective_orders/_order.scss
+- app/assets/stylesheets/effective_orders/_subscriptions.scss
 - app/controllers/admin/customers_controller.rb
 - app/controllers/admin/order_items_controller.rb
 - app/controllers/admin/orders_controller.rb
-- app/controllers/concerns/acts_as_active_admin_controller.rb
 - app/controllers/effective/carts_controller.rb
+- app/controllers/effective/concerns/purchase.rb
+- app/controllers/effective/customers_controller.rb
 - app/controllers/effective/orders_controller.rb
 - app/controllers/effective/providers/app_checkout.rb
 - app/controllers/effective/providers/ccbill.rb
 - app/controllers/effective/providers/cheque.rb
+- app/controllers/effective/providers/free.rb
+- app/controllers/effective/providers/mark_as_paid.rb
 - app/controllers/effective/providers/moneris.rb
 - app/controllers/effective/providers/paypal.rb
 - app/controllers/effective/providers/pretend.rb
+- app/controllers/effective/providers/refund.rb
 - app/controllers/effective/providers/stripe.rb
 - app/controllers/effective/providers/stripe_connect.rb
-- app/controllers/effective/subscriptions_controller.rb
 - app/controllers/effective/webhooks_controller.rb
 - app/datatables/effective_customers_datatable.rb
 - app/datatables/effective_order_items_datatable.rb
@@ -291,45 +280,44 @@ files:
 - app/helpers/effective_orders_helper.rb
 - app/helpers/effective_paypal_helper.rb
 - app/helpers/effective_stripe_helper.rb
+- app/helpers/effective_subscriptions_helper.rb
 - app/mailers/effective/orders_mailer.rb
 - app/models/concerns/acts_as_purchasable.rb
+- app/models/concerns/acts_as_subscribable.rb
+- app/models/concerns/acts_as_subscribable_buyer.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/cart.rb
 - app/models/effective/cart_item.rb
 - app/models/effective/customer.rb
-- app/models/effective/datatables/customers.rb
-- app/models/effective/datatables/order_items.rb
-- app/models/effective/datatables/orders.rb
 - app/models/effective/order.rb
 - app/models/effective/order_item.rb
 - app/models/effective/product.rb
 - app/models/effective/providers/ccbill_postback.rb
 - app/models/effective/providers/stripe_charge.rb
+- app/models/effective/subscripter.rb
 - app/models/effective/subscription.rb
 - app/models/effective/tax_rate_calculator.rb
-- app/models/inputs/price_field.rb
-- app/models/inputs/price_form_input.rb
-- app/models/inputs/price_formtastic_input.rb
-- app/models/inputs/price_input.rb
-- app/models/inputs/price_simple_form_input.rb
 - app/models/validators/effective/sold_out_validator.rb
 - app/views/admin/customers/_actions.html.haml
 - app/views/admin/customers/index.html.haml
+- app/views/admin/customers/show.html.haml
 - app/views/admin/order_items/index.html.haml
 - app/views/admin/orders/_actions.html.haml
 - app/views/admin/orders/_form.html.haml
-- app/views/admin/orders/_form_mark_as_paid.html.haml
 - app/views/admin/orders/_form_note_internal.html.haml
 - app/views/admin/orders/_order_actions.html.haml
 - app/views/admin/orders/_order_item_fields.html.haml
-- app/views/admin/orders/_order_payment_details.html.haml
+- app/views/admin/orders/edit.html.haml
 - app/views/admin/orders/index.html.haml
-- app/views/admin/orders/mark_as_paid.html.haml
 - app/views/admin/orders/new.html.haml
 - app/views/admin/orders/show.html.haml
 - app/views/effective/carts/_cart.html.haml
 - app/views/effective/carts/_cart_actions.html.haml
 - app/views/effective/carts/show.html.haml
+- app/views/effective/customers/_customer.html.haml
+- app/views/effective/customers/_fields.html.haml
+- app/views/effective/customers/_form.html.haml
+- app/views/effective/customers/edit.html.haml
 - app/views/effective/orders/_checkout_step1.html.haml
 - app/views/effective/orders/_checkout_step2.html.haml
 - app/views/effective/orders/_order.html.haml
@@ -347,45 +335,45 @@ files:
 - app/views/effective/orders/_orders_table.html.haml
 - app/views/effective/orders/app_checkout/_form.html.haml
 - app/views/effective/orders/ccbill/_form.html.haml
-- app/views/effective/orders/checkout_step1.html.haml
-- app/views/effective/orders/checkout_step2.html.haml
 - app/views/effective/orders/cheque/_form.html.haml
 - app/views/effective/orders/cheque/pay_by_cheque.html.haml
 - app/views/effective/orders/declined.html.haml
+- app/views/effective/orders/edit.html.haml
+- app/views/effective/orders/free/_form.html.haml
 - app/views/effective/orders/index.html.haml
+- app/views/effective/orders/mark_as_paid/_form.html.haml
 - app/views/effective/orders/moneris/_form.html.haml
 - app/views/effective/orders/my_purchases.html.haml
 - app/views/effective/orders/my_sales.html.haml
+- app/views/effective/orders/new.html.haml
 - app/views/effective/orders/paypal/_form.html.haml
 - app/views/effective/orders/pretend/_form.html.haml
 - app/views/effective/orders/purchased.html.haml
+- app/views/effective/orders/refund/_form.html.haml
 - app/views/effective/orders/show.html.haml
 - app/views/effective/orders/stripe/_form.html.haml
-- app/views/effective/orders/stripe/_subscription_fields.html.haml
 - app/views/effective/orders_mailer/order_error.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_admin.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_buyer.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_seller.html.haml
 - app/views/effective/orders_mailer/payment_request_to_buyer.html.haml
 - app/views/effective/orders_mailer/pending_order_invoice_to_buyer.html.haml
-- app/views/effective/subscriptions/index.html.haml
-- app/views/effective/subscriptions/new.html.haml
-- app/views/effective/subscriptions/show.html.haml
+- app/views/effective/orders_mailer/subscription_canceled.html.haml
+- app/views/effective/orders_mailer/subscription_payment_failed.html.haml
+- app/views/effective/orders_mailer/subscription_payment_succeeded.html.haml
+- app/views/effective/orders_mailer/subscription_trial_expired.html.haml
+- app/views/effective/orders_mailer/subscription_trial_expiring.html.haml
+- app/views/effective/subscriptions/_fields.html.haml
+- app/views/effective/subscriptions/_plan.html.haml
 - app/views/layouts/effective_orders_mailer_layout.html.haml
 - config/effective_orders.rb
 - config/routes.rb
 - db/migrate/01_create_effective_orders.rb.erb
-- db/upgrade/02_upgrade_effective_orders_from03x.rb.erb
-- db/upgrade/03_upgrade_effective_orders_from1x.rb.erb
-- db/upgrade/upgrade_price_column_on_table.rb.erb
 - lib/effective_orders.rb
 - lib/effective_orders/app_checkout_service.rb
 - lib/effective_orders/engine.rb
 - lib/effective_orders/version.rb
 - lib/generators/effective_orders/install_generator.rb
-- lib/generators/effective_orders/upgrade_from03x_generator.rb
-- 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

data/active_admin/effective_carts.rb

@@ -1,14 +0,0 @@
-if defined?(ActiveAdmin)
-  ActiveAdmin.register Effective::Cart, namespace: EffectiveOrders.active_admin_namespace, as: 'Carts' do
-    menu label: 'My Cart', if: proc { (authorized?(:manage, Effective::Cart.new(user: current_user)) rescue false) }
-
-    actions :index
-
-    controller do
-      def index
-        redirect_to(effective_orders.cart_path)
-      end
-    end
-
-  end
-end

data/active_admin/effective_orders.rb

@@ -1,112 +0,0 @@
-if defined?(ActiveAdmin)
-  require 'csv'
-
-  ActiveAdmin.register Effective::Order, namespace: EffectiveOrders.active_admin_namespace, as: 'Orders' do
-    menu label: 'Orders', if: proc { (authorized?(:manage, Effective::Order.new(user: current_user)) rescue false) }
-
-    actions :index
-
-    filter :id, label: 'Order Number'
-    filter :user
-    filter :created_at, label: 'Order Date'
-    filter :payment
-
-    scope :purchased, default: true do |objs| objs.purchased end
-    scope :all
-
-    controller do
-      include EffectiveOrdersHelper
-
-      def scoped_collection
-        scoped = end_of_association_chain.includes(:user).includes(order_items: :purchasable)
-
-        if EffectiveOrders.orders_collection_scope.respond_to?(:call)
-          scoped = EffectiveOrders.orders_collection_scope.call(scoped)
-        end
-
-        scoped = scoped.where(user: current_user) if !authorized?(:admin, :effective_orders)
-        scoped
-      end
-    end
-
-    sidebar :export, :only => :index do
-      export_csv_path = ['export_csv', EffectiveOrders.active_admin_namespace.presence, 'orders_path'].compact.join('_')
-      link_to "Export Orders to .csv", public_send(export_csv_path)
-    end
-
-    index :download_links => false do
-      column :purchased_at
-
-      column 'Order', :sortable => :id do |order|
-        link_to "##{order.to_param}", effective_orders.order_path(order)
-      end
-
-      column 'Buyer Email' do |order|
-        mail_to order.user.email
-      end
-
-      column 'Buyer Name', :sortable => :user_id do |order|
-        user_path = [EffectiveOrders.active_admin_namespace.presence, 'user_path'].compact.join('_')
-        link_to order.user, (public_send(user_path, order.user) rescue '#')
-      end
-
-      column 'Order Items' do |order|
-        content_tag(:ul) do
-          (order.order_items).map { |oi| content_tag(:li, oi.to_s.html_safe) }.join.html_safe
-        end
-      end
-
-      column 'Total' do |order|
-        price_to_currency(order.total)
-      end
-
-      column :payment_provider do |order|
-        order.payment_provider
-      end
-
-      column :payment_card do |order|
-        order.payment_card
-      end
-
-      column do |order|
-        link_to('View Receipt', effective_orders.order_path(order), class: 'member_link view_link') if order.purchased?
-      end
-
-    end
-
-    collection_action :export_csv do
-      @orders = Effective::Order.purchased.includes(:addresses)
-
-      col_headers = []
-      col_headers << "Order"
-      col_headers << "Purchased at"
-      col_headers << "Email"
-      col_headers << "Full Name"
-      col_headers << "Subtotal"
-      col_headers << "Tax"
-      col_headers << "Total"
-      col_headers << 'Payment provider'
-      col_headers << 'Payment card'
-
-      csv_string = CSV.generate do |csv|
-        csv << col_headers
-
-        @orders.each do |order|
-          csv << [
-            order.to_param,
-            order.purchased_at.strftime("%Y-%m-%d %H:%M:%S %z"),
-            order.user.try(:email),
-            (order.try(:billing_address).try(:full_name) || order.user.to_s),
-            (order.subtotal / 100.0).round(2),
-            (order.tax / 100.0).round(2),
-            (order.total / 100.0).round(2),
-            order.payment_provider,
-            order.payment_card
-          ]
-        end
-      end
-
-      send_data(csv_string, :type => 'text/csv; charset=utf-8; header=present', :filename => "orders-export.csv")
-    end
-  end
-end