app_manager 1.2.0 → 1.2.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:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bd770dce16b7f6239b4d98067abafbf7701a3dd5b02cd4094b2f264c2ce9d8dd
|
|
4
|
+
data.tar.gz: 466aa7a4aba2811f53b582b0d2fa6dd7b94b2eb0430ef146729214414175ad8c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6d6e415883e4a5e08155776f041da234c099ec0a9c17814be2013d7efafa91263d117046c35b2dd95c4a0809230a637878cb1d9e1f785b385e9f9588269547db
|
|
7
|
+
data.tar.gz: 0d3e02114538f9178a88cfc1e2f30409227852088755121c47dd1648d20bd1919e78228f197c41199ae02f2251fef66953ae6ee560b46389ded1bd555f48088a
|
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
app_manager (1.2.
|
|
4
|
+
app_manager (1.2.1)
|
|
5
5
|
httparty
|
|
6
6
|
kaminari (>= 0.16.3)
|
|
7
7
|
rails (>= 5.2.0)
|
|
@@ -119,7 +119,7 @@ GEM
|
|
|
119
119
|
mime-types-data (3.2022.0105)
|
|
120
120
|
mini_mime (1.1.2)
|
|
121
121
|
mini_portile2 (2.8.0)
|
|
122
|
-
minitest (5.16.
|
|
122
|
+
minitest (5.16.2)
|
|
123
123
|
multi_xml (0.6.0)
|
|
124
124
|
net-imap (0.2.3)
|
|
125
125
|
digest
|
|
@@ -34,7 +34,8 @@ module AppManager
|
|
|
34
34
|
AppManager::EventHandler.new('charge_created',{
|
|
35
35
|
"plan" => plan_data,
|
|
36
36
|
"charge" => nil,
|
|
37
|
-
"previous_charge" => nil
|
|
37
|
+
"previous_charge" => nil,
|
|
38
|
+
"shopify_domain" => params[:shop]
|
|
38
39
|
})
|
|
39
40
|
rescue Exception => e
|
|
40
41
|
Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
|
|
@@ -82,11 +83,11 @@ module AppManager
|
|
|
82
83
|
plan_data = plan_obj.get_plan(params[:plan],params[:shop])
|
|
83
84
|
|
|
84
85
|
charge = charges.parsed_response['recurring_application_charge']
|
|
85
|
-
charge['charge_id'] = charge['id']
|
|
86
|
-
charge['type'] = 'recurring'
|
|
87
|
-
charge['plan_id'] = params[:plan]
|
|
88
|
-
charge['shop_domain'] = params[:shop]
|
|
89
|
-
charge['interval'] = plan_data['interval']['value']
|
|
86
|
+
charge['charge_id'] = charge['id']
|
|
87
|
+
charge['type'] = 'recurring'
|
|
88
|
+
charge['plan_id'] = params[:plan]
|
|
89
|
+
charge['shop_domain'] = params[:shop]
|
|
90
|
+
charge['interval'] = plan_data['interval']['value']
|
|
90
91
|
|
|
91
92
|
if !@plan_field.nil?
|
|
92
93
|
begin
|
|
@@ -107,7 +108,8 @@ module AppManager
|
|
|
107
108
|
AppManager::EventHandler.new('charge_created',{
|
|
108
109
|
"plan" => plan_data,
|
|
109
110
|
"charge" => charge,
|
|
110
|
-
"previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil
|
|
111
|
+
"previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil,
|
|
112
|
+
"shopify_domain" => params[:shop]
|
|
111
113
|
})
|
|
112
114
|
rescue Exception => e
|
|
113
115
|
Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
|
|
@@ -13,6 +13,7 @@ module AppManager
|
|
|
13
13
|
|
|
14
14
|
def plans
|
|
15
15
|
active_plan_id_or_name = shopify_plan = plan = nil
|
|
16
|
+
active_charge = nil
|
|
16
17
|
default_plan_id = nil
|
|
17
18
|
choose_later = false
|
|
18
19
|
plan_obj = AppManager::Client.new
|
|
@@ -30,7 +31,7 @@ module AppManager
|
|
|
30
31
|
@trial_activated_field = AppManager.configuration.field_names['trial_activated_at']
|
|
31
32
|
trial_activated_at = @shop[@trial_activated_field] rescue nil
|
|
32
33
|
active_charge = plan_obj.get_charge(params[:shop_domain])
|
|
33
|
-
if active_charge && active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && trial_activated_at
|
|
34
|
+
if active_charge && active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && !trial_activated_at
|
|
34
35
|
choose_later = true
|
|
35
36
|
end
|
|
36
37
|
|
|
@@ -64,7 +65,8 @@ module AppManager
|
|
|
64
65
|
'shopify_plan' => shopify_plan,
|
|
65
66
|
'plan' => plan,
|
|
66
67
|
'default_plan_id' => default_plan_id,
|
|
67
|
-
'choose_later' => choose_later
|
|
68
|
+
'choose_later' => choose_later,
|
|
69
|
+
'has_active_charge' => (!active_charge['active_charge'].nil? ? true : false)
|
|
68
70
|
}
|
|
69
71
|
render json: response
|
|
70
72
|
end
|
|
@@ -127,12 +129,13 @@ module AppManager
|
|
|
127
129
|
"plan" => plan_data,
|
|
128
130
|
"charge" => nil,
|
|
129
131
|
"previous_charge" => nil,
|
|
130
|
-
"choose_later" => true
|
|
132
|
+
"choose_later" => true,
|
|
133
|
+
"shopify_domain" => params[:shop_domain]
|
|
131
134
|
})
|
|
132
135
|
rescue Exception => e
|
|
133
136
|
Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
|
|
134
137
|
end
|
|
135
|
-
|
|
138
|
+
render json: {'status' => true}
|
|
136
139
|
else
|
|
137
140
|
render json: {'status' => false,'error' => "#{@shop.errors.full_messages.to_sentence}"}, status: 422
|
|
138
141
|
end
|
data/lib/app_manager/version.rb
CHANGED