effective_orders 3.1.3 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a44d926ef3b5778ccedeb057cb96ed9d0df5e63642ef26851db9d4df4a4e0f7
-  data.tar.gz: 222f7df06cf76aa2d39ab3c428744057eed9468f4838c6230612ac6bda81ed55
+  metadata.gz: 2452332fcebd03986bf33bd266f0a4f59002fcd24dd9734085cd341e1f32afa6
+  data.tar.gz: d11d5da4657bed64443d42a7cb7b6fc3eb79c2eb832d97b84ceb5bc2ffa20c62
 SHA512:
-  metadata.gz: 3218139fa9780d82e159d83498e35589fbe99115b59e076b2cc1c27f033a1a6f7e91fbcc4eb9eb4d7161a6a28a1dbac3ecbaf42026f305d08a7aa986ddc95211
-  data.tar.gz: 0c6b49680dac2b6f4044484f15ed197b32ce145433ff67171331896f0251cba6e4f8b1e2341fa2913a73fb5fd1278d65ee8f7a45ce7bda14dc65a028a6ed7e5d
+  metadata.gz: aac4714aaab0a7d4cd86b2b7e3496719a7d63b00844181ee25c25c1c92a2ff5e48f8e37a110d060af48aab3ab782f1bbcb17e42cab451d0204c4182bfca87d5b
+  data.tar.gz: 20de7342f472d9b57a983fdc318c6bb90d6740d6d080c896c36928d9255b520e6a87de43d69a3322af83813f0a512c9699735c2411c7df46441b42f93555566f

data/README.md

@@ -512,7 +512,7 @@ The `acts_as_purchasable` `.purchased?` and `.purchased_by?(user)` methods only
 To programatically purchase one or more `acts_as_purchasable` objects:
 
 ```ruby
-Effective::Order.new(@product1, @product2, user: current_user).purchase!(details: 'from my rake task')
+Effective::Order.new(items: [@product1, @product2], user: current_user).purchase!(details: 'from my rake task')
 ```
 
 Here the `billing_address` and `shipping_address` are copied from the `current_user` object if the `current_user` responds_to `billing_address` / `shipping_address` as per [effective_addresses](https://github.com/code-and-effect/effective_addresses/).
@@ -541,7 +541,7 @@ The one gotcha with the above two scenarios, is that when `purchase!` is called,
 You can skip validations with the following command, but be careful as this skips all validations:
 
 ```ruby
-Effective::Order.new(@product, user: @user).purchase!(validate: false)
+Effective::Order.new(item: @product, user: @user).purchase!(validate: false)
 ```
 
 The `@product` is now considered purchased.

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,12 +19,12 @@ 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
     def new
-      @order ||= Effective::Order.new(current_cart, user: current_user)
+      @order ||= Effective::Order.new(item: current_cart, user: current_user)
 
       EffectiveOrders.authorize!(self, :new, @order)
 
@@ -48,7 +48,7 @@ module Effective
     end
 
     def create
-      @order ||= Effective::Order.new(current_cart, user: current_user)
+      @order ||= Effective::Order.new(item: current_cart, user: current_user)
       EffectiveOrders.authorize!(self, :create, @order)
 
       @order.assign_attributes(checkout_params) if params[:effective_order]

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/helpers/effective_carts_helper.rb

@@ -127,7 +127,7 @@ module EffectiveCartsHelper
   end
 
   def render_purchasables(*purchasables)
-    render(partial: 'effective/orders/order_items', locals: { order: Effective::Order.new(purchasables) })
+    render(partial: 'effective/orders/order_items', locals: { order: Effective::Order.new(items: purchasables) })
   end
 
 end

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.3'.freeze
+  VERSION = '3.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.1
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2021-06-04 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.