mno-enterprise-api 2.0.9 → 3.0.0

data/app/views/mno_enterprise/auth/passwords/edit.html.haml

@@ -5,7 +5,7 @@
     .row
       .login-box-wrapper
         .login-box-title
-          %h2 Change your password
+          %h2= t('.title')
         .login-box
           .brand-logo
           = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: 'form-horizontal autofill-detect' }) do |f|
@@ -33,21 +33,10 @@
             .row
               .col-sm-12
                 .text-center
-                  %button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' } Change my password
+                  %button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' }= t('.change')
                   %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }
             
             
-            / .field
-            /   = f.label :password, "New password"
-            /   %br/
-            /   = f.password_field :password, autofocus: true, autocomplete: "off", 'ng-model' => 'user.company', class: 'form-control'
-            / .field
-            /   = f.label :password_confirmation, "Confirm new password"
-            /   %br/
-            /   = f.password_field :password_confirmation, autocomplete: "off"
-            / .actions
-            /   = f.submit "Change my password"
-            
             %hr
             
             = render "devise/shared/links"

data/app/views/mno_enterprise/auth/passwords/new.html.haml

@@ -5,7 +5,7 @@
     .row
       .login-box-wrapper
         .login-box-title
-          %h2 Password Recovery
+          %h2= t('.title')
         .login-box
           .brand-logo
           
@@ -26,7 +26,7 @@
             .row
               .col-sm-12
                 .text-center
-                  %button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' } Recover my password
+                  %button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' }= t('.title')
                   %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }
           
           %hr

data/app/views/mno_enterprise/auth/registrations/{default/_form.html.haml → _form.html.haml}

@@ -1,35 +1,36 @@
 %div{ 'ng-init' => "user = { $pwdScore: {}, email: '#{params['email']}' }" }
 
 = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { 'name' => 'form', :class => 'form-horizontal autofill-detect', :autocomplete => "off" }) do |f|
-  
+
   - unless devise_error_messages!.empty?
     .row
       .alert.alert-error
         %button.close ×
         = devise_error_messages!
-  
+
   .row
     .col-sm-12
       = f.email_field :email, placeholder: "*Email", :required => true, 'ng-model' => 'user.email', :class => 'form-control'
-  
+
   %br
-  
+
   .row
     .col-sm-12
       = f.text_field :company, placeholder: "Company", 'ng-model' => 'user.company', class: 'form-control'
-  
+
   %br
-  
+
   .row
     .col-sm-12
       .checkbox-section.text-center
         = check_box_tag 'tos', 'accept', false, :required => true, :style => "margin-top: -3px;", 'ng-model' => 'acceptTos'
-        %label{for: 'tos'} I accept the
-        = link_to "Terms of Use", MnoEnterprise.router.terms_url, :target => '_blank'
-  
+        %label{for: 'tos'}= t('mno_enterprise.auth.registrations.new.user_accept')
+        = link_to t('.tos'), MnoEnterprise.router.terms_url, target: '_blank'
+
   %br
   .row
     .col-sm-12
       .text-center
-        %button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' } Create my account!
-        %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }
+        %button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' }
+          = t('mno_enterprise.auth.registrations.new.create')
+        %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }

data/app/views/mno_enterprise/auth/registrations/new.html.haml

@@ -1,4 +1,11 @@
-- if MnoEnterprise.style.design.material
-  = render "mno_enterprise/auth/registrations/material/new"
-- else
-  = render "mno_enterprise/auth/registrations/default/new"
+.registration
+  .container
+    .row
+      .login-box-wrapper
+        .login-box-title
+          %h2= t('mno_enterprise.auth.registrations.new.title')
+        .login-box
+          .brand-logo
+          = render "mno_enterprise/auth/registrations/form"
+          %hr
+          = render "mno_enterprise/auth/shared/links"

data/app/views/mno_enterprise/auth/sessions/{default/_form.html.haml → _form.html.haml}

@@ -4,14 +4,15 @@
   %br
   %div
     = f.password_field :password, :placeholder => "Password", :required => true, 'ng-model' => 'password', :class => 'form-control', :autocomplete => "off"
-  
+
   %br/
   %div
-    %button{ :class => "btn btn-warning btn-login", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'loginForm.$invalid', 'ng-hide' => 'hasClicked' } Sign in
+    %button{ :class => "btn btn-warning btn-login", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'loginForm.$invalid', 'ng-hide' => 'hasClicked' }
+      = t('mno_enterprise.auth.sessions.new.sign_in')
     %img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }
-  
+
   - if devise_mapping.rememberable? && MnoEnterprise.style.devise.remember_checkbox_shown
     %br/
     %div.form-inline.checkbox-section
       = f.check_box :remember_me, { checked: true }
-      = f.label :remember_me
+      = f.label :remember_me

data/app/views/mno_enterprise/auth/sessions/new.html.haml

@@ -1,4 +1,11 @@
-- if MnoEnterprise.style.design.material
-  = render "mno_enterprise/auth/sessions/material/new"
-- else
-  = render "mno_enterprise/auth/sessions/default/new"
+.registration
+  .container
+    .row
+      .login-box-wrapper
+        .login-box-title
+          %h2= t('mno_enterprise.auth.sessions.new.title')
+        .login-box
+          .brand-logo
+          = render "mno_enterprise/auth/sessions/form"
+          %hr
+          = render "mno_enterprise/auth/shared/links"

data/app/views/mno_enterprise/auth/shared/_links.html.haml

@@ -1,24 +1,24 @@
 - if controller_name != 'sessions'
-  = link_to "Already have an account? Log in", new_session_path(resource_name)
+  = link_to t('mno_enterprise.auth.shared.links.login'), new_session_path(resource_name)
   %br/
 
 - if devise_mapping.registerable? && controller_name != 'registrations'
-  = link_to "Don't have an account? Sign up", new_registration_path(resource_name)
+  = link_to t('mno_enterprise.auth.shared.links.signup'), new_registration_path(resource_name)
   %br/
 
 - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' && MnoEnterprise.style.devise.forgot_password_link_shown
-  = link_to "Forgot your password?", new_password_path(resource_name)
+  = link_to t('mno_enterprise.auth.shared.links.recover_password'), new_password_path(resource_name)
   %br/
 
 - if devise_mapping.confirmable? && controller_name != 'confirmations' && MnoEnterprise.style.devise.confirmation_link_shown
-  = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
+  = link_to t('mno_enterprise.auth.shared.links.resend_confirmation'), new_confirmation_path(resource_name)
   %br/
 
 - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' && MnoEnterprise.style.devise.unlock_link_shown
-  = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
+  = link_to t('mno_enterprise.auth.shared.links.unlock'), new_unlock_path(resource_name)
   %br/
 
 - if devise_mapping.omniauthable? && MnoEnterprise.style.devise.omniauth_link_shown 
   - resource_class.omniauth_providers.each do |provider|
-    = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+    = link_to t('mno_enterprise.auth.shared.links.omni_login', provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider)
     %br/

data/app/views/mno_enterprise/auth/unlocks/new.html.haml

@@ -1,4 +1,4 @@
-%h2 Resend unlock instructions
+%h2= t('.title')
 = form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
   = devise_error_messages!
   .field
@@ -6,5 +6,6 @@
     %br/
     = f.email_field :email, autofocus: true
   .actions
-    = f.submit "Resend unlock instructions"
+    = f.submit t('.unlock')
+
 = render "devise/shared/links"

data/app/views/mno_enterprise/jpi/v1/current_users/show.json.jbuilder

@@ -13,7 +13,10 @@ json.cache! ['v1', @user.cache_key] do
     json.website @user.website
     json.sso_session @user.sso_session
     json.admin_role @user.admin_role
-
+    if current_impersonator
+      json.current_impersonator true
+    end
+    
     # Embed association if user is persisted
     if @user.id
       json.organizations do
@@ -24,7 +27,6 @@ json.cache! ['v1', @user.cache_key] do
           json.currency o.billing_currency
           json.current_user_role o.role
           json.has_myob_essentials_only o.has_myob_essentials_only?
-          json.financial_year_end_month o.financial_year_end_month
         end
       end
 

data/app/views/mno_enterprise/jpi/v1/impac/kpis/_kpi.json.jbuilder

@@ -1 +1 @@
-json.extract! kpi, :id, :element_watched, :endpoint, :source, :targets, :settings, :extra_params
+json.extract! kpi, :id, :name, :element_watched, :endpoint, :source, :targets, :settings, :extra_params

data/app/views/mno_enterprise/jpi/v1/organizations/_credit_card.json.jbuilder

@@ -2,6 +2,6 @@ json.credit_card do
   if credit_card
     json.extract! credit_card, :id, :title,:first_name,:last_name,:month,:year,:country,:billing_address,:billing_city,:billing_postcode, :billing_country
     json.number credit_card.masked_number
-    json.verification_value credit_card.id ? 'CVV' : nil
+    json.verification_value 'CVV'
   end
-end
+end

data/app/views/mno_enterprise/pages/app_access_unauthorized.html.haml

@@ -3,17 +3,14 @@
     .row.text-center
       = image_tag("mno_enterprise/main-logo.png")
     .row
-      %h2 App Access Not Granted
+      %h2= t('.title')
     %hr
     .row
       .col-md-6.col-md-offset-3
         .align-center
-          %h3
-            It looks like the administrator of this application has not granted you access.
-          %p You should ask your administrator to share this application with you.
+          %h3= t('.explanation')
+          %p= t('.recommendation')
         .spacer4
         .align-center
-          %h5
-            If you think this is a mistake, please send us an email at
-            = mail_to support_email
+          %h5= t('.support_help_html', email: mail_to(support_email))
         .spacer4

data/app/views/mno_enterprise/pages/app_logout.html.haml

@@ -3,16 +3,13 @@
     .row.text-center
       = image_tag("mno_enterprise/main-logo.png")
     .row
-      %h2 Successful logout
+      %h2= t('.title')
     %hr
     .row
       .col-md-6.col-md-offset-3
         .align-center
-          %h3
-            You have successfully logged out from your application
+          %h3= t('.explanation')
         .spacer4
         .align-center
-          %h5
-            If you think this is a mistake, please send us an email at
-            = mail_to support_email
+          %h5= t('.support_help_html', email: mail_to(support_email))
         .spacer4

data/app/views/mno_enterprise/pages/billing_details_required.html.haml

@@ -3,17 +3,14 @@
     .row.text-center
       = image_tag("mno_enterprise/main-logo.png")
     .row
-      %h2 Billing Details Required
+      %h2= t('.title')
     %hr
     .row
       .col-md-6.col-md-offset-3
         .align-center
-          %h3
-            Oops! It looks like the free trial has ended for this application and no billing details have been entered.
-          %p Please ask your administrator to enter valid billing details for your company.
+          %h3= t('.explanation')
+          %p= t('.recommendation')
         .spacer4
         .align-center
-          %h5
-            If you think this is a mistake, please send us an email at
-            = mail_to support_email
+          %h5= t('.support_help_html', email: mail_to(support_email))
         .spacer4

data/app/views/mno_enterprise/provision/_provision_apps.html.haml

@@ -3,10 +3,10 @@
   .container
     .row
       .col-md-6.text-center.col-md-offset-3
-        %h3 You order is being prepared
+        %h3= t('mno_enterprise.provision.provision_apps.title')
         .spacer1
         = image_tag('mno_enterprise/loader-32x32-bg-inverse.gif')
-        
+
 - # Provision applications in the background and remove params
 - # Used to avoid double-provisioning on page reload and keep
 - # actual provisioning (create action) as POST
@@ -18,13 +18,11 @@
         else
             setTimeout(function() { defer(method) }, 50);
     }
-  
+
     function provisionApps() {
       $(document).ready( function() {
-      
-        //window.location.href.replace(window.location.search,'');
-        window.history.replaceState({}, 'Preparing Order', window.location.pathname + "?status=preparing");
-      
+        window.history.replaceState({}, "#{t('mno_enterprise.provision.provision_apps.title')}", window.location.pathname + "?status=preparing");
+
         $.ajax({
           url: "#{provision_index_path}",
           method: "POST",
@@ -35,8 +33,8 @@
         }).always(function() {
           window.location.href = "#{after_provision_path}?dhbRefId=#{@organization.id}"
         });
-    
+
       });
     }
-  
+
     defer(provisionApps);

data/app/views/mno_enterprise/provision/_select_organization.html.haml

@@ -1,17 +1,17 @@
 .banners.promo.dark.darkblue
   .container
     .row
-      %h2 Choose an organization
+      %h2= t('mno_enterprise.provision.select_organization.title')
 .banners.promo
   .container
     .row
       .col-md-6.col-md-offset-3
         .align-center
-          %h3 You belong to multiple organizations
-          %p Please select the organization you are making this new order for
+          %h3= t('mno_enterprise.provision.select_organization.explanation')
+          %p= t('mno_enterprise.provision.select_organization.select')
           = form_tag(new_provision_path, method: :get) do
             - @apps.each do |app|
               = hidden_field_tag 'apps[]', app
             = select_tag :organization_id, options_for_select(@organizations.map { |o| [o.name, o.id]} )
-            = submit_tag 'Go', class: 'btn'
+            = submit_tag t('mno_enterprise.provision.select_organization.submit'), class: 'btn'
         .spacer4

data/app/views/mno_enterprise/webhook/o_auth/authorize.html.haml

@@ -3,11 +3,11 @@
   .container
     .row
       .col-md-6.text-center.col-md-offset-3
-        %h3 You are about to be connected via our integration partner
+        %h3= t('.you_are_redirected')
         = image_tag('mno_enterprise/maestrano/logo-whitebg.png')
-        
+
         .spacer1
-        
+
         %hr
         = image_tag('mno_enterprise/loader-32x32-bg-inverse.gif')
         %hr
@@ -23,4 +23,4 @@
     window.location.href = "#{@redirect_to}";
   }
 
-  defer(doRedirect);
+  defer(doRedirect);

data/app/views/mno_enterprise/webhook/o_auth/providers/myob.html.haml

@@ -6,24 +6,25 @@
         .col-md-6.text-center.col-md-offset-3
           = image_tag 'mno_enterprise/main-logo.png', class: 'top-picture'
           .spacer2
-          %h3 Which version of MYOB do you use?
-        
+          %h3= t('.which_version_used')
+
           .spacer1
-        
+
           %hr
-        
+
           - # form with options
           .align-center
             = form_tag authorize_webhook_oauth_path, method: :get do
               = hidden_field_tag :perform, true
-              
+
               .spacer1
-              
+
               .form-group
-                %p My version of MYOB is:
-                = select_tag :version, options_for_select([["Account Right Live","account_right"],["Essentials","essentials"]], "essentials")
-              
+                %p= t('.my_version_is')
+                = select_tag :version, options_for_select([["Account Right (Desktop)","account_right"],["Essentials (Cloud)","essentials"]], "essentials")
+
               %hr
-              
+
               .form-group
-              %button{ class: 'btn btn-warning', type: 'submit' } Connect
+              %button{ class: 'btn btn-warning', type: 'submit' }
+                = t('.connect')

data/app/views/mno_enterprise/webhook/o_auth/providers/xero.html.haml

@@ -6,29 +6,30 @@
         .col-md-6.text-center.col-md-offset-3
           = image_tag 'mno_enterprise/main-logo.png', class: 'top-picture'
           .spacer2
-          %h3 How do you want us to connect your Xero account?
-        
+          %h3= t('.how_do_you_want_to_connect')
+
           .spacer1
-        
+
           %hr
-        
+
           - # form with options
           .align-center
             = form_tag authorize_webhook_oauth_path, method: :get do
               = hidden_field_tag :perform, true
-              
-              %p Do you want to connect any of the following extra modules?
+
+              %p= t('.which_extra_modules')
               .form-inline
                 = check_box_tag 'extra_params[]', :payroll, false, {'ng-model' => 'payroll'}
                 = label_tag :payroll
-              
+
               .spacer1
 
               .form-group{'ng-if' => 'payroll', 'ng-cloak' => true}
-                %p What is the country associated with your Xero account?
+                %p= t('.which_country_for_the_account')
                 = select_tag :xero_country, options_for_select([["Australia","AU"],["USA","US"]], "AU")
 
               %hr
-              
+
               .form-group
-              %button{ class: 'btn btn-warning', type: 'submit' } Connect
+              %button{ class: 'btn btn-warning', type: 'submit' }
+                = t('.connect')