Release impac-angular#v1.9.1 to PROD

.travis.yml

@@ -1,6 +1,12 @@
 language: ruby
 script:
   - bundle install --quiet
-  - bundle exec rake
+#  - bundle exec rake
+  - bundle exec bundler-audit update
+  - bundle exec bundler-audit check --ignore CVE-2019-5421 CVE-2015-9284 CVE-2019-16109
+  - bundle exec rake brakeman:run
+  - bundle exec rake rubocop
+  - bundle exec rspec
+
 rvm:
-  - 2.3.4
+  - 2.3

Gemfile.lock

@@ -48,36 +48,36 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       arel (~> 6.0)
-    activesupport (4.2.10)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -88,8 +88,8 @@ GEM
     bcrypt (3.1.11)
     brakeman (3.3.5)
     builder (3.2.3)
-    bundler-audit (0.6.0)
-      bundler (~> 1.2)
+    bundler-audit (0.6.1)
+      bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
     cancancan (1.17.0)
     coffee-rails (4.2.2)
@@ -139,7 +139,7 @@ GEM
       faraday (>= 0.7.4, < 1.0)
     figaro (1.1.1)
       thor (~> 0.14)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (4.0.7)
       tilt
@@ -196,28 +196,28 @@ GEM
       sprockets (> 2, < 4)
       tilt
     libv8 (3.16.14.19)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     mandrill-api (1.0.53)
       excon (>= 0.16.0, < 1.0)
       json (>= 1.7.7, < 2.0)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     money (6.11.1)
       i18n (>= 0.6.4, < 1.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    newrelic_rpm (4.7.0.339)
+    newrelic_rpm (5.4.0.347)
     ngannotate-rails (1.2.2)
       execjs
       rails (>= 3.1)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
     omniauth (1.3.2)
@@ -234,39 +234,39 @@ GEM
       ttfunk (~> 1.5)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    puma (3.11.0)
-    rack (1.6.10)
+    puma (3.12.0)
+    rack (1.6.11)
     rack-rewrite (1.5.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.10)
-      actionmailer (= 4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      activemodel (= 4.2.10)
-      activerecord (= 4.2.10)
-      activesupport (= 4.2.10)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.10)
+      railties (= 4.2.11.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.9)
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     rails_stdout_logging (0.0.5)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
-    rake (12.3.1)
+    rake (12.3.3)
     redcarpet (3.4.0)
     ref (2.0.0)
     responders (2.4.0)
@@ -325,7 +325,7 @@ GEM
     spring (1.7.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
@@ -337,7 +337,7 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.8)
     ttfunk (1.5.1)
@@ -378,4 +378,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

README.md

@@ -2,6 +2,11 @@
 
 Generic mno-enterprise express project
 
+| branch | status |
+| ------ | ------ |
+| [master](https://github.com/maestrano/mno-enterprise-demo/tree/master) | [![Build Status](https://travis-ci.org/maestrano/mno-enterprise-demo.svg?branch=master)](https://travis-ci.org/maestrano/mno-enterprise-demo) |
+| [develop](https://github.com/maestrano/mno-enterprise-demo/tree/develop) | [![Build Status](https://travis-ci.org/maestrano/mno-enterprise-demo.svg?branch=develop)](https://travis-ci.org/maestrano/mno-enterprise-demo) |
+
 ## Getting started
 
 Update `config/settings/development.yml` and `config/application.yml` with the configuration you've been provided with.

package.json

@@ -2,7 +2,7 @@
   "name": "mno-enterprise-demo",
   "private": true,
   "dependencies": {
-    "impac-angular": "git+https://[email protected]/maestrano/impac-angular.git#v1.8.3",
+    "impac-angular": "git+https://[email protected]/maestrano/impac-angular.git#v1.9.1",
     "mno-enterprise-angular": "git+https://[email protected]/maestrano/mno-enterprise-angular.git#master",
     "mnoe-admin-panel": "git+https://[email protected]/maestrano/mnoe-admin-panel.git#1.0"
   },

public/dashboard/index.html

@@ -1,3 +1,3 @@
-<!doctype html><html ng-app="mnoEnterpriseAngular" ng-strict-di="true"><head><meta charset="utf-8"><title state-title="Dashboard" pattern="{{::app_name}} - Dashboard - %s"></title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="apple-touch-icon" sizes="57x57" href="images/favicons/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="images/favicons/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="images/favicons/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="images/favicons/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="images/favicons/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="images/favicons/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="images/favicons/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="images/favicons/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="images/favicons/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="images/favicons/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="images/favicons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="images/favicons/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="images/favicons/favicon-16x16.png"><link rel="manifest" href="images/favicons/manifest.json"><meta name="msapplication-TileImage" content="images/favicons/ms-icon-144x144.png"><link rel="stylesheet" href="styles/vendor-67ceb12894.css"><link rel="stylesheet" href="styles/app-b20a437d18.css"></head><body translate-cloak=""><!--[if lt IE 10]>
+<!doctype html><html ng-app="mnoEnterpriseAngular" ng-strict-di="true"><head><meta charset="utf-8"><title state-title="Dashboard" pattern="{{::app_name}} - Dashboard - %s"></title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="apple-touch-icon" sizes="57x57" href="images/favicons/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="images/favicons/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="images/favicons/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="images/favicons/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="images/favicons/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="images/favicons/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="images/favicons/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="images/favicons/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="images/favicons/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="images/favicons/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="images/favicons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="images/favicons/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="images/favicons/favicon-16x16.png"><link rel="manifest" href="images/favicons/manifest.json"><meta name="msapplication-TileImage" content="images/favicons/ms-icon-144x144.png"><link rel="stylesheet" href="styles/vendor-67ceb12894.css"><link rel="stylesheet" href="styles/app-78daf9448a.css"></head><body translate-cloak=""><!--[if lt IE 10]>
  <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/?locale=en">upgrade your browser</a> to improve your experience.</p>
- <![endif]--><div ng-if="!isLoggedIn" class="layout-loading text-center"><mno-loader></mno-loader><span class="layout-loading-text" translate="mno_enterprise.templates.components.layout.your_dashboard_is_loading"></span></div><div ui-view="" class="myspace"></div><script src="scripts/vendor-b2c6f26a0c.js"></script><script src="scripts/app-829cd43a41.js"></script><script src="/assets/mno_enterprise/config.js"></script><div ng-controller="IndexController" ng-bind-html="google_tag_scripts"></div><div ng-controller="IndexController" ng-bind-html="intercom"></div></body></html>
+ <![endif]--><div ng-if="!isLoggedIn" class="layout-loading text-center"><mno-loader></mno-loader><span class="layout-loading-text" translate="mno_enterprise.templates.components.layout.your_dashboard_is_loading"></span></div><div ui-view="" class="myspace"></div><script src="scripts/vendor-9663f54e24.js"></script><script src="scripts/app-4445884522.js"></script><script src="/assets/mno_enterprise/config.js"></script><div ng-controller="IndexController" ng-bind-html="google_tag_scripts"></div><div ng-controller="IndexController" ng-bind-html="intercom"></div></body></html>

public/dashboard/locales/impac/en.json

@@ -141,6 +141,12 @@
   "impac.widget.settings.tag-filter.add_filter":  "Add filter:",
   "impac.widget.settings.tag-filter.report_filtered":  "*Report is currently tag filtered",
 
+  "impac.widget.settings.averages.title": "Average Profit",
+  "impac.widget.settings.averages.include_option": "Include average expenses/revenue into cash projection",
+  "impac.widget.settings.averages.granularity": "Granularity",
+  "impac.widget.settings.averages.period_for_calculation": "Calculate average for period",
+  "impac.widget.settings.averages.period_for_application": "Apply average on period",
+
   "impac.dashboard_selector.delete_widget.description": "Are you sure you want to delete this {name}?",
   "impac.dashboard_selector.bootstrap_tabs.add_widget": "Add Widget",
   "impac.dashboard_selector.bootstrap_tabs.source": "Source:",
@@ -168,6 +174,9 @@
 
   "impac.widget.common.confirm-modal.delete_trx.title": "Delete forecast transaction",
   "impac.widget.common.confirm-modal.delete_trx.message": "Are you sure you want to delete transaction {title} {preposition} {customer}?",
+  "impac.widget.common.confirm-modal.delete_trx.only_this": "Delete only this transaction",
+  "impac.widget.common.confirm-modal.delete_trx.all_occurrences": "Delete this one and all occurrencies",
+  "impac.widget.common.confirm-modal.delete_trx.only_occurrences": "Delete all occurrencies",
 
   "impac.widget.common.top_buttons.info_popup.delete": "Delete widget",
   "impac.widget.common.top_buttons.info_popup.edit": "Edit widget",

public/dashboard/theme-previewer.html

@@ -1,3 +1,3 @@
 <!doctype html><html ng-app="mnoEnterpriseAngular"><head><meta charset="utf-8"><title>mnoEnterpriseAngular</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="styles/vendor-67ceb12894.css"><link rel="stylesheet/less" type="text/css" href="styles/theme-previewer.less"></head><body><!--[if lt IE 10]>
  <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/?locale=en">upgrade your browser</a> to improve your experience.</p>
- <![endif]--><div ui-view="" class="myspace"></div><theme-editor></theme-editor><script src="scripts/less-2c8757a6d5.js"></script><script src="scripts/vendor-b2c6f26a0c.js"></script><script src="scripts/app-829cd43a41.js"></script><script src="/assets/mno_enterprise/config.js"></script></body></html>
+ <![endif]--><div ui-view="" class="myspace"></div><theme-editor></theme-editor><script src="scripts/less-2c8757a6d5.js"></script><script src="scripts/vendor-9663f54e24.js"></script><script src="scripts/app-4445884522.js"></script><script src="/assets/mno_enterprise/config.js"></script></body></html>

yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"impac-angular@git+https://[email protected]/maestrano/impac-angular.git#v1.8.3":
-  version "1.8.3"
-  resolved "git+https://[email protected]/maestrano/impac-angular.git#f8a83fbea321bb1deb55338373e6dadf95190a62"
+"impac-angular@git+https://[email protected]/maestrano/impac-angular.git#v1.9.1":
+  version "1.9.1"
+  resolved "git+https://[email protected]/maestrano/impac-angular.git#8d7af87415e114e7da166359581494e8e640d161"
 
 "mno-enterprise-angular@git+https://[email protected]/maestrano/mno-enterprise-angular.git#master":
   version "1.1.3"