effective_orders 6.7.2 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1784e619c52695ef3be94dfd8ed164c5c6b0f81e2a853239ba5963e916ee14
-  data.tar.gz: ef0eeb3c19bd456a8d806dfb0ea2963b06b0a2786ce2e7d0f0071c261ed61162
+  metadata.gz: f83eb44947b1c5f4f906f04822df9860f892727a02146f33e03eb468ffe65ea6
+  data.tar.gz: 726acb095ff327c25c438eacaec1db6cfa551207582a4d82a7a677e809b5087f
 SHA512:
-  metadata.gz: dba9ec63003ed63c5b40ea9aae431c42ea55d11eb496acfe9154e07e5ecdc5ab41f7b37be0b6ab1d65747bc7515b77fc342cb841491c714aab238d7c5d0f182b
-  data.tar.gz: 5b809f63ee1cb262688f69f274b79519711b7a8fc5eec2028fdc76aa1fcb579bd78bd6aac681227947e86ea43737f54693889aac79d82237a145ab4ed32316d7
+  metadata.gz: 0cc47f00733d0927470036ec6d9d2ef434945204426692ac26858e64a88d0b38e3a57396f64d2c1980152a8924d174cbd014dde7cc4245c2e8bcdf1922f7eb22
+  data.tar.gz: 3e6d4ee0aa861c39ec8f11e55879201908b3c6c62910e47631e69ab8662966eaef265e51906a8a954a806a7cec9020c13c6eb1123b26c11669d3c44137172cfc

data/app/assets/stylesheets/effective_orders/_order.scss

@@ -53,7 +53,7 @@ form.new_effective_order {
 }
 
 .effective-moneris-checkout {
-  height: 560px;
+  height: 720px;
 }
 
 @media print {

data/app/models/effective/cart.rb

@@ -1,6 +1,6 @@
 module Effective
   class Cart < ActiveRecord::Base
-    self.table_name = EffectiveOrders.carts_table_name.to_s
+    self.table_name = (EffectiveOrders.carts_table_name || :carts).to_s
 
     belongs_to :user, polymorphic: true, optional: true  # Optional. We want non-logged-in users to have carts too.
 

data/app/models/effective/cart_item.rb

@@ -1,6 +1,6 @@
 module Effective
   class CartItem < ActiveRecord::Base
-    self.table_name = EffectiveOrders.cart_items_table_name.to_s
+    self.table_name = (EffectiveOrders.cart_items_table_name || :cart_items).to_s
 
     belongs_to :cart, counter_cache: true
     belongs_to :purchasable, polymorphic: true

data/app/models/effective/customer.rb

@@ -1,6 +1,6 @@
 module Effective
   class Customer < ActiveRecord::Base
-    self.table_name = EffectiveOrders.customers_table_name.to_s
+    self.table_name = (EffectiveOrders.customers_table_name || :customers).to_s
 
     attr_accessor :stripe_customer
 

data/app/models/effective/order.rb

@@ -9,7 +9,7 @@
 
 module Effective
   class Order < ActiveRecord::Base
-    self.table_name = EffectiveOrders.orders_table_name.to_s
+    self.table_name = (EffectiveOrders.orders_table_name || :orders).to_s
 
     # Effective Resources
     acts_as_statused(
@@ -201,13 +201,13 @@ module Effective
       end
     end
 
-    validate(if: -> { was_voided? }) do
-      errors.add(:status, "cannot update a voided order") unless (voided? || pending?)
+    validate(if: -> { was_voided? && status_changed? }) do
+      errors.add(:status, "cannot update status of a voided order") unless voided?
     end
 
     # Sanity check
     before_save(if: -> { status_was.to_s == 'purchased' }) do
-      raise('cannot unpurchase an order') unless purchased?
+      raise('cannot unpurchase an order. try voiding instead.') unless purchased? || voided?
 
       raise('cannot change subtotal of a purchased order') if changes[:subtotal].present?
 
@@ -722,13 +722,13 @@ module Effective
     end
 
     def void!
-      raise('unable to void a purchased order') if purchased?
-      voided!
+      raise('already voided') if voided?
+      voided!(skip_buyer_validations: true)
     end
 
     def unvoid!
       raise('order must be voided to unvoid') unless voided?
-      pending!
+      unvoided!(skip_buyer_validations: true)
     end
 
     # These are all the emails we send all notifications to

data/app/models/effective/order_item.rb

@@ -3,7 +3,7 @@
 module Effective
   # An Order Item
   class OrderItem < ActiveRecord::Base
-    self.table_name = EffectiveOrders.order_items_table_name.to_s
+    self.table_name = (EffectiveOrders.order_items_table_name || :order_items).to_s
 
     belongs_to :order
 

data/app/models/effective/product.rb

@@ -1,6 +1,6 @@
 module Effective
   class Product < ActiveRecord::Base
-    self.table_name = EffectiveOrders.products_table_name.to_s
+    self.table_name = (EffectiveOrders.products_table_name || :products).to_s
 
     acts_as_purchasable
     log_changes if respond_to?(:log_changes)

data/app/models/effective/subscription.rb

@@ -1,6 +1,6 @@
 module Effective
   class Subscription < ActiveRecord::Base
-    self.table_name = EffectiveOrders.subscriptions_table_name.to_s
+    self.table_name = (EffectiveOrders.subscriptions_table_name || :subscriptions).to_s
 
     attr_accessor :stripe_subscription
 

data/config/effective_orders.rb

@@ -1,15 +1,6 @@
 # EffectiveOrders Rails Engine
 
 EffectiveOrders.setup do |config|
-  # Configure Database Tables
-  config.orders_table_name = :orders
-  config.order_items_table_name = :order_items
-  config.carts_table_name = :carts
-  config.cart_items_table_name = :cart_items
-  config.customers_table_name = :customers
-  config.subscriptions_table_name = :subscriptions
-  config.products_table_name = :products
-
   # Layout Settings
   # config.layout = { application: 'application', admin: 'admin' }
 

data/config/routes.rb

@@ -51,7 +51,7 @@ EffectiveOrders::Engine.routes.draw do
         post :send_payment_request
         post :send_buyer_receipt
 
-        post :void
+        delete :void
         post :unvoid
 
         # GET should be last here

data/db/migrate/{01_create_effective_orders.rb.erb → 101_create_effective_orders.rb}

@@ -1,6 +1,6 @@
-class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
-  def self.up
-    create_table <%= @orders_table_name %> do |t|
+class CreateEffectiveOrders < ActiveRecord::Migration[6.0]
+  def change
+    create_table :orders do |t|
       t.integer   :user_id
       t.string    :user_type
 
@@ -43,10 +43,9 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @orders_table_name %>, :user_id
+    add_index :orders, :user_id
 
-
-    create_table <%= @order_items_table_name %> do |t|
+    create_table :order_items do |t|
       t.integer   :order_id
       t.string    :purchasable_type
       t.integer   :purchasable_id
@@ -59,12 +58,11 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @order_items_table_name %>, :order_id
-    add_index <%= @order_items_table_name %>, :purchasable_id
-    add_index <%= @order_items_table_name %>, [:purchasable_type, :purchasable_id]
-
+    add_index :order_items, :order_id
+    add_index :order_items, :purchasable_id
+    add_index :order_items, [:purchasable_type, :purchasable_id]
 
-    create_table <%= @carts_table_name %> do |t|
+    create_table :carts do |t|
       t.integer   :user_id
       t.string    :user_type
 
@@ -72,9 +70,9 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @carts_table_name %>, :user_id
+    add_index :carts, :user_id
 
-    create_table <%= @cart_items_table_name %> do |t|
+    create_table :cart_items do |t|
       t.integer   :cart_id
       t.string    :purchasable_type
       t.integer   :purchasable_id
@@ -85,11 +83,11 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @cart_items_table_name %>, :cart_id
-    add_index <%= @cart_items_table_name %>, :purchasable_id
-    add_index <%= @cart_items_table_name %>, [:purchasable_type, :purchasable_id]
+    add_index :cart_items, :cart_id
+    add_index :cart_items, :purchasable_id
+    add_index :cart_items, [:purchasable_type, :purchasable_id]
 
-    create_table <%= @customers_table_name %> do |t|
+    create_table :customers do |t|
       t.integer   :user_id
       t.string    :user_type
 
@@ -103,9 +101,9 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @customers_table_name %>, :user_id
+    add_index :customers, :user_id
 
-    create_table <%= @subscriptions_table_name %> do |t|
+    create_table :subscriptions do |t|
       t.integer   :customer_id
 
       t.integer   :subscribable_id
@@ -123,11 +121,11 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @subscriptions_table_name %>, :customer_id
-    add_index <%= @subscriptions_table_name %>, :subscribable_id
-    add_index <%= @subscriptions_table_name %>, [:subscribable_type, :subscribable_id]
+    add_index :subscriptions, :customer_id
+    add_index :subscriptions, :subscribable_id
+    add_index :subscriptions, [:subscribable_type, :subscribable_id]
 
-    create_table <%= @products_table_name %> do |t|
+    create_table :products do |t|
       t.integer   :purchased_order_id
 
       t.string    :name
@@ -140,14 +138,4 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
     end
 
   end
-
-  def self.down
-    drop_table <%= @orders_table_name %>
-    drop_table <%= @order_items_table_name %>
-    drop_table <%= @carts_table_name %>
-    drop_table <%= @cart_items_table_name %>
-    drop_table <%= @customers_table_name %>
-    drop_table <%= @subscriptions_table_name %>
-    drop_table <%= @products_table_name %>
-  end
 end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.7.2'.freeze
+  VERSION = '6.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.7.2
+  version: 6.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -328,7 +328,7 @@ files:
 - config/effective_orders.rb
 - config/locales/effective_orders.en.yml
 - config/routes.rb
-- db/migrate/01_create_effective_orders.rb.erb
+- db/migrate/101_create_effective_orders.rb
 - lib/effective_orders.rb
 - lib/effective_orders/engine.rb
 - lib/effective_orders/version.rb