RubyGems - killbill-aviate - Versions diffs - 1.1.0.pre.6 → 1.1.0.pre.7 - Mend

killbill-aviate 1.1.0.pre.6 → 1.1.0.pre.7

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.

Files changed (10) hide show

checksums.yaml +4 -4
data/app/controllers/aviate/configuration_controller.rb +5 -6
data/app/views/aviate/wallets/_form.html.erb +65 -35
data/app/views/aviate/wallets/index.html.erb +42 -28
data/app/views/aviate/wallets/new.html.erb +16 -5
data/app/views/aviate/wallets/show.html.erb +16 -5
data/config/locales/en.yml +2 -0
data/lib/aviate/client.rb +7 -11
data/lib/aviate/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 237b14cde57c3e487b24109830a9fece4b0adacc7258bdaf137fc223837d2ed7
-  data.tar.gz: 39131607c8da262ac2f0a9a9c8252e5f6d4ffa7463df8b89976c5ad3d72cede3
+  metadata.gz: bf309d8121edf5c7e3da515a13826dfdfab7afbf6d2bde7392cffbc3553b3e65
+  data.tar.gz: fa8fcedb5694e3d29baa18f292e845e96c0681835a9411f395a8acaf523d2e22
 SHA512:
-  metadata.gz: 4aec8c79ef28c8b01c66e86addec6291948913247665dd40581c3e256aef700ba2fa6fed39712d92105e68508f2ab568f1562cd55ff25b9fc8d8bb01a4f616fb
-  data.tar.gz: 6e008e248edac89eb61fd9586357260faa5729bb1b71c5f8834e605e8caf97a0ee511686e55c411ba22869510fa538e3be5f0922b4cac2cb187dc2db3b932450
+  metadata.gz: 60f1ef78a00aa97a9a2e10ff09c064c27f08b6ff32cc3c0c9e261ba3b70fcdae9fb397a5007607cf3a5bd67bf7dc815bcdc9d3346d9d5d22442d42dd90987a75
+  data.tar.gz: 1018af92b5222da5cde7ac9d2a4507c00011fd4b2e61e151f56d321750f2b7238172c5405ac6bed19e6be7a87d16beb8c508c143a830007b9bb358bbbdbf0010

data/app/controllers/aviate/configuration_controller.rb CHANGED Viewed

@@ -5,7 +5,6 @@ require 'securerandom'
 module Aviate
   class ConfigurationController < Aviate::EngineController
     def index
       @available = Killbill::Aviate::AviateClient.aviate_plugin_available?(options_for_klient).first
     end
@@ -15,18 +14,18 @@ module Aviate
       email = params[:aviate_email]
       password = params[:aviate_password]
       response = Killbill::Aviate::AviateClient.authenticate(email, password, cached_options_for_klient)
       if response.is_a?(Hash) && response['token']
         reference_token = SecureRandom.hex(16)
         session[:aviate_token_ref] = reference_token
         # Store actual JWT in Rails cache using the reference token
         Rails.cache.write("aviate_jwt_#{reference_token}", response['token'], expires_in: 1.hour)
-        flash[:notice] = "Successfully authenticated with Aviate"
+        flash[:notice] = t('aviate.configuration.authentication_success')
       else
-        flash[:error] = "Authentication failed. Please check your credentials."
+        flash[:error] = t('aviate.configuration.authentication_failed')
       end
       redirect_to aviate_root_path
     end
@@ -36,7 +35,7 @@ module Aviate
         Rails.cache.delete(jwt_cache_key)
         session.delete(:aviate_token_ref)
       end
-      flash[:notice] = "Successfully logged out from Aviate"
+      flash[:notice] = t('aviate.configuration.logout_success')
       redirect_to aviate_root_path
     end
   end

data/app/views/aviate/wallets/_form.html.erb CHANGED Viewed

@@ -1,19 +1,19 @@
 <%= form_tag @wallet ? aviate_engine.top_off_config_account_wallet_path(@account.account_id, @wallet[:wallet_id]) : aviate_engine.account_wallets_path(@account.account_id), :class => 'form-horizontal', :method => :post, :multipart => true do %>
   <%= hidden_field_tag :account_id, @account.account_id %>
   <%= hidden_field_tag :wallet_id, @wallet[:wallet_id] if @wallet %>
-  <div class="form-group">
-    <%= label_tag :currency, 'Currency', :class => 'col-sm-2 control-label' %>
-    <div class="col-sm-10">
+  <div class="form-group d-flex pb-3">
+    <%= label_tag :currency, 'Currency', :class => 'col-sm-3 control-label' %>
+    <div class="col-sm-9">
       <%= hidden_field_tag :currency, @wallet ? @wallet[:currency] : @currency, required: true %>
-      <p class="form-control-static"><%= @wallet ? @wallet[:currency] : @currency %></p>
+      <span class="form-control-static form-control"><%= @wallet ? @wallet[:currency] : @currency %></span>
     </div>
   </div>
   <% unless @wallet %>
-    <h3>Initial Credit</h3>
-    <div class="form-group">
-      <%= label_tag :credit_type, 'Credit Type', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
+    <h3 class="border-bottom pb-2 mb-3 pt-3 fw-bold text-start">Initial Credit</h3>
+    <div class="form-group d-flex pb-3">
+      <%= label_tag :credit_type, 'Credit Type', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
         <%= select_tag :credit_type,
             options_for_select(['CREDIT_PAID', 'CREDIT_FREE'], @wallet.try(:[], :credit_type)),
             :class => 'form-control',
@@ -21,24 +21,24 @@
             required: true %>
       </div>
     </div>
-    <div class="form-group">
-      <%= label_tag :amount, 'Amount', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
+    <div class="form-group d-flex pb-3">
+      <%= label_tag :amount, 'Amount', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
         <%= number_field_tag :amount, @wallet.try(:[], :amount), :class => 'form-control', :step => '0.01', :min => '0', required: true %>
       </div>
     </div>
-    <div class="form-group">
-      <%= label_tag :exp_date, 'Expiration Date', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
-        <%= date_field_tag :exp_date, @wallet.try(:[], :exp_date), :class => 'form-control', required: true %>
+    <div class="form-group d-flex pb-3">
+      <%= label_tag :exp_date, 'Expiration Date', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= date_field_tag :exp_date, @wallet.try(:[], :exp_date), class: 'form-control', id: 'exp_date_input', required: true %>
       </div>
     </div>
   <% end %>
-  <h3>Top Off</h3>
-  <div class="form-group">
-    <%= label_tag :top_off_type, 'Top Off Type', :class => 'col-sm-2 control-label' %>
-    <div class="col-sm-10">
+  <h3 class="border-bottom pb-2 mb-3 pt-3 fw-bold text-start">Top Off</h3>
+  <div class="form-group d-flex pb-3">
+    <%= label_tag :top_off_type, 'Top Off Type', :class => 'col-sm-3 control-label' %>
+    <div class="col-sm-9">
       <%= select_tag :top_off_type,
           options_for_select(['TOP_OFF_FIXED', 'TOP_OFF_TARGET'], @wallet.try(:[], :top_off_type)),
           :class => 'form-control',
@@ -46,21 +46,21 @@
           required: true %>
     </div>
   </div>
-  <div class="form-group">
-    <%= label_tag :low_watermark, 'Low Water Mark', :class => 'col-sm-2 control-label' %>
-    <div class="col-sm-10">
+  <div class="form-group d-flex pb-3">
+    <%= label_tag :low_watermark, 'Low Water Mark', :class => 'col-sm-3 control-label' %>
+    <div class="col-sm-9">
       <%= text_field_tag :low_watermark, @wallet.try(:[], :low_watermark), :class => 'form-control', required: true %>
     </div>
   </div>
-  <div class="form-group">
-    <%= label_tag :top_off_amount, 'Amount', :class => 'col-sm-2 control-label' %>
-    <div class="col-sm-10">
+  <div class="form-group d-flex pb-3">
+    <%= label_tag :top_off_amount, 'Amount', :class => 'col-sm-3 control-label' %>
+    <div class="col-sm-9">
       <%= number_field_tag :top_off_amount, @wallet.try(:[], :top_off_amount), :class => 'form-control', :step => '0.01', :min => '0', required: true %>
     </div>
   </div>
-  <div class="form-group">
-    <%= label_tag :exp_duration_unit, 'Expiration Duration Unit', :class => 'col-sm-2 control-label' %>
-    <div class="col-sm-10">
+  <div class="form-group d-flex pb-3">
+    <%= label_tag :exp_duration_unit, 'Expiration Duration Unit', :class => 'col-sm-3 control-label pe-3' %>
+    <div class="col-sm-9">
       <%= select_tag :exp_duration_unit,
           options_for_select(['DAYS', 'WEEKS', 'MONTHS', 'YEARS'], @wallet.try(:[], :exp_duration_unit)),
           :class => 'form-control',
@@ -68,16 +68,46 @@
           required: true %>
     </div>
   </div>
-  <div class="form-group">
-    <%= label_tag :exp_duration_length, 'Expiration Duration Length', :class => 'col-sm-2 control-label' %>
-    <div class="col-sm-10">
+  <div class="form-group d-flex pb-4">
+    <%= label_tag :exp_duration_length, 'Expiration Duration Length', :class => 'col-sm-3 control-label' %>
+    <div class="col-sm-9">
       <%= number_field_tag :exp_duration_length, @wallet.try(:[], :exp_duration_length), :class => 'form-control', required: true %>
     </div>
   </div>
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-      <%= submit_tag 'Save', :class => 'btn btn-default' %>
-    </div>
+  <div class="form-group d-flex justify-content-end pt-3 border-top">
+    <%= render "kaui/components/button/button", {
+      label: 'Close',
+      variant: "outline-secondary d-inline-flex align-items-center gap-1",
+      type: "button",
+      html_class: "kaui-button custom-hover mx-2",
+      html_options: {
+        onclick: "window.history.back();"
+      }
+    } %>
+    <%= render "kaui/components/button/button", {
+      label: 'Save Wallet',
+      variant: "outline-secondary d-inline-flex align-items-center gap-1",
+      type: "submit",
+      html_class: "kaui-dropdown custom-hover"
+    } %>
   </div>
 <% end %>
+<%= javascript_tag do %>
+window.addEventListener('load', function() {
+  const dateInput = document.getElementById('exp_date_input');
+  if (!dateInput) return;
+  dateInput.addEventListener('click', function() {
+    if (typeof this.showPicker === 'function') {
+      this.showPicker();
+      return;
+    }
+    this.focus();
+    this.type = 'text';
+    this.type = 'date';
+  });
+});
+<% end %>

data/app/views/aviate/wallets/index.html.erb CHANGED Viewed

@@ -1,31 +1,45 @@
-<div class="search">
-  <div class="column-block">
-    <h1>
-      Wallets
-      <%= link_to '<i class="fa fa-plus-square"></i>'.html_safe,
-                  aviate_engine.new_account_wallet_path(@account_id),
-                  :class => 'btn btn-xs' %>
-    </h1>
-    <table id="wallets-table" class="table table-condensed mobile-data">
-      <thead>
-      <tr>
-        <th>Wallet ID</th>
-        <th>Account ID</th>
-        <th>Wallet Currency</th>
-        <th>Wallet Balance</th>
-        <th>Live Balance</th>
-      </tr>
-      </thead>
-      <tbody>
-      <tr>
-        <td colspan="1" class="dataTables_empty">Loading data from server</td>
-      </tr>
-      </tbody>
-    </table>
+<div class="kaui-container wallets-index">
+  <div class="d-flex " style="gap: 4rem;">
+    <div class="wallets" style="max-width: 80rem;">
+      <div class="d-flex flex-column ">
+        <div class="wallets-header mb-4">
+          <div class="d-flex align-items-center">
+            <h2>Wallets</h2>
+          </div>
+          <span>
+            <%= render "kaui/components/button/button", {
+              label: "Create Wallet",
+              icon: "kaui/plus.svg",
+              variant: "outline-secondary d-inline-flex align-items-center gap-1 mx-2",
+              type: "button",
+              html_class: "kaui-dropdown custom-hover text-nowrap",
+              html_options: {
+                onclick: "window.location.href='#{aviate_engine.new_account_wallet_path(@account_id)}'"
+              }
+            } %>
+          </span>
+        </div>
+        <div id="search-labels-container" class="ml-2">
+          <!-- Dynamic search labels will be added here -->
+        </div>
+        <table id="wallets-table" class="wallets-table">
+          <thead>
+            <tr>
+              <th>Wallet ID</th>
+              <th>Account ID</th>
+              <th>Wallet Currency</th>
+              <th>Wallet Balance</th>
+              <th>Live Balance</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td colspan="1" class="dataTables_empty">Loading data from server</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
   </div>
 </div>

data/app/views/aviate/wallets/new.html.erb CHANGED Viewed

@@ -1,8 +1,19 @@
-<div class="register">
-  <div class="col-md-8 col-md-offset-2">
-    <div class="column-block">
-      <h1>Create Wallet</h1>
+<div class="register add-new-wallet-details">
+  <div>
+    <div class="mx-auto" style="max-width:  37.5rem;">
+      <h5 class="add-new-wallet-title border-bottom pb-3 mb-3">
+        <span class="icon-container">
+          <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+            <path d="M15.8333 5.83333H4.16667C3.24619 5.83333 2.5 6.57953 2.5 7.5V15C2.5 15.9205 3.24619 16.6667 4.16667 16.6667H15.8333C16.7538 16.6667 17.5 15.9205 17.5 15V7.5C17.5 6.57953 16.7538 5.83333 15.8333 5.83333Z" stroke="#414651" stroke-width="1.5" stroke-linejoin="round"/>
+            <path d="M2.5 9.16667H17.5" stroke="#414651" stroke-width="1.5" stroke-linecap="round"/>
+            <path d="M5.83325 11.6667H7.49992" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+            <path d="M14.1667 12.5C14.6269 12.5 15 12.1269 15 11.6667C15 11.2064 14.6269 10.8333 14.1667 10.8333C13.7064 10.8333 13.3333 11.2064 13.3333 11.6667C13.3333 12.1269 13.7064 12.5 14.1667 12.5Z" fill="#414651"/>
+            <path d="M5.83325 3.33333C5.83325 2.8731 6.20635 2.5 6.66659 2.5H13.3333C13.7935 2.5 14.1666 2.8731 14.1666 3.33333V5.83333H5.83325V3.33333Z" stroke="#414651" stroke-width="1.5" stroke-linejoin="round"/>
+          </svg>
+        </span>
+        Create Wallet
+      </h5>
       <%= render 'form' %>
     </div>
   </div>
-</div>
+</div>

data/app/views/aviate/wallets/show.html.erb CHANGED Viewed

@@ -1,8 +1,19 @@
-<div class="register">
-  <div class="col-md-8 col-md-offset-2">
-    <div class="column-block">
-      <h1>Edit Wallet</h1>
+<div class="register add-new-wallet-details">
+  <div>
+    <div class="mx-auto" style="max-width:  37.5rem;">
+      <h5 class="add-new-wallet-title border-bottom pb-3 mb-3">
+        <span class="icon-container">
+          <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+            <path d="M15.8333 5.83333H4.16667C3.24619 5.83333 2.5 6.57953 2.5 7.5V15C2.5 15.9205 3.24619 16.6667 4.16667 16.6667H15.8333C16.7538 16.6667 17.5 15.9205 17.5 15V7.5C17.5 6.57953 16.7538 5.83333 15.8333 5.83333Z" stroke="#414651" stroke-width="1.5" stroke-linejoin="round"/>
+            <path d="M2.5 9.16667H17.5" stroke="#414651" stroke-width="1.5" stroke-linecap="round"/>
+            <path d="M5.83325 11.6667H7.49992" stroke="#414651" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+            <path d="M14.1667 12.5C14.6269 12.5 15 12.1269 15 11.6667C15 11.2064 14.6269 10.8333 14.1667 10.8333C13.7064 10.8333 13.3333 11.2064 13.3333 11.6667C13.3333 12.1269 13.7064 12.5 14.1667 12.5Z" fill="#414651"/>
+            <path d="M5.83325 3.33333C5.83325 2.8731 6.20635 2.5 6.66659 2.5H13.3333C13.7935 2.5 14.1666 2.8731 14.1666 3.33333V5.83333H5.83325V3.33333Z" stroke="#414651" stroke-width="1.5" stroke-linejoin="round"/>
+          </svg>
+        </span>
+        Edit Wallet
+      </h5>
       <%= render 'form' %>
     </div>
   </div>
-</div>
+</div>

data/config/locales/en.yml CHANGED Viewed

@@ -2,6 +2,8 @@ en:
   aviate:
     configuration:
       authentication_success: "Successfully authenticated. Welcome to Aviate!"
+      authentication_failed: "Authentication failed. Please check your credentials."
+      logout_success: "Successfully logged out from Aviate"
   flashes:
     notices:
       wallet_created_successfully: "Wallet created successfully"

data/lib/aviate/client.rb CHANGED Viewed

@@ -8,9 +8,8 @@ module Killbill
       class << self
         def aviate_plugin_available?(options = nil)
           path = "#{KILLBILL_AVIATE_PREFIX}/health/data"
           request_options = build_request_options(options)
           KillBillClient::API.get path, {}, request_options
           [true, nil]
@@ -31,9 +30,8 @@ module Killbill
         def retrieve_wallets(account_id, options = nil)
           path = "#{KILLBILL_AVIATE_PREFIX}/wallet/#{account_id}"
           request_options = build_request_options(options)
           response = KillBillClient::API.get path, {}, request_options
           JSON.parse(response.body)
         end
@@ -47,9 +45,9 @@ module Killbill
             expDurationUnit: wallet_params[:exp_duration_unit],
             expDurationLength: wallet_params[:exp_duration_length]
           }
           request_options = build_request_options(options)
           response = KillBillClient::API.put path, body.to_json, {}, request_options
           response.code
         end
@@ -109,11 +107,9 @@ module Killbill
             api_key: options[:api_key],
             api_secret: options[:api_secret]
           }
-          if options[:jwt_token].present?
-            request_options[:head] = { 'Authorization' => "Bearer #{options[:jwt_token]}" }
-          end
+          request_options[:head] = { 'Authorization' => "Bearer #{options[:jwt_token]}" } if options[:jwt_token].present?
           request_options
         end
       end

data/lib/aviate/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Aviate
-  VERSION = '1.1.0.pre.6'
+  VERSION = '1.1.0.pre.7'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-aviate
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre.6
+  version: 1.1.0.pre.7
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-26 00:00:00.000000000 Z
+date: 2025-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui