effective_orders 6.7.2 → 6.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1784e619c52695ef3be94dfd8ed164c5c6b0f81e2a853239ba5963e916ee14
-  data.tar.gz: ef0eeb3c19bd456a8d806dfb0ea2963b06b0a2786ce2e7d0f0071c261ed61162
+  metadata.gz: 8aa1ddb69cee5eeb8fb020d877fb24ee95d8cce527fa01222eeaeca7ccb31d8e
+  data.tar.gz: 3ec6df985d1a939b7780551a41badcd06ee4eacb88e2ad97c3bcd9d9da20700e
 SHA512:
-  metadata.gz: dba9ec63003ed63c5b40ea9aae431c42ea55d11eb496acfe9154e07e5ecdc5ab41f7b37be0b6ab1d65747bc7515b77fc342cb841491c714aab238d7c5d0f182b
-  data.tar.gz: 5b809f63ee1cb262688f69f274b79519711b7a8fc5eec2028fdc76aa1fcb579bd78bd6aac681227947e86ea43737f54693889aac79d82237a145ab4ed32316d7
+  metadata.gz: 74f7ea6712882bfaf3c7f8ef643f2e951a5dd355197a7f167e6fae092625fe20a76691cb16b730d926876c958f6e8e26024af8a1580b4ea260a6227f1d301ef8
+  data.tar.gz: b80bdb5f15eb7ff86739e9a0994ff54727fac1075bdc48f432ae13d6b65c6b1eaab77d532409a80fdd7f3c8f107be5e3a6214e0bd52ae75f534d38f84e0ba6ba

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/order.rb

@@ -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/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/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.7.2'.freeze
+  VERSION = '6.7.3'.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.7.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails