mno-enterprise-core 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8e1fe8fd42565b2cf5f939e4a018c1ab33ff576
-  data.tar.gz: a6fb0eece8899bc8c7a9bbd2e584e2a218dce7ca
+  metadata.gz: 31badd1b35fad273dd0d904445d60c9af708e87f
+  data.tar.gz: 415613eb183bd7f511be46f2cd221a6228e67847
 SHA512:
-  metadata.gz: b3e019b4e3e072537b9dffd8ca2e9615b2f1413920dcb769470cd1ffc7c0a4bd8a8d0d0073fb163df83b7daca5d968cce9e34f6c440954e60700701f77d05a8c
-  data.tar.gz: ed1b104400a046e01a67026f38bea30ace63d99c3b2b3c3f3b10182b530fa708c5878233d51e3ddd02563615b7aeb49c0e3abed1af7b68309a8fb76710ec62fb
+  metadata.gz: 5efebbd5a99177c6a089de239354cb0d2b14c63f421b93eabcebf40dab9a4883855ed1735e8c71935afa6cba87233f3b9af7b4890b4be4e78faaf5f4dec88291
+  data.tar.gz: c23a3e38b6f423f49fac9be8faeb7821d99ce0d59c972488860ce86ae1de49b9c4923f157586a765eed773351050a267bfb6b4db8d8258bfa11baed56d7e0bd2

data/app/controllers/mno_enterprise/application_controller.rb

@@ -126,13 +126,13 @@ module MnoEnterprise
     private
 
     # Append params to the fragment part of an existing url String
-    #   add_param("/#/platform/accounts", 'foo', 'bar')
-    #     => "/#/platform/accounts?foo=bar"
-    #   add_param("/#/platform/dashboard/he/43?en=690", 'foo', 'bar')
-    #     => "/#/platform/dashboard/he/43?en=690&foo=bar"
+    #   add_param_to_fragment("/#!/platform/accounts", 'foo', 'bar')
+    #     => "/#!/platform/accounts?foo=bar"
+    #   add_param_to_fragment("/#!/platform/dashboard/he/43?en=690", 'foo', 'bar')
+    #     => "/#!/platform/dashboard/he/43?en=690&foo=bar"
     def add_param_to_fragment(url, param_name, param_value)
       uri = URI(url)
-      fragment = URI(uri.fragment || "")
+      fragment = URI(uri.fragment || "!")
       params = URI.decode_www_form(fragment.query || "") << [param_name, param_value]
       fragment.query = URI.encode_www_form(params)
       uri.fragment = fragment.to_s

data/app/helpers/mno_enterprise/image_helper.rb

@@ -0,0 +1,32 @@
+module MnoEnterprise
+  module ImageHelper
+    
+    IMAGES_LOCATION = "/app/assets/images/mno_enterprise/"
+    
+    # Helper method to easily access and select the images
+    # If full_path is true returns filename appended to the path
+    # If full_path is false returns filename
+    # Return the main-logo-whitebg.png if exists, otherwise get main-logo.png
+    def main_logo_white_bg_path(full_path=false)
+      logo_path = app_image_path("main-logo-whitebg.png") || main_logo_path
+      full_path ? logo_path : "mno_enterprise/#{File.basename(logo_path)}"
+    end
+
+    # Return the main-logo.png if exists otherwise get engine's logo
+    def main_logo_path
+      file_name = "main-logo.png"
+      app_image_path(file_name) || engine_image_path(file_name)
+    end
+
+    # Build path and checks if the logo exists
+    def app_image_path(file_name)
+      app_path = "#{Rails.root}#{IMAGES_LOCATION}#{file_name}"
+      app_path if File.exists?(app_path)
+    end
+
+    # Get engine's logo and return it
+    def engine_image_path(file_name)
+      "#{MnoEnterprise::Engine.root}#{IMAGES_LOCATION}#{file_name}"
+    end
+  end
+end

data/app/models/mno_enterprise/app.rb

@@ -42,6 +42,7 @@ module MnoEnterprise
     has_many :reviews,   class_name: 'AppReview'
     has_many :feedbacks, class_name: 'AppFeedback'
     has_many :questions, class_name: 'AppQuestion'
+    has_many :shared_entities
 
     # Return the list of available categories
     def self.categories(list = nil)
@@ -64,12 +65,20 @@ module MnoEnterprise
     end
 
     # Methods for appinfo flags
-    %w(coming_soon single_billing add_on).each do |method|
+    %w(responsive coming_soon single_billing add_on).each do |method|
       define_method "#{method}?" do
-        appinfo.presence && appinfo[method]
+        !!(appinfo.presence && appinfo[method])
       end
     end
 
+    def star_ready?
+      !!(appinfo.presence && appinfo['starReady'])
+    end
+
+    def connec_ready?
+      !!(appinfo.presence && !!appinfo['connecReady'])
+    end
+
     def regenerate_api_key!
       data = self.put(operation: 'regenerate_api_key')
       self.api_key = data[:data][:api_key]

data/app/models/mno_enterprise/base_resource.rb

@@ -115,9 +115,11 @@ module MnoEnterprise
           .max
     end
 
+    # Clear the record association cache
     def clear_association_cache
       self.class.associations[:has_many].each do |assoc|
         instance_variable_set(:"@_her_association_#{assoc[:name]}", nil)
+        attributes.delete(assoc[:name].to_s)
       end
     end
 

data/app/models/mno_enterprise/credit_card.rb

@@ -1,6 +1,6 @@
 # == Schema Information
 #
-# Endpoint: 
+# Endpoint:
 #  - /v1/credit_cards
 #  - /v1/organizations/:organization_id/credit_card
 #
@@ -27,14 +27,17 @@
 
 module MnoEnterprise
   class CreditCard < BaseResource
-    
+
     attributes :id, :created_at, :updated_at, :title, :first_name, :last_name, :country, :masked_number, :number,
     :month, :year, :billing_address, :billing_city, :billing_postcode, :billing_country, :verification_value, :organization_id
-    
+
     #==============================================================
     # Associations
     #==============================================================
     belongs_to :organization, class_name: 'MnoEnterprise::Organization'
-    
+
+    def expiry_date
+      year && month && Date.new(year, month).end_of_month
+    end
   end
 end

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

@@ -38,7 +38,10 @@ module MnoEnterprise
     end
 
     def to_audit_event
-      {name: name}
+      {
+        name: name,
+        organization_id: (owner_type == 'MnoEnterprise::Organization') ? owner_id : nil
+      }
     end
   end
 end

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

@@ -1,15 +1,21 @@
 module MnoEnterprise
   class Impac::Widget < BaseResource
 
-    attributes :name, :width, :widget_category, :settings
-
-    alias_attribute :endpoint, :widget_category
+    # TODO: remove :widget_category when mnohub migrated to new model
+    attributes :name, :width, :widget_category, :settings, :endpoint
 
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
     has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi'
 
     def to_audit_event
-      {name: name}
+
+      if settings['organization_ids'].any?
+        organization = MnoEnterprise::Organization.find_by(uid: settings['organization_ids'].first)
+        { name: name, organization_id: organization.id }
+      else
+        { name: name }
+      end
+
     end
 
   end

data/app/models/mno_enterprise/org_invite.rb

@@ -29,23 +29,27 @@ module MnoEnterprise
     belongs_to :referrer, class_name: 'MnoEnterprise::User'
     belongs_to :organization, class_name: 'MnoEnterprise::Organization'
     belongs_to :team, class_name: 'MnoEnterprise::Team'
-    
+
     # TODO: specs
     # Add the user to the organization and update the status of the invite
     # Add team
     def accept!(user = self.user)
       self.put(operation: 'accept', data: { user_id: user.id})
     end
-    
+
     # TODO: specs
     def cancel!
       self.put(operation: 'cancel')
     end
-    
+
     # TODO: specs
     # Check whether the invite is expired or not
     def expired?
       self.status != 'pending' || self.created_at < 3.days.ago
     end
+
+    def to_audit_event
+      self.attributes.slice(:team_id, :user_role, :user_email, :user_id, :referrer_id, :organization_id)
+    end
   end
 end

data/app/models/mno_enterprise/shared_entity.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Endpoint:
+#  - /v1/app/:app_id/shared_entities
+#
+#  id                :integer         not null, primary key
+#  nid               :string
+#  name              :string
+#  created_at        :datetime        not null
+#  updated_at        :datetime        not null
+
+module MnoEnterprise
+  class SharedEntity < BaseResource
+    include MnoEnterprise::Concerns::Models::SharedEntity
+  end
+end

data/app/models/mno_enterprise/user.rb

@@ -54,9 +54,14 @@ module MnoEnterprise
       :api_key, :api_secret, :developer, :kpi_enabled, :external_id, :meta_data
 
     define_model_callbacks :validation #required by Devise
-    devise :remote_authenticatable, :registerable, :recoverable, :rememberable,
+
+    devise_modules = [
+      :remote_authenticatable, :registerable, :recoverable, :rememberable,
       :trackable, :validatable, :lockable, :confirmable, :timeoutable, :password_expirable,
-      :omniauthable, omniauth_providers: Devise.omniauth_providers
+      :omniauthable
+    ]
+    devise_modules.delete(:registerable) if Settings.try(:devise).try(:registration).try(:disabled)
+    devise(*devise_modules, omniauth_providers: Devise.omniauth_providers)
 
     #================================
     # Validation

data/app/pdf/mno_enterprise/invoice_pdf.rb

@@ -1,5 +1,6 @@
 module MnoEnterprise
   class InvoicePdf
+    include MnoEnterprise::ImageHelper
     attr_reader :invoice, :pdf, :data
 
     # InvoicePdf requires to be initialized
@@ -41,7 +42,6 @@ module MnoEnterprise
       @data[:invoice_currency] = @invoice.price.currency_as_string
       @data[:invoice_currency_name] = @invoice.price.currency.name
       @data[:invoice_credit_paid] = @invoice.credit_paid
-      @data[:invoice_total_due] = @invoice.total_due
       @data[:invoice_total_payable] = @invoice.total_payable
       @data[:invoice_tax_payable] = @invoice.tax_payable
       @data[:invoice_tax_pips] = (@invoice.tax_pips_applied || 0)
@@ -117,31 +117,21 @@ module MnoEnterprise
       }
     end
 
-    # Helper method to easily access
-    # images
-    def image_path(name)
-      path = "/app/assets/images/#{name}"
-      engine_path = "#{MnoEnterprise::Engine.root}#{path}"
-      app_path = "#{Rails.root}#{path}"
-
-      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
+      title = Settings.payment.disabled ? 'Account Statement - ' : 'Monthly Invoice - '
       @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 image_path('mno_enterprise/main-logo.png'), :fit => [135, (@format[:footer_size])]
+            @pdf.image main_logo_white_bg_path(true), scale: 0.5
           end
           @pdf.move_down 52
-          @pdf.font_size(20) { @pdf.text "Monthly Invoice - #{@data[:period_month]}", style: :bold, align: :right }
+          @pdf.font_size(20) { @pdf.text "#{title} #{@data[:period_month]}", style: :bold, align: :right }
         end
       end
     end
@@ -156,7 +146,7 @@ module MnoEnterprise
           @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 102, 410 Elizabeth Street, Surry Hills 2010, Sydney, Australia.</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
           end
         end
@@ -179,6 +169,8 @@ module MnoEnterprise
     # This method is responsible for
     # generating the actual pdf content
     def add_page_body
+      payment_enabled = !Settings.payment.disabled
+
       @pdf.stroke_color '999999'
 
       #===============================
@@ -191,10 +183,10 @@ module MnoEnterprise
         @pdf.fill_color = original_color
 
         @pdf.text_box "Your Reference", at: [310,@pdf.cursor], width: 65, height: 13, align: :center, valign: :center,
-          style: :bold_italic, size: 7
+                      style: :bold_italic, size: 7
 
         @pdf.text_box @data[:invoice_reference], at: [310,@pdf.cursor], width: 230, height: 50, align: :center, valign: :center,
-          style: :bold
+                      style: :bold
       end
 
       #===============================
@@ -211,8 +203,6 @@ module MnoEnterprise
         @pdf.text "<color rgb='999999'>#{@data[:customer_billing_address]}</color>", align: :left, inline_format: true, style: :italic, size: 9
       end
 
-
-
       #===============================
       # Summary
       #===============================
@@ -221,9 +211,12 @@ module MnoEnterprise
       @pdf.stroke_horizontal_rule
       @pdf.move_down 10
 
+      summary_data_amount = @data[:invoice_price]
+      summary_data_amount = @data[:invoice_total_payable_with_tax] if payment_enabled
+
       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")}",money(@data[:invoice_total_payable_with_tax])]
+      summary_data << ["#{@data[:period_started_at].strftime("%B, %e %Y")} to #{@data[:period_ended_at].strftime("%B, %e %Y")}",money(summary_data_amount)]
 
       # Draw Table background
       bg_height = @data[:invoice_tax_pips] > 0 ? 58 : 50
@@ -284,7 +277,7 @@ module MnoEnterprise
           @pdf.fill_color = original_color
 
           @pdf.text_box "Credit Remaining", at: [445,@pdf.cursor], width: 95, height: 23, align: :center, valign: :center,
-            style: :bold, size: 10
+                        style: :bold, size: 10
 
           @pdf.text_box money(@data[:customer_current_credit]), at: [445,@pdf.cursor], width: 95, height: 37, align: :center, valign: :bottom
         end
@@ -292,140 +285,79 @@ module MnoEnterprise
         @pdf.move_down 40
       end
 
-      #========================()=======
-      # Account Situation
-      #===============================
-      @pdf.move_down 30
-      @pdf.font_size(20) { @pdf.text 'Account Situation', style: :bold }
-      @pdf.stroke_horizontal_rule
-      @pdf.move_down 10
-
-      # Situation Data
-      situation_data = []
-      # Header
-      situation_data << [
-        '',
-        '',
-        'Due Last Month',
-        '',
-        'Paid (Thank You)',
-        '',
-        'This Month',
-        '',
-        'Credit',
-        '',
-        'Total'
-      ]
-
-      #Content
-      situation_data << [
-        '',
-        '',
-        money(@data[:invoice_previous_total_due]),
-        '-',
-        money(@data[:invoice_previous_total_paid]),
-        '+',
-        money(@data[:invoice_price]),
-        '-',
-        money(@data[:invoice_credit_paid]),
-        '=',
-        money(@data[:invoice_total_payable])
-      ]
-
-      # Draw background
-      @pdf.float do
-        original_color = @pdf.fill_color
-        @pdf.fill_color "F0F0F0"
-        @pdf.fill_rounded_rectangle [0,@pdf.cursor], 540, 50, 5
-        @pdf.fill_color = original_color
-      end
-
-
-      # Draw left background
-      @pdf.float do
-        original_color = @pdf.fill_color
-        @pdf.fill_color "E0E0E0"
-        @pdf.fill_rounded_rectangle [0,@pdf.cursor], 80, 50, 5
-        @pdf.fill_color = original_color
-        @pdf.move_down 21
-        if @data[:invoice_tax_pips] > 0
-          @pdf.text_box 'Excl. GST', at: [12,@pdf.cursor]
-        else
-          @pdf.text_box 'Details', at: [20,@pdf.cursor]
-        end
-      end
-
-      # Draw table
-      @pdf.table(situation_data) do |t|
-        t.header = true
-        t.width = 540
-        t.column_widths = [75,18,75,18,75,18,75,18,75,18,75]
-        t.row(0).font_style = :bold
-        t.row(0).size = 8
-        t.row(0).height = 22
-        t.row(1).height = 25
-
-        t.cell_style = {
-          borders: [],
-          overflow: :shrink_to_fit,
-          align: :center
-        }
-
-        # Color the '+','-' and '=' characters
-        t.cells.style do |c|
-          if c.row == 1 && c.column.odd?
-            c.text_color = "a8a8a8"
-          end
-        end
-      end
-
-
-      #=================================
-      # Account Situation - Tax Section
-      #=================================
-      if @data[:invoice_tax_pips] > 0
-
-        #-----------------
-        # GST row
-        #-----------------
-        @pdf.move_down 8
-
-        table_data = []
-        table_data << [
+      if payment_enabled
+        #===============================
+        # Account Situation
+        #===============================
+        @pdf.move_down 30
+        @pdf.font_size(20) { @pdf.text 'Account Situation', style: :bold }
+        @pdf.stroke_horizontal_rule
+        @pdf.move_down 10
+
+        # Situation Data
+        situation_data = []
+        # Header
+        situation_data << [
           '',
           '',
+          'Due Last Month',
           '',
+          'Paid (Thank You)',
           '',
+          'This Month',
           '',
+          'Credit',
           '',
+          'Total'
+        ]
+
+        #Content
+        situation_data << [
           '',
           '',
-          'GST',
+          money(@data[:invoice_previous_total_due]),
+          '-',
+          money(@data[:invoice_previous_total_paid]),
           '+',
-          money(@data[:invoice_tax_payable]),
+          money(@data[:invoice_price]),
+          '-',
+          money(@data[:invoice_credit_paid]),
+          '=',
+          money(@data[:invoice_total_payable])
         ]
 
-        # Draw table background
+        # Draw background
         @pdf.float do
           original_color = @pdf.fill_color
           @pdf.fill_color "F0F0F0"
-          @pdf.fill_rounded_rectangle [368,@pdf.cursor], 172, 24, 5
+          @pdf.fill_rounded_rectangle [0,@pdf.cursor], 540, 50, 5
           @pdf.fill_color = original_color
         end
 
+
         # Draw left background
         @pdf.float do
           original_color = @pdf.fill_color
-          @pdf.fill_color "FAB451"
-          @pdf.fill_rounded_rectangle [368,@pdf.cursor], 80, 24, 5
+          @pdf.fill_color "E0E0E0"
+          @pdf.fill_rounded_rectangle [0,@pdf.cursor], 80, 50, 5
           @pdf.fill_color = original_color
+          @pdf.move_down 21
+          if @data[:invoice_tax_pips] > 0
+            @pdf.text_box 'Excl. GST', at: [12,@pdf.cursor]
+          else
+            @pdf.text_box 'Details', at: [20,@pdf.cursor]
+          end
         end
 
-        @pdf.table(table_data) do |t|
+        # Draw table
+        @pdf.table(situation_data) do |t|
           t.header = true
           t.width = 540
           t.column_widths = [75,18,75,18,75,18,75,18,75,18,75]
-          t.row(0).height = 25
+          t.row(0).font_style = :bold
+          t.row(0).size = 8
+          t.row(0).height = 22
+          t.row(1).height = 25
 
           t.cell_style = {
             borders: [],
@@ -435,73 +367,134 @@ module MnoEnterprise
 
           # Color the '+','-' and '=' characters
           t.cells.style do |c|
-            if c.row == 0 && c.column.odd?
+            if c.row == 1 && c.column.odd?
               c.text_color = "a8a8a8"
             end
           end
         end
 
 
-        #-----------------
-        # Total (incl. GST)
-        #-----------------
-        @pdf.move_down 5
+        #=================================
+        # Account Situation - Tax Section
+        #=================================
+        if @data[:invoice_tax_pips] > 0
 
-        table_data = []
-        table_data << [
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          '',
-          'Total (incl. GST)',
-          '=',
-          money(@data[:invoice_total_payable_with_tax]),
-        ]
+          #-----------------
+          # GST row
+          #-----------------
+          @pdf.move_down 8
+
+          table_data = []
+          table_data << [
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            'GST',
+            '+',
+            money(@data[:invoice_tax_payable]),
+          ]
+
+          # Draw table background
+          @pdf.float do
+            original_color = @pdf.fill_color
+            @pdf.fill_color "F0F0F0"
+            @pdf.fill_rounded_rectangle [368,@pdf.cursor], 172, 24, 5
+            @pdf.fill_color = original_color
+          end
 
-        # Draw table background
-        @pdf.float do
-          original_color = @pdf.fill_color
-          @pdf.fill_color "F0F0F0"
-          @pdf.fill_rounded_rectangle [368,@pdf.cursor], 172, 24, 5
-          @pdf.fill_color = original_color
-        end
+          # Draw left background
+          @pdf.float do
+            original_color = @pdf.fill_color
+            @pdf.fill_color "FAB451"
+            @pdf.fill_rounded_rectangle [368,@pdf.cursor], 80, 24, 5
+            @pdf.fill_color = original_color
+          end
 
-        # Draw left background
-        @pdf.float do
-          original_color = @pdf.fill_color
-          @pdf.fill_color "DAE173"
-          @pdf.fill_rounded_rectangle [368,@pdf.cursor], 80, 24, 5
-          @pdf.fill_color = original_color
-        end
+          @pdf.table(table_data) do |t|
+            t.header = true
+            t.width = 540
+            t.column_widths = [75,18,75,18,75,18,75,18,75,18,75]
+            t.row(0).height = 25
+
+            t.cell_style = {
+              borders: [],
+              overflow: :shrink_to_fit,
+              align: :center
+            }
+
+            # Color the '+','-' and '=' characters
+            t.cells.style do |c|
+              if c.row == 0 && c.column.odd?
+                c.text_color = "a8a8a8"
+              end
+            end
+          end
 
-        @pdf.table(table_data) do |t|
-          t.header = true
-          t.width = 540
-          t.row(0).font_style = :bold
-          t.column_widths = [75,18,75,18,75,18,75,18,75,18,75]
-          t.row(0).height = 25
 
-          t.cell_style = {
-            borders: [],
-            overflow: :shrink_to_fit,
-            align: :center
-          }
+          #-----------------
+          # Total (incl. GST)
+          #-----------------
+          @pdf.move_down 5
+
+          table_data = []
+          table_data << [
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            'Total (incl. GST)',
+            '=',
+            money(@data[:invoice_total_payable_with_tax]),
+          ]
+
+          # Draw table background
+          @pdf.float do
+            original_color = @pdf.fill_color
+            @pdf.fill_color "F0F0F0"
+            @pdf.fill_rounded_rectangle [368,@pdf.cursor], 172, 24, 5
+            @pdf.fill_color = original_color
+          end
 
-          # Color the '+','-' and '=' characters
-          t.cells.style do |c|
-            if c.row == 0 && c.column.odd?
-              c.text_color = "a8a8a8"
+          # Draw left background
+          @pdf.float do
+            original_color = @pdf.fill_color
+            @pdf.fill_color "DAE173"
+            @pdf.fill_rounded_rectangle [368,@pdf.cursor], 80, 24, 5
+            @pdf.fill_color = original_color
+          end
+
+          @pdf.table(table_data) do |t|
+            t.header = true
+            t.width = 540
+            t.row(0).font_style = :bold
+            t.column_widths = [75,18,75,18,75,18,75,18,75,18,75]
+            t.row(0).height = 25
+
+            t.cell_style = {
+              borders: [],
+              overflow: :shrink_to_fit,
+              align: :center
+            }
+
+            # Color the '+','-' and '=' characters
+            t.cells.style do |c|
+              if c.row == 0 && c.column.odd?
+                c.text_color = "a8a8a8"
+              end
             end
           end
         end
-
       end
 
-
       #===============================
       # Details
       #===============================
@@ -520,10 +513,10 @@ module MnoEnterprise
         t.row_colors = ["FFFFFF", "F0F0F0"]
         t.column_widths = [240,100,100,100]
         t.cell_style = { borders: [:bottom],
-                        border_width: 1,
-                        border_color: "999999",
-                        inline_format: true
-                        }
+                         border_width: 1,
+                         border_color: "999999",
+                         inline_format: true
+        }
         t.row(0).borders = [:bottom]
         t.row(0).border_width = 2
         t.row(0).font_style = :bold