mno-enterprise-core 3.2.1 → 3.3.0

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

@@ -13,7 +13,7 @@
 
 <p>We received a request to change your email address in the platform to <%= @info[:unconfirmed_email] %>.</p>
 
-<p>If you did not request an email change, contact us.</p>
+<p>If you did not request an email change, contact us at <%= mail_to(MnoEnterprise.support_email) %>.</p>
 
 <p>
   Regards,<br/>

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

@@ -3,7 +3,7 @@ Hi <%= @info[:first_name] %>
 
 We received a request to change your email address in the platform to <%= @info[:unconfirmed_email] %>.
 
-If you did not request an email change, contact us.
+If you did not request an email change, contact us at <%= MnoEnterprise.support_email %>.
 
 
 Regards,

data/config/initializers/audit_log.rb

@@ -1,3 +1,30 @@
 unless defined? AUDIT_LOG_CONFIG
-  AUDIT_LOG_CONFIG = Rails.application.config_for('audit_log') rescue {}
+  begin
+    AUDIT_LOG_CONFIG = Rails.application.config_for('audit_log')
+  rescue
+    AUDIT_LOG_CONFIG = {
+      "events" => {
+        "app_add" => "%{name} added",
+        "app_destroy" => "%{name} removed",
+        "app_launch" => "%{name} launched",
+        "dashboard_create" => "Dashboard '%{name}' created",
+        "dashboard_delete" => "Dashboard '%{name}' deleted",
+        "widget_create" => "Widget '%{name}' added",
+        "widget_delete" => "Widget '%{name}' deleted",
+        "widget_update" => "Widget '%{name}' updated with params: '%{widget_action}'",
+        "user_invite" => "%{user_email} invited",
+        "user_invite_accept" => "%{user_email} accepted invitation",
+        "user_confirm" => "%{user_email} accepted invitation",
+        "user_add" => "User '%{user_email}' signed up",
+        "user_role_update" => "User '%{email}' role changed to '%{role}'",
+        "user_role_delete" => "User '%{email}' removed from org",
+        "team_add" => "Team '%{name}' created",
+        "team_delete" => "Team '%{name}' deleted",
+        "team_update" => "Team '%{name}' user list modified. Action: %{action}, User(s) '%{users}'",
+        "team_apps_update" => "Team '%{name}' app list modified. New list: '%{apps}'",
+        "app_connected" => "App '%{name}' connected",
+        "app_disconnected" => "App '%{name}' disconnected",
+      }
+    }
+  end
 end

data/config/locales/templates/components/en.yml

@@ -20,11 +20,36 @@ en:
           app_not_managed_by_us: The app you requested does not seem to be managed by us.
           did_you_type_the_right_url: Are you sure you typed the right url?
 
+        layout:
+          your_dashboard_is_loading: "Your dashboard is loading..."
+
+        without_organisation:
+          hello: "Hi, {name}!"
+          text: "Unfortunately, your account is not attached to an organisation. Please contact your administrator."
+          text_if_can_create: "Unfortunately, your account is not attached to an organisation. Please contact your administrator or create a new one using the button below."
+          button: "Create an organisation"
+          logout: "Logout"
+
         app_install_btn:
           conflicting_app: "You cannot install this App as it is incompatible with:"
           start_app: "Start Now!"
           launch_app: "Launch App"
-          connect_app: "Connect App"
-          success_notification_title: "{{name}} has been added to your account"
-          success_launch_notification_body: "To start using {{name}}, click on the {{name}} icon then click on \"Launch\"."
-          success_connect_notification_body: "To start using {{name}}, click on the {{name}} icon then click on \"Connect\"."
+          create_account: "Create an account"
+          create_account_tooltip: "A new tab will open for you to create an account. Afterwards, return here to connect it."
+          connect_app: "Connect an existing account"
+          access_addon: "Access Add-on"
+          insufficient_privilege: "You do not have the sufficient privileges. Contact your administrator."
+          success_notification_title: "{name} has been added to your account"
+          success_launch_notification_body: "To start using {name}, click on the {name} icon then click on \"Launch\"."
+          success_connect_notification_body: "To start using {name}, click on the {name} icon then click on \"Connect\"."
+
+        audit_events_list:
+          loading_events: Loading Events
+          table:
+            date: Date
+            user: User
+            action: Action
+            description: Description
+
+        mno_pagination:
+          items_per_page: "Items per page: "

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

@@ -42,9 +42,9 @@ en:
         apps_list:
           title: Dashboard
           manual_data_sync: Manual Data Sync
-          manual_data_sync_tooltip: Trigger a manual sync between {{appname}} and Maestrano.
+          manual_data_sync_tooltip: Trigger a manual sync between {appname} and Maestrano.
           disconnect_link: Disconnect Link
-          disconnect_link_tooltip: Are you sure you want to disconnect {{appname}} and Maestrano?
+          disconnect_link_tooltip: Are you sure you want to disconnect {appname} and Maestrano?
           restart: Restart
           delete: Delete
           linked_to: Linked to

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

@@ -23,9 +23,9 @@ en:
             tag_star: "Star!™ Tutorials"
             tag_connec: "Connec!™ Ready"
             conflicting_app: "You cannot install this app as it is incompatible with:"
-            success_notification_title: "{{name}} has been added to your account"
-            success_launch_notification_body: "To start using {{name}}, click on the {{name}} icon then click on \"Launch\"."
-            success_connect_notification_body: "To start using {{name}}, click on the {{name}} icon then click on \"Connect\"."
+            success_notification_title: "{name} has been added to your account"
+            success_launch_notification_body: "To start using {name}, click on the {name} icon then click on \"Launch\"."
+            success_connect_notification_body: "To start using {name}, click on the {name} icon then click on \"Connect\"."
             no_reviews: "No reviews on"
             write_review: "Write a review"
             number_of_reviews: "Reviews per page:"
@@ -50,7 +50,7 @@ en:
             question_search: "Search..."
             question_ask: "Ask a question"
             question_ask_placeholder: "Enter your question here..."
-            no_review: "There are no reviews of {{name}}."
+            no_review: "There are no reviews of {name}."
             answers: "Answers"
             answer_q: "Answer this Question"
             answer_placeholder: "Enter your answer to this question here..."
@@ -82,7 +82,7 @@ en:
               delete_modal_body: "Do you really want to delete your question?"
               delete_modal_cancel: "Cancel"
               delete_modal_delete: "Delete"
-              no_question: "There are no questions on {{name}}."
+              no_question: "There are no questions on {name}."
             comment:
               delete_modal_header: "Delete a comment"
               delete_modal_body: "Do you really want to delete your comment?"

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

@@ -7,12 +7,15 @@ en:
             title: Sorry we couldn't process this payment
             explanation: Your account is currently in arrears as we were unable to charge your designated credit card.
             recommendation: "Please make sure your credit card details are up to date, then click the button below."
-            warning: "Unfortunately if we are unable to charge your credit card by {{date}}, your applications will be automatically shut down."
+            warning: "Unfortunately if we are unable to charge your credit card by {date}, your applications will be automatically shut down."
             retry: Retry Payment
 
+          audit_log:
+            export: Export
+
           billing:
-            current_billing_html: "Your billing for the current invoicing period is: <b>{{amount}}</b>"
-            current_credit_html: "You have <b>{{amount}}</b> credit on your account to be used for the next payment. Note that this credit account will also be linked to any organization you create."
+            current_billing_html: "Your billing for the current invoicing period is: <b>{amount}</b>"
+            current_credit_html: "You have <b>{amount}</b> credit on your account to be used for the next payment. Note that this credit account will also be linked to any organization you create."
             disclaimer: Note that the amount for your current invoicing period is indicative and might not reflect the latest changes in your current billing.
             about_title: About our billing cycle
             about_body: Our invoicing period runs from the 25th of the previous month to the 24th of the current month. Any amount due (current spending minus credit) is charged on the 2nd of the following month.
@@ -46,11 +49,14 @@ en:
 
           index:
             title: Company
+            audit_log:
+              title: Audit Log
             billing:
               title: Billing
               current_billing: Current Billing
               billing_details: Billing Details
               past_invoices: Past Invoices
+              account_statement: Account Statements
             members:
               title: Members
             teams:
@@ -61,7 +67,7 @@ en:
               title: Settings
 
           invoices:
-            disclaimer: All amounts are displayed in {{currency}}
+            disclaimer: All amounts are displayed in {currency}
             period: Period
             amount: Amount
             paid: Paid
@@ -78,8 +84,8 @@ en:
             edit: Edit
             remove: Remove
             invite_modal:
-              title_name: "Edit Member: {{name}} {{surname}}"
-              title_email: "Edit Member: {{email}}"
+              title_name: "Edit Member: {name} {surname}"
+              title_email: "Edit Member: {email}"
               description: Enter the email addresses of the people you want to invite in your company
               example: "One address per line, e.g.:"
               disclaimer: Please note that for security reasons unaccepted invites will automatically expire after 3 days.
@@ -96,8 +102,8 @@ en:
                 super_admin: A Super Admin has all power within the company including access to billing management
             removal_modal:
               title: Confirm action
-              body_name: Are you really sure you want to remove {{name}} {{surname}}?
-              body_email: Are you really sure you want to remove {{email}}?
+              body_name: Are you really sure you want to remove {name} {surname}?
+              body_email: Are you really sure you want to remove {email}?
               cancel: Cancel
               remove: Remove
 

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

@@ -7,12 +7,12 @@ id:
             title: "Maaf kami tidak dapat memproses pembayaran ini"
             explanation: "Akun Anda saat ini dalam tunggakan karena kami tidak mampu membebankan kartu kredit Anda."
             recommendation: "Pastikan detail kartu kredit Anda adalah yang terbaru, lalu klik tombol di bawah ini."
-            warning: "Sayang sekali jika kami tidak dapat membebankan kartu kredit Anda pada {{date}}, aplikasi Anda akan secara otomatis nonaktif."
+            warning: "Sayang sekali jika kami tidak dapat membebankan kartu kredit Anda pada {date}, aplikasi Anda akan secara otomatis nonaktif."
             retry: "Coba Lagi Pembayaran"
 
           billing:
-            current_billing_html: "Tagihan Anda untuk periode tagihan saat ini adalah: <b>{{amount}}</b>"
-            current_credit_html: "Anda memiliki <b>{{amount}}</b> kredit di akun Anda untuk digunakan pada pembayaran berikutnya. Perhatikan bahwa akun kredit ini juga akan dihubungkan ke organisasi apa pun yang Anda buat."
+            current_billing_html: "Tagihan Anda untuk periode tagihan saat ini adalah: <b>{amount}</b>"
+            current_credit_html: "Anda memiliki <b>{amount}</b> kredit di akun Anda untuk digunakan pada pembayaran berikutnya. Perhatikan bahwa akun kredit ini juga akan dihubungkan ke organisasi apa pun yang Anda buat."
             disclaimer: "Perhatikan bahwa jumlah untuk periode tagihan Anda bersifat indikatif dan mungkin tidak menunjukkan perubahan terakhir dalam penagihan Anda saat ini."
             about_title: "Tentang siklus penagihan kami"
             about_body: "Periode tagihan kami berlangsung dari tanggal 25 pada bulan sebelumnya hingga tanggal 24 bulan ini. Jumlah utang (belanja saat ini dikurangi kredit) dibebankan tanggal 2 pada bulan berikutnya."
@@ -58,7 +58,7 @@ id:
               title: Penyetelan
 
           invoices:
-            disclaimer: Seluruh jumlah ditampilkan dalam {{currency}}
+            disclaimer: Seluruh jumlah ditampilkan dalam {currency}
             period: Periode
             amount: Jumlah
             paid: Sudah Dibayar

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

@@ -7,12 +7,12 @@ zh:
             title: "对不起我们无法处理此付款"
             explanation: "您的帐户目前尚有欠款，因为我们无法用您指定的信用卡结帐。"
             recommendation: "请确定您的信用卡信息是最新的，然后点击以下按钮。"
-            warning: "很遗憾，如果我们无法在{{date}}前使用您的信用卡结帐，您的应用程序将自动关闭。"
+            warning: "很遗憾，如果我们无法在{date}前使用您的信用卡结帐，您的应用程序将自动关闭。"
             retry: "重试付款"
 
           billing:
-            current_billing_html: "您在目前开票期限内的帐单金额是： <b>{{amount}}</b>"
-            current_credit_html: "您的帐户余额有<b>{{amount}}</b>，可供下次付款使用。注意，此信用帐户也会连接至您创建的任何公司组织。"
+            current_billing_html: "您在目前开票期限内的帐单金额是： <b>{amount}</b>"
+            current_credit_html: "您的帐户余额有<b>{amount}</b>，可供下次付款使用。注意，此信用帐户也会连接至您创建的任何公司组织。"
             disclaimer: "请注意，您在目前开票期限内的帐单金额仅供参考，不一定能反映您的目前帐单的最新变动。"
             about_title: "关于我们的帐单周期"
             about_body: "我们的开票期从上个月的25号至本月24号。任何到期款项（当前支出扣除余额）在下个月的2号结帐。"
@@ -58,7 +58,7 @@ zh:
               title: 设置
 
           invoices:
-            disclaimer: 所有金额以{{currency}}显示
+            disclaimer: 所有金额以{currency}显示
             period: 期限
             amount: 金额
             paid: 已支付

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

@@ -22,7 +22,7 @@ en:
 
           member_removal_modal:
             title: Confirm action
-            confirmation: "Are you sure you want to remove {{fullname}} from {{teamname}}?"
+            confirmation: "Are you sure you want to remove {fullname} from {teamname}?"
             cancel: Cancel
             remove: Remove
 
@@ -34,12 +34,12 @@ en:
 
           team_delete_modal:
             title: Confirm action
-            confirmation: "Are you really sure you want to remove {{teamname}}?"
+            confirmation: "Are you really sure you want to remove {teamname}?"
             cancel: Cancel
             remove: Remove
 
           team_list:
-            no_team_member_warning: "{{teamname}} does not have any team member yet!"
+            no_team_member_warning: "{teamname} does not have any team member yet!"
             add_team_members: Add Team Members
             tbl_name: Name
             tbl_surname: Surname

data/config/locales/templates/dashboard/teams/id.yml

@@ -20,7 +20,7 @@
             add: Tambahkan
           member_removal_modal:
             title: Konfirmasi tindakan
-            confirmation: Yakin ingin menghapus {{fullname}} dari {{teamname}}?
+            confirmation: Yakin ingin menghapus {fullname} dari {teamname}?
             cancel: Batalkan
             remove: Hapus
           team_add_modal:
@@ -30,11 +30,11 @@
             create: Buat
           team_delete_modal:
             title: Konfirmasi tindakan
-            confirmation: Yakin ingin menghapus {{teamname}}?
+            confirmation: Yakin ingin menghapus {teamname}?
             cancel: Batalkan
             remove: Hapus
           team_list:
-            no_team_member_warning: '{{teamname}} belum memiliki satu pun anggota tim!'
+            no_team_member_warning: '{teamname} belum memiliki satu pun anggota tim!'
             add_team_members: Tambahkan Anggota Tim
             tbl_name: Nama
             tbl_surname: Nama belakang

data/config/locales/templates/dashboard/teams/zh.yml

@@ -20,7 +20,7 @@ zh:
             add: 添加
           member_removal_modal:
             title: 确认操作
-            confirmation: 您确定要从{{teamname}}移除{{fullname}}？
+            confirmation: 您确定要从{teamname}移除{fullname}？
             cancel: 取消
             remove: 移除
           team_add_modal:
@@ -30,11 +30,11 @@ zh:
             create: 创建
           team_delete_modal:
             title: 确认操作
-            confirmation: 您真的确定要移除{{teamname}}？
+            confirmation: 您真的确定要移除{teamname}？
             cancel: 取消
             remove: 移除
           team_list:
-            no_team_member_warning: '{{teamname}}尚无任何成员！'
+            no_team_member_warning: '{teamname}尚无任何成员！'
             add_team_members: 添加团队成员
             tbl_name: 名字
             tbl_surname: 姓氏

data/config/locales/templates/onboarding/en.yml

@@ -0,0 +1,45 @@
+en:
+  mno_enterprise:
+    templates:
+      app_feature:
+        single_sign_on: "Single Sign-on"
+        single_billing: "Single billing"
+        data_sharing: "Data-sharing"
+      onboarding:
+        breadcrumb:
+          step1: "Welcome"
+          step2: "Select your application(s)"
+          step3: "Connect your application(s)"
+          step4: "Discover your account"
+        welcome:
+          title: "Welcome, {name}!"
+          intro: "Setting up the Maestrano platform for the first time takes just a few minutes."
+          setup: "Our easy setup guide will take you through the process of connecting your first business applications and offer some insights on how to get the most out of your new cloud platform."
+          choose_my_apps: "Choose my apps!"
+          connect_my_apps: "Connect my apps!"
+          discover_your_account: "Discover your account now!"
+        select_your_app:
+          title: "Select the applications you want to connect"
+          search: "Search"
+          categories: "Categories"
+          max_apps_selected: "You cannot start with more than 4 apps, you will be able to add more at a later stage."
+        data_sync:
+          what_data: "What data will be synchronised"
+          start: "Visualise what data will be synchronised from your applications by clicking on their icons."
+          learn_more: "Learn how Maestrano synchronises data between your applications."
+          no_entity_shared: "No entities are shared"
+        app_infos_modal:
+          what_is: "What is {name}?"
+          how_is_app_integrated:
+            title: "How is {name} integrated to Maestrano?"
+            connector: "{name} is an add-on on Maestrano. You either need an existing account or to create an account.<br>The only thing you need to do is to authorise Maestrano to synchronise data with your account by clicking on \"connect my account\""
+            cloud: "{name} is a cloud app."
+            cube: "{name} is a cube app."
+          what_is_shared: "What data is shared with {name}?"
+          free_trial: "{duration} days free trial"
+        connect_apps:
+          connect_applications: "Connect your applications"
+          apps_to_connect: "Click on <b>Connect an existing account</b> button on each application to connect them now, you can skip this step if you want to connect your {nb, plural, one{application} other{applications}} later."
+          all_apps_connected: "{nb, plural, one{Your application is connected} other{Your applications are all connected}}! Click on the button below to go to the last step."
+          go_to_dashboard: "Go to my dashboard!"
+          skip: "Skip & Go to my dashboard!"

data/config/locales/views/auth/confirmations/en.yml

@@ -9,9 +9,11 @@ en:
           title: Almost there
           confirm: Confirm my account
         lounge:
-          title: Congratulations! We've sent you a confirmation link, please check your email inbox.
-          subtitle: If you did not receive the email please click resend.
-          resend: Resend!
+          title: Confirmation sent!
+          subtitle: "We've sent you a confirmation link, please check your email inbox."
+          resend:
+            description: If you did not receive the email please click resend.
+            button: Resend!
           support_tip_html: "Or if you prefer you can send an email to our %{email} directly and we'll activate it for you."
           support_team: customer care service
           support_email_subject: Signup Verification

data/config/locales/views/webhook/o_auth/providers/en.yml

@@ -9,7 +9,7 @@ en:
             which_version_used: "Which version of MYOB do you use?"
             my_version_is: "My version of MYOB is:"
             connect: "Connect"
-            connect_to: "Connect to {{appname}}"
+            connect_to: "Connect to {appname}"
 
           xero:
             how_do_you_want_to_connect: "How do you want us to connect your Xero account?"
@@ -17,4 +17,4 @@ en:
             payroll: "Payroll"
             which_country_for_the_account: "What is the country associated with your Xero account?"
             connect: "Connect"
-            connect_to: "Connect to {{appname}}"
+            connect_to: "Connect to {appname}"

data/lib/generators/mno_enterprise/install/install_generator.rb

@@ -8,15 +8,26 @@ module MnoEnterprise
 
       # class_option :skip_rspec, type: :boolean, default: false, desc: 'Skip rspec-rails installation'
       # class_option :skip_factory_girl, type: :boolean, default: false, desc: 'Skip factory_girl installation'
+      class_option :skip_application_config, type: :boolean, default: false, desc: 'Skip Application config'
       class_option :skip_frontend, type: :boolean, default: false, desc: 'Skip frontend installation'
       class_option :skip_admin, type: :boolean, default: false, desc: 'Skip admin installation'
 
+      def application_config
+        return if options[:skip_application_config]
+
+        say("\n")
+        @company_name  = ask("Company Name [My Company]: ").presence || "My Company"
+        @support_email = ask("Support email [support@example.com]: ").presence || "support@example.com"
+        @system_email  = ask("System email [no-reply@example.com]: ").presence || "no-reply@example.com"
+      end
+
       def copy_initializer
         # Foreman config
         template "Procfile"
         template "Procfile.dev"
         template ".foreman"
         template ".healthcheck"
+        template "nginx.conf"
 
         template "config/initializers/mno_enterprise.rb"
         template "config/mno_enterprise_styleguide.yml"
@@ -30,6 +41,7 @@ module MnoEnterprise
         template "config/application.yml", "config/application.yml"
         template "config/application.yml", "config/application.sample.yml"
 
+        @new_relic_app_name = new_relic_app_name
         template "config/newrelic.yml", "config/newrelic.yml"
       end
 
@@ -130,7 +142,7 @@ module MnoEnterprise
             say_status("==> Maestrano Enterprise Angular has been installed", nil)
             say("- You can quickly customize the platform style in frontend/src/app/stylesheets")
             say("- You can customize the whole frontend by overriding mno-enterprise-angular in frontend/src/")
-            say("- You can run 'rake mnoe:frontend:dist' to rebuild the frontend after changing frontend/src")
+            say("- You can run 'rake mnoe:frontend:build' to rebuild the frontend after changing frontend/src")
           end
 
           if @install_admin
@@ -162,6 +174,12 @@ module MnoEnterprise
           end
           answer.downcase[0] == ?y
         end
+
+        def new_relic_app_name
+          app_name = Rails.application.class.parent_name.to_s
+          name = app_name.parameterize.gsub('enterprise', '')
+          "frontend-#{name}"
+        end
     end
   end
 end