mno-enterprise-core 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b36015e6f83cd3b2b8568c374127f08851e3fa19
-  data.tar.gz: 3bc67afb284d6876665d4ee2c8fb9e0f71488a6b
+  metadata.gz: f917a6e753baa8624dce8b43b2bcb11fbcf2181e
+  data.tar.gz: 65f316eaa0ffdc58c30b77fa277c5ab7a719b736
 SHA512:
-  metadata.gz: bad44bd8652ccd321ecf95edd1db48d9dc8c465d213a0ab184f866320a0c12ae295aafbcdcc4de982612a13c3702a1f0e411d399faee0e2ba9d586c87f7c0b09
-  data.tar.gz: 317554cdc777ab9f5fac31da149caf1f0d8aea70bf0cabaf197f94e06d07faef1a63e996a1246373304582de44855996aad0496c430463504fe782a53ea74c9a
+  metadata.gz: 3b7d6482aab8df033971214542cd4812f207c57d428d62501a20c2bffc529bb5b99d6a1ebc566e1ca7737e5bda6ba05b72d1530cb4b09dfdc55addb077613168
+  data.tar.gz: 73a4607b1a631b6654fd83193880abce436ed050800d165497059ef5c32a3ef66fc5a9c71c923582be1685e83ab69a2777f99c354bcf831a2ddd48f0ab543c3e

data/app/helpers/mno_enterprise/image_helper.rb

@@ -28,5 +28,9 @@ module MnoEnterprise
     def engine_image_path(file_name)
       "#{MnoEnterprise::Engine.root}#{IMAGES_LOCATION}#{file_name}"
     end
+
+    def fit_image
+      'max-width: 150px; max-height: 150px;'
+    end
   end
 end

data/app/models/mno_enterprise/impac/dashboard.rb

@@ -1,11 +1,16 @@
 module MnoEnterprise
   class Impac::Dashboard < BaseResource
 
-    attributes :full_name, :widgets_order, :settings, :organization_ids, :widgets_templates, :currency
+    attributes :full_name, :widgets_order, :settings, :organization_ids, :widgets_templates, :currency, :published, :dashboard_type
 
     has_many :widgets, class_name: 'MnoEnterprise::Impac::Widget'
     has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi'
     belongs_to :owner, polymorphic: true
+    default_scope -> { where(dashboard_type: 'dashboard') }
+    scope :templates, -> { where(dashboard_type: 'template') }
+    scope :published_templates, -> { where(dashboard_type: 'template', published: true) }
+
+    custom_post :copy
 
     #============================================
     # Instance methods
@@ -16,10 +21,11 @@ module MnoEnterprise
       self.name
     end
 
-    # Return all the organizations linked to this dashboard and to which
-    # the user has access
+    # Return all the organizations linked to this dashboard and to which the user has access
+    # If the dashboard is a template, return all the current user's organization
     def organizations(org_list = nil)
       if org_list
+        return org_list if dashboard_type == 'template'
         org_list.to_a.select { |e| self.organization_ids.include?(e.uid) }
       else
         MnoEnterprise::Organization.where('uid.in' => self.organization_ids).to_a
@@ -40,8 +46,20 @@ module MnoEnterprise
     def to_audit_event
       {
         name: name,
-        organization_id: (owner_type == 'MnoEnterprise::Organization') ? owner_id : nil
+        organization_id: (owner_type == 'Organization') ? owner_id : nil
+      }
+    end
+
+    def copy(owner, name, organization_ids)
+      owner_type = owner.class.name.demodulize
+      attrs = {
+        id: self.id,
+        name: name,
+        organization_ids: organization_ids,
+        owner_type: owner_type,
+        owner_id: owner.id
       }
+      self.class.copy(attrs)
     end
   end
 end

data/app/models/mno_enterprise/impac/widget.rb

@@ -9,7 +9,7 @@ module MnoEnterprise
 
     def to_audit_event
 
-      if settings['organization_ids'].any?
+      if settings.present? && settings['organization_ids'].present?
         organization = MnoEnterprise::Organization.find_by(uid: settings['organization_ids'].first)
         { name: name, organization_id: organization.id }
       else

data/app/pdf/mno_enterprise/invoice_pdf.rb

@@ -128,7 +128,7 @@ module MnoEnterprise
       @pdf.repeat :all do
         @pdf.bounding_box([0, @pdf.bounds.top+@format[:header_size]], width: 540, height: @format[:footer_size]) do
           @pdf.float do
-            @pdf.image main_logo_white_bg_path(true), scale: 0.5
+            @pdf.image main_logo_white_bg_path(true), fit: [135, (@format[:footer_size])]
           end
           @pdf.move_down 52
           @pdf.font_size(20) { @pdf.text "#{title} #{@data[:period_month]}", style: :bold, align: :right }
@@ -145,9 +145,10 @@ module MnoEnterprise
           @pdf.stroke_horizontal_rule
           @pdf.move_down 10
           @pdf.font_size(8) do
-            @pdf.text "<color rgb='999999'>Maestrano is a service of Maestrano Pty Ltd (ABN: 80 152 564 424),</color>", inline_format: true
-            @pdf.text "<color rgb='999999'>Suite 504, 46 Market Street, Sydney, NSW 2000, Australia.</color>", inline_format: true
-            @pdf.text "<color rgb='999999'>All charges are in #{@data[:invoice_currency_name]} (#{@data[:invoice_currency]}).</color>", inline_format: true
+            @pdf.text "<color rgb='999999'>This invoice has been generated by Maestrano Pty Ltd on behalf of the #{MnoEnterprise.app_name} platform (the \"Service\").</color>", inline_format: true
+            @pdf.text "<color rgb='999999'>All charges in this invoice are in #{@data[:invoice_currency_name]} (#{@data[:invoice_currency]}). Credit card payments will be processed by Maestrano Pty Ltd.</color>", inline_format: true
+            @pdf.text " ", inline_format: true
+            @pdf.text "<color rgb='999999'>Maestrano Pty Ltd | Suite 504, 46 Market Street, Sydney, NSW 2000, Australia | ABN: 80 152 564 424</color>", inline_format: true
           end
         end
       end
@@ -246,11 +247,12 @@ module MnoEnterprise
       @pdf.move_down 10
       @pdf.indent(5) do
         @pdf.font_size(8) do
+          @pdf.text "<color rgb='999999'> This charge will appear as INV #{@data[:invoice_reference]} on your bank statement.</color>", inline_format: true
           @pdf.text "<color rgb='999999'> Charges are all displayed in #{@data[:invoice_currency_name]} (#{@data[:invoice_currency]})</color>", inline_format: true
           if @data[:invoice_fully_paid]
             @pdf.text "<color rgb='999999'>  No credit card payments required for this invoice</color>", inline_format: true
           else
-            @pdf.text "<color rgb='999999'>  Your designated credit card will be charged on #{@data[:period_charge_date].strftime("%B,%e %Y")} at midnight UTC</color>", inline_format: true
+            @pdf.text "<color rgb='999999'>  Your designated credit card will be charged on #{@data[:period_charge_date].strftime("%B,%e %Y")} at midnight UTC by Maestrano Pty Ltd as service provider to the #{MnoEnterprise.app_name} platform.</color>", inline_format: true
           end
         end
       end

data/app/views/system_notifications/confirmation-instructions.html.erb

@@ -6,7 +6,7 @@
   </head>
   <body>
     <p class="header">
-      <%= image_tag('mno_enterprise/main-logo.png') %>
+      <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
     </p>
 
     <p>Hi <%= @info[:first_name] %></p>

data/app/views/system_notifications/delete-request-instructions.html.erb

@@ -6,7 +6,7 @@
   </head>
   <body>
     <p class="header">
-      <%= image_tag('mno_enterprise/main-logo.png') %>
+      <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
     </p>
 
     <p>Hi <%= @info[:first_name] %></p>

data/app/views/system_notifications/email-change.html.erb

@@ -6,7 +6,7 @@
 </head>
 <body>
 <p class="header">
-  <%= image_tag('mno_enterprise/main-logo.png') %>
+  <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
 </p>
 
 <p>Hi <%= @info[:first_name] %></p>

data/app/views/system_notifications/organization-invite-existing-user.html.erb

@@ -6,7 +6,7 @@
   </head>
   <body>
     <p class="header">
-      <%= image_tag('mno_enterprise/main-logo.png') %>
+      <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
     </p>
 
     <p>Hi there,</p>

data/app/views/system_notifications/organization-invite-new-user.html.erb

@@ -6,7 +6,7 @@
   </head>
   <body>
     <p class="header">
-      <%= image_tag('mno_enterprise/main-logo.png') %>
+      <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
     </p>
 
     <p>Hi there,</p>

data/app/views/system_notifications/password-change.html.erb

@@ -6,7 +6,7 @@
 </head>
 <body>
 <p class="header">
-  <%= image_tag('mno_enterprise/main-logo.png') %>
+  <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
 </p>
 
 <p>Hi <%= @info[:first_name] %></p>

data/app/views/system_notifications/reconfirmation-instructions.html.erb

@@ -6,7 +6,7 @@
   </head>
   <body>
     <p class="header">
-      <%= image_tag('mno_enterprise/main-logo.png') %>
+      <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
     </p>
 
     <p>Hi <%= @info[:first_name] %></p>

data/app/views/system_notifications/registration-instructions.html.erb

@@ -6,7 +6,7 @@
   </head>
   <body>
     <p class="header">
-      <%= image_tag('mno_enterprise/main-logo.png') %>
+      <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
     </p>
 
     <p>Hi there,</p>

data/app/views/system_notifications/reset-password-instructions.html.erb

@@ -6,7 +6,7 @@
   </head>
   <body>
     <p class="header">
-      <%= image_tag('mno_enterprise/main-logo.png') %>
+      <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
     </p>
 
     <p>Hi <%= @info[:first_name] %></p>

data/app/views/system_notifications/unlock-instructions.html.erb

@@ -6,7 +6,7 @@
   </head>
   <body>
     <p class="header">
-      <%= image_tag('mno_enterprise/main-logo.png') %>
+      <%= image_tag(main_logo_white_bg_path, style: fit_image) %>
     </p>
 
     <p>Hi <%= @info[:first_name] %></p>

data/config/locales/templates/dashboard/marketplace/en.yml

@@ -122,3 +122,4 @@ en:
             companies_number: "Number of companies using the application"
             pricing: "Pricing"
             pricing_not_available: "pricing information not available"
+            no_review: "Rating not yet available"

data/config/locales/templates/dashboard/organization/en.yml

@@ -94,12 +94,15 @@ en:
               cancel: Cancel
               next: Next
               invite: Invite
+              roles_info:
+                member: "A <b>Member</b> can see other members and access the company apps"
+                admin: "An <b>Admin</b> can manage other members (except Super Admin users) and manage the company apps"
+                super_admin: "A <b>Super Admin</b> has all power within the company including access to billing management"
             edition_modal:
               cancel: Cancel
               change: Change
               roles:
                 member: A member can see other members and access the company apps
-                power_user: A Power User can see other members and start idle company apps (on per hour plan)
                 admin: An Admin can manage other members (except Super Admin users) and manage the company apps
                 super_admin: A Super Admin has all power within the company including access to billing management
             removal_modal:

data/lib/generators/mno_enterprise/install/templates/config/settings.yml

@@ -71,6 +71,10 @@ admin_panel:
       enabled: true
   finance:
     enabled: true
+  # Ability to enable Intercom on the admin panel
+  # Intercom needs to be properly setup for the dashboard
+  intercom:
+    enabled: false
   impersonation:
     disabled: false
   staff:

data/lib/mno_enterprise/concerns/controllers/auth/confirmations_controller.rb

@@ -92,6 +92,9 @@ module MnoEnterprise::Concerns::Controllers::Auth::ConfirmationsController
     end
 
     if resource.errors.empty?
+      if params[:tos] == "accept"
+        params[:user][:meta_data] = resource.meta_data.merge(tos_accepted_at: Time.current)
+      end
       resource.assign_attributes(params[:user]) unless resource.confirmed?
       resource.perform_confirmation(@confirmation_token)
       resource.save

data/lib/mno_enterprise/concerns/controllers/auth/registrations_controller.rb

@@ -20,7 +20,8 @@ module MnoEnterprise::Concerns::Controllers::Auth::RegistrationsController
           :surname,
           :company,
           :phone,
-          :phone_country_code
+          :phone_country_code,
+          {meta_data: [:tos_accepted_at]}
         )}
       end
   end
@@ -44,6 +45,11 @@ module MnoEnterprise::Concerns::Controllers::Auth::RegistrationsController
 
   # POST /resource
   def create
+    #  Filling the time at which TOS were accepted
+    if params[:tos]
+      params[:user][:meta_data] = {tos_accepted_at: Time.current}
+    end
+
     build_resource(sign_up_params)
     resource.password ||= Devise.friendly_token
 

data/lib/mno_enterprise/concerns/models/ability.rb

@@ -144,7 +144,7 @@ module MnoEnterprise::Concerns::Models::Ability
 
   # Abilities for admin user
   def admin_abilities(user)
-    if user.admin_role.to_s.casecmp('admin').zero?
+    if user.admin_role.to_s.casecmp('admin').zero? || user.admin_role.to_s.casecmp('staff').zero?
       can :manage_app_instances, MnoEnterprise::Organization
     end
   end

data/lib/mno_enterprise/smtp_client.rb

@@ -3,6 +3,8 @@ require 'action_mailer/railtie'
 module MnoEnterprise
   # Base class (instantiable) for SMTP adapter
   class SmtpClient < ActionMailer::Base
+    helper MnoEnterprise::ImageHelper
+    
     # Send SMTP template - terminal mailing part
     def deliver(template, from, to, vars={}, opts={})
       @info = vars

data/lib/mno_enterprise/testing_support/factories/users.rb

@@ -21,6 +21,7 @@ FactoryGirl.define do
     updated_at 2.days.ago
     sso_session "1fdd5sf5a73D7sd1as2a4sd541"
     admin_role nil
+    meta_data Hash[]
 
     confirmation_sent_at 2.days.ago
     confirmation_token "wky763pGjtzWR7dP44PD"

data/lib/mno_enterprise/version.rb

@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 end

data/spec/helpers/image_helper_spec.rb

@@ -3,67 +3,74 @@ require 'rails_helper'
 module MnoEnterprise
   describe ImageHelper do
 
-    let(:folder) { "/app/assets/images/mno_enterprise" }
+    let(:folder) { '/app/assets/images/mno_enterprise' }
     let(:root) {"#{Rails.root}#{folder}"}
     let(:path_engine_main_logo) { "#{MnoEnterprise::Engine.root}#{folder}/main-logo.png" }    
     let(:path_main_logo) { "#{root}/main-logo.png" }
     let(:path_main_logo_white) { "#{root}/main-logo-whitebg.png" }
 
-    describe "#main_logo_white_bg_path" do
+    describe '#main_logo_white_bg_path' do
     
-      context "when no logos exist"  do
+      context 'when no logos exist'  do
 
-        it "returns the engine main-logo filename" do
-          expect(helper.main_logo_white_bg_path).to match("mno_enterprise/main-logo.png")
+        it 'returns the engine main-logo filename' do
+          expect(helper.main_logo_white_bg_path).to match('mno_enterprise/main-logo.png')
         end
 
-        it "returns the engine main-logo full path"  do
+        it 'returns the engine main-logo full path'  do
           expect(helper.main_logo_white_bg_path(true)).to match(path_engine_main_logo)
         end
       end
 
-      context "when main-logo.png exists and main-logo-whitebg.png do not exist"  do
+      context 'when main-logo.png exists and main-logo-whitebg.png do not exist'  do
         before { allow(File).to receive(:exists?).with(path_main_logo_white).and_return(false) }
         before { allow(File).to receive(:exists?).with(path_main_logo).and_return(true) }
         
-        it "returns the main-logo filename" do
-          expect(helper.main_logo_white_bg_path).to match("mno_enterprise/main-logo.png")
+        it 'returns the main-logo filename' do
+          expect(helper.main_logo_white_bg_path).to match('mno_enterprise/main-logo.png')
         end
 
-        it "returns the main-logo full path"  do
+        it 'returns the main-logo full path'  do
           expect(helper.main_logo_white_bg_path(true)).to match(path_main_logo)
         end
       end
 
-      context "when main-logo-whitebg.png exists"  do
+      context 'when main-logo-whitebg.png exists'  do
         before { allow(File).to receive(:exists?).with(path_main_logo_white).and_return(true) }
         
-        it "returns the filename" do
-          expect(helper.main_logo_white_bg_path).to match("mno_enterprise/main-logo-whitebg.png")
+        it 'returns the filename' do
+          expect(helper.main_logo_white_bg_path).to match('mno_enterprise/main-logo-whitebg.png')
         end
 
-        it "returns the full path"  do
+        it 'returns the full path'  do
           expect(helper.main_logo_white_bg_path(true)).to match(path_main_logo_white)
         end
       end
     end
     
-    describe "#main_logo_path" do
+    describe '#main_logo_path' do
 
-      context "when there are no logos" do
+      context 'when there are no logos' do
 
-        it "returns the engines main-logo " do
+        it 'returns the engines main-logo' do
           expect(helper.main_logo_path).to match(path_engine_main_logo)
         end
       end
 
-      context "when main-logo.png exists"  do
+      context 'when main-logo.png exists'  do
         before { allow(File).to receive(:exists?).with(path_main_logo).and_return(true) }
 
-        it "returns the full path"  do
+        it 'returns the full path'  do
           expect(helper.main_logo_path).to match(path_main_logo)
         end
       end
     end
+
+    describe '#fit_image' do
+
+      it 'returns the style' do
+        expect(helper.fit_image).to match('max-width: 150px; max-height: 150px;')
+      end
+    end
   end
 end

data/spec/models/mno_enterprise/impac/dashboard_spec.rb

@@ -2,17 +2,14 @@ require 'rails_helper'
 
 module MnoEnterprise
   RSpec.describe Impac::Dashboard, type: :model do
-    subject(:dashboard) { build(:impac_dashboard) }
+    let(:org1) { build(:organization) }
+    subject(:dashboard) { build(:impac_dashboard, organization_ids: [org1.uid]) }
 
     describe '#full_name' do
       subject { dashboard.full_name }
       it { is_expected.to eq(dashboard.name) }
     end
 
-    describe '#sorted_widgets' do
-      it 'is pending'
-    end
-
     describe '#filtered_widgets_templates' do
       let(:templates) {
         [
@@ -42,5 +39,20 @@ module MnoEnterprise
         end
       end
     end
+
+    describe '#organizations(orgs_list)' do
+      subject { dashboard.organizations(orgs_list) }
+
+      let(:org2) { build(:organization) }
+      let(:orgs_list) { [org1, org2] }
+
+      it { is_expected.to eq([org1]) }
+
+      context 'when the dashboard is a template' do
+        let(:dashboard) { build(:impac_dashboard, organization_ids: [org1.uid], dashboard_type: 'template') }
+
+        it { is_expected.to eq([org1, org2]) }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails