effective_orders 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f8f7d52a67d1ce51884188e1731619ec49e06862122a47c7ef6453a53b1a841
-  data.tar.gz: f6326e488f80799a0b5425d319a0a576053a5f73d51967931d1b0b58281b5ce5
+  metadata.gz: 72eca7d0655eb6a817f703d2787d7a211d5b9da7889aaf1920ec79edb49384b7
+  data.tar.gz: ff602f25ce5ab9294c292e98060d505da015b6fb38c57f11463705d404871183
 SHA512:
-  metadata.gz: f21b668907138f9d2257215ee2446064bceaccfe69bb4553923fac8c018f0309cf050a4aa26322d37bde38b67de363057cbdc5982bb30c085f09e4dae5b4dcca
-  data.tar.gz: 5d78b1895cd76eafbb041324e5bc4be940a191c8d5a48ea3f5458af1d72c05b1cea9dafd0fbdab41bf56105a8f6ae0b28b5bb4ee9f47e7243c8fe76d04e25533
+  metadata.gz: 251acbaf892b9f51e0fd6ebd739d1a64538b6a597f071afcd4d2c0fd3b4b839c9f4423594620ae31ed7ce4dc8c92a79bbe30e7d6f2d07a3ab29607eab04accbe
+  data.tar.gz: bd8a5fd153eba267e138a32f598e01888c427fde5171327cc6271b8a1d7dcea7931f2d4b3187981f7bcea1e3e397cef4aafedd00aa64504c66b221f0deadd04b

data/README.md

@@ -351,7 +351,10 @@ The permissions you actually want to define for a regular user are as follows (u
 
 ```ruby
 can [:manage], Effective::Cart, user_id: user.id
+
 can [:manage], Effective::Order, user_id: user.id # Orders cannot be deleted
+cannot [:edit, :update], Effective::Order, state: 'purchased'
+
 can [:manage], Effective::Subscription, user_id: user.id
 ```
 

data/app/controllers/admin/orders_controller.rb

@@ -50,7 +50,7 @@ module Admin
     # The show page posts to this action
     # See Effective::OrdersController checkout
     def checkout
-      @order = Effective::Order.find(params[:id])
+      @order = Effective::Order.not_purchased.find(params[:id])
 
       authorize_effective_order!
 

data/app/controllers/effective/orders_controller.rb

@@ -68,13 +68,13 @@ module Effective
 
     # Always step1
     def edit
-      @order ||= Effective::Order.find(params[:id])
+      @order ||= Effective::Order.not_purchased.find(params[:id])
       EffectiveResources.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])
       EffectiveResources.authorize!(self, :update, @order)
 
       @order.assign_attributes(checkout_params)
@@ -110,7 +110,7 @@ module Effective
     end
 
     def send_buyer_receipt
-      @order = Effective::Order.find(params[:id])
+      @order = Effective::Order.purchased.find(params[:id])
       EffectiveResources.authorize!(self, :show, @order)
 
       if @order.send_order_receipt_to_buyer!

data/app/models/effective/order.rb

@@ -78,6 +78,10 @@ module Effective
       self.state = EffectiveOrders::CONFIRMED if pending?
     end
 
+    before_save(if: -> { state_was == EffectiveOrders::PURCHASED }) do
+      raise EffectiveOrders::AlreadyPurchasedException.new('cannot unpurchase an order') unless purchased?
+    end
+
     # Order validations
     validates :user_id, presence: true
     validates :email, presence: true, email: true  # email and cc validators are from effective_resources
@@ -338,6 +342,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!
@@ -348,6 +354,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 = '5.0.0'.freeze
+  VERSION = '5.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails