effective_orders 5.1.7 → 5.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 642b6831172be548e28cec2adf8c2f13f75ec9ef9af0e1cb15ee48cb763e3edc
-  data.tar.gz: ce4111bbaf7d8fb7a50e16c7ff8a0a43ae412586d2c7063a9c6e910d1337fbc4
+  metadata.gz: d4ceb232058ad48722e375f9ada63ee99219ca2c6e4171ebc4be851dc5218518
+  data.tar.gz: a7ec1aabca5e20e22d834a6d9bca6a3efc277f2b2aabc03f888d274145fbaa80
 SHA512:
-  metadata.gz: a7e2f6adabe417e43819f95c46e12dcc2c36680c82bedc870041a7665a700428428888927eb35b1dca18ab89d3d695b03183edc3cb35be3e1406f3befa0eee80
-  data.tar.gz: 5650b3ed6960e16d3c630be6697ab9fe69084122a543f2cbbfec875a6defa3fefeb0bb19655affcaadbb4b15e074d5191579aead15107a91f447b401ae31f2aa
+  metadata.gz: d04a7b6902627945ecfae1c56b2133a3dba96b586a6f8eea8b61327de03c84c6e6cddbd374eff1b21d0030625014c5ab0471fb96ea7a37058373853d5be189c4
+  data.tar.gz: 95d763d0f61864d12fc6fde4a27f884af573ac218ea0f4947f7c00e8410308c6fd42d996519eb4b5872d19d79c67ca6ce68c5be1316468be451cf96a5f721213

data/app/models/effective/order.rb

@@ -72,7 +72,7 @@ module Effective
     before_validation { assign_user_address }
 
     before_validation(if: -> { confirmed_checkout }) do
-      self.state = EffectiveOrders::CONFIRMED if pending?
+      assign_attributes(state: EffectiveOrders::CONFIRMED) if pending?
     end
 
     before_save(if: -> { state_was == EffectiveOrders::PURCHASED }) do
@@ -143,6 +143,7 @@ module Effective
     scope :confirmed, -> { where(state: EffectiveOrders::CONFIRMED) }
     scope :deferred, -> { where(state: EffectiveOrders::DEFERRED) }
     scope :declined, -> { where(state: EffectiveOrders::DECLINED) }
+    scope :abandoned, -> { where(state: EffectiveOrders::ABANDONED) }
     scope :refunds, -> { purchased.where('total < ?', 0) }
 
     # Effective::Order.new()
@@ -334,6 +335,10 @@ module Effective
       state == EffectiveOrders::DECLINED
     end
 
+    def abandoned?
+      state == EffectiveOrders::ABANDONED
+    end
+
     def purchasables
       order_items.map { |order_item| order_item.purchasable }
     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_notes.html.haml

@@ -11,7 +11,7 @@
       %tbody
         %tr
           - if order.note.present?
-            %td= order.note
+            %td= simple_format(order.note)
 
           - if order.note_to_buyer.present?
-            %td= order.note_to_buyer
+            %td= simple_format(order.note_to_buyer)

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

@@ -1,9 +1,14 @@
 .card
   .card-body
-    %h2 Admin: Mark as Paid
+    %h2
+      Admin:
+      = 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.date_field :purchased_at, required: true
+      - if order.refund?
+        = f.hidden_field :purchased_at, value: Time.zone.now
+      - else
+        = f.date_field :purchased_at, required: true
 
       = f.select :payment_provider, EffectiveOrders.payment_providers, required: true
 
@@ -21,4 +26,4 @@
 
       = f.text_area :note_to_buyer, hint: 'This message will be displayed on the receipt.'
 
-      = f.submit order_checkout_label(:mark_as_paid), center: true
+      = f.submit 'Admin: ' + order_checkout_label(order.refund? ? :refund : :mark_as_paid)

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.7'.freeze
+  VERSION = '5.1.11'.freeze
 end

data/lib/effective_orders.rb

@@ -10,7 +10,16 @@ module EffectiveOrders
   DEFERRED = 'deferred'      # Deferred providers. Cheque or Phone was selected.
   PURCHASED = 'purchased'    # Purchased by provider
   DECLINED = 'declined'      # Declined by provider
-  STATES = { PENDING => PENDING, CONFIRMED => CONFIRMED, DEFERRED => DEFERRED, PURCHASED => PURCHASED, DECLINED => DECLINED }
+  ABANDONED = 'abandoned'    # Not set by this gem. Can be set outside it.
+
+  STATES = {
+    PENDING => PENDING,
+    CONFIRMED => CONFIRMED,
+    DEFERRED => DEFERRED,
+    PURCHASED => PURCHASED,
+    DECLINED => DECLINED,
+    ABANDONED => ABANDONED
+  }
 
   # Subscription statuses (as per stripe)
   ACTIVE = 'active'

metadata

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