effective_orders 3.1.4 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95a8ee70cdfec1d0abf23bd3a3d983f9ac6d853a6e795464bcd77bae043799d4
-  data.tar.gz: 4465d2da717814cdb4de4ca1efc6d606c57e41e034dfe8299aedf9ea93ca1ed3
+  metadata.gz: 2fb16bce7ab1576f59980e3774ca39033738a7fb1f5dfc26065ff037bdab48c7
+  data.tar.gz: 76b131fd50900070e6ef39214ef833ba5af31106092a0451f7a8bee6f6e7cb40
 SHA512:
-  metadata.gz: 738feb98567d85fc601d721e79ba2c06d223d69252287623cca17c4540c362b514bb535000980c3421f30e9c792b40514550eeee5c53a486efb8f02bc8c8054e
-  data.tar.gz: cca56bc31234719b1ddb3f61721e98ce2ceca177e48eeb812305b270222f8b9f4e5fbc54ac1c24b0fec7166b81b7f12371ee563ab2e36a804330cb933b17d9d6
+  metadata.gz: a012457f0896f338f98b164a393d1bb21e83f7cbaa55516b0d1d015277ca2fde3b82b988e933c3905b3447fdc7e2c6edbbcc7610292c12810fc39bb1f9922f37
+  data.tar.gz: 78a7aaa52c8b208f13229f5e969f6acf034e7086104246690d44dccdb9c0415a732eb6673b131c5d49137557e8de0edae720d928c3ee934c7e5b3638e488af42

data/app/assets/config/effective_orders_manifest.js

@@ -0,0 +1,3 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+//= link_directory ../images/effective_orders

data/app/controllers/effective/orders_controller.rb

@@ -19,7 +19,7 @@ module Effective
 
     layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:orders] : EffectiveOrders.layout)
 
-    before_action :authenticate_user!, except: [:ccbill_postback, :free, :paypal_postback, :pretend]
+    before_action :authenticate_user!, except: [:ccbill_postback, :free, :moneris_postback, :paypal_postback, :pretend]
     before_action :set_page_title, except: [:show]
 
     # This is the entry point for any Checkout button

data/app/datatables/effective_orders_datatable.rb

@@ -15,6 +15,13 @@ class EffectiveOrdersDatatable < Effective::Datatable
     )
   end
 
+  filters do
+    if admin_namespace?
+      filter :start_date, nil, as: :effective_date_picker
+      filter :end_date, nil, as: :effective_date_picker
+    end
+  end
+
   datatable do
     order :created_at, :desc
 
@@ -94,6 +101,14 @@ class EffectiveOrdersDatatable < Effective::Datatable
       scope = EffectiveOrders.orders_collection_scope.call(scope)
     end
 
+    if filters[:start_date].present?
+      scope = scope.where('created_at > ?', Time.zone.parse(filters[:start_date]).beginning_of_day)
+    end
+
+    if filters[:end_date].present?
+      scope = scope.where('created_at < ?', Time.zone.parse(filters[:end_date]).end_of_day)
+    end
+
     attributes[:user_id].present? ? scope.where(user_id: attributes[:user_id]) : scope
   end
 

data/app/models/effective/customer.rb

@@ -32,7 +32,7 @@ module Effective
     validates :stripe_customer_id, presence: true
     validates :status, if: -> { stripe_subscription_id.present? }, inclusion: { in: %w(active past_due) }
 
-    def self.for_user(user)
+    def self.for_buyer(user)
       Effective::Customer.where(user: user).first_or_initialize
     end
 

data/app/models/effective/order_item.rb

@@ -4,7 +4,7 @@ module Effective
 
     belongs_to :order, class_name: 'Effective::Order'
     belongs_to :purchasable, polymorphic: true
-    belongs_to :seller, class_name: 'User'
+    belongs_to :seller, class_name: 'User', optional: true
 
     delegate :purchased_download_url, to: :purchasable
     delegate :purchased?, :declined?, to: :order

data/app/models/effective/providers/moneris_charge.rb

@@ -104,7 +104,8 @@ module Effective
       def order_id
         [
           order.to_param,
-          (order.billing_name.to_s.parameterize.presence if EffectiveOrders.moneris[:include_billing_name_in_order_id])
+          (order.billing_name.to_s.parameterize.presence if EffectiveOrders.moneris[:include_billing_name_in_order_id]),
+          Time.zone.now.to_i
         ].compact.join('-')
       end
 

data/lib/effective_orders/engine.rb

@@ -2,7 +2,7 @@ module EffectiveOrders
   class Engine < ::Rails::Engine
     engine_name 'effective_orders'
 
-    config.autoload_paths += Dir["#{config.root}/app/models/**/"]
+    #config.autoload_paths += Dir["#{config.root}/app/models/**/"]
 
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_orders.active_record' do |app|
@@ -18,6 +18,10 @@ module EffectiveOrders
       eval File.read("#{config.root}/config/effective_orders.rb")
     end
 
+    initializer 'effective_orders.assets' do |app|
+      app.config.assets.precompile += ['effective_orders_manifest.js', 'effective_orders/*']
+    end
+
     # Set up mail delivering config option
     initializer 'effective_orders.mailer', after: :load_config_initializers do |app|
       deliver_method = Rails.gem_version >= Gem::Version.new('4.2') ? :deliver_now : :deliver

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '3.1.4'.freeze
+  VERSION = '3.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.2
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,6 +119,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/effective_orders_manifest.js
 - app/assets/images/effective_orders/stripe_connect.png
 - app/assets/javascripts/effective_orders.js
 - app/assets/javascripts/effective_orders/customers.js.coffee
@@ -169,10 +170,10 @@ files:
 - app/models/effective/providers/ccbill_postback.rb
 - app/models/effective/providers/moneris_charge.rb
 - app/models/effective/providers/stripe_charge.rb
+- app/models/effective/sold_out_validator.rb
 - app/models/effective/subscripter.rb
 - app/models/effective/subscription.rb
 - app/models/effective/tax_rate_calculator.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
@@ -255,7 +256,7 @@ homepage: https://github.com/code-and-effect/effective_orders
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -270,8 +271,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Quickly build an online store with carts, orders, automatic email receipts
   and payment collection via Stripe, StripeConnect, PayPal and Moneris.