effective_orders 5.6.1 → 5.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9916dc95644358778cbf90e9fd1901470b4212af2e17dc57bbc417d56c6d68bd
-  data.tar.gz: 59ee98077944da2d2b2d60f017b605ddc232828d141480e607e6594643dc72a7
+  metadata.gz: 1ed47eb29f0eb40e2b50f31007a7c7d27c01a0d511e2b5a0de59c4677a2d19c3
+  data.tar.gz: c9f86388847d98ff584118155e14cf783431be89a4a18d8b81d8ea8446c44d10
 SHA512:
-  metadata.gz: cae30e352a619e635506bc5c94f941f76b0b7d7bfa9d60a289fc7f1315bb9bcdf5959e0f6d05e35687152bfe5085bf44cfb3b875f819bac75464c70b5e61cf56
-  data.tar.gz: 6f00eced041af3ba59e122676059845cad7728cac6b08404dfd09fea324c37bc6e62435a981eb7cc32a0787e0e90a30c2584361008d07cea5aa71a5009428b2f
+  metadata.gz: a654abd31e39c1e933136279289b77ba9b8afe33c56f3d5b745d73c9c85e15c0316d597a25093a0b987bcb135b1e9c4ca7d37719db3615f9a0718f25fc7adc39
+  data.tar.gz: b67584c4477f8012fd50f988e535a22591bd52a38d76e5db065ce68f3bc279ab11bdd9436ba86b0153e637788c9667895ac0ff93a7bc975d1d0842693fcbfb50

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/views/admin/orders/_form.html.haml

@@ -1,8 +1,9 @@
 = effective_form_with(model: [:admin, order], engine: true) do |f|
   = f.hidden_field :user_type, value: (f.object.user || current_user).class.name
 
-  - collection = (@users || current_user.class.try(:sorted) || current_user.class.all)
-  = f.select :user_id, collection, label: 'Buyer', required: true, hint: 'The user that should purchase this order.'
+  = f.select :user_id, current_user.class.all, label: 'Buyer', required: true,
+    ajax_url: effective_resources.users_admin_select2_ajax_index_path,
+    hint: 'The user that should purchase this order.'
 
   = f.email_cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
 

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.1'.freeze
+  VERSION = '5.7.1'.freeze
 end

metadata

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