effective_orders 5.1.11 → 5.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ceb232058ad48722e375f9ada63ee99219ca2c6e4171ebc4be851dc5218518
-  data.tar.gz: a7ec1aabca5e20e22d834a6d9bca6a3efc277f2b2aabc03f888d274145fbaa80
+  metadata.gz: 436e77b078b12d2931ad0bf50e1f8572bfb6dca3cc7b021e0a867660ddd327c2
+  data.tar.gz: 128a0aece9b52ec31d4e5ff31ddd6a66f5179aeb7078542a5a5561d662745ebd
 SHA512:
-  metadata.gz: d04a7b6902627945ecfae1c56b2133a3dba96b586a6f8eea8b61327de03c84c6e6cddbd374eff1b21d0030625014c5ab0471fb96ea7a37058373853d5be189c4
-  data.tar.gz: 95d763d0f61864d12fc6fde4a27f884af573ac218ea0f4947f7c00e8410308c6fd42d996519eb4b5872d19d79c67ca6ce68c5be1316468be451cf96a5f721213
+  metadata.gz: 9b567e4f3078270590a92a12c4f27326a9c525b30e3ec8b2ed9ab31bc7d34f48b0fbab6a9ba0be8d00da8fd132b5d8032072b58e8c20da74f1e9b4017601b848
+  data.tar.gz: 0127161fde74a4fb97aec8c54ade566fed751e5bfd49f9d694b6a18d64d27bdd020a4106399c11121f1a661e9f127c56368a3771c977586cdf55b542147ffa5e

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/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/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.11'.freeze
+  VERSION = '5.1.12'.freeze
 end

metadata

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