effective_orders 5.6.0 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff78fd58ee1ed93581d8595a4696c6949cd034453b25a3aacc0202141cf5a1c0
-  data.tar.gz: ebb6df4bd158ed459c6be065b7974961f7090a4bc7505ff7d53ae62ed64b107e
+  metadata.gz: 10e6548b3a84173f5f3f45a9affc25399639d63ede24fe528ff209713567dee5
+  data.tar.gz: 54a7feb0ef6f669ab1d2fe01e5ec2b0097bde754653575c40b7806ce9ca26ddb
 SHA512:
-  metadata.gz: 29f6c8410a99510761e7c9ee258314d731c8d78b64adec91f42ecb89e99c4a26e949a29f987cf9e421d88071f0425da8ed1e4802d06d29c4167d1e5aa7076e49
-  data.tar.gz: c9bce8b4363d39ea49eb1d8f99a80c92893185dbd28ab860d17ca4035677d5b52b42ae84adf84249885c8c4bb7184eac9aaf21510739885f80a6d43b762ee0a9
+  metadata.gz: ea11b4ac3dfe6d4091a89761fbc434367c432b91ee0ae2e2f18b8d2fc79672e26a1488123f4214589ed1b7be8f2229b41d6df362c73a60d379dacd83f268f91d
+  data.tar.gz: 18632a2434b9081cad43dac618ce37785ac0fe1aa6a2770e09df9ce6a0e016f66c70b31f8b8d8db99a6920f04a3f7634524bcee1e13a1473acce6b4b7bb17c3b

data/app/models/effective/order.rb

@@ -82,7 +82,7 @@ module Effective
       self.state = EffectiveOrders::CONFIRMED if pending? && confirmed_checkout
     end
 
-    with_options(unless: -> { purchased? }) do
+    with_options(unless: -> { done? }) do
       before_validation { assign_email }
       before_validation { assign_user_address }
       before_validation { assign_billing_name }
@@ -105,7 +105,7 @@ module Effective
 
       validate(unless: -> { (free? && EffectiveOrders.free?) || (refund? && EffectiveOrders.refund?) }) do
         if total.present? && total < EffectiveOrders.minimum_charge
-          self.errors.add(:total, "must be $#{'%0.2f' % (EffectiveOrders.minimum_charge.to_i / 100.0)} or more. Please add additional items.")
+          errors.add(:total, "must be $#{'%0.2f' % (EffectiveOrders.minimum_charge.to_i / 100.0)} or more. Please add additional items.")
         end
       end
     end
@@ -139,7 +139,7 @@ module Effective
       validates :payment_provider, presence: true
 
       validate do
-        self.errors.add(:payment_provider, "unknown deferred payment provider") unless EffectiveOrders.deferred_providers.include?(payment_provider)
+        errors.add(:payment_provider, "unknown deferred payment provider") unless EffectiveOrders.deferred_providers.include?(payment_provider)
       end
     end
 
@@ -147,6 +147,10 @@ module Effective
       raise EffectiveOrders::AlreadyPurchasedException.new('cannot unpurchase an order') unless purchased?
     end
 
+    before_save(if: -> { done? }) do
+      raise('cannot change total of a purchased order') if changes[:total].present?
+    end
+
     # Effective::Order.new()
     # Effective::Order.new(Product.first)
     # Effective::Order.new(current_cart)
@@ -390,7 +394,7 @@ module Effective
     end
 
     def done?
-      purchased? || declined?
+      persisted? && (purchased? || declined?)
     end
 
     # A custom order is one that was created by an admin
@@ -641,7 +645,6 @@ module Effective
       EffectiveOrders.send_email(:refund_notification_to_admin, self) if purchased? && refund?
     end
 
-
     protected
 
     def get_tax_rate
@@ -666,11 +669,11 @@ module Effective
     end
 
     def assign_billing_name
-      self.billing_name ||= billing_address.try(:full_name).presence || user.to_s.presence
+      self.billing_name = billing_address.try(:full_name).presence || user.to_s.presence
     end
 
     def assign_email
-      self.email ||= user.try(:email)
+      self.email = user.email if user.try(:email).present?
     end
 
     def assign_user_address
@@ -690,9 +693,9 @@ module Effective
     # This overwrites the prices, taxes, etc on every save.
     def assign_order_totals
       # Copies prices from purchasable into order items
-      present_order_items.each { |oi| oi.assign_purchasable_attributes() }
+      present_order_items.each { |oi| oi.assign_purchasable_attributes }
 
-      # The subtotal
+      # Sum of order item subtotals
       subtotal = present_order_items.map { |oi| oi.subtotal }.sum
 
       self.subtotal = subtotal

data/app/models/effective/order_item.rb

@@ -34,7 +34,7 @@ module Effective
 
     # This method is called in a before_validation in order.assign_order_totals()
     def assign_purchasable_attributes
-      assign_attributes(name: purchasable.name, price: purchasable.price, tax_exempt: purchasable.tax_exempt?) if purchasable
+      assign_attributes(name: purchasable.purchasable_name, price: purchasable.price, tax_exempt: purchasable.tax_exempt) if purchasable
     end
 
     def build_purchasable(atts = {})

data/app/views/admin/orders/edit.html.haml

@@ -1,8 +1,8 @@
 %h1.effective-admin-heading= @page_title
 
-= render 'effective/orders/order_actions', order: @order
+- if @order.custom_order? && @order.in_progress?
+  = render 'effective/orders/order_actions', order: @order
 
-- if @order.custom_order?
   .mb-4
     = collapse('show order') do
       = render 'effective/orders/order', order: @order, no_order_actions: true
@@ -10,4 +10,6 @@
   = render 'admin/orders/form', order: @order
 
 - else
+  - # Same as the show action
   = render 'effective/orders/order', order: @order
+  = render 'admin/orders/form_note_internal', order: @order

data/app/views/effective/orders/_order_actions.html.haml

@@ -7,17 +7,18 @@
       class: 'btn btn-secondary',
       data: { method: :post, confirm: "Send receipt to #{order.emails_send_to}?" }
 
-  - if order.persisted? && order.in_progress? && EffectiveResources.authorized?(controller, :admin, :effective_orders)
-    - if params[:action] == 'show'
-      = link_to('Edit', effective_orders.edit_admin_order_path(order), class: 'btn btn-primary')
+  - if controller_path.include?('admin/') && (EffectiveResources.authorized?(controller, :admin, :effective_orders) rescue false)
+    - if order.persisted? && order.in_progress?
+      - if params[:action] == 'show'
+        = link_to('Edit', effective_orders.edit_admin_order_path(order), class: 'btn btn-primary')
 
-    - if params[:action] == 'edit'
-      = link_to('Show', effective_orders.admin_order_path(order), class: 'btn btn-primary')
+      - if params[:action] == 'edit'
+        = link_to('Show', effective_orders.admin_order_path(order), class: 'btn btn-primary')
 
-    = link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
-      class: 'btn btn-secondary',
-      data: { method: :post, confirm: "Send request for payment to #{order.emails_send_to}?" }
+      = link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
+        class: 'btn btn-secondary',
+        data: { method: :post, confirm: "Send request for payment to #{order.emails_send_to}?" }
 
-    = link_to 'Delete', effective_orders.admin_order_path(order),
-      class: 'btn btn-danger',
-      data: { method: :delete, confirm: "Really delete #{order}?" }
+      = link_to 'Delete', effective_orders.admin_order_path(order),
+        class: 'btn btn-danger',
+        data: { method: :delete, confirm: "Really delete #{order}?" }

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.6.0'.freeze
+  VERSION = '5.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.7.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails