effective_orders 5.1.9 → 5.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aebed7dcf8c4b8c6e754b4425d407020ab7e3078baa82e0e5ddb10d748041d74
-  data.tar.gz: a834e0574e803ad7af2e568395814a3fc7e2b129953dcc37e52bea17bae1a963
+  metadata.gz: d17fbe687d0cbbb9a8bea76c5a537d26edd929655f7ca620266ea9c9de1935f2
+  data.tar.gz: 49d1e34f960ce258483823bab108460344934bd6d4d3666655e523a56458f729
 SHA512:
-  metadata.gz: b4162e7ec6328b52f4dc36b3a79199966980948cc8dbb9612a460105e4f9682c70586424be157baf897b07f501bff158499e80f3c77ea7f229b3351fa9bc9d61
-  data.tar.gz: 27eff0b3035f2dbaf1e426aa7337a933b8f90ef44e88da04eac4fab0ba77f3d7d8ea3695b6bd3cf6e7d42f933f5186868076e45fb25c66717b1d8e423401883d
+  metadata.gz: e6aca42047832dbf391eeca8ac2f8fb6a896900ccc6e4e418b1463c3814c98f00838be8dcbfe26a2f7a065554f9f89537fbbd02cd1a01ebabdea1fe404a5abfa
+  data.tar.gz: 536e053ad280f5c755524414e1510a7be9cd270166fb50514299125d2a54b8c313ff1fd71265957816fb1a957e446aa51d01ea70cd439aa3effc0e8fa87ee1f9

data/app/mailers/effective/orders_mailer.rb

@@ -43,7 +43,7 @@ module Effective
         @order = (order_param.kind_of?(Effective::Order) ? order_param : Effective::Order.find(order_param))
         @user = @order.user
 
-        @subject = subject_for(@order, :payment_request_to_buyer, "Request for Payment: Invoice ##{@order.to_param}")
+        @subject = subject_for(@order, :payment_request_to_buyer, "Payment request - Order ##{@order.to_param}")
 
         mail({to: @order.email, cc: @order.cc, subject: @subject}.compact)
       end

data/app/models/effective/order.rb

@@ -265,14 +265,30 @@ module Effective
     end
 
     def label
-      if refund?
-        "Refund"
+      if refund? && purchased?
+        'Refund'
       elsif purchased?
-        "Receipt"
-      elsif pending?
-        "Pending Order"
+        'Receipt'
+      elsif refund? && (pending? || confirmed?)
+        'Pending Refund'
+      elsif (pending? || confirmed?)
+        'Pending Order'
       else
-        "Order"
+        'Order'
+      end
+    end
+
+    def total_label
+      if refund? && purchased?
+        'Total Paid'
+      elsif purchased?
+        'Total Paid'
+      elsif refund? && (pending? || confirmed?)
+        'Total Due'
+      elsif (pending? || confirmed?)
+        'Total Due'
+      else
+        'Total'
       end
     end
 

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

@@ -6,7 +6,7 @@
 
   - if order.purchased?
     = dropdown_link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
-      data: { confirm: "Send receipt to #{order.emails_send_to}?" }
+      data: { method: :post, confirm: "Send receipt to #{order.emails_send_to}?" }
 
   - if order.pending? || order.confirmed? || order.deferred?
     = dropdown_link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),

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

@@ -5,7 +5,7 @@
   - if order.purchased?
     = link_to 'E-mail Receipt', effective_orders.send_buyer_receipt_order_path(order),
       class: 'btn btn-secondary',
-      data: { confirm: "Send receipt to #{order.emails_send_to}?" }
+      data: { method: :post, confirm: "Send receipt to #{order.emails_send_to}?" }
 
   - if order.persisted? && EffectiveResources.authorized?(controller, :admin, :effective_orders)
     - if order.pending? || order.confirmed? || order.deferred?

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

@@ -62,11 +62,6 @@
             %th.download
 
           %th.total
-            - if order.pending?
-              Amount Due
-            - elsif order.purchased?
-              Amount Paid
-            - else
-              Total
+            = order.total_label
 
           %td.price.total-price= price_to_currency(order.total)

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

@@ -5,10 +5,7 @@
       = order.refund? ? 'Complete Refund' : 'Mark as Paid'
 
     = effective_form_with(model: order, url: effective_orders.mark_as_paid_order_path(order), method: :post) do |f|
-      - if order.refund?
-        = f.hidden_field :purchased_at, value: Time.zone.now
-      - else
-        = f.date_field :purchased_at, required: true
+      = f.hidden_field :purchased_at, value: Time.zone.now
 
       = f.select :payment_provider, EffectiveOrders.payment_providers, required: true
 

data/config/routes.rb

@@ -5,7 +5,7 @@ EffectiveOrders::Engine.routes.draw do
         get :purchased
         get :deferred
         get :declined
-        get :send_buyer_receipt
+        post :send_buyer_receipt
 
         post :free
         post :mark_as_paid

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.9'.freeze
+  VERSION = '5.1.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.1.9
+  version: 5.1.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails