shopify-gold 2.0.3.pre → 2.1.0.pre
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/gold/billing.sass +2 -2
- data/app/controllers/gold/billing_controller.rb +1 -1
- data/app/operations/gold/select_tier_op.rb +1 -1
- data/app/views/gold/admin/billing/_credit.erb +9 -7
- data/app/views/gold/billing/suspended.html.erb +5 -3
- data/app/views/gold/billing/transition_error.html.erb +2 -2
- data/lib/gold/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b60caa1e9a44c3ef0460d4c3e8d9f33f4457b9a550d874fc9196c1c6b79f5d9c
|
|
4
|
+
data.tar.gz: 747ad055581e3256e19a511e18f798bd891f3cb1886f42a4593871816f5c8972
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dda0880c7d55806e387a5dd701b024836abecc64dcf235590e6c902894de2d590ec58de342277eb33dda68aceddf02238a1ecb8b77316e58e3808481cbea1f8b
|
|
7
|
+
data.tar.gz: 686cfa5a32d461053b21050e9b194c3bf0dd53c1398cd1d338d76e132182eae7342c1453c678b5101ae9c23a02003460bb3cb09439b6c8e6febed5be3704db87
|
|
@@ -23,7 +23,7 @@ body
|
|
|
23
23
|
|
|
24
24
|
.main-content
|
|
25
25
|
margin: auto
|
|
26
|
-
max-width:
|
|
26
|
+
max-width: 700px
|
|
27
27
|
|
|
28
28
|
aside
|
|
29
29
|
width: 50%
|
|
@@ -70,7 +70,7 @@ body
|
|
|
70
70
|
flex-wrap: wrap
|
|
71
71
|
|
|
72
72
|
.tier-description
|
|
73
|
-
max-width:
|
|
73
|
+
max-width: 300px
|
|
74
74
|
|
|
75
75
|
@media (max-width: 800px)
|
|
76
76
|
width: 100%
|
|
@@ -53,7 +53,7 @@ module Gold
|
|
|
53
53
|
when SameTier, TierApplied
|
|
54
54
|
redirect_to main_app.root_url
|
|
55
55
|
when CannotSelectTier
|
|
56
|
-
flash.now[:error] = "
|
|
56
|
+
flash.now[:error] = "Your shop is not eligible for this plan"
|
|
57
57
|
render :tier
|
|
58
58
|
when ChargeNeeded
|
|
59
59
|
handle_charge_outcome ChargeOp.new(billing, process_charge_url).call
|
|
@@ -19,7 +19,7 @@ module Gold
|
|
|
19
19
|
return CannotSelectTier.new(:nil) unless @tier
|
|
20
20
|
return CannotSelectTier.new(:locked) if @enforce_locking && @tier.locked?
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
if (@billing.tier != @tier) && !@billing.qualifies_for_tier?(@tier)
|
|
23
23
|
return CannotSelectTier.new(:disqualified)
|
|
24
24
|
end
|
|
25
25
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<% billing.shop.with_shopify_session do %>
|
|
2
|
-
<% credits =
|
|
2
|
+
<% credits = ShopifyAPI::ApplicationCredit.all %>
|
|
3
3
|
<div class="card mb-3">
|
|
4
4
|
<div class="card-header">
|
|
5
5
|
<strong>Credit</strong>
|
|
@@ -15,16 +15,18 @@
|
|
|
15
15
|
</tr>
|
|
16
16
|
</thead>
|
|
17
17
|
<tbody>
|
|
18
|
-
<%
|
|
19
|
-
|
|
20
|
-
<
|
|
18
|
+
<% credits.each do |credit| %>
|
|
19
|
+
<tr>
|
|
20
|
+
<td>
|
|
21
21
|
<%= credit.description %>
|
|
22
22
|
<% if credit.test %>
|
|
23
23
|
<strong>(test)</strong>
|
|
24
24
|
<% end %>
|
|
25
|
-
</
|
|
26
|
-
<
|
|
27
|
-
|
|
25
|
+
</td>
|
|
26
|
+
<td>
|
|
27
|
+
<%= number_to_currency(credit.amount) %>
|
|
28
|
+
</td>
|
|
29
|
+
</tr>
|
|
28
30
|
<% end %>
|
|
29
31
|
</tbody>
|
|
30
32
|
</table>
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
<p class="Polaris-DisplayText Polaris-DisplayText--sizeLarge">
|
|
2
|
-
Your store is currently suspended
|
|
2
|
+
Uh oh! Your store is currently suspended
|
|
3
3
|
</p>
|
|
4
4
|
|
|
5
5
|
<p>
|
|
6
|
-
We have sent you an email about
|
|
7
|
-
|
|
6
|
+
We should have sent you an email about why your store is suspended. Please
|
|
7
|
+
reach out to our
|
|
8
|
+
<a href="mailto:<%= Gold.configuration.contact_email %>">support team</a>
|
|
9
|
+
so we can work with you on a resolution.
|
|
8
10
|
</p>
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<p class="Polaris-DisplayText Polaris-DisplayText--sizeLarge">
|
|
2
|
-
Request failed
|
|
2
|
+
Oops! Request failed
|
|
3
3
|
</p>
|
|
4
4
|
|
|
5
5
|
<p>
|
|
6
6
|
We're sorry, but we couldn't respond to your request. Please
|
|
7
7
|
<a href="<%= shopify_app.logout_path %>" class="Polaris-Link">logout</a>
|
|
8
8
|
and try again in a few minutes. If the problem persists, please reach out to our
|
|
9
|
-
support and we'll get right on it.
|
|
9
|
+
<a class="Polaris-Link" href="mailto:<%= Gold.configuration.contact_email %>">support team</a> and we'll get right on it.
|
|
10
10
|
</p>
|
data/lib/gold/version.rb
CHANGED