killbill-deposit 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f9d458d0d13e4cf5cf593e189a1909b4304bacf3e3d933a45bd76e0633e3c63
-  data.tar.gz: 3811a062311367fb2c891fa1ada7a381cccfced7b81dc398794a00fc5fba8fd1
+  metadata.gz: 98f39094855afd068d98855380e846bfea1a60c3e1a23485e922be4b6a260b65
+  data.tar.gz: 4ad6cf222ae0250ecf0f7ac18c8068ccfc30dec8d6386c70de0389cdaf14cba8
 SHA512:
-  metadata.gz: 126ebe9687c9adac9fa598064b26fcf175d7b8473053c3e1069a811c21635e49fc9616265e2b8313207bcf5922fee3edeeff5ae384caa799f3dfafe663d7d26a
-  data.tar.gz: 834315a56ba092d7a4f76797cf2b6697b9a20fd51a4f9232346f6c9424eed703285c308d17651e0b10036c2d15563c09a91fe91b5d886bd4d6f01640d83ef89f
+  metadata.gz: e514d7fe797de3493c77fcde00e7bffe59ad4310ecfc9356bb150b9545f467459f8aff5d95386e078666843706de093f9ab7e9e006e8d074cf85587c65de5777
+  data.tar.gz: 2c9a372dd382637f7d6bc5d160570fc42e7c83cad40376e02cde9686996f27b53df53108f14181c0634f898b73fb4525ed0c38e99b6c487884c7f5b01871b71d

data/README.md

@@ -11,8 +11,9 @@ Kill Bill compatibility
 
 | Deposit UI version | Kill Bill version |
 |-------------------:|------------------:|
-|              0.0.y |            0.22.z |
-|              1.0.y |            0.24.z |
+|              0.0.y |            0.22.z (Rails 5) |
+|              0.1.y |            0.24.z (Rails 6) |
+|              1.0.y |            0.24.z (Rails 7) |
 
 Functionality
 -------------
@@ -47,3 +48,13 @@ To run tests:
 ```
 rails t
 ```
+
+This plugin is using [killbill-assets-ui](https://github.com/killbill/killbill-assets-ui) to load the common assets.
+If you want to override the assets you can add it to ```app/assets/stylesheet/deposit``` or ```app/assets/javascripts/deposit```
+
+For integrate run with [killbill-admin-ui-standalone](https://github.com/killbill/killbill-admin-ui-standalone), please update the Gemfile to use Deposit locally
+
+```
+# gem 'killbill-deposit'
+gem 'killbill-deposit', :path => '../killbill-deposit-ui'
+```

data/app/assets/javascripts/application.js

@@ -10,8 +10,5 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
-//= require dataTables/jquery.dataTables
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
 //= require deposit/deposit
+//= require assets/common

data/app/assets/stylesheets/application.css

@@ -11,8 +11,6 @@
  * file per style scope.
  *
  *= require_self
- *= require dataTables/jquery.dataTables
- *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
- *= require font-awesome
  *= require deposit/deposit
+ *= require assets/common
  */

data/app/controllers/deposit/collection_controller.rb

@@ -110,7 +110,7 @@ module Deposit
       pages ||= []
 
       # Until we support server-side sorting
-      ordering = ((params[:order] || {})[:'0'] || {})
+      ordering = (params[:order] || {})[:'0'] || {}
       ordering_column = (ordering[:column] || 0).to_i
       ordering_dir = ordering[:dir] || 'asc'
       unless search_key.nil?

data/app/views/deposit/collection/_invoices_table.html.erb

@@ -44,7 +44,7 @@ $(document).ready(function() {
         }
       ],
     createdRow: function(row, data, dataIndex) {
-      $('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">')
+      $('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">')
     },
     drawCallback: function() {
       $('input').change(function() {

data/app/views/deposit/collection/_payment_form.html.erb

@@ -15,8 +15,8 @@
   <div class="form-group">
     <%= label_tag :effective_date, 'Payment Date', :class => 'col-sm-2 control-label' %>
     <div class="col-sm-2">
-      <%= text_field_tag :effective_date, Date.parse(Time.now.to_s).to_s, :class => 'form-control date-picker', :required => true %>
-    </div>
+      <%= 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"} %>
+      </div>
   </div>
   <div class="form-group">
     <%= label_tag :payment_reference_number, 'Payment Ref. #', :class => 'col-sm-2 control-label' %>

data/app/views/deposit/layouts/deposit_application.html.erb

@@ -1,31 +1,34 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Deposit</title>
-  <%= yield :scripts %>
-  <%= stylesheet_link_tag 'application', :media => 'all' %>
-  <%= javascript_include_tag 'application' %>
-  <%= csrf_meta_tags %>
-</head>
-<div class="container-fluid">
-  <%- # :alert used by devise -%>
-  <% [:error, :alert].each do |key| %>
-      <% if flash[key] %>
+  <head>
+    <title>Deposit</title>
+    <%= yield :scripts %>
+    <%= stylesheet_link_tag 'application', :media => 'all' %>
+    <%= javascript_include_tag 'application' %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <div class="container">
+      <div class="container-fluid">
+      <%- # :alert used by devise  -%>
+      <% [:error, :alert].each do |key| %>
+          <% if flash[key] %>
+              <div class="row">
+                <div class="col-md-10 col-md-offset-2">
+                  <div class="alert alert-error"><%= flash[key] %></div>
+                </div>
+              </div>
+          <% end %>
+      <% end %>
+      <% if flash[:notice] %>
           <div class="row">
             <div class="col-md-10 col-md-offset-2">
-              <div class="alert alert-error"><%= flash[key] %></div>
+              <div class="alert alert-info"><%= flash[:notice] %></div>
             </div>
           </div>
       <% end %>
-  <% end %>
-  <% if flash[:notice] %>
-      <div class="row">
-        <div class="col-md-10 col-md-offset-2">
-          <div class="alert alert-info"><%= flash[:notice] %></div>
-        </div>
+      <%= yield %>
       </div>
-  <% end %>
-  <%= yield %>
-</div>
-</body>
+    </div>
+  </body>
 </html>

data/lib/deposit/engine.rb

@@ -6,11 +6,10 @@
 # We need to explicitly require all of our dependencies listed in deposit.gemspec
 #
 # See also https://github.com/carlhuda/bundler/issues/49
-require 'jquery-rails'
-require 'jquery-datatables-rails'
-require 'font-awesome-rails'
+
 require 'money-rails'
 require 'killbill_client'
+require 'killbill_assets_ui'
 
 module Deposit
   class Engine < ::Rails::Engine

data/lib/deposit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deposit
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: killbill-deposit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: font-awesome-rails
+  name: killbill-assets-ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-datatables-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.5.1
 - !ruby/object:Gem::Dependency
   name: killbill-client
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Rails UI plugin for the Deposit plugin.
 email: killbilling-users@googlegroups.com
 executables: []
@@ -121,7 +79,6 @@ files:
 - app/assets/javascripts/application.js
 - app/assets/javascripts/deposit/deposit.js
 - app/assets/stylesheets/application.css
-- app/assets/stylesheets/bootstrap_and_overrides.css
 - app/assets/stylesheets/deposit/deposit.css
 - app/controllers/deposit/collection_controller.rb
 - app/controllers/deposit/engine_controller.rb

data/app/assets/stylesheets/bootstrap_and_overrides.css

@@ -1,9 +0,0 @@
-/* Override Bootstrap 3 font locations */
-@font-face {
-    font-family: 'Glyphicons Halflings';
-    src: url('../assets/glyphicons-halflings-regular.eot');
-    src: url('../assets/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
-    url('../assets/glyphicons-halflings-regular.woff') format('woff'),
-    url('../assets/glyphicons-halflings-regular.ttf') format('truetype'),
-    url('../assets/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
-}