effective_orders 6.15.0 → 6.16.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0b08f45584d4d140c41e019bde939d75ae38b5e95bc0ae46da885f2209b9ee0b
4
- data.tar.gz: e20642203408a7b2549ff3407c5a20ca955d0bbd3fb76db696ee397307426792
3
+ metadata.gz: ffa33665fa5af04954108d70f64895af61c92aa692fcf51ed66c8468fa1498bf
4
+ data.tar.gz: 3d96ecf58a32a0b4e4b54497d598382feda33eee72179f92db2d76d8362afda4
5
5
  SHA512:
6
- metadata.gz: 42bcfa092afb097f92f949ac8bd7aa61fc623a1b5b3b857410d696bcb02bb1911a78eadbd222365e1e5e8b56a6b302e6038e81a4c5d2f0d9b3606bf5c5e3b4cf
7
- data.tar.gz: 9f0e6c8f7de1243e537186ba8f78bbc89d0c096d2d84eb5340fc1d1757083fdfe8e1e91423cb627193960e8f92919bf3061810143ea1d1b08d6e953c0c4641a2
6
+ metadata.gz: bbbfd9685c8460f66e4b99bcc77e3be6b4bbbf9c429a5d10825347bb059edc68ac7895e853e01ea46ed23a49f5b9febee15997d6f0c10a6b5f7817bad92e12ce
7
+ data.tar.gz: 15fa6f23120b52cbb7c80bef5f860e272bcc6f6933eeef3ad0579a7156f9d7059bfa0dde7b28c15fb347fe99b1e3e48d92499d6a42619472faca36cc6a748d4e
@@ -1,7 +1,7 @@
1
1
  = effective_form_with(model: [:admin, order], engine: true) do |f|
2
2
  -# User
3
3
  - klass = (f.object.user || current_user).class
4
- - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
4
+ - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
5
5
 
6
6
  = f.hidden_field :user_type, value: klass.name
7
7
  = f.select :user_id, klass.all, ajax_url: ajax_url
@@ -9,7 +9,7 @@
9
9
  -# Organization
10
10
  - if EffectiveOrders.organization_enabled?
11
11
  - klass = (f.object.organization || EffectiveOrders.Organization.new).class
12
- - ajax_url = (@select2_organizations_ajax_path || effective_resources.organizations_admin_select2_ajax_index_path) unless Rails.env.test?
12
+ - ajax_url = (effective_resources.organizations_effective_ajax_index_path unless Rails.env.test?)
13
13
 
14
14
  = f.hidden_field :organization_type, value: klass.name
15
15
  = f.select :organization_id, klass.all, ajax_url: ajax_url
@@ -41,7 +41,7 @@
41
41
  %p.my-4.text-center - or -
42
42
  = render partial: '/effective/orders/deferred/form', locals: provider_locals
43
43
 
44
- - if EffectiveResources.authorized?(controller, :admin, :effective_orders) && order.user != current_user
44
+ - if EffectiveResources.authorized?(controller, :admin, :effective_orders) && controller_path.include?('admin/') && order.user != current_user
45
45
  - if EffectiveOrders.delayed? && order.delayed? && order.deferred?
46
46
  .effective-order-admin-purchase-actions
47
47
  = render partial: '/effective/orders/delayed/form_purchase', locals: provider_locals
@@ -8,6 +8,16 @@
8
8
  %tr
9
9
  %td
10
10
  - if order.delayed?
11
- Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime('%F')}
11
+ %p Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime('%F')}
12
12
  - else
13
- Waiting for payment by #{order.payment_provider}
13
+ %p Waiting for payment by #{order.payment_provider}
14
+
15
+ - if order.payment_provider == "etransfer" && (EffectiveOrders.etransfer[:success] rescue false).present?
16
+ %p= EffectiveOrders.etransfer[:success].html_safe
17
+
18
+ - if order.payment_provider == "cheque" && (EffectiveOrders.cheque[:success] rescue false).present?
19
+ %p= EffectiveOrders.cheque[:success].html_safe
20
+
21
+ - if order.payment_provider == "phone" && (EffectiveOrders.phone[:success] rescue false).present?
22
+ %p= EffectiveOrders.phone[:success].html_safe
23
+
@@ -1,3 +1,3 @@
1
1
  module EffectiveOrders
2
- VERSION = '6.15.0'.freeze
2
+ VERSION = '6.16.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_orders
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.15.0
4
+ version: 6.16.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-10-03 00:00:00.000000000 Z
11
+ date: 2024-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails