effective_products 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 006c2b27675ae29a8501335d6871b82c4fc620d506735742507f32959b6480dd
-  data.tar.gz: ba32bd1465cbd5b74415afb6f4e51712486190c02917915d05002251e8ad9fc6
+  metadata.gz: 8126cdc9fd87848c7da280fb0e2ecc23cd4c83beb1f5efbb07aa2b0d7ebdbb1f
+  data.tar.gz: 71481f64c82b4a422bfc7b348e286cf8099c50adf6b897774e3a4ea76890f43e
 SHA512:
-  metadata.gz: 7332f32313fe53a91d3fee09f05e324ecf3261a43ae2a7055b0297fc474f0a81ccccf47c358e6b2879b6024b9e92a5096c7e76de5757a8dde4de6833ae0fabf0
-  data.tar.gz: e1658a2f562c294c0e8b3f434118449752e2c61d5b4750ef74dc7280f6162e7312e570c6821f690f219cd96e3fed6655234c51f20e67919280bf2e17667cb892
+  metadata.gz: b4c894fff91b9dc09933d3ed0d461c7698f33f5f8f45ed964ec07d622a7a78bf42650cc9a283522984f7a6e1df7bb705ea3a4fed4310ada9c6828128c688e753
+  data.tar.gz: 36ebdab52e77a293f8f5905a6cb1b0a531442bdb5f7303d57937c452d09a0fd650663c6a5042f19f50271a8c816312391a9b5ae124ebf3696b4da08d7c28fb03

data/app/models/concerns/effective_products_stamp_wizard.rb

@@ -134,6 +134,10 @@ module EffectiveProductsStampWizard
     save!
   end
 
+  def stamp_categories
+    EffectiveProducts.stamp_categories
+  end
+
   private
 
   def present_stamps

data/app/models/effective/stamp.rb

@@ -72,15 +72,15 @@ module Effective
     validates :shipping_address, presence: true, unless: -> { category == 'Digital-only' }
 
     validate(if: -> { name.present? && name_confirmation.present? }) do
-      self.errors.add(:name_confirmation, "doesn't match name") unless name == name_confirmation
+      errors.add(:name_confirmation, "doesn't match name") unless name == name_confirmation
     end
 
     validate(if: -> { category.present? }) do
-      self.errors.add(:category, "is not included") unless EffectiveProducts.stamp_categories.include?(category)
+      errors.add(:category, "is not included") unless EffectiveProducts.stamp_categories.include?(category)
     end
 
     validate(if: -> { admin_action }) do
-      self.errors.add(:owner_id, "must have a membership") unless owner && owner.try(:membership).present?
+      errors.add(:owner_id, "must have a membership") unless owner && owner.try(:membership).present?
     end
 
     def to_s
@@ -114,19 +114,25 @@ module Effective
 
     # This is the Admin Save and Mark Paid action
     def mark_paid!
-      update!(admin_action: true) # Make sure we have an owner with a membership
-      raise('expected an user with a membership category') unless owner && owner.try(:membership).present?
+      assign_attributes(admin_action: true)
 
-      category = owner.membership.categories.first
+      category = owner&.membership&.categories&.first
 
-      assign_attributes(
-        price: category.stamp_fee,
-        tax_exempt: category.stamp_fee_tax_exempt,
-        qb_item_name: category.stamp_fee_qb_item_name
-      )
+      if category.present?
+        assign_attributes(
+          price: category.stamp_fee,
+          tax_exempt: category.stamp_fee_tax_exempt,
+          qb_item_name: category.stamp_fee_qb_item_name
+        )
+      end
 
-      submitted!
-      Effective::Order.new(items: self, user: owner).mark_as_purchased!
+      submitted! # Will fail with invalid owner membership anyway
+
+      if category.present?
+        Effective::Order.new(items: self, user: owner).mark_as_purchased!
+      end
+
+      true
     end
 
   end

data/app/views/effective/stamp_wizards/stamp.html.haml

@@ -14,6 +14,6 @@
         = fr.hidden_field :owner_id
         = fr.hidden_field :owner_type
 
-        = render('effective/stamps/fields', f: fr)
+        = render('effective/stamps/fields', f: fr, parent: resource)
 
       = f.save 'Save and Continue'

data/app/views/effective/stamps/_fields.html.haml

@@ -4,12 +4,8 @@
 = f.text_field :name
 = f.text_field :name_confirmation, hint: 'must match name'
 
-- collection = EffectiveProducts.stamp_categories
-
-- if collection.length == 1
-  = f.hidden_field :category, value: collection.first
-- else
-  = f.select :category, collection
+- collection = local_assigns[:parent].try(:stamp_categories) || EffectiveProducts.stamp_categories
+= f.select :category, collection
 
 %h4 Shipping address
 = effective_address_fields(f, :shipping)

data/lib/effective_products/version.rb

@@ -1,3 +1,3 @@
 module EffectiveProducts
-  VERSION = '0.3.6'.freeze
+  VERSION = '0.3.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_products
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails