effective_orders 4.6.2 → 4.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07ed479ba56ebd55dae9b20168feec83435c0264cf7b00738a4438aa5104024e
-  data.tar.gz: 5756b29a14db32c53571fe75991285ed9864864e9a245b2b051886a68ed19229
+  metadata.gz: '0619b2dc6fc02860fcf6100f107133d2bb47133cb43eb03e60905a1932acca06'
+  data.tar.gz: a2cb49a3e9fba575b7f95941b64f58b02bd81e4030b4ddb14130ea2fb3f041f3
 SHA512:
-  metadata.gz: 8de08c2426a57c57176a585131e211242fad9cb9f3bb18bac6216375798388e951021f6a58354be3c0810c3fa59b9d4b8f4505aae9f24b6377b34c0db8793a3d
-  data.tar.gz: 9a9bba6683d48272c12f4e509617afa99f1721bc53bd448e3689b07782d9b6e8a31cf28b29a031bf0be00ce621f0405eef56d2ca06c1323ec4f306d8a3852c53
+  metadata.gz: 8b39ed3047b11b55ddb153a4465c3c31e11304cef618eb70ed1eb237f522e1ddd7267cd1507b7a2c25ee737dc3f31654940c676a9ef4419565f7b776f4a5622c
+  data.tar.gz: 36a94c2eb539e2beb23996fb97d14b2befe62ae9154cd1cd578cac1bf9f886f0a9c3eca05f453b92d4bd4fdf6c17f84c621cce270732e70360cb272ee1db6ddd

data/app/controllers/effective/orders_controller.rb

@@ -64,13 +64,13 @@ module Effective
 
     # Always step1
     def edit
-      @order ||= Effective::Order.find(params[:id])
+      @order ||= Effective::Order.not_purchased.find(params[:id])
       EffectiveOrders.authorize!(self, :edit, @order)
     end
 
     # Confirms the order from existing order
     def update
-      @order ||= Effective::Order.find(params[:id])
+      @order ||= Effective::Order.not_purchased.find(params[:id])
       EffectiveOrders.authorize!(self, :update, @order)
 
       @order.assign_attributes(checkout_params)
@@ -106,7 +106,7 @@ module Effective
     end
 
     def send_buyer_receipt
-      @order = Effective::Order.find(params[:id])
+      @order = Effective::Order.purchased.find(params[:id])
       EffectiveOrders.authorize!(self, :show, @order)
 
       if @order.send_order_receipt_to_buyer!

data/app/models/effective/order.rb

@@ -73,7 +73,7 @@ module Effective
     end
 
     before_save(if: -> { state_was == EffectiveOrders::PURCHASED }) do
-      raise Exception.new('cannot change state of purchased order') unless purchased?
+      raise EffectiveOrders::AlreadyPurchasedException.new('cannot unpurchase an order') unless purchased?
     end
 
     # Order validations
@@ -330,6 +330,8 @@ module Effective
     # It skips any address or bad user validations
     # It's basically the same as save! on a new order, except it might send the payment request to buyer
     def pending!
+      return false if purchased?
+
       self.state = EffectiveOrders::PENDING
       self.addresses.clear if addresses.any? { |address| address.valid? == false }
       save!
@@ -340,6 +342,7 @@ module Effective
 
     # Used by admin checkout only
     def confirm!
+      return false if purchased?
       update!(state: EffectiveOrders::CONFIRMED)
     end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.6.2'.freeze
+  VERSION = '4.6.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.3
 platform: ruby
 authors:
 - Code and Effect