[feature] Ability to disable invoices generation and interfaces

2025-01-17 06:52:27 +01:00 · 2019-09-30 15:29:10 +02:00 · 2019-09-30 15:29:10 +02:00 · 0d3cc0fe40
commit 0d3cc0fe40
parent 8bd1d72fdf
15 changed files with 31 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,8 @@
 - Compute the VAT per item in each invoices, instead of globally
 - Use Alpine Linux to build the Docker image (#147)
 - Ability to set project's CAO attachement maximum upload size
+- Ability to bulk-import members from a CSV file
+- Ability to disable invoices generation and interfaces
 - Fix a bug: invoices with total = 0, are marked as paid on site even if paid by card
 - Fix a bug: after disabling a group, its associated plans are hidden from the interface
 - Fix a bug: in case of unexpected server error during stripe payment process, the confirm button is not unlocked
@ -15,6 +17,7 @@
 - [TODO DEPLOY] add `MAX_CAO_SIZE` environment variable (see [doc/environment.md](doc/environment.md) for configuration details)
 - [TODO DEPLOY] add `MAX_IMPORT_SIZE` environment variable (see [doc/environment.md](doc/environment.md) for configuration details)
 - [TODO DEPLOY] add `- ${PWD}/imports:/usr/src/app/imports` in the volumes list of your fabmanager service in [docker-compose.yml](docker/docker-compose.yml)
+- [TODO DEPLOY] add the `FABLAB_WITHOUT_INVOICES` environment variable (see [doc/environment.md](doc/environment.md) for configuration details)

 ## v4.1.0 2019 September 12

--- a/app/assets/javascripts/app.js
+++ b/app/assets/javascripts/app.js
@ -84,6 +84,8 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout
      $rootScope.fablabWithoutSpaces = Fablab.withoutSpaces;
      // Global config: if true, all payments will be disabled in the application for the members (only admins will be able to proceed reservations)
      $rootScope.fablabWithoutOnlinePayment = Fablab.withoutOnlinePayment;
+      // Global config: if true, no invoices will be generated
+      $rootScope.fablabWithoutInvoices = Fablab.withoutInvoices;

      // Global function to allow the user to navigate to the previous screen (ie. $state).
      // If no previous $state were recorded, navigate to the home page
--- a/app/assets/templates/admin/invoices/index.html.erb
+++ b/app/assets/templates/admin/invoices/index.html.erb
@ -24,7 +24,7 @@
  <div class="row">
    <div class="col-md-12">
      <uib-tabset justified="true">
-        <uib-tab heading="{{ 'invoices.invoices_list' | translate }}">
+        <uib-tab heading="{{ 'invoices.invoices_list' | translate }}" ng-if="!fablabWithoutInvoices">
          <h3 class="m-t-xs"><i class="fa fa-filter"></i> {{ 'invoices.filter_invoices' | translate }}</h3>

          <div class="row">
@ -117,6 +117,10 @@


 	    <uib-tab heading="{{ 'invoices.invoicing_settings' | translate }}">
+      <div class="alert alert-warning p-md m-t" role="alert" ng-show="fablabWithoutInvoices">
+        <i class="fa fa-warning m-r"></i>
+        <span translate>{{ 'invoices.warning_invoices_disabled' }}</span>
+      </div>
 			<form class="invoice-placeholder">
 				<div class="invoice-logo">
 				    <img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!invoice.logo" class="img-responsive">
--- a/app/assets/templates/admin/members/edit.html.erb
+++ b/app/assets/templates/admin/members/edit.html.erb
@ -187,7 +187,7 @@
          </div>
        </uib-tab>

-        <uib-tab heading="{{ 'invoices' | translate }}">
+        <uib-tab heading="{{ 'invoices' | translate }}" ng-hide="fablabWithoutInvoices">
          <div class="col-md-12 m m-t-lg">


--- a/app/assets/templates/dashboard/nav.html.erb
+++ b/app/assets/templates/dashboard/nav.html.erb
@ -15,7 +15,7 @@
          <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.projects" translate>{{ 'my_projects' }}</a></li>
          <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.trainings" translate>{{ 'my_trainings' }}</a></li>
          <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.events" translate>{{ 'my_events' }}</a></li>
-          <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.invoices" translate>{{ 'my_invoices' }}</a></li>
+          <li ui-sref-active="active" ng-hide="fablabWithoutInvoices"><a class="text-black" href="#" ui-sref="app.logged.dashboard.invoices" translate>{{ 'my_invoices' }}</a></li>
          <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.wallet" translate>{{ 'my_wallet' }}</a></li>
        </ul>
      </section>
--- a/app/assets/templates/shared/header.html.erb
+++ b/app/assets/templates/shared/header.html.erb
@ -39,7 +39,7 @@
        <li><a href="#" ui-sref="app.logged.dashboard.projects" translate>{{ 'my_projects' }}</a></li>
        <li><a href="#" ui-sref="app.logged.dashboard.trainings" translate>{{ 'my_trainings' }}</a></li>
        <li><a href="#" ui-sref="app.logged.dashboard.events" translate>{{ 'my_events' }}</a></li>
-        <li><a href="#" ui-sref="app.logged.dashboard.invoices" translate>{{ 'my_invoices' }}</a></li>
+        <li><a href="#" ui-sref="app.logged.dashboard.invoices" ng-hide="fablabWithoutInvoices" translate>{{ 'my_invoices' }}</a></li>
        <li><a href="#" ui-sref="app.logged.dashboard.wallet" translate>{{ 'my_wallet' }}</a></li>

        <li class="divider"></li>
--- a/app/assets/templates/shared/leftnav.html.erb
+++ b/app/assets/templates/shared/leftnav.html.erb
@ -56,7 +56,7 @@
                    <i class="fa fa-calendar-o"></i> <span translate>{{ 'my_events' }}</span>
                </a>
            </li>
-            <li class="hidden-sm hidden-md hidden-lg"  ng-if-end>
+            <li class="hidden-sm hidden-md hidden-lg" ng-hide="fablabWithoutInvoices" ng-if-end>
                <a href="#" ui-sref="app.logged.dashboard.invoices">
                    <i class="fa fa-file-pdf-o"></i> <span translate>{{ 'my_invoices' }}</span>
                </a>
--- a/app/assets/templates/wallet/credit_modal.html.erb
+++ b/app/assets/templates/wallet/credit_modal.html.erb
@ -40,7 +40,7 @@
    </div>

    <hr/>
-    <div class="text-right m-t">
+    <div class="text-right m-t" ng-hide="fablabWithoutInvoices">
      <label for="generate_avoir" translate>{{ 'generate_a_refund_invoice' }}</label>
      <div class="inline m-l">
        <input bs-switch
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@ -188,6 +188,8 @@ class Invoice < ActiveRecord::Base
  private

  def generate_and_send_invoice
+    return if Rails.application.secrets.fablab_without_invoices == 'true'
+
    unless Rails.env.test?
      puts "Creating an InvoiceWorker job to generate the following invoice: id(#{id}), invoiced_id(#{invoiced_id}), " \
           "invoiced_type(#{invoiced_type}), user_id(#{invoicing_profile.user_id})"
--- a/app/views/application/index.html.erb
+++ b/app/views/application/index.html.erb
@ -19,6 +19,7 @@
      Fablab.withoutPlans = ('<%= Rails.application.secrets.fablab_without_plans %>' == 'true');
      Fablab.withoutSpaces = ('<%= Rails.application.secrets.fablab_without_spaces %>' != 'false');
      Fablab.withoutOnlinePayment = ('<%= Rails.application.secrets.fablab_without_online_payments %>' == 'true');
+      Fablab.withoutInvoices = ('<%= Rails.application.secrets.fablab_without_invoices %>' == 'true');
      Fablab.disqusShortname = "<%= Rails.application.secrets.disqus_shortname %>";
      Fablab.defaultHost = "<%= Rails.application.secrets.default_host %>";
      Fablab.gaId = "<%= Rails.application.secrets.google_analytics_id %>";
--- a/config/application.yml.default
+++ b/config/application.yml.default
@ -14,6 +14,7 @@ INVOICE_PREFIX: Demo-FabLab-facture
 FABLAB_WITHOUT_PLANS: 'false'
 FABLAB_WITHOUT_SPACES: 'true'
 FABLAB_WITHOUT_ONLINE_PAYMENT: 'false'
+FABLAB_WITHOUT_INVOICES: 'false'

 DEFAULT_MAIL_FROM: Fab Manager Demo <noreply@fab-manager.com>

--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@ -306,6 +306,7 @@ fr:
          display_more_invoices: "Afficher plus de factures ..."
          no_invoices_for_now: "Aucune facture pour le moment."
          invoicing_settings: "Paramètres de facturation"
+          warning_invoices_disabled: "Attention : les factures ne sont pas activées. Aucune facture ne sera générée par Fab-manager. Vous devez néanmoins remplir correctement les informations ci-dessous, particulièrement la TVA."
          change_logo: "Changer le logo"
          john_smith: "Jean Dupont"
          john_smith_at_example_com: "jean.dupont@example.com"
--- a/config/secrets.yml
+++ b/config/secrets.yml
@ -19,6 +19,7 @@ development:
  fablab_without_plans: <%= ENV["FABLAB_WITHOUT_PLANS"] %>
  fablab_without_spaces: <%= ENV["FABLAB_WITHOUT_SPACES"] %>
  fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %>
+  fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %>
  default_host: <%= ENV["DEFAULT_HOST"] %>
  default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %>
  time_zone: <%= ENV["TIME_ZONE"] %>
@ -59,6 +60,7 @@ test:
  fablab_without_plans: false
  fablab_without_spaces: false
  fablab_without_online_payments: false
+  fablab_without_invoices: false
  default_host: <%= ENV["DEFAULT_HOST"] %>
  default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %>
  time_zone: Paris
@ -99,6 +101,7 @@ staging:
  fablab_without_plans: <%= ENV["FABLAB_WITHOUT_PLANS"] %>
  fablab_without_spaces: <%= ENV["FABLAB_WITHOUT_SPACES"] %>
  fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %>
+  fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %>
  default_host: <%= ENV["DEFAULT_HOST"] %>
  default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %>
  delivery_method: <%= ENV['DELIVERY_METHOD'] %>
@ -150,6 +153,7 @@ production:
  fablab_without_plans: <%= ENV["FABLAB_WITHOUT_PLANS"] %>
  fablab_without_spaces: <%= ENV["FABLAB_WITHOUT_SPACES"] %>
  fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %>
+  fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %>
  default_host: <%= ENV["DEFAULT_HOST"] %>
  default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %>
  delivery_method: <%= ENV['DELIVERY_METHOD'] %>
--- a/doc/environment.md
+++ b/doc/environment.md
@ -82,6 +82,12 @@ It is not recommended to disable spaces if at least one space reservation was ma
 If set to 'true', the online payment won't be available and the you'll be only able to process reservations when logged as admin.
 Valid stripe API keys are still required, even if you don't require online payments. 

+    FABLAB_WITHOUT_INVOICES
+
+If set to 'true', the invoices will be disabled. 
+This is useful if you have your own invoicing system and you want to prevent Fab-manager from generating and sending invoices to members.
+**Very important**: if you disable invoices, you still have to configure VAT in the interface to prevent errors in accounting and prices.
+
    DEFAULT_MAIL_FROM

 When sending notification mails, the platform will use this address to identify the sender.
--- a/docker/env.example
+++ b/docker/env.example
@ -12,6 +12,7 @@ INVOICE_PREFIX=Demo-FabLab-facture
 FABLAB_WITHOUT_PLANS=false
 FABLAB_WITHOUT_SPACES=true
 FABLAB_WITHOUT_ONLINE_PAYMENT=true
+FABLAB_WITHOUT_INVOICES=false

 DEFAULT_MAIL_FROM=Fab Manager Demo <noreply@fab-manager.com>
 DEFAULT_HOST=demo.fab-manager.com