effective_orders 5.8.1 → 5.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e5e07bb9f141ffa7bfc4b43417e8cb1aedc08768e02c9b5dafb63d1434a40e
-  data.tar.gz: aa819e0ad7f7d949abe6510b74c8a614f0639e9a2f3727c18f8350b264b6bc86
+  metadata.gz: 88341609720b1eea6a41fbe9aef2556b14791e12072e195f966d17460355d26d
+  data.tar.gz: dcb1636b46c9b788a925e36708f6d1aebb433424eaac25657773bc4e04aba6e4
 SHA512:
-  metadata.gz: b93e4a1ec80c04b9e507157feb1a92c6443b22d5729800cffca1bcf2f2c52aab4a484e667e31798b8a3d165462bff4454a3099c81818b015b546f708bd5fc3ad
-  data.tar.gz: cd59f3b82d0bc1500ab9b64bf2a0e8789d0dda0bc12cc6f9f068e15e071881b3b61fca7f2f32c954d63e764b68ea6649f14418a2de35d9bfa4cb3a7970139840
+  metadata.gz: b23cfd1c483fae1ed2387ce838b8cace69bbde2c925bb97057c4e1b58836f0f50b65b2e523de335ff856295b49125c5e68ddf93f9a0eb159a2728e4dd48d8550
+  data.tar.gz: 8db2613a663b3ed0fb929f717ba95a04470fdbbe1d836823650c6294e4d7f0021922b62a8ed0afa3a2da9dc8f35517ec4708041d40d567c16a44ac3f261b75f4

data/app/models/effective/order.rb

@@ -524,7 +524,7 @@ module Effective
 
         payment_provider: provider,
         payment_card: (card.presence || 'none'),
-        purchased_at: Time.zone.now,
+        purchased_at: (purchased_at.presence || Time.zone.now),
         payment: payment_to_h(payment)
       )
 

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

@@ -5,17 +5,19 @@
       = 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|
-      = f.hidden_field :purchased_at, value: Time.zone.now
+      .row
+        .col-6
+          = f.select :payment_provider, EffectiveOrders.admin_payment_providers, required: true
 
-      = f.select :payment_provider, EffectiveOrders.admin_payment_providers, required: true
+          = f.text_field :payment_card,
+            label: 'Payment card type, cheque, e-transfer or transaction number',
+            hint: 'Do not enter credit card numbers here, or anywhere.'
 
-      = f.text_field :payment_card,
-        label: 'Payment card type, cheque, e-transfer or transaction number',
-        hint: 'Do not enter credit card numbers here, or anywhere.'
+          = f.datetime_field :purchased_at
 
-      = f.check_box :send_mark_as_paid_email_to_buyer,
-        label: 'Yes, send a receipt email to the buyer.',
-        input_html: { checked: (f.object.send_mark_as_paid_email_to_buyer.nil? ? EffectiveOrders.send_order_receipts_when_mark_as_paid : f.object.send_mark_as_paid_email_to_buyer?) }
+          = f.check_box :send_mark_as_paid_email_to_buyer,
+            label: 'Yes, send a receipt email to the buyer.',
+            input_html: { checked: (f.object.send_mark_as_paid_email_to_buyer.nil? ? EffectiveOrders.send_order_receipts_when_mark_as_paid : f.object.send_mark_as_paid_email_to_buyer?) }
 
       .row
         .col

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.8.1'.freeze
+  VERSION = '5.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.8.1
+  version: 5.8.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails