kaui 4.0.1 → 4.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/kaui/sessions_controller.rb +6 -1
- data/app/views/kaui/accounts/_billing_details.html.erb +3 -2
- data/app/views/kaui/accounts/_billing_info.html.erb +4 -1
- data/app/views/kaui/accounts/index.html.erb +3 -3
- data/app/views/kaui/admin_tenants/show.html.erb +2 -0
- data/app/views/kaui/invoices/show.html.erb +31 -28
- data/app/views/kaui/payments/show.html.erb +29 -26
- data/app/views/kaui/sessions/_form.html.erb +2 -2
- data/config/locales/devise.en.yml +12 -12
- data/lib/kaui/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e7cbe8cab6b7967577eb779077021684be2ca3dce7e68bc12fa8c8cbfc14fcf4
|
|
4
|
+
data.tar.gz: e30c6f225929c287c251874fc22fd66cf25e71177efcc251a5c2842671b87024
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dc2a8a66d733b76cab4e92be0b9351e6d4f36831463ed4f8e4e6e83cbfd0a3d0c888cbc5978ee9811713ea36bd9a57f4a063eda25141cdeec0383fd2734d1659
|
|
7
|
+
data.tar.gz: ddad13b0ee0fe86eafd53b705a1b220acff07215826ee3483d6ddc7b164a0e3a7b7c8308edc7df55f8455b7337bbff884ad559f8f52078fdce086b375e77bbd0
|
|
@@ -11,6 +11,11 @@ module Kaui
|
|
|
11
11
|
|
|
12
12
|
# The sign-in flow eventually calls authenticate! from config/initializers/killbill_authenticatable.rb
|
|
13
13
|
|
|
14
|
+
def new
|
|
15
|
+
flash.delete(:alert) if flash[:alert] == I18n.t('devise.failure.unauthenticated') && (stored_location_for(:user).nil? || flash[:notice].present?)
|
|
16
|
+
super
|
|
17
|
+
end
|
|
18
|
+
|
|
14
19
|
rescue_from(StandardError) do |exception|
|
|
15
20
|
Rails.logger.error(exception.message)
|
|
16
21
|
Rails.logger.error(exception.backtrace.join("\n")) if exception.backtrace
|
|
@@ -29,7 +34,7 @@ module Kaui
|
|
|
29
34
|
|
|
30
35
|
def after_sign_out_path_for(_resource)
|
|
31
36
|
cookies.delete(:jwt_token)
|
|
32
|
-
|
|
37
|
+
new_user_session_path
|
|
33
38
|
end
|
|
34
39
|
|
|
35
40
|
def require_no_authentication
|
|
@@ -161,8 +161,9 @@
|
|
|
161
161
|
} %>
|
|
162
162
|
</div>
|
|
163
163
|
<div class="form-check">
|
|
164
|
-
<%=
|
|
165
|
-
<%=
|
|
164
|
+
<%= hidden_field_tag :dry_run, '1' %>
|
|
165
|
+
<%= check_box_tag :dry_run_checkbox, '1', true, :disabled => !can?(:trigger, Kaui::Invoice), class: 'form-check-input', id: 'dry_run_checkbox', onchange: "document.getElementById('dry_run').value = this.checked ? '1' : '0';" %>
|
|
166
|
+
<%= label_tag :dry_run_checkbox, 'Dry-run', class: 'form-check-label' %>
|
|
166
167
|
</div>
|
|
167
168
|
<% end %>
|
|
168
169
|
</div>
|
|
@@ -120,7 +120,10 @@
|
|
|
120
120
|
</div>
|
|
121
121
|
<div style="width: 14.5%; float: left; padding: 0;">
|
|
122
122
|
<%= label_tag :dry_run do %>
|
|
123
|
-
|
|
123
|
+
<% dry_run_checked = true %>
|
|
124
|
+
<% dry_run_disabled = !can?(:trigger, Kaui::Invoice) %>
|
|
125
|
+
<%= hidden_field_tag :dry_run, '1' %>
|
|
126
|
+
<%= check_box_tag :dry_run_checkbox, '1', dry_run_checked, :disabled => dry_run_disabled, :onchange => "document.getElementById('dry_run').value = this.checked ? '1' : '0';" %> <small>Dry-run</small>
|
|
124
127
|
<% end %>
|
|
125
128
|
</div>
|
|
126
129
|
<div class="col-xs-1" style="padding: 0;">
|
|
@@ -35,14 +35,14 @@
|
|
|
35
35
|
variant: "outline-secondary",
|
|
36
36
|
id: "dropdownMenu1"
|
|
37
37
|
},
|
|
38
|
-
{
|
|
38
|
+
(can?(:create, Kaui::Account) ? {
|
|
39
39
|
label: "Create Account",
|
|
40
40
|
icon: 'kaui/plus.svg',
|
|
41
41
|
path: kaui_engine.new_account_path,
|
|
42
42
|
html_class: "kaui-dropdown custom-hover",
|
|
43
43
|
variant: "outline-secondary"
|
|
44
|
-
}
|
|
45
|
-
]
|
|
44
|
+
} : nil)
|
|
45
|
+
].compact
|
|
46
46
|
} %>
|
|
47
47
|
|
|
48
48
|
<div id="search-labels-container" class="ml-2">
|
|
@@ -1,16 +1,21 @@
|
|
|
1
1
|
<div class="kaui-container invoice-show">
|
|
2
2
|
|
|
3
3
|
<%= render "kaui/components/breadcrumb/breadcrumb" %>
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
4
|
+
|
|
5
|
+
<div class="d-flex" style="gap: 4rem;">
|
|
6
|
+
<%= render :template => 'kaui/layouts/kaui_account_sidebar' %>
|
|
7
|
+
|
|
8
|
+
<div class="w-100">
|
|
9
|
+
<div class="invoice">
|
|
10
|
+
<div class="d-flex flex-column ">
|
|
11
|
+
<div class="invoice-header mb-4">
|
|
12
|
+
<div class="d-flex align-items-center">
|
|
13
|
+
<h2>
|
|
14
|
+
Invoice
|
|
15
|
+
<%= @invoice.invoice_number %>
|
|
16
|
+
|
|
17
|
+
</h2>
|
|
18
|
+
</div>
|
|
14
19
|
<% dry_run = @invoice.invoice_number.blank? %>
|
|
15
20
|
<% if dry_run %>
|
|
16
21
|
<div class="alert alert-warning">
|
|
@@ -176,21 +181,17 @@
|
|
|
176
181
|
</div>
|
|
177
182
|
|
|
178
183
|
<%= render :partial => 'kaui/invoices/invoice_table', :locals => {:dry_run => dry_run} %>
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
<h2>Payment Details</h2>
|
|
191
|
-
</div>
|
|
192
|
-
<span>
|
|
193
|
-
<% if payment.capturable? || payment.voidable? || (payment.refundable? && (can?(:refund, Kaui::Payment) || can?(:chargeback, Kaui::Payment))) %>
|
|
184
|
+
|
|
185
|
+
<% unless @payments.empty? %>
|
|
186
|
+
<% @payments.each_with_index do |payment, idx| %>
|
|
187
|
+
<div class="mt-4">
|
|
188
|
+
<div class="d-flex flex-column ">
|
|
189
|
+
<div class="invoice-header mb-4">
|
|
190
|
+
<div class="d-flex align-items-center">
|
|
191
|
+
<h2>Payment Details</h2>
|
|
192
|
+
</div>
|
|
193
|
+
<span>
|
|
194
|
+
<% if payment.capturable? || payment.voidable? || (payment.refundable? && (can?(:refund, Kaui::Payment) || can?(:chargeback, Kaui::Payment))) %>
|
|
194
195
|
|
|
195
196
|
|
|
196
197
|
<div class="tag-select-box">
|
|
@@ -383,11 +384,13 @@
|
|
|
383
384
|
<hr class="breathe"/>
|
|
384
385
|
<% end %>
|
|
385
386
|
|
|
386
|
-
|
|
387
|
+
</div>
|
|
388
|
+
</div>
|
|
389
|
+
<% end %>
|
|
390
|
+
<% end %>
|
|
387
391
|
</div>
|
|
388
|
-
<% end %>
|
|
389
392
|
</div>
|
|
390
|
-
|
|
393
|
+
</div>
|
|
391
394
|
|
|
392
395
|
<%= javascript_tag do %>
|
|
393
396
|
function disableLinks() {
|
|
@@ -2,13 +2,18 @@
|
|
|
2
2
|
|
|
3
3
|
<div class="kaui-container payments-show">
|
|
4
4
|
<%= render "kaui/components/breadcrumb/breadcrumb" %>
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
<
|
|
5
|
+
|
|
6
|
+
<div class="d-flex" style="gap: 4rem;">
|
|
7
|
+
<%= render :template => 'kaui/layouts/kaui_account_sidebar' %>
|
|
8
|
+
|
|
9
|
+
<div class="w-100">
|
|
10
|
+
<div class="payments">
|
|
11
|
+
<div class="d-flex flex-column ">
|
|
12
|
+
<div class="payments-header mb-4">
|
|
13
|
+
<div class="d-flex align-items-center">
|
|
14
|
+
<h2>Payment <%= @payment.payment_number %></h2>
|
|
15
|
+
</div>
|
|
16
|
+
<span>
|
|
12
17
|
<% if @payment.capturable? || @payment.voidable? || (@payment.refundable? && (can?(:refund, Kaui::Payment) || can?(:chargeback, Kaui::Payment))) %>
|
|
13
18
|
|
|
14
19
|
|
|
@@ -212,29 +217,27 @@
|
|
|
212
217
|
:payment => @payment,
|
|
213
218
|
:account => @account,
|
|
214
219
|
:custom_fields => @custom_fields} %>
|
|
220
|
+
|
|
221
|
+
<div class="mt-4">
|
|
222
|
+
<div class="d-flex flex-column ">
|
|
223
|
+
<div class="payments-header mb-4">
|
|
224
|
+
<div class="d-flex align-items-center">
|
|
225
|
+
<h2>Payment Method Details</h2>
|
|
226
|
+
</div>
|
|
227
|
+
</div>
|
|
228
|
+
<div class="payment-details">
|
|
229
|
+
<% if @payment_method.nil? %>
|
|
230
|
+
The Payment method has been deleted.
|
|
231
|
+
<% else %>
|
|
232
|
+
<%= render :partial => 'kaui/payment_methods/payment_methods_details_table', :locals => {:payment_method => @payment_method} %>
|
|
233
|
+
<% end %>
|
|
234
|
+
</div>
|
|
235
|
+
</div>
|
|
236
|
+
</div>
|
|
215
237
|
|
|
216
238
|
</div>
|
|
217
239
|
</div>
|
|
218
240
|
</div>
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
<div class="kaui-container py-5 payments-show">
|
|
222
|
-
<div class="d-flex " style="gap: 4rem;">
|
|
223
|
-
<div class="payments">
|
|
224
|
-
<div class="d-flex flex-column ">
|
|
225
|
-
<div class="payments-header mb-4">
|
|
226
|
-
<div class="d-flex align-items-center">
|
|
227
|
-
<h2>Payment Method Details</h2>
|
|
228
|
-
</div>
|
|
229
|
-
</div>
|
|
230
|
-
<div class="payment-details">
|
|
231
|
-
<% if @payment_method.nil? %>
|
|
232
|
-
The Payment method has been deleted.
|
|
233
|
-
<% else %>
|
|
234
|
-
<%= render :partial => 'kaui/payment_methods/payment_methods_details_table', :locals => {:payment_method => @payment_method} %>
|
|
235
|
-
<% end %>
|
|
236
|
-
</div>
|
|
237
|
-
</div>
|
|
238
241
|
</div>
|
|
239
242
|
</div>
|
|
240
243
|
</div>
|
|
@@ -4,6 +4,6 @@
|
|
|
4
4
|
<%= render "kaui/components/form_password/form_password", f: f, field: :password, label: t("devise.sessions.new.password"), placeholder: "*****" %>
|
|
5
5
|
|
|
6
6
|
<div class="d-grid mt-4">
|
|
7
|
-
<%= render "kaui/components/button/button", label: t("devise.sessions.new.
|
|
7
|
+
<%= render "kaui/components/button/button", label: t("devise.sessions.new.sign_in"), variant: "btn-primary custom-hover", type: "submit", html_class: "w-100" %>
|
|
8
8
|
</div>
|
|
9
|
-
<% end %>
|
|
9
|
+
<% end %>
|
|
@@ -3,19 +3,19 @@
|
|
|
3
3
|
en:
|
|
4
4
|
devise:
|
|
5
5
|
confirmations:
|
|
6
|
-
confirmed: "Your account was successfully confirmed. You are now
|
|
6
|
+
confirmed: "Your account was successfully confirmed. You are now signed in."
|
|
7
7
|
send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
|
|
8
8
|
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
|
|
9
9
|
failure:
|
|
10
|
-
already_authenticated: "You are already
|
|
10
|
+
already_authenticated: "You are already signed in."
|
|
11
11
|
inactive: "Your account was not activated yet."
|
|
12
12
|
invalid: "Invalid username or password."
|
|
13
13
|
invalid_token: "Invalid authentication token."
|
|
14
14
|
locked: "Your account is locked."
|
|
15
15
|
not_found_in_database: "Invalid username or password."
|
|
16
16
|
killbill_not_available: "Kill Bill is unavailable"
|
|
17
|
-
timeout: "Your session expired, please
|
|
18
|
-
unauthenticated: "You need to
|
|
17
|
+
timeout: "Your session expired, please sign in again to continue."
|
|
18
|
+
unauthenticated: "You need to sign in before continuing."
|
|
19
19
|
unconfirmed: "You have to confirm your account before continuing."
|
|
20
20
|
mailer:
|
|
21
21
|
confirmation_instructions:
|
|
@@ -31,31 +31,31 @@ en:
|
|
|
31
31
|
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
|
|
32
32
|
send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
|
|
33
33
|
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
|
|
34
|
-
updated: "Your password was changed successfully. You are now
|
|
34
|
+
updated: "Your password was changed successfully. You are now signed in."
|
|
35
35
|
updated_not_active: "Your password was changed successfully."
|
|
36
36
|
registrations:
|
|
37
37
|
destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
|
|
38
38
|
signed_up: "Welcome! You have signed up successfully."
|
|
39
|
-
signed_up_but_inactive: "You have signed up successfully. However, we could not
|
|
40
|
-
signed_up_but_locked: "You have signed up successfully. However, we could not
|
|
39
|
+
signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
|
|
40
|
+
signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
|
|
41
41
|
signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
|
|
42
42
|
update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
|
|
43
43
|
updated: "You updated your account successfully."
|
|
44
44
|
sessions:
|
|
45
|
-
signed_in: "
|
|
46
|
-
signed_out: "
|
|
45
|
+
signed_in: "Signed in successfully."
|
|
46
|
+
signed_out: "Signed out successfully."
|
|
47
47
|
new:
|
|
48
48
|
username: "Username"
|
|
49
49
|
password: "Password"
|
|
50
50
|
enter_username: "Enter your username"
|
|
51
|
-
|
|
51
|
+
sign_in: "Sign in"
|
|
52
52
|
unlocks:
|
|
53
53
|
send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
|
|
54
54
|
send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
|
|
55
|
-
unlocked: "Your account has been unlocked successfully. Please
|
|
55
|
+
unlocked: "Your account has been unlocked successfully. Please sign in to continue."
|
|
56
56
|
errors:
|
|
57
57
|
messages:
|
|
58
|
-
already_confirmed: "was already confirmed, please try
|
|
58
|
+
already_confirmed: "was already confirmed, please try signing in"
|
|
59
59
|
confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
|
|
60
60
|
expired: "has expired, please request a new one"
|
|
61
61
|
not_found: "not found"
|
data/lib/kaui/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kaui
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.0.
|
|
4
|
+
version: 4.0.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kill Bill core team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-
|
|
11
|
+
date: 2025-12-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: actionpack
|