mno-enterprise-core 3.0.7 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e66a5aee69128edacb89198ee45091e47f122bf
-  data.tar.gz: d44daad907fa1a756615b594da21d7c44501a297
+  metadata.gz: 1f6186245d5ffafcbdde4aebcb976b5ec4e841b2
+  data.tar.gz: d5ecb24f9f5be4a58bbd39b1ee0f1210c971d544
 SHA512:
-  metadata.gz: 2b169ef2e75dc049271f3bc6a350716369485437483cf258d3674f4f480af0a448ed8d66ef8e76d361526715d752d31cd2619bc5ef1d12ec71e35db01a83f0e7
-  data.tar.gz: 3cc52c2f2ba69f7612502bab7dc21017067a71b178e5c25e3d31a5a0dcb30fdfbfe1c20c9d3e3f8b785a2f731a85c17b9a34fa6a0b08a3f44ce8ee960788e638
+  metadata.gz: f0ed824978bc6d391744c66a0045e634bd4364c289796e4138bf2818955eac35f2957c27d9183c3e17d5e138b5c29fc7ddb91d765053606e4adda06d53b15a99
+  data.tar.gz: 665975695947ba02bae356968e139128006e258730e949bcd5e14709a39bf264e01f265e4a22d024c9f5ff5bb696606c238bfc22a0a39425da29d1f90e0f1c74

data/app/assets/stylesheets/mno_enterprise/mail.css

@@ -0,0 +1,27 @@
+.header {
+  display: block;
+  width: 100%;
+
+  margin-bottom: 40px;
+  padding: 20px 0;
+  border-bottom: 1px solid #ccc;
+}
+.header img{
+  display: block;
+  width: 40%;
+  min-width: 200px;
+  max-width: 400px;
+  
+  margin: 0 auto;
+}
+
+.footer {
+  margin-top: 40px;
+  padding: 10px 0 0;
+
+  text-align: right;
+  font-size: 15px;
+  
+  color: #666;
+  border-top: 1px solid #ccc;
+}

data/app/helpers/mno_enterprise/application_helper.rb

@@ -63,5 +63,19 @@ module MnoEnterprise
       return text unless text.present?
       HtmlProcessor.new(text, format: :markdown).html.html_safe
     end
+
+    # Return the user avatar url. The displayed picture use the gravatar of the user email
+    # TODO: add and use avatar_email from the OAUTH user
+    def avatar_url(user)
+      gravatar_url(user.email)
+    end
+
+    # Return the gravatar url for the given email
+    def gravatar_url(email)
+      if email
+        gravatar_id = Digest::MD5.hexdigest(email.downcase)
+        "https://gravatar.com/avatar/#{gravatar_id}.png?s=50&d=mm"
+      end
+    end
   end
 end

data/app/helpers/mno_enterprise/impersonate_helper.rb

@@ -24,4 +24,4 @@ module MnoEnterprise
     end
 
   end
-end
+end

data/app/models/mno_enterprise/app.rb

@@ -22,6 +22,7 @@
 #  stack                    :string(255)
 #  terms_url                :string(255)
 #  tags                     :text
+#  rank                     :integer
 #
 
 module MnoEnterprise
@@ -31,7 +32,7 @@ module MnoEnterprise
 
     attributes :id, :uid, :nid, :name, :description, :tiny_description, :created_at, :updated_at, :logo, :website, :slug,
     :categories, :key_benefits, :key_features, :testimonials, :worldwide_usage, :tiny_description,
-    :popup_description, :stack, :terms_url, :pictures, :tags, :api_key, :metadata_url, :metadata, :details
+    :popup_description, :stack, :terms_url, :pictures, :tags, :api_key, :metadata_url, :metadata, :details, :rank
 
     # Return the list of available categories
     def self.categories(list = nil)

data/app/models/mno_enterprise/base_resource.rb

@@ -143,8 +143,7 @@ module MnoEnterprise
       if perform_validations(options)
         ret = super()
         process_response_errors
-        raise_record_invalid if self.errors.any?
-        ret
+        raise_record_invalid
       else
         false
       end

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

@@ -19,7 +19,9 @@ module MnoEnterprise
     # Return all the organizations linked to this dashboard and to which
     # the user has access
     def organizations
-      MnoEnterprise::Organization.where('uid.in' => self.organization_ids).to_a
+      self.organization_ids.map do |uid|
+        MnoEnterprise::Organization.find_by(uid: uid)
+      end
     end
 
     def sorted_widgets

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

@@ -1,7 +1,7 @@
 module MnoEnterprise
   class Impac::Kpi < BaseResource
 
-    attributes :settings, :targets, :extra_params, :endpoint, :source, :element_watched
+    attributes :name, :settings, :targets, :extra_params, :endpoint, :source, :element_watched
 
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
     

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

@@ -1,7 +1,7 @@
 module MnoEnterprise
   class Impac::Widget < BaseResource
 
-    attributes :name, :width, :widget_category, :settings
+  	attributes :name, :width, :widget_category, :settings
 
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
 

data/app/models/mno_enterprise/org_invite.rb

@@ -20,6 +20,7 @@
 module MnoEnterprise
   class OrgInvite < BaseResource
     scope :active, -> { where(status: 'pending') }
+    scope :active_or_staged, -> { where('status.in' => %w(staged pending)) }
     
     #==============================================================
     # Associations
@@ -47,4 +48,4 @@ module MnoEnterprise
       self.status != 'pending' || self.created_at < 3.days.ago
     end
   end
-end
+end

data/app/models/mno_enterprise/tenant.rb

@@ -1,7 +1,5 @@
 module MnoEnterprise
   class Tenant < BaseResource
-    def self.show
-      self.get('tenant')
-    end
+
   end
-end
+end

data/app/models/mno_enterprise/user.rb

@@ -56,6 +56,7 @@ module MnoEnterprise
     #================================
     # Validation
     #================================
+    validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
 
     if Devise.password_regex
       validates :password, format: { with: Devise.password_regex, message: Devise.password_regex_message }, if: :password_required?
@@ -133,6 +134,11 @@ module MnoEnterprise
       @errors ||= ActiveModel::Errors.new(self)
     end
 
+    # Don't require a password for unconfirmed users (user save password at confirmation step)
+    def password_required?
+      super if confirmed?
+    end
+
     #================================
     # Instance Methods
     #================================

data/app/pdf/mno_enterprise/invoice_pdf.rb

@@ -55,11 +55,11 @@ module MnoEnterprise
       # Billing details
       @data[:billing_report] = @invoice.billing_summary.map do |item|
         item_label = item[:label]
-        price_label = item[:price_tag]
+        price_label = format_price item
 
         (item[:lines] || []).each do |item_line|
           item_label += "<font size='4'>\n\n</font><font size='8'><color rgb='999999'><i>#{Prawn::Text::NBSP * 3}#{item_line[:label]}</i></color></font>"
-          price_label += "<font size='4'>\n\n</font><font size='8'><color rgb='999999'>#{item_line[:price_tag]}</color></font>"
+          price_label += "<font size='4'>\n\n</font><font size='8'><color rgb='999999'>#{format_price(item_line)}</color></font>"
         end
 
         [item_label, item[:name], item[:usage], price_label]
@@ -80,6 +80,17 @@ module MnoEnterprise
       @pdf.render
     end
 
+    def format_price(item)
+      # price_tag is deprecated
+      price = item[:price]
+      if price
+        # Money hash are automatically parsed to Money in core/lib/her_extension/middleware/mnoe_api_v1_parse_json.rb
+        money(price)
+      else
+        item[:price_tag]
+      end
+    end
+
     # Generate the document content
     # by adding body, header, footer and
     # page numbering
@@ -116,6 +127,12 @@ module MnoEnterprise
       File.exists?(app_path) ? app_path : engine_path
     end
 
+    # Format a money object
+    def money(m)
+      "#{m.format(symbol: false)} #{m.currency_as_string}"
+    end
+
+
     # Add a repeated header to the document
     def add_page_header
       @pdf.repeat :all do
@@ -206,7 +223,7 @@ module MnoEnterprise
 
       summary_data = []
       summary_data << ['Period', 'Total Payable' + (@data[:invoice_tax_pips] > 0 ? "\n<font size='8'><i>(incl. GST)</i></font>" : '')]
-      summary_data << ["#{@data[:period_started_at].strftime("%B, %e %Y")} to #{@data[:period_ended_at].strftime("%B, %e %Y")}",@data[:invoice_total_payable_with_tax].format]
+      summary_data << ["#{@data[:period_started_at].strftime("%B, %e %Y")} to #{@data[:period_ended_at].strftime("%B, %e %Y")}",money(@data[:invoice_total_payable_with_tax])]
 
       # Draw Table background
       bg_height = @data[:invoice_tax_pips] > 0 ? 58 : 50
@@ -269,13 +286,13 @@ module MnoEnterprise
           @pdf.text_box "Credit Remaining", at: [445,@pdf.cursor], width: 95, height: 23, align: :center, valign: :center,
             style: :bold, size: 10
 
-          @pdf.text_box @data[:customer_current_credit].format, at: [445,@pdf.cursor], width: 95, height: 37, align: :center, valign: :bottom
+          @pdf.text_box money(@data[:customer_current_credit]), at: [445,@pdf.cursor], width: 95, height: 37, align: :center, valign: :bottom
         end
 
         @pdf.move_down 40
       end
 
-      #===============================
+      #========================()=======
       # Account Situation
       #===============================
       @pdf.move_down 30
@@ -304,15 +321,15 @@ module MnoEnterprise
       situation_data << [
         '',
         '',
-        @data[:invoice_previous_total_due].format,
+        money(@data[:invoice_previous_total_due]),
         '-',
-        @data[:invoice_previous_total_paid].format,
+        money(@data[:invoice_previous_total_paid]),
         '+',
-        @data[:invoice_price].format,
+        money(@data[:invoice_price]),
         '-',
-        @data[:invoice_credit_paid].format,
+        money(@data[:invoice_credit_paid]),
         '=',
-        @data[:invoice_total_payable].format
+        money(@data[:invoice_total_payable])
       ]
 
       # Draw background
@@ -385,7 +402,7 @@ module MnoEnterprise
           '',
           'GST',
           '+',
-          @data[:invoice_tax_payable].format,
+          money(@data[:invoice_tax_payable]),
         ]
 
         # Draw table background
@@ -442,7 +459,7 @@ module MnoEnterprise
           '',
           'Total (incl. GST)',
           '=',
-          @data[:invoice_total_payable_with_tax].format,
+          money(@data[:invoice_total_payable_with_tax]),
         ]
 
         # Draw table background

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

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+    <%= stylesheet_link_tag('mno_enterprise/mail.css') %>
+  </head>
+  <body>
+    <p class="header">
+      <%= image_tag('mno_enterprise/main-logo.png') %>
+    </p>
+
+    <p>Hi <%= @info[:first_name] %></p>
+     
+    <p>You can confirm your email by clicking on the following link</p>
+     
+    <a href="<%= @info[:confirmation_link] %>">Confirm my account</a>
+     
+    <p>
+      Regards,<br/>
+      The Marketplace team
+    </p>
+    <p class="footer">
+      <%= @info[:company] %>
+    </p>
+  </body>
+</html>

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

@@ -0,0 +1,10 @@
+Hi <%= @info[:first_name] %>
+==================================================================
+
+You can confirm your email by clicking on the following link
+ 
+To confirm your email, please follow this link : <%= @info[:confirmation_link] %>
+ 
+
+Regards,
+The Marketplace team

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

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+    <%= stylesheet_link_tag('mno_enterprise/mail.css') %>
+  </head>
+  <body>
+    <p class="header">
+      <%= image_tag('mno_enterprise/main-logo.png') %>
+    </p>
+
+    <p>Hi <%= @info[:first_name] %></p>
+     
+    <p>We have received a request from you to terminate your account.</p>
+     
+    <p>If this is a mistake, you can simply disregard this email - however, we strongly recommend you change your password too.</p>
+     
+    <p>If you would like to proceed with the termination of your account you can do so by clicking the link below and following the prompts.</p>
+    <a href="<%= @info[:terminate_account_link] %>">Terminate Your Account</a>
+      
+    <p>Please be advised, this is an irreversible action.</p>
+     
+    <p>
+      Regards,<br/>
+      The Marketplace team
+    </p>
+    <p class="footer">
+      <%= @info[:company] %>
+    </p>
+  </body>
+</html>

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

@@ -0,0 +1,15 @@
+Hi <%= @info[:first_name] %>
+=================================================================
+
+We have received a request from you to terminate your account.
+ 
+If this is a mistake, you can simply disregard this email - however, we strongly recommend you change your password too.
+ 
+If you would like to proceed with the termination of your account you can do so by clicking the link below and following the prompts.
+<%= @info[:terminate_account_link] %>
+  
+Please be advised, this is an irreversible action.
+ 
+
+Regards,
+The Marketplace team

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

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+    <%= stylesheet_link_tag('mno_enterprise/mail.css') %>
+  </head>
+  <body>
+    <p class="header">
+      <%= image_tag('mno_enterprise/main-logo.png') %>
+    </p>
+
+    <p>Hi there,</p>
+
+    <p>You have been invited by <%= @info[:ref_full_name] %> to join <%= @info[:organization] %> on our platform!. You can automatically create your account on our platform and join <%= @info[:organization] %> by clicking on the link below:</p>
+    <a href="<%= @info[:confirmation_link] %>">Create my account and join <%= @info[:organization] %></a>
+     
+    <% if @info[:team]? %>
+    <p>By accepting this invite you will automatically join the <%= @info[:team] %> team.</p>
+    <% end %>
+
+    <p>
+       Regards,<br/>
+       The Marketplace team
+    </p>
+    
+    <p class="footer">
+      <%= @info[:company] %>
+    </p>
+  </body>
+</html>

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

@@ -0,0 +1,13 @@
+Hi there
+=================================================================
+
+You have been invited by <%= @info[:ref_full_name] %> to join <%= @info[:organization] %> on our platform!. You can automatically create your account on our platform and join <%= @info[:organization] %> by clicking on the link below:
+<%= @info[:confirmation_link] %>
+ 
+<% if @info[:team]? %>
+By accepting this invite you will automatically join the <%= @info[:team] %> team.
+<% end %>
+
+
+Regards,
+The Marketplace team

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

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+    <%= stylesheet_link_tag('mno_enterprise/mail.css') %>
+  </head>
+  <body>
+    <p class="header">
+      <%= image_tag('mno_enterprise/main-logo.png') %>
+    </p>
+
+    <p>Hi there,</p>
+
+    <p>You have been invited by <%= @info[:ref_full_name] %> to join <%= @info[:organization] %> on our platform!. You can automatically create your account on our platform and join <%= @info[:organization] %> by clicking on the link below:</p>
+    <a href="<%= @info[:confirmation_link] %>">Create my account and join <%= @info[:organization] %></a>
+     
+    <% if @info[:team]? %>
+    <p>By accepting this invite you will automatically join the <%= @info[:team] %> team.</p>
+    <% end %>
+
+    <p>
+      Regards,<br/>
+      The Marketplace team
+    </p>
+    
+    <p class="footer">
+      <%= @info[:company] %>
+    </p>
+  </body>
+</html>