Merge remote-tracking branch 'origin/disable_wallet_option' into dev

CHANGELOG.md

@@ -121,6 +121,7 @@
 - [TODO DEPLOY] add the `MAX_IMPORT_SIZE` environment variable (see [doc/environment.md](doc/environment.md#MAX_IMPORT_SIZE) for configuration details)
 - [TODO DEPLOY] add the `FABLAB_WITHOUT_INVOICES` environment variable (see [doc/environment.md](doc/environment.md#FABLAB_WITHOUT_INVOICES) for configuration details)
 - [TODO DEPLOY] add the `SMTP_TLS` environment variable (see [doc/environment.md](doc/environment.md#SMTP_TLS) for configuration details)
+- [TODO DEPLOY] add the `FABLAB_WITHOUT_WALLET` environment variable (see [doc/environment.md](doc/environment.md#FABLAB_WITHOUT_WALLET) for configuration details)
 - [TODO DEPLOY] **IMPORTANT** Please read [postgres_upgrade.md](doc/postgres_upgrade.md) for instructions on upgrading PostgreSQL.
 
 ## v4.1.1 2019 September 20

app/assets/javascripts/app.js

@@ -97,6 +97,8 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout
       $rootScope.slotDuration = Fablab.slotDuration;
       // Global config: if true, user must confirm his email to sign in
       $rootScope.userConfirmationNeededToSignIn = Fablab.userConfirmationNeededToSignIn;
+      // Global config: if true, wallet will be disable
+      $rootScope.fablabWithoutWallet = Fablab.fablabWithoutWallet;
 
       // 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

app/assets/templates/admin/members/edit.html.erb

@@ -224,7 +224,7 @@
           </div>
         </uib-tab>
 
-        <uib-tab heading="{{ 'app.admin.members_edit.wallet' | translate }}">
+        <uib-tab heading="{{ 'app.admin.members_edit.wallet' | translate }}" ng-hide="fablabWithoutWallet">
           <div class="col-md-12 m m-t-lg">
             <ng-include src="'<%= asset_path "wallet/show.html" %>'"></ng-include>
 

app/assets/templates/dashboard/nav.html.erb

@@ -16,7 +16,7 @@
           <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.trainings" translate>{{ 'app.public.common.my_trainings' }}</a></li>
           <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.events" translate>{{ 'app.public.common.my_events' }}</a></li>
           <li ui-sref-active="active" ng-hide="fablabWithoutInvoices"><a class="text-black" href="#" ui-sref="app.logged.dashboard.invoices" translate>{{ 'app.public.common.my_invoices' }}</a></li>
-          <li ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.wallet" translate>{{ 'app.public.common.my_wallet' }}</a></li>
+          <li ng-hide="fablabWithoutWallet" ui-sref-active="active"><a class="text-black" href="#" ui-sref="app.logged.dashboard.wallet" translate>{{ 'app.public.common.my_wallet' }}</a></li>
         </ul>
       </section>
     </div>

app/assets/templates/shared/header.html.erb

@@ -39,6 +39,7 @@
         <li><a ui-sref="app.logged.dashboard.trainings" translate>{{ 'app.public.common.my_trainings' }}</a></li>
         <li><a ui-sref="app.logged.dashboard.events" translate>{{ 'app.public.common.my_events' }}</a></li>
         <li><a ui-sref="app.logged.dashboard.invoices" ng-hide="fablabWithoutInvoices" translate>{{ 'app.public.common.my_invoices' }}</a></li>
+        <li ng-hide="fablabWithoutWallet"><a ui-sref="app.logged.dashboard.wallet" translate>{{ 'app.public.common.my_wallet' }}</a></li>
         <li><a ui-sref="app.logged.dashboard.wallet" translate>{{ 'app.public.common.my_wallet' }}</a></li>
         <li class="divider" ng-if="currentUser.role === 'admin'"></li>
         <li><a class="text-black pointer" ng-click="help($event)" ng-if="currentUser.role === 'admin'"><i class="fa fa-question-circle"></i> <span translate>{{ 'app.public.common.help' }}</span> </a></li>

app/controllers/api/wallet_controller.rb

@@ -18,6 +18,8 @@ class API::WalletController < API::ApiController
   end
 
   def credit
+    return head 422 if Rails.application.secrets.fablab_without_wallet == 'true'
+
     @wallet = Wallet.find(credit_params[:id])
     authorize @wallet
     service = WalletService.new(user: current_user, wallet: @wallet)

app/views/application/index.html.erb

@@ -28,6 +28,7 @@
       Fablab.withoutOnlinePayment = ('<%= Rails.application.secrets.fablab_without_online_payments %>' === 'true');
       Fablab.withoutInvoices = ('<%= Rails.application.secrets.fablab_without_invoices %>' === 'true');
       Fablab.phoneRequired = ('<%= Rails.application.secrets.phone_required %>' === 'true');
+      Fablab.fablabWithoutWallet = ('<%= Rails.application.secrets.fablab_without_wallet %>' === 'true');
       Fablab.eventsInCalendar = ('<%= Rails.application.secrets.events_in_calendar %>' === 'true');
       Fablab.slotDuration = parseInt("<%= ApplicationHelper::SLOT_DURATION %>", 10);
       Fablab.featureTourDisplay =  "<%= Rails.application.secrets.feature_tour_display %>";

config/application.yml.default

@@ -21,6 +21,7 @@ FABLAB_WITHOUT_SPACES: 'true'
 FABLAB_WITHOUT_ONLINE_PAYMENT: 'false'
 FABLAB_WITHOUT_INVOICES: 'false'
 PHONE_REQUIRED: 'true'
+FABLAB_WITHOUT_WALLET: 'false'
 
 USER_CONFIRMATION_NEEDED_TO_SIGN_IN: 'false'
 

config/secrets.yml

@@ -21,6 +21,7 @@ development:
   fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %>
   fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %>
   phone_required: <%= ENV["PHONE_REQUIRED"] %>
+  fablab_without_wallet: <%= ENV["FABLAB_WITHOUT_WALLET"] %>
   user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
   events_in_calendar: <%= ENV["EVENTS_IN_CALENDAR"] %>
   slot_duration: <%= ENV["SLOT_DURATION"] %>
@@ -68,6 +69,7 @@ test:
   fablab_without_online_payments: false
   fablab_without_invoices: false
   phone_required: true
+  fablab_without_wallet: false
   user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
   events_in_calendar: false
   slot_duration: 60
@@ -115,6 +117,7 @@ staging:
   fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %>
   fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %>
   phone_required: <%= ENV["PHONE_REQUIRED"] %>
+  fablab_without_wallet: <%= ENV["FABLAB_WITHOUT_WALLET"] %>
   user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
   events_in_calendar: <%= ENV["EVENTS_IN_CALENDAR"] %>
   slot_duration: <%= ENV["SLOT_DURATION"] %>
@@ -174,6 +177,7 @@ production:
   fablab_without_online_payments: <%= ENV["FABLAB_WITHOUT_ONLINE_PAYMENT"] %>
   fablab_without_invoices: <%= ENV["FABLAB_WITHOUT_INVOICES"] %>
   phone_required: <%= ENV["PHONE_REQUIRED"] %>
+  fablab_without_wallet: <%= ENV["FABLAB_WITHOUT_WALLET"] %>
   user_confirmation_needed_to_sign_in: <%= ENV["USER_CONFIRMATION_NEEDED_TO_SIGN_IN"] %>
   events_in_calendar: <%= ENV["EVENTS_IN_CALENDAR"] %>
   slot_duration: <%= ENV["SLOT_DURATION"] %>

doc/environment.md

@@ -102,6 +102,13 @@ Valid stripe API keys are still required, even if you don't require online payme
 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.
+<a name="FABLAB_WITHOUT_WALLET"></a>
+
+    FABLAB_WITHOUT_WALLET
+
+If set to 'true', the wallet will be disabled.
+This is useful if you won't use wallet system
+**Very important**: if you disable invoices, you still have to configure VAT in the interface to prevent errors in accounting and prices.
 <a name="PHONE_REQUIRED"></a>
 
     PHONE_REQUIRED

setup/env.example

@@ -14,6 +14,7 @@ FABLAB_WITHOUT_SPACES=true
 FABLAB_WITHOUT_ONLINE_PAYMENT=true
 FABLAB_WITHOUT_INVOICES=false
 PHONE_REQUIRED=false
+FABLAB_WITHOUT_WALLET=false
 
 EVENTS_IN_CALENDAR=false
 SLOT_DURATION=60