kaui 1.0.0 → 1.1.0

data/app/views/kaui/accounts/_payment_methods.html.erb

@@ -1,4 +1,4 @@
-<div class="col-md-6">
+<div class="col-md-6 col-xs-12">
 
   <div class="column-block">
 

data/app/views/kaui/accounts/_personal_info.html.erb

@@ -0,0 +1,74 @@
+<div class="col-md-6 col-xs-12">
+
+  <div class="column-block">
+
+    <h1>Personal Information</h1>
+
+    <div class="info-wrapper">
+
+      <div class="toggler">
+        <div class="first-line">
+          <b>Show/Hide Content</b>
+          <i class="fa fa-caret-down"></i>
+          <i class="fa fa-caret-up"></i>
+        </div>
+
+          <div class="toggle">
+            <div class="row">
+            <div class="col-md-12">
+              <div class="fix-position">
+                <table class="transparent">
+                  <tr>
+                    <th>Name</th>
+                    <td><%= @account.name %></td>
+                  </tr>
+                  <tr>
+                    <th>Address1</th>
+                    <td><%= @account.address1 %></td>
+                  </tr>
+                  <tr>
+                    <th>Address2</th>
+                    <td><%= @account.address2 %></td>
+                  </tr>
+                  <tr>
+                    <th>City</th>
+                    <td><%= @account.city %></td>
+                  </tr>
+                  <tr>
+                    <th>State</th>
+                    <td><%= @account.state %></td>
+                  </tr>
+                  <tr>
+                    <th>Country</th>
+                    <td><%= @account.country %></td>
+                  </tr>
+                  <tr>
+                    <th>Postal Code</th>
+                    <td><%= @account.postal_code %></td>
+                  </tr>
+                  <tr>
+                    <th>Phone</th>
+                    <td><%= @account.phone %></td>
+                  </tr>
+                  <tr>
+                    <th>Company</th>
+                    <td><%= @account.company %></td>
+                  </tr>
+                  <tr>
+                    <th>Primary email</th>
+                    <td><%= @account.email %></td>
+                  </tr>
+                  <%= render :partial => 'kaui/account_emails/account_emails_table',
+                             :locals => {:account_emails => @account_emails} %>
+                </table>
+              </div>
+            </div>
+          </div>
+          </div>
+      </div>
+
+    </div>
+
+  </div>
+
+</div>

data/app/views/kaui/accounts/index.html.erb

@@ -12,12 +12,9 @@
       <thead>
       <tr>
         <th></th>
-        <th>Name</th>
         <th>ID</th>
         <th>External key</th>
         <th>Balance</th>
-        <th>City</th>
-        <th>Country</th>
       </tr>
       </thead>
       <tbody>
@@ -55,7 +52,10 @@ $(document).ready(function() {
         $(td).css('width', '60px');
 
     } }
-    ]
+    ],
+    drawCallback: function() {
+        setObjectIdPopover();
+    }
   });
 
   <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->

data/app/views/kaui/accounts/show.html.erb

@@ -1,8 +1,14 @@
-<%= render :partial => 'account_info' %>
+<div class="row">
+  <%= render :partial => 'account_info' %>
 
-<%= render :partial => 'billing_info' %>
+  <%= render :partial => 'billing_info' %>
+</div>
+<div class="row">
+  <%= render :partial => 'personal_info' %>
+
+  <%= render :partial => 'payment_methods' %>
+</div>
 
-<%= render :partial => 'payment_methods' %>
 
 <%= render :partial => 'link_parent_modal' %>
 

data/app/views/kaui/admin_allowed_users/_form.html.erb

@@ -1,10 +1,11 @@
 <% # Unclear why this url/method hack is needed %>
 <%= form_for @allowed_user, :url => @allowed_user.persisted? ? admin_allowed_user_path(@allowed_user.id) : admin_allowed_users_path, :method => @allowed_user.persisted? ? :put : :post, :html => {:class => 'form-horizontal'} do |f| %>
+    <input type="hidden" id="killbillManaged" value="<%= @is_killbill_managed %>" />
     <div class='form-group'>
       <div class="col-sm-offset-2 col-sm-9">
         <div class="checkbox">
           <%= label_tag :external do %>
-              <%= check_box_tag :external %>Managed externally (LDAP, Okta, etc.)?
+                  <%= check_box_tag :external, '1', false, { :disabled => !@allowed_user.id.blank? } %>Managed externally (LDAP, Okta, etc.)?
           <% end %>
         </div>
       </div>
@@ -42,15 +43,42 @@
     </div>
 <% end %>
 
+<!-- is the user been edited? -->
+<% if @allowed_user.persisted? %>
+  <div class="footer-notice managed-externally-notice">
+    <div class="modal-footer">
+      <div class="alert alert-warning">
+        <strong>Notice</strong>
+        <p id="noticeMessage">This user is managed externally (LDAP, Okta, etc.) or via Shiro configuration file.</p>
+      </div>
+    </div>
+  </div>
+<% end %>
+
 <%= javascript_tag do %>
-    $('#external').change(function() {
-      if ($('#external').is(":checked")) {
-        $('#password').attr('disabled', true);
-        $('#roles').attr('disabled', true);
-      }
-      else {
-        $('#password').attr('disabled', false);
-        $('#roles').attr('disabled', false);
-      }
+    $(document).ready(function() {
+
+        $('#external').change(function() {
+            is_killbill_managed();
+        });
+
+        function is_killbill_managed() {
+            var isKillbillManaged = isBlank($('#killbillManaged').val()) || $('#killbillManaged').val() == 'true';
+
+            if ($('#external').is(":checked") || !isKillbillManaged) {
+                $('#password').attr('disabled', true);
+                $('#roles').attr('disabled', true);
+                $('.help-block').hide();
+                $('.managed-externally-notice').show();
+            }
+            else {
+                $('#password').attr('disabled', false);
+                $('#roles').attr('disabled', false);
+                $('.help-block').show();
+                $('.managed-externally-notice').hide();
+            }
+        }
+
+        is_killbill_managed();
     });
 <% end %>

data/app/views/kaui/admin_tenants/_form_plugin_config.erb

@@ -22,6 +22,7 @@
               <%= text_field_tag :entered_plugin_name, nil, :class => 'form-control', :plugin_config => @plugin_config, :tenant_plugin_config => @tenant_plugin_config %>
               <div class="text plugin-suggestion text-danger"></div>
             </div>
+            <div class="col-sm-1 spinner"><i class="fa fa-cog fa-2x fa-spin"></i></div>
             <label class="col-sm-1 toggle-container control-label">
               <label class="switch">
                 <input id="toggle_input" type="checkbox">
@@ -31,8 +32,17 @@
             <label class="col-sm-3 control-label toggle-label text-muted">or toggle plugin name input</label>
           </div>
 
+          <div id="plugin_config_properties_header" class="form-group">
+            <label class="col-sm-2 control-label" for="plugin_name">Plugin Properties</label>
+            <label class="control-label switch-half-container" title="toggle raw">
+              <label class="switch-half">
+                <input id="toggle_raw" type="checkbox">
+                <span class="slider round"></span>
+              </label>
+            </label>
+          </div>
           <!-- Anchor DIV that gets thrown away when switching plugins -->
-          <div id="plugin_config_properties" plugin_name="" class="col-sm-10">
+          <div id="plugin_config_properties" plugin_name="" class="row">
           </div>
 
           <div class="form-group">
@@ -45,10 +55,11 @@
 <% end %>
 
 <script id="plugin_config_properties_template" type="text/template">
+  <input type="hidden" id="plugin_key_values" value="{{data_json}}" />
   {{#plugin_props_with_values}}
   <div class="form-group">
-    <label class="col-sm-2 control-label" for="{{property}}">{{property_label}}</label>
-    <div class="col-sm-4">
+    <label class="col-sm-offset-1 col-sm-2 control-label" for="{{property}}">{{property_label}}</label>
+    <div class="col-sm-6">
       {{#is_raw_config}}
         <textarea name="plugin_properties[raw_config]" id="raw_config" rows="10" class="form-control">{{value}}</textarea>
       {{/is_raw_config}}
@@ -73,6 +84,8 @@
 
 <%= javascript_tag do %>
     $(document).ready(function() {
+        $(".spinner").hide();
+        $('#plugin_config_properties_header').hide();
 
         $('#entered_plugin_name').toggle();
         $('#toggle_input').on('change', function() {
@@ -86,18 +99,42 @@
             $('#select_plugin_name').val('');
             $('#plugin_config_properties').attr('plugin_name', '');
             $('#plugin_config_properties').empty();
+            $('#plugin_config_properties_header').hide();
+            $(".plugin-suggestion").html('');
+        });
 
+        $("#toggle_raw").on('change', function(e) {
+            if (isBlank($('#plugin_key_values').val())) {
+                return;
+            }
+
+            var plugin_key_values = JSON.parse($('#plugin_key_values').val());
+            if ($("#toggle_raw").prop("checked")) {
+                var raw = [];
+                raw.push({ is_raw_config: true, property: "raw_config", property_label: "Raw Config", value: ''});
+                for ( var i = 0; i < plugin_key_values.length ; i++ ) {
+                    raw[0].value += plugin_key_values[i].property + '=' + plugin_key_values[i].value;
+                    if (i < plugin_key_values.length - 1) {
+                        raw[0].value += "\n";
+                    }
+                }
+                render_plugin_key_values(raw, plugin_key_values);
+            } else {
+                render_plugin_key_values(plugin_key_values, plugin_key_values);
+            }
         });
 
-        $('#select_plugin_name').on('click', function(e) {
-            if (e.target.localName == 'option') {
-                var plugin_name = e.target.value;
-                var plugin_key = e.target.text;
+        $('#select_plugin_name').on('change', function(e) {
+            var selectedOption = e.target.selectedOptions;
+
+            if (selectedOption.length > 0) {
+                var plugin_name = selectedOption[0].value;
+                var plugin_key = selectedOption[0].text;
                 $("#plugin_name").val(plugin_name);
                 $("#plugin_key").val(plugin_key);
-                $("#plugin_type").val(e.target.dataset['pluginType']);
+                $("#plugin_type").val(selectedOption[0].dataset['pluginType']);
                 $('#plugin_config_properties').attr('plugin_name', '');
-
+                $('#plugin_config_properties_header').hide();
                 add_properties_for_plugin(plugin_key, plugin_name);
             }
         });
@@ -131,7 +168,7 @@
                     var el_props = el_parts[1];
                     if (el_plugin_name === entered_plugin_name) {
                         if (el_props.split('=')[0] == 'raw_config') {
-                            res['raw_config'] = el_props.substr(11);
+                            res['raw_config'] = el_props.replace("raw_config=", "");
                         } else {
                             $.map(el_props.split('|'), function(el) {
                                 var parts = el.split('=');
@@ -145,7 +182,7 @@
             return res;
         }
 
-        function get_selected_plugin_info(plugin_index) {
+        function get_selected_plugin_info(plugin_key) {
             var plugin_config_str = $('#entered_plugin_name').attr('plugin_config');
             var res = {}
             /* Deserialize plugin/properties (see AdminTenant model)*/
@@ -155,14 +192,14 @@
                 var el_plugin_name = el_parts_key[0];
                 var el_plugin_type = el_parts_key[1];
                 var el_plugin_props = el_parts[1];
-                if (el_plugin_name == plugin_index) {
+                if (el_plugin_name == plugin_key) {
                     res['type'] = el_plugin_type;
                     res['props'] = el_plugin_props == "" ? [] : (el_plugin_type == "" ? ['raw_config'] : el_plugin_props.split(','));
                     return false;
                 }
             });
 
-            if (res['props'] == undefined) {
+            if (isBlank(res['props'])) {
                 res['type'] = '';
                 res['props'] = ['raw_config'];
             }
@@ -171,7 +208,6 @@
         }
 
         function add_properties_for_plugin(plugin_key, plugin_name) {
-            console.log(plugin_key, plugin_name);
             var plugin_info = get_selected_plugin_info(plugin_key);
 
             if (isBlank(plugin_name)) {
@@ -188,14 +224,25 @@
             /* Retrieve existing plugin properties for this tenant */
             var existing_props = get_existing_tenant_plugin_properties(plugin_key);
 
+            // try by plugin name for proprietary plugins
+            if (isBlank(existing_props)) {
+                existing_props = get_existing_tenant_plugin_properties(plugin_name);
+            }
+
             var type = plugin_info['type'];
             var props = plugin_info['props']
 
+            if (isBlank(type)) {
+                $(".switch-half-container").hide();
+            } else {
+                $(".switch-half-container").show();
+            }
+
             $('#plugin_type').val(type);
             /* Prune the tree to restart from scratch */
+            $('#plugin_config_properties_header').show();
             $('#plugin_config_properties').empty();
-            $('#plugin_config_properties').append('<label class="col-sm-2 control-label" for="plugin_name">Plugin Properties</label>');
-            $('#plugin_config_properties').append('<div id="plugin_config_properties_anchor" class="col-sm-offset-2 col-sm-10">');
+            $('#plugin_config_properties').append('<div id="plugin_config_properties_anchor" class="col-sm-12"></div>');
 
             var merged_props_with_values = existing_props;
             if (props != undefined) {
@@ -233,8 +280,13 @@
                 plugin_props_with_values.push({ property_label: format_label(p), property: p, value: v, is_raw_config: p == 'raw_config'});
             });
 
+            render_plugin_key_values(plugin_props_with_values, plugin_props_with_values);
+        }
+
+        function render_plugin_key_values(plugin_props_with_values, original) {
             var template = $("#plugin_config_properties_template").html();
-            var plugin_props_with_values_html = Mustache.render( template , { plugin_props_with_values: plugin_props_with_values});
+            var plugin_props_with_values_html = Mustache.render( template ,{ plugin_props_with_values: plugin_props_with_values,
+                                                                             data_json: JSON.stringify(original)});
             $("#plugin_config_properties_anchor").html(plugin_props_with_values_html);
         }
 
@@ -256,6 +308,7 @@
         }
 
         function suggested_response(response) {
+            $(".spinner").hide();
             if (!isBlank(response.suggestion)) {
                 $(".plugin-suggestion").html(response.suggestion);
 
@@ -266,6 +319,7 @@
                     $("#entered_plugin_name").val(plugin_name);
                     $("#plugin_key").val(plugin_key);
                     $("#plugin_type").val(e.currentTarget.dataset['pluginType']);
+                    $("#entered_plugin_name").data("last", plugin_name);
 
                     $(".plugin-suggestion").html('');
                     add_properties_for_plugin(isBlank(plugin_key) ? plugin_name : plugin_key, plugin_name);
@@ -284,12 +338,23 @@
 
         function suggest_plugin_name() {
             var plugin_name = $("#entered_plugin_name").val();
+            var last_plugin_name = $("#entered_plugin_name").data("last");
             $("#plugin_key").val(plugin_name);
 
             if (isBlank(plugin_name)) {
                 return;
             }
 
+            // no change
+            if ( plugin_name == last_plugin_name) {
+                return;
+            }
+
+            $('#plugin_config_properties').attr('plugin_name', '');
+            $('#plugin_config_properties').empty();
+            $(".plugin-suggestion").html('');
+            $("#entered_plugin_name").data("last", plugin_name);
+            $(".spinner").show();
             $.ajax({
                 url: '<%= suggest_plugin_name_path() %>',
                 type: "GET",

data/app/views/kaui/admin_tenants/_show_catalog_simple.erb

@@ -4,11 +4,15 @@
     <h1>Existing Plans
         <% if can? :config_upload, Kaui::AdminTenant %>
             <%= link_to '<i class="fa fa-plus-square"></i>'.html_safe,
-                        kaui_engine.admin_tenant_new_catalog_path(:id => @tenant.id),
+                        admin_tenant_new_catalog_path(:id => @tenant.id),
                         :class => 'btn btn-xs' %>
         <% end %>
+        <%= link_to '<i class="fa fa-arrow-down" aria-hidden="true"></i>'.html_safe,
+                    download_catalog_xml_path(:id => @tenant.id, :effective_date => @latest_version),
+                    :class => 'btn btn-xs', :id => 'download_link' %>
         <% if can?(:delete, Kaui::AdminTenant) %>
-            <%= link_to '<i class="fa fa-times"></i>'.html_safe, kaui_engine.admin_tenant_delete_catalog_path(:id => @tenant.id), :method => :delete %>
+            <%= link_to '<i class="fa fa-times"></i>'.html_safe,
+                        admin_tenant_delete_catalog_path(:id => @tenant.id), :method => :delete, :class => 'btn btn-xs' %>
         <% end %>
         <a class='btn btn-xs' href="javascript:void(0);" onclick="switchXMLConfig();">Enable XML View</a>
     </h1>
@@ -153,7 +157,7 @@
     function fetchCatalog(effectiveDate) {
         if (effectiveDate == '')
             return;
-        
+
         $.ajax(
         {
             url: Routes.kaui_engine_catalog_by_effective_date_path(),
@@ -166,6 +170,10 @@
             success: function(data) {
                 renderCurrencySelect(data);
                 renderCatalog(data);
+
+                //update the download path
+                var download_path = Routes.kaui_engine_download_catalog_xml_path(<%= @tenant.id %>, { 'effective_date': effectiveDate });
+                $('#download_link').attr('href',download_path);
             }
         });
     }

data/app/views/kaui/admin_tenants/_show_overdue.erb

@@ -34,14 +34,14 @@
               <td><%= state.external_message %></td>
               <td>
                 <ul>
-                  <% if state.block_changes %>
+                  <% if state.is_block_changes %>
                       <li>
-                        <%= 'Block changes:' %><%= state.block_changes %>
+                        <%= 'Block changes:' %><%= state.is_block_changes %>
                       </li>
                   <% end %>
-                  <% if state.disable_entitlement %>
+                  <% if state.is_disable_entitlement %>
                       <li>
-                        <%= 'Cancel subscriptions:' %><%= state.disable_entitlement %>
+                        <%= 'Cancel subscriptions:' %><%= state.is_disable_entitlement %>
                         (policy:<%= state.subscription_cancellation_policy %>)
                       </li>
                   <% end %>