killbill-deposit 1.0.1 → 1.0.2

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: 3f9d458d0d13e4cf5cf593e189a1909b4304bacf3e3d933a45bd76e0633e3c63
4
- data.tar.gz: 3811a062311367fb2c891fa1ada7a381cccfced7b81dc398794a00fc5fba8fd1
3
+ metadata.gz: 98f39094855afd068d98855380e846bfea1a60c3e1a23485e922be4b6a260b65
4
+ data.tar.gz: 4ad6cf222ae0250ecf0f7ac18c8068ccfc30dec8d6386c70de0389cdaf14cba8
5
5
  SHA512:
6
- metadata.gz: 126ebe9687c9adac9fa598064b26fcf175d7b8473053c3e1069a811c21635e49fc9616265e2b8313207bcf5922fee3edeeff5ae384caa799f3dfafe663d7d26a
7
- data.tar.gz: 834315a56ba092d7a4f76797cf2b6697b9a20fd51a4f9232346f6c9424eed703285c308d17651e0b10036c2d15563c09a91fe91b5d886bd4d6f01640d83ef89f
6
+ metadata.gz: e514d7fe797de3493c77fcde00e7bffe59ad4310ecfc9356bb150b9545f467459f8aff5d95386e078666843706de093f9ab7e9e006e8d074cf85587c65de5777
7
+ data.tar.gz: 2c9a372dd382637f7d6bc5d160570fc42e7c83cad40376e02cde9686996f27b53df53108f14181c0634f898b73fb4525ed0c38e99b6c487884c7f5b01871b71d
data/README.md CHANGED
@@ -11,8 +11,9 @@ Kill Bill compatibility
11
11
 
12
12
  | Deposit UI version | Kill Bill version |
13
13
  |-------------------:|------------------:|
14
- | 0.0.y | 0.22.z |
15
- | 1.0.y | 0.24.z |
14
+ | 0.0.y | 0.22.z (Rails 5) |
15
+ | 0.1.y | 0.24.z (Rails 6) |
16
+ | 1.0.y | 0.24.z (Rails 7) |
16
17
 
17
18
  Functionality
18
19
  -------------
@@ -47,3 +48,13 @@ To run tests:
47
48
  ```
48
49
  rails t
49
50
  ```
51
+
52
+ This plugin is using [killbill-assets-ui](https://github.com/killbill/killbill-assets-ui) to load the common assets.
53
+ If you want to override the assets you can add it to ```app/assets/stylesheet/deposit``` or ```app/assets/javascripts/deposit```
54
+
55
+ For integrate run with [killbill-admin-ui-standalone](https://github.com/killbill/killbill-admin-ui-standalone), please update the Gemfile to use Deposit locally
56
+
57
+ ```
58
+ # gem 'killbill-deposit'
59
+ gem 'killbill-deposit', :path => '../killbill-deposit-ui'
60
+ ```
@@ -10,8 +10,5 @@
10
10
  // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
11
11
  // about supported directives.
12
12
  //
13
- //= require jquery
14
- //= require jquery_ujs
15
- //= require dataTables/jquery.dataTables
16
- //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
17
13
  //= require deposit/deposit
14
+ //= require assets/common
@@ -11,8 +11,6 @@
11
11
  * file per style scope.
12
12
  *
13
13
  *= require_self
14
- *= require dataTables/jquery.dataTables
15
- *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
16
- *= require font-awesome
17
14
  *= require deposit/deposit
15
+ *= require assets/common
18
16
  */
@@ -110,7 +110,7 @@ module Deposit
110
110
  pages ||= []
111
111
 
112
112
  # Until we support server-side sorting
113
- ordering = ((params[:order] || {})[:'0'] || {})
113
+ ordering = (params[:order] || {})[:'0'] || {}
114
114
  ordering_column = (ordering[:column] || 0).to_i
115
115
  ordering_dir = ordering[:dir] || 'asc'
116
116
  unless search_key.nil?
@@ -44,7 +44,7 @@ $(document).ready(function() {
44
44
  }
45
45
  ],
46
46
  createdRow: function(row, data, dataIndex) {
47
- $('td', row).eq(4).html('<input class="payment_amount_invoice" type="number" name="payment_amount_' + data[0] + '" id="payment_amount_' + dataIndex + '" step="any" class="form-control">')
47
+ $('td', row).eq(4).html('<input class="payment_amount_invoice" type="number" name="payment_amount_' + data[0] + '" id="payment_amount_' + dataIndex + '" step="any" class="form-control" value="0">')
48
48
  },
49
49
  drawCallback: function() {
50
50
  $('input').change(function() {
@@ -15,8 +15,8 @@
15
15
  <div class="form-group">
16
16
  <%= label_tag :effective_date, 'Payment Date', :class => 'col-sm-2 control-label' %>
17
17
  <div class="col-sm-2">
18
- <%= text_field_tag :effective_date, Date.parse(Time.now.to_s).to_s, :class => 'form-control date-picker', :required => true %>
19
- </div>
18
+ <%= text_field_tag :effective_date, Date.parse(Time.now.to_s).to_s, :class => 'form-control date-picker', :required => true, :data =>{:provide => 'datepicker', 'date-format': "yyyy-mm-dd"} %>
19
+ </div>
20
20
  </div>
21
21
  <div class="form-group">
22
22
  <%= label_tag :payment_reference_number, 'Payment Ref. #', :class => 'col-sm-2 control-label' %>
@@ -1,31 +1,34 @@
1
1
  <!DOCTYPE html>
2
2
  <html>
3
- <head>
4
- <title>Deposit</title>
5
- <%= yield :scripts %>
6
- <%= stylesheet_link_tag 'application', :media => 'all' %>
7
- <%= javascript_include_tag 'application' %>
8
- <%= csrf_meta_tags %>
9
- </head>
10
- <div class="container-fluid">
11
- <%- # :alert used by devise -%>
12
- <% [:error, :alert].each do |key| %>
13
- <% if flash[key] %>
3
+ <head>
4
+ <title>Deposit</title>
5
+ <%= yield :scripts %>
6
+ <%= stylesheet_link_tag 'application', :media => 'all' %>
7
+ <%= javascript_include_tag 'application' %>
8
+ <%= csrf_meta_tags %>
9
+ </head>
10
+ <body>
11
+ <div class="container">
12
+ <div class="container-fluid">
13
+ <%- # :alert used by devise -%>
14
+ <% [:error, :alert].each do |key| %>
15
+ <% if flash[key] %>
16
+ <div class="row">
17
+ <div class="col-md-10 col-md-offset-2">
18
+ <div class="alert alert-error"><%= flash[key] %></div>
19
+ </div>
20
+ </div>
21
+ <% end %>
22
+ <% end %>
23
+ <% if flash[:notice] %>
14
24
  <div class="row">
15
25
  <div class="col-md-10 col-md-offset-2">
16
- <div class="alert alert-error"><%= flash[key] %></div>
26
+ <div class="alert alert-info"><%= flash[:notice] %></div>
17
27
  </div>
18
28
  </div>
19
29
  <% end %>
20
- <% end %>
21
- <% if flash[:notice] %>
22
- <div class="row">
23
- <div class="col-md-10 col-md-offset-2">
24
- <div class="alert alert-info"><%= flash[:notice] %></div>
25
- </div>
30
+ <%= yield %>
26
31
  </div>
27
- <% end %>
28
- <%= yield %>
29
- </div>
30
- </body>
32
+ </div>
33
+ </body>
31
34
  </html>
@@ -6,11 +6,10 @@
6
6
  # We need to explicitly require all of our dependencies listed in deposit.gemspec
7
7
  #
8
8
  # See also https://github.com/carlhuda/bundler/issues/49
9
- require 'jquery-rails'
10
- require 'jquery-datatables-rails'
11
- require 'font-awesome-rails'
9
+
12
10
  require 'money-rails'
13
11
  require 'killbill_client'
12
+ require 'killbill_assets_ui'
14
13
 
15
14
  module Deposit
16
15
  class Engine < ::Rails::Engine
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Deposit
4
- VERSION = '1.0.1'
4
+ VERSION = '1.0.2'
5
5
  end
metadata CHANGED
@@ -1,17 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: killbill-deposit
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.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
- name: font-awesome-rails
14
+ name: killbill-assets-ui
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - ">="
@@ -24,34 +24,6 @@ dependencies:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
- - !ruby/object:Gem::Dependency
28
- name: jquery-datatables-rails
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - ">="
32
- - !ruby/object:Gem::Version
33
- version: '0'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - ">="
39
- - !ruby/object:Gem::Version
40
- version: '0'
41
- - !ruby/object:Gem::Dependency
42
- name: jquery-rails
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - "~>"
46
- - !ruby/object:Gem::Version
47
- version: 4.5.1
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - "~>"
53
- - !ruby/object:Gem::Version
54
- version: 4.5.1
55
27
  - !ruby/object:Gem::Dependency
56
28
  name: killbill-client
57
29
  requirement: !ruby/object:Gem::Requirement
@@ -94,20 +66,6 @@ dependencies:
94
66
  - - "~>"
95
67
  - !ruby/object:Gem::Version
96
68
  version: '7.0'
97
- - !ruby/object:Gem::Dependency
98
- name: sass-rails
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - ">="
102
- - !ruby/object:Gem::Version
103
- version: '0'
104
- type: :runtime
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - ">="
109
- - !ruby/object:Gem::Version
110
- version: '0'
111
69
  description: Rails UI plugin for the Deposit plugin.
112
70
  email: killbilling-users@googlegroups.com
113
71
  executables: []
@@ -121,7 +79,6 @@ files:
121
79
  - app/assets/javascripts/application.js
122
80
  - app/assets/javascripts/deposit/deposit.js
123
81
  - app/assets/stylesheets/application.css
124
- - app/assets/stylesheets/bootstrap_and_overrides.css
125
82
  - app/assets/stylesheets/deposit/deposit.css
126
83
  - app/controllers/deposit/collection_controller.rb
127
84
  - app/controllers/deposit/engine_controller.rb
@@ -1,9 +0,0 @@
1
- /* Override Bootstrap 3 font locations */
2
- @font-face {
3
- font-family: 'Glyphicons Halflings';
4
- src: url('../assets/glyphicons-halflings-regular.eot');
5
- src: url('../assets/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
6
- url('../assets/glyphicons-halflings-regular.woff') format('woff'),
7
- url('../assets/glyphicons-halflings-regular.ttf') format('truetype'),
8
- url('../assets/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
9
- }