effective_orders 6.7.0 → 6.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b95b58112e836a932ba93507f74ab11a551110d5e656100be363fef929dff4f
-  data.tar.gz: baa58804ceab0264a4f87b9c97c1268c90a765d5d1d3bc86e224b6ec2e558982
+  metadata.gz: cf1784e619c52695ef3be94dfd8ed164c5c6b0f81e2a853239ba5963e916ee14
+  data.tar.gz: ef0eeb3c19bd456a8d806dfb0ea2963b06b0a2786ce2e7d0f0071c261ed61162
 SHA512:
-  metadata.gz: a4bd65c532f86d5eeb602a4699ff87922f010137825bcfa960f82584f33fd61bb5d7f2db962fdbc93c7044c076597ee677e84b9285909a24d99864f192d8c360
-  data.tar.gz: fe9c072ee1aad78d10216fa930faafe7ebd569b21488347c674c9dc34fe590f23352e6a3820701df89d4366b869cc26d007c94bc2155d4bf4bf162bbb6db20e0
+  metadata.gz: dba9ec63003ed63c5b40ea9aae431c42ea55d11eb496acfe9154e07e5ecdc5ab41f7b37be0b6ab1d65747bc7515b77fc342cb841491c714aab238d7c5d0f182b
+  data.tar.gz: 5b809f63ee1cb262688f69f274b79519711b7a8fc5eec2028fdc76aa1fcb579bd78bd6aac681227947e86ea43737f54693889aac79d82237a145ab4ed32316d7

data/app/controllers/effective/providers/moneris_checkout.rb

@@ -22,6 +22,11 @@ module Effective
           )
         end
 
+        if payment['card_type'].present?
+          active_card = "**** **** **** #{payment['first6last4'].to_s.last(4)} #{payment['card_type']} #{payment['expiry_date'].to_s.first(2)}/#{payment['expiry_date'].to_s.last(2)}"
+          payment = payment.except('first6last4').merge('active_card' => active_card)
+        end
+
         order_purchased(
           payment: payment,
           provider: 'moneris_checkout',

data/app/models/concerns/acts_as_purchasable.rb

@@ -54,6 +54,9 @@ module ActsAsPurchasable
 
     scope :purchased_by, lambda { |user| joins(order_items: :order).where(orders: { purchased_by: user, status: :purchased }).distinct }
     scope :not_purchased_by, lambda { |user| where.not(id: purchased_by(user)) }
+
+    scope :purchased_or_deferred, -> { joins(order_items: :order).where(orders: { status: [:purchased, :deferred] }) }
+    scope :deferred, -> { joins(order_items: :order).where(orders: { status: :deferred }) }
   end
 
   module ClassMethods

data/app/models/effective/order.rb

@@ -103,7 +103,10 @@ module Effective
     scope :sorted, -> { order(:id) }
 
     scope :purchased, -> { where(status: :purchased) }
+    scope :purchased_or_deferred, -> { where(status: [:purchased, :deferred]) }
+
     scope :purchased_by, lambda { |user| purchased.where(user: user) }
+
     scope :not_purchased, -> { where.not(status: [:purchased, :deferred]) }
     scope :was_not_purchased, -> { where.not(status: :purchased) }
 
@@ -406,6 +409,10 @@ module Effective
         payment[:active_card][15,4]
       end
 
+      last4 ||= if payment['active_card'] && payment['active_card'].include?('**** **** ****')
+        payment['active_card'][15,4]
+      end
+
       # stripe, moneris, moneris_checkout
       last4 ||= (payment['f4l4'] || payment['first6last4']).to_s.last(4)
 

data/app/models/effective/tax_rate_calculator.rb

@@ -30,14 +30,14 @@ module Effective
       country = country_code
       state = state_code
 
-      if order.present? && order.billing_address.present?
-        country ||= order.billing_address.country_code
-        state ||= order.billing_address.state_code
-      end
-
-      if order.present? && order.user.respond_to?(:billing_address) && order.user.billing_address.present?
-        country ||= order.user.billing_address.country_code
-        state ||= order.user.billing_address.state_code
+      if order.present?
+        country ||= order.billing_address.try(:country_code)
+        country ||= order.organization.try(:billing_address).try(:country_code)
+        country ||= order.user.try(:billing_address).try(:country_code)
+
+        state ||= order.billing_address.try(:state_code)
+        state ||= order.organization.try(:billing_address).try(:state_code)
+        state ||= order.user.try(:billing_address).try(:state_code)
       end
 
       rate = RATES[country]

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

@@ -9,5 +9,5 @@
       %tbody
         %tr
           %td= price_to_currency(order.total)
-          %td= order.purchased_at.strftime('%b %d, %Y')
+          %td= order.purchased_at.in_time_zone(Time.zone).strftime('%b %d, %Y')
           %td= order.payment_method

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.7.0'.freeze
+  VERSION = '6.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.7.0
+  version: 6.7.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails