kaui 3.0.1 → 3.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (77) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -1
  3. data/app/assets/config/kaui_manifest.js +2 -44
  4. data/app/assets/javascripts/application.js +12 -0
  5. data/app/assets/javascripts/kaui/kaui.js +7 -452
  6. data/app/assets/javascripts/kaui/kaui_override.js +441 -0
  7. data/app/assets/stylesheets/application.css +23 -0
  8. data/app/assets/stylesheets/kaui/account.css +34 -0
  9. data/app/assets/stylesheets/kaui/audit.css +19 -0
  10. data/app/assets/stylesheets/kaui/common.css +550 -0
  11. data/app/assets/stylesheets/kaui/datatable.css +71 -0
  12. data/app/assets/stylesheets/kaui/header.css +129 -0
  13. data/app/assets/stylesheets/kaui/home.css +72 -0
  14. data/app/assets/stylesheets/kaui/invoice.css +37 -0
  15. data/app/assets/stylesheets/kaui/kaui.css +152 -0
  16. data/app/assets/stylesheets/kaui/overdue.css +7 -0
  17. data/app/assets/stylesheets/kaui/payment.css +28 -0
  18. data/app/assets/stylesheets/kaui/subscription.css +15 -0
  19. data/app/assets/stylesheets/kaui/tags.css +137 -0
  20. data/app/assets/stylesheets/kaui/timeline.css +5 -0
  21. data/app/assets/stylesheets/kaui/tooltip.css +16 -0
  22. data/app/controllers/kaui/account_tags_controller.rb +1 -1
  23. data/app/controllers/kaui/admin_allowed_users_controller.rb +1 -1
  24. data/app/controllers/kaui/admin_tenants_controller.rb +3 -3
  25. data/app/controllers/kaui/bundle_tags_controller.rb +1 -1
  26. data/app/controllers/kaui/engine_controller_util.rb +1 -1
  27. data/app/controllers/kaui/home_controller.rb +21 -12
  28. data/app/controllers/kaui/invoice_tags_controller.rb +1 -1
  29. data/app/controllers/kaui/invoices_controller.rb +6 -1
  30. data/app/controllers/kaui/payment_methods_controller.rb +1 -1
  31. data/app/controllers/kaui/subscriptions_controller.rb +9 -8
  32. data/app/controllers/kaui/transactions_controller.rb +1 -1
  33. data/app/helpers/kaui/object_helper.rb +16 -1
  34. data/app/models/kaui/admin_tenant.rb +1 -1
  35. data/app/models/kaui/catalog.rb +2 -2
  36. data/app/models/kaui/invoice_payment.rb +1 -1
  37. data/app/models/kaui/overdue.rb +2 -2
  38. data/app/models/kaui/tag.rb +2 -2
  39. data/app/models/kaui/tag_definition.rb +1 -1
  40. data/app/views/kaui/accounts/_billing_info.html.erb +2 -4
  41. data/app/views/kaui/accounts/_form.html.erb +3 -3
  42. data/app/views/kaui/accounts/index.html.erb +0 -1
  43. data/app/views/kaui/admin_tenants/new_overdue_config.html.erb +5 -5
  44. data/app/views/kaui/home/_advanced_search_modal.html.erb +22 -1
  45. data/app/views/kaui/invoices/show.html.erb +2 -1
  46. data/app/views/kaui/layouts/kaui_header.html.erb +2 -18
  47. data/app/views/kaui/refunds/_form.html.erb +50 -2
  48. data/app/views/kaui/subscriptions/_cancel_by_date_modal.html.erb +1 -1
  49. data/app/views/kaui/subscriptions/_edit_form.html.erb +1 -1
  50. data/app/views/kaui/subscriptions/_form.html.erb +1 -1
  51. data/app/views/kaui/subscriptions/edit_bcd.erb +1 -1
  52. data/app/views/kaui/tag_definitions/_form.html.erb +1 -2
  53. data/config/routes.rb +1 -0
  54. data/lib/kaui/engine.rb +1 -4
  55. data/lib/kaui/version.rb +1 -1
  56. data/lib/kaui.rb +10 -10
  57. metadata +29 -130
  58. data/app/assets/javascripts/jquery.spin.js +0 -76
  59. data/app/assets/javascripts/kaui_application.js +0 -25
  60. data/app/assets/javascripts/spin.js +0 -76
  61. data/app/assets/stylesheets/bootstrap_and_overrides.scss +0 -240
  62. data/app/assets/stylesheets/kaui/account.scss +0 -52
  63. data/app/assets/stylesheets/kaui/audit.scss +0 -42
  64. data/app/assets/stylesheets/kaui/common.scss +0 -765
  65. data/app/assets/stylesheets/kaui/datatable.scss +0 -115
  66. data/app/assets/stylesheets/kaui/header.scss +0 -197
  67. data/app/assets/stylesheets/kaui/home.scss +0 -89
  68. data/app/assets/stylesheets/kaui/invoice.scss +0 -58
  69. data/app/assets/stylesheets/kaui/kaui.scss +0 -265
  70. data/app/assets/stylesheets/kaui/kaui_bootstrap.scss +0 -3
  71. data/app/assets/stylesheets/kaui/overdue.scss +0 -11
  72. data/app/assets/stylesheets/kaui/payment.scss +0 -43
  73. data/app/assets/stylesheets/kaui/subscription.scss +0 -27
  74. data/app/assets/stylesheets/kaui/tags.scss +0 -208
  75. data/app/assets/stylesheets/kaui/timeline.scss +0 -7
  76. data/app/assets/stylesheets/kaui/tooltip.scss +0 -15
  77. data/app/assets/stylesheets/kaui_application.css +0 -12
data/lib/kaui/engine.rb CHANGED
@@ -10,9 +10,6 @@
10
10
  require 'js-routes'
11
11
  require 'jquery-rails'
12
12
  require 'jquery-ui-rails'
13
- require 'jquery-datatables-rails'
14
- require 'font-awesome-sass'
15
- require 'bootstrap-sass'
16
13
  require 'bootstrap-datepicker-rails'
17
14
  require 'json'
18
15
  require 'money-rails'
@@ -25,9 +22,9 @@ require 'concurrent'
25
22
  require 'mustache-js-rails'
26
23
  require 'nokogiri'
27
24
  require 'time'
28
- require 'd3-rails'
29
25
  require 'spinjs-rails'
30
26
  require 'popper_js'
27
+ require 'killbill_assets_ui'
31
28
 
32
29
  module Kaui
33
30
  class Engine < ::Rails::Engine
data/lib/kaui/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Kaui
4
- VERSION = '3.0.1'
4
+ VERSION = '3.0.2'
5
5
  end
data/lib/kaui.rb CHANGED
@@ -20,6 +20,7 @@ module Kaui
20
20
  mattr_accessor :account_search_columns
21
21
  mattr_accessor :invoice_search_columns
22
22
  mattr_accessor :account_invoices_columns
23
+ mattr_accessor :refund_invoice_description
23
24
 
24
25
  mattr_accessor :customer_invoice_link
25
26
 
@@ -46,6 +47,8 @@ module Kaui
46
47
  mattr_accessor :gateways_urls
47
48
 
48
49
  mattr_accessor :disable_sign_up_link
50
+ mattr_accessor :additional_headers_partial
51
+ mattr_accessor :additional_invoice_links
49
52
 
50
53
  self.home_path = -> { Kaui::Engine.routes.url_helpers.home_path }
51
54
  self.tenant_home_path = -> { Kaui::Engine.routes.url_helpers.tenants_path }
@@ -66,7 +69,7 @@ module Kaui
66
69
  ]
67
70
  end
68
71
 
69
- self.invoice_search_columns = lambda do |invoice = nil, view_context = nil|
72
+ self.invoice_search_columns = lambda do |invoice = nil, view_context = nil, _cached_options_for_klient = nil|
70
73
  default_label = 'label-info'
71
74
  default_label = 'label-default' if invoice&.status == 'DRAFT'
72
75
  default_label = 'label-success' if invoice&.status == 'COMMITTED'
@@ -96,8 +99,14 @@ module Kaui
96
99
  ]
97
100
  end
98
101
 
102
+ self.refund_invoice_description = lambda { |index, ii, bundle_result|
103
+ "Item #{index + 1} : #{ii.description} #{"(bundle #{bundle_result.external_key})" unless bundle_result.nil?}"
104
+ }
105
+
99
106
  self.customer_invoice_link = ->(invoice, ctx) { ctx.link_to 'View customer invoice html', ctx.kaui_engine.show_html_invoice_path(invoice.invoice_id), class: 'btn', target: '_blank' }
100
107
 
108
+ self.additional_invoice_links = ->(invoice, ctx) {}
109
+
101
110
  self.demo_mode = false
102
111
 
103
112
  # Root credentials for SaaS operations
@@ -202,12 +211,3 @@ module Kaui
202
211
  }
203
212
  end
204
213
  end
205
-
206
- # ruby-1.8 compatibility
207
- module Kernel
208
- def define_singleton_method(*args, &)
209
- class << self
210
- self
211
- end.send(:define_method, *args, &)
212
- end
213
- end
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: 3.0.1
4
+ version: 3.0.2
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: 2023-06-22 00:00:00.000000000 Z
11
+ date: 2024-01-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack
@@ -38,34 +38,6 @@ dependencies:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
- - !ruby/object:Gem::Dependency
42
- name: bootstrap-datepicker-rails
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - ">="
46
- - !ruby/object:Gem::Version
47
- version: '0'
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - ">="
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
- - !ruby/object:Gem::Dependency
56
- name: bootstrap-sass
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - "~>"
60
- - !ruby/object:Gem::Version
61
- version: 3.4.1
62
- type: :runtime
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - "~>"
67
- - !ruby/object:Gem::Version
68
- version: 3.4.1
69
41
  - !ruby/object:Gem::Dependency
70
42
  name: cancan
71
43
  requirement: !ruby/object:Gem::Requirement
@@ -108,20 +80,6 @@ dependencies:
108
80
  - - ">="
109
81
  - !ruby/object:Gem::Version
110
82
  version: '0'
111
- - !ruby/object:Gem::Dependency
112
- name: d3-rails
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - ">="
116
- - !ruby/object:Gem::Version
117
- version: '0'
118
- type: :runtime
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - ">="
123
- - !ruby/object:Gem::Version
124
- version: '0'
125
83
  - !ruby/object:Gem::Dependency
126
84
  name: devise
127
85
  requirement: !ruby/object:Gem::Requirement
@@ -151,21 +109,21 @@ dependencies:
151
109
  - !ruby/object:Gem::Version
152
110
  version: '0'
153
111
  - !ruby/object:Gem::Dependency
154
- name: font-awesome-sass
112
+ name: jquery-rails
155
113
  requirement: !ruby/object:Gem::Requirement
156
114
  requirements:
157
- - - ">="
115
+ - - "~>"
158
116
  - !ruby/object:Gem::Version
159
- version: '0'
117
+ version: 4.5.1
160
118
  type: :runtime
161
119
  prerelease: false
162
120
  version_requirements: !ruby/object:Gem::Requirement
163
121
  requirements:
164
- - - ">="
122
+ - - "~>"
165
123
  - !ruby/object:Gem::Version
166
- version: '0'
124
+ version: 4.5.1
167
125
  - !ruby/object:Gem::Dependency
168
- name: jquery-datatables-rails
126
+ name: jquery-ui-rails
169
127
  requirement: !ruby/object:Gem::Requirement
170
128
  requirements:
171
129
  - - ">="
@@ -179,21 +137,7 @@ dependencies:
179
137
  - !ruby/object:Gem::Version
180
138
  version: '0'
181
139
  - !ruby/object:Gem::Dependency
182
- name: jquery-rails
183
- requirement: !ruby/object:Gem::Requirement
184
- requirements:
185
- - - "~>"
186
- - !ruby/object:Gem::Version
187
- version: 4.5.1
188
- type: :runtime
189
- prerelease: false
190
- version_requirements: !ruby/object:Gem::Requirement
191
- requirements:
192
- - - "~>"
193
- - !ruby/object:Gem::Version
194
- version: 4.5.1
195
- - !ruby/object:Gem::Dependency
196
- name: jquery-ui-rails
140
+ name: js-routes
197
141
  requirement: !ruby/object:Gem::Requirement
198
142
  requirements:
199
143
  - - ">="
@@ -207,7 +151,7 @@ dependencies:
207
151
  - !ruby/object:Gem::Version
208
152
  version: '0'
209
153
  - !ruby/object:Gem::Dependency
210
- name: js-routes
154
+ name: jwt
211
155
  requirement: !ruby/object:Gem::Requirement
212
156
  requirements:
213
157
  - - ">="
@@ -221,7 +165,7 @@ dependencies:
221
165
  - !ruby/object:Gem::Version
222
166
  version: '0'
223
167
  - !ruby/object:Gem::Dependency
224
- name: jwt
168
+ name: kenui
225
169
  requirement: !ruby/object:Gem::Requirement
226
170
  requirements:
227
171
  - - ">="
@@ -235,7 +179,7 @@ dependencies:
235
179
  - !ruby/object:Gem::Version
236
180
  version: '0'
237
181
  - !ruby/object:Gem::Dependency
238
- name: kenui
182
+ name: killbill-assets-ui
239
183
  requirement: !ruby/object:Gem::Requirement
240
184
  requirements:
241
185
  - - ">="
@@ -318,48 +262,6 @@ dependencies:
318
262
  - - "~>"
319
263
  - !ruby/object:Gem::Version
320
264
  version: '7.0'
321
- - !ruby/object:Gem::Dependency
322
- name: sass
323
- requirement: !ruby/object:Gem::Requirement
324
- requirements:
325
- - - ">="
326
- - !ruby/object:Gem::Version
327
- version: '0'
328
- type: :runtime
329
- prerelease: false
330
- version_requirements: !ruby/object:Gem::Requirement
331
- requirements:
332
- - - ">="
333
- - !ruby/object:Gem::Version
334
- version: '0'
335
- - !ruby/object:Gem::Dependency
336
- name: sassc-rails
337
- requirement: !ruby/object:Gem::Requirement
338
- requirements:
339
- - - ">="
340
- - !ruby/object:Gem::Version
341
- version: 2.1.0
342
- type: :runtime
343
- prerelease: false
344
- version_requirements: !ruby/object:Gem::Requirement
345
- requirements:
346
- - - ">="
347
- - !ruby/object:Gem::Version
348
- version: 2.1.0
349
- - !ruby/object:Gem::Dependency
350
- name: sass-rails
351
- requirement: !ruby/object:Gem::Requirement
352
- requirements:
353
- - - ">="
354
- - !ruby/object:Gem::Version
355
- version: '0'
356
- type: :runtime
357
- prerelease: false
358
- version_requirements: !ruby/object:Gem::Requirement
359
- requirements:
360
- - - ">="
361
- - !ruby/object:Gem::Version
362
- version: '0'
363
265
  - !ruby/object:Gem::Dependency
364
266
  name: spinjs-rails
365
267
  requirement: !ruby/object:Gem::Requirement
@@ -430,27 +332,24 @@ files:
430
332
  - app/assets/images/kaui/logo.png
431
333
  - app/assets/images/kaui/search.png
432
334
  - app/assets/images/kaui/search_white.png
433
- - app/assets/javascripts/jquery.spin.js
335
+ - app/assets/javascripts/application.js
434
336
  - app/assets/javascripts/kaui/kaui.js
435
- - app/assets/javascripts/kaui_application.js
436
- - app/assets/javascripts/spin.js
437
- - app/assets/stylesheets/bootstrap_and_overrides.scss
438
- - app/assets/stylesheets/kaui/account.scss
439
- - app/assets/stylesheets/kaui/audit.scss
440
- - app/assets/stylesheets/kaui/common.scss
441
- - app/assets/stylesheets/kaui/datatable.scss
442
- - app/assets/stylesheets/kaui/header.scss
443
- - app/assets/stylesheets/kaui/home.scss
444
- - app/assets/stylesheets/kaui/invoice.scss
445
- - app/assets/stylesheets/kaui/kaui.scss
446
- - app/assets/stylesheets/kaui/kaui_bootstrap.scss
447
- - app/assets/stylesheets/kaui/overdue.scss
448
- - app/assets/stylesheets/kaui/payment.scss
449
- - app/assets/stylesheets/kaui/subscription.scss
450
- - app/assets/stylesheets/kaui/tags.scss
451
- - app/assets/stylesheets/kaui/timeline.scss
452
- - app/assets/stylesheets/kaui/tooltip.scss
453
- - app/assets/stylesheets/kaui_application.css
337
+ - app/assets/javascripts/kaui/kaui_override.js
338
+ - app/assets/stylesheets/application.css
339
+ - app/assets/stylesheets/kaui/account.css
340
+ - app/assets/stylesheets/kaui/audit.css
341
+ - app/assets/stylesheets/kaui/common.css
342
+ - app/assets/stylesheets/kaui/datatable.css
343
+ - app/assets/stylesheets/kaui/header.css
344
+ - app/assets/stylesheets/kaui/home.css
345
+ - app/assets/stylesheets/kaui/invoice.css
346
+ - app/assets/stylesheets/kaui/kaui.css
347
+ - app/assets/stylesheets/kaui/overdue.css
348
+ - app/assets/stylesheets/kaui/payment.css
349
+ - app/assets/stylesheets/kaui/subscription.css
350
+ - app/assets/stylesheets/kaui/tags.css
351
+ - app/assets/stylesheets/kaui/timeline.css
352
+ - app/assets/stylesheets/kaui/tooltip.css
454
353
  - app/controllers/kaui/account_children_controller.rb
455
354
  - app/controllers/kaui/account_custom_fields_controller.rb
456
355
  - app/controllers/kaui/account_emails_controller.rb
@@ -1,76 +0,0 @@
1
- // Generated by CoffeeScript 1.6.3
2
- /*
3
- jQuery Spin
4
- Copyright 2014 Kevin Sylvestre
5
- 1.1.6
6
- */
7
-
8
-
9
- (function() {
10
- "use strict";
11
- var $, Spinner;
12
-
13
- $ = jQuery;
14
-
15
- Spinner = (function() {
16
- Spinner.prototype.defaults = {
17
- petals: 9
18
- };
19
-
20
- function Spinner($element, options) {
21
- this.$element = $element;
22
- this.options = $.extend({}, this.defaults, options);
23
- this.configure();
24
- }
25
-
26
- Spinner.prototype.show = function() {
27
- return this.$element.animate({
28
- opacity: 1.0
29
- });
30
- };
31
-
32
- Spinner.prototype.hide = function() {
33
- return this.$element.animate({
34
- opacity: 0.0
35
- });
36
- };
37
-
38
- Spinner.prototype.destroy = function() {
39
- this.$element.empty();
40
- return this.$element.data('spin', void 0);
41
- };
42
-
43
- Spinner.prototype.configure = function() {
44
- var $petal, i, _i, _ref, _results;
45
- this.$element.empty();
46
- _results = [];
47
- for (i = _i = 0, _ref = this.options.petals; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
48
- $petal = $("<div />");
49
- _results.push(this.$element.append($petal));
50
- }
51
- return _results;
52
- };
53
-
54
- return Spinner;
55
-
56
- })();
57
-
58
- $.fn.spin = function(options) {
59
- return $(this).each(function() {
60
- var $this, spinner;
61
- $this = $(this);
62
- spinner = $this.data('spinner');
63
- if (spinner == null) {
64
- $this.data('spinner', spinner = new Spinner($this, options));
65
- }
66
- if (typeof options === 'string') {
67
- return spinner[options]();
68
- }
69
- });
70
- };
71
-
72
- $(function() {
73
- return $('[data-spin]').spin();
74
- });
75
-
76
- }).call(this);
@@ -1,25 +0,0 @@
1
- // This is a manifest file that'll be compiled into including all the files listed below.
2
- // Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
3
- // be included in the compiled file accessible from http://example.com/assets/application.js
4
- // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
5
- // the compiled file.
6
- //
7
- //
8
- //= link js-routes
9
- //= link jquery-ui/widgets/autocomplete
10
- //= link jquery_ujs
11
- //= link bootstrap-sprockets.js
12
- //= link dataTables/jquery.dataTables
13
- //= link dataTables/bootstrap/3/jquery.dataTables.bootstrap
14
- //= link mustache
15
- //= link kaui/kaui
16
- //= link popper
17
- //= link bootstrap-datepicker3
18
-
19
- import * as d3 from "d3"
20
- window.d3 = d3
21
-
22
- import jquery from 'jquery';
23
- window.jQuery = jquery;
24
- window.$ = jquery;
25
- window.jquery = jquery;
@@ -1,76 +0,0 @@
1
- // Generated by CoffeeScript 1.6.3
2
- /*
3
- jQuery Spin
4
- Copyright 2014 Kevin Sylvestre
5
- 1.1.6
6
- */
7
-
8
-
9
- (function() {
10
- "use strict";
11
- var $, Spinner;
12
-
13
- $ = jQuery;
14
-
15
- Spinner = (function() {
16
- Spinner.prototype.defaults = {
17
- petals: 9
18
- };
19
-
20
- function Spinner($element, options) {
21
- this.$element = $element;
22
- this.options = $.extend({}, this.defaults, options);
23
- this.configure();
24
- }
25
-
26
- Spinner.prototype.show = function() {
27
- return this.$element.animate({
28
- opacity: 1.0
29
- });
30
- };
31
-
32
- Spinner.prototype.hide = function() {
33
- return this.$element.animate({
34
- opacity: 0.0
35
- });
36
- };
37
-
38
- Spinner.prototype.destroy = function() {
39
- this.$element.empty();
40
- return this.$element.data('spin', void 0);
41
- };
42
-
43
- Spinner.prototype.configure = function() {
44
- var $petal, i, _i, _ref, _results;
45
- this.$element.empty();
46
- _results = [];
47
- for (i = _i = 0, _ref = this.options.petals; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
48
- $petal = $("<div />");
49
- _results.push(this.$element.append($petal));
50
- }
51
- return _results;
52
- };
53
-
54
- return Spinner;
55
-
56
- })();
57
-
58
- $.fn.spin = function(options) {
59
- return $(this).each(function() {
60
- var $this, spinner;
61
- $this = $(this);
62
- spinner = $this.data('spinner');
63
- if (spinner == null) {
64
- $this.data('spinner', spinner = new Spinner($this, options));
65
- }
66
- if (typeof options === 'string') {
67
- return spinner[options]();
68
- }
69
- });
70
- };
71
-
72
- $(function() {
73
- return $('[data-spin]').spin();
74
- });
75
-
76
- }).call(this);