effective_orders 6.17.1 → 6.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1694915aa5c646859677437bf8eef6227c2301dd850928cb4d7c179fcf74a17a
-  data.tar.gz: 702d26261725a04e5ef44ae247aa98719204f2090d99f0e7326ec91422f792a2
+  metadata.gz: '0559a1dd68e0c43937ccf7a6e13c0f4e8f54c0bf79382744a360f5151b613340'
+  data.tar.gz: 1ae3981f93b86d70bc6706b7688351d3ea555aa9700265e9dc62616eb449f96c
 SHA512:
-  metadata.gz: eace5c4d6ab80404524a861323b58dff8e7f84af4714ec3001eb29724faf545dda03312a5c92b362364512e93113051c601428455a43689be8912d0318192a96
-  data.tar.gz: c63d78cc2e5e97c66f4995124753722bcd55ba7ed7edc2b28ccf58bf62dc710ad02298339fc8935fc115284efabffda2ac5280ee971ed5d8b88054a134b90ddf
+  metadata.gz: 4e44abc94fabf240ca5d7c8d446c362f2aca1e59afffc55724753471499acec7fb9bf52d6e6a78469a7763f820c659dfb4a033a80bc09f6452d498fce9283b80
+  data.tar.gz: c648c5762abbb8b39842e1424a78631e614128404ffe73859232bc350d619ba4df5a5da1e22f3632bf357b94b4a8dd66ece50d1b080272903f5b124a500684ed

data/app/models/effective/order.rb

@@ -935,7 +935,13 @@ module Effective
     protected
 
     def get_subtotal
-      present_order_items.map { |oi| oi.subtotal }.sum
+      subtotal = present_order_items.map { |oi| oi.subtotal }.sum
+
+      if subtotal.to_i < 0 && EffectiveOrders.no_refund?
+        return 0 
+      end
+
+      subtotal
     end
 
     def get_tax_rate
@@ -950,7 +956,14 @@ module Effective
 
     def get_tax
       return 0 unless tax_rate.present?
-      present_order_items.reject { |oi| oi.tax_exempt? }.map { |oi| (oi.subtotal * (tax_rate / 100.0)).round(0).to_i }.sum
+
+      tax = present_order_items.reject { |oi| oi.tax_exempt? }.map { |oi| (oi.subtotal * (tax_rate / 100.0)).round(0).to_i }.sum
+
+      if tax.to_i < 0 && EffectiveOrders.no_refund?
+        return 0 
+      end
+
+      tax
     end
 
     def get_amount_owing

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

@@ -4,7 +4,7 @@
 
     %p 
       = succeed('.') do
-        - distance = distance_of_time_in_words(Time.zone.now, order.delayed_payment_date)
+        - distance = distance_of_time_in_words(Time.zone.now, order.delayed_payment_date.beginning_of_day)
 
         The payment date for this order
 

data/app/views/effective/orders/delayed/_form_purchase.html.haml

@@ -9,7 +9,7 @@
 
     %p 
       = succeed('.') do
-        - distance = distance_of_time_in_words(Time.zone.now, order.delayed_payment_date)
+        - distance = distance_of_time_in_words(Time.zone.now, order.delayed_payment_date.beginning_of_day)
 
         The payment date for this order
 

data/config/effective_orders.rb

@@ -242,6 +242,8 @@ EffectiveOrders.setup do |config|
   # config.buyer_purchases_refund = false
   # config.send_refund_notification_to_admin = false
   #
+  # If you set config.refund = false, Negative order price is set to $0. Can checkout free.
+  #
   # You can call order.send_refund_notification! directly or implement a better one in your app
   config.refund = false
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.17.1'.freeze
+  VERSION = '6.18.0'.freeze
 end

data/lib/effective_orders.rb

@@ -127,6 +127,10 @@ module EffectiveOrders
     refund.kind_of?(Hash)
   end
 
+  def self.no_refund?
+    !refund?
+  end
+
   def self.buyer_purchases_refund?
     buyer_purchases_refund == true
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.17.1
+  version: 6.18.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails