effective_orders 4.5.10 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fedc9964ed35e8479f4c5d663fe37c7f76f1ebebd3a6852f880be58aa9ada488
-  data.tar.gz: 0b6e195ea558eec5b0bb5b5be2f7dd17fe769233b039c475c6c24f1136d5b144
+  metadata.gz: 07ed479ba56ebd55dae9b20168feec83435c0264cf7b00738a4438aa5104024e
+  data.tar.gz: 5756b29a14db32c53571fe75991285ed9864864e9a245b2b051886a68ed19229
 SHA512:
-  metadata.gz: 92930b78d50b28a14afbb274fe01c9a8677541955084b19b3d3e17440dacdb00299e7462a9db6921074736e903123bee09ba5ffc2483271a89aa088ebd637285
-  data.tar.gz: c0966358967695aa5df3c62ed423123640e91e4b816e607b5e153a6a3cced73c7228d7b133e4d10e25e4243bc9470e55e35a898b24c5e41a3466cecb3f1d8b1e
+  metadata.gz: 8de08c2426a57c57176a585131e211242fad9cb9f3bb18bac6216375798388e951021f6a58354be3c0810c3fa59b9d4b8f4505aae9f24b6377b34c0db8793a3d
+  data.tar.gz: 9a9bba6683d48272c12f4e509617afa99f1721bc53bd448e3689b07782d9b6e8a31cf28b29a031bf0be00ce621f0405eef56d2ca06c1323ec4f306d8a3852c53

data/app/controllers/effective/providers/mark_as_paid.rb

@@ -24,7 +24,8 @@ module Effective
 
       def mark_as_paid_params
         params.require(:effective_order).permit(
-          :payment, :payment_provider, :payment_card, :note_to_buyer, :send_mark_as_paid_email_to_buyer
+          :purchased_at, :payment, :payment_provider, :payment_card,
+          :note_to_buyer, :send_mark_as_paid_email_to_buyer
         )
       end
 

data/app/helpers/effective_subscriptions_helper.rb

@@ -17,7 +17,7 @@ module EffectiveSubscriptionsHelper
     raise 'form object must be an acts_as_subscribable object' unless subscribable.respond_to?(:subscripter)
 
     subscripter = subscribable.subscripter
-    raise 'subscribable.subscribable_buyer must match current_user' unless subscripter.user == current_user
+    # raise 'subscribable.subscribable_buyer must match current_user' unless subscripter.user == current_user
 
     render('effective/subscripter/form', subscripter: subscripter)
   end

data/app/models/effective/order.rb

@@ -72,6 +72,10 @@ module Effective
       self.state = EffectiveOrders::CONFIRMED if pending?
     end
 
+    before_save(if: -> { state_was == EffectiveOrders::PURCHASED }) do
+      raise Exception.new('cannot change state of purchased 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

data/app/models/effective/subscripter.rb

@@ -31,7 +31,7 @@ module Effective
     end
 
     def customer
-      @customer ||= Effective::Customer.deep.where(user: user).first_or_initialize
+      @customer ||= Effective::Customer.deep.where(user: subscribable&.subscribable_buyer || user).first_or_initialize
     end
 
     def current_user=(user)

data/app/views/effective/orders/mark_as_paid/_form.html.haml

@@ -3,6 +3,8 @@
     %h2 Admin: Mark as Paid
 
     = effective_form_with(model: order, url: effective_orders.mark_as_paid_order_path(order), method: :post) do |f|
+      = f.date_field :purchased_at, required: true
+
       = f.select :payment_provider, EffectiveOrders.payment_providers, required: true
 
       = f.text_field :payment_card,
@@ -20,4 +22,3 @@
       = f.text_area :note_to_buyer, hint: 'This message will be displayed on the receipt.'
 
       = f.submit order_checkout_label(:mark_as_paid), center: true
-

data/lib/effective_orders/version.rb

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

metadata

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