rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-18 07:52:23 +01:00
Code Issues Releases Activity

Revert "ask for user agreement to CGV on signup"

Browse Source 
This reverts commit 2bf5a60ab586f3c7a54268dc9f1d4c8cffe01a17.
This commit is contained in:
Sylvain 2016-03-31 13:00:54 +02:00
parent 2587eaf3cc
commit 9bf6025b53
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/controllers/application.coffee.erb
View File

@ -85,10 +85,6 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
CustomAsset.get {name: 'cgu-file'}, (cgu) -> CustomAsset.get {name: 'cgu-file'}, (cgu) ->
$scope.cgu = cgu.custom_asset $scope.cgu = cgu.custom_asset
# retrieve the CGV
CustomAsset.get {name: 'cgv-file'}, (cgv) ->
$scope.cgv = cgv.custom_asset
# default user's parameters # default user's parameters
$scope.user = $scope.user =
is_allow_contact: true is_allow_contact: true

14
app/assets/templates/shared/signupModal.html.erb
View File

@ -179,23 +179,9 @@
<a href="{{cgu.custom_asset_file_attributes.attachment_url}}" target="_blank" translate>{{ '_the_fablab_policy' }}</a> <a href="{{cgu.custom_asset_file_attributes.attachment_url}}" target="_blank" translate>{{ '_the_fablab_policy' }}</a>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error': signupForm.cgv.$dirty && signupForm.cgv.$invalid}" ng-show="cgv">
<div class="col-sm-12">
<input type="checkbox"
name="cgv"
ng-model="user.cgv"
value="true"
ng-required="cgv != null"/>
<span translate>{{ 'i_ve_read_and_i_accept_' }}</span>
<a href="{{cgv.custom_asset_file_attributes.attachment_url}}" target="_blank" translate>{{ '_the_general_terms_and_conditions' }}</a>
</div>
</div>
<div ng-if="!cgu"> <div ng-if="!cgu">
<input type="hidden" name="cgu" ng-model="user.cgu" value="true"> <input type="hidden" name="cgu" ng-model="user.cgu" value="true">
</div> </div>
<div ng-if="!cgv">
<input type="hidden" name="cgv" ng-model="user.cgv" value="true">
</div>
</form> </form>
</div> </div>
</div> </div>

2
config/locales/app.shared.en.yml
View File

@ -79,7 +79,6 @@ en:
from_time: "From" # context: time. eg. "from 18:00 to 21:00" from_time: "From" # context: time. eg. "from 18:00 to 21:00"
to_date: "to" # context: date. eg: "from 01/01 to 01/05" to_date: "to" # context: date. eg: "from 01/01 to 01/05"
to_time: "to" # context: time. eg. "from 18:00 to 21:00" to_time: "to" # context: time. eg. "from 18:00 to 21:00"
_the_general_terms_and_conditions: "the general terms and conditions."
messages: messages:
you_will_lose_any_unsaved_modification_if_you_quit_this_page: "You will lose any unsaved modification if you quit this page" you_will_lose_any_unsaved_modification_if_you_quit_this_page: "You will lose any unsaved modification if you quit this page"
@ -143,6 +142,7 @@ en:
stripe: stripe:
# stripe payment modal # stripe payment modal
i_have_read_and_accept_: "I have read, and accept" i_have_read_and_accept_: "I have read, and accept"
_the_general_terms_and_conditions: "the general terms and conditions."
enter_your_card_number: "Enter your card number" enter_your_card_number: "Enter your card number"
confirm_my_payment_of_: "Confirm my payment of" # context: confirm my payment of $20.00 confirm_my_payment_of_: "Confirm my payment of" # context: confirm my payment of $20.00

2
config/locales/app.shared.fr.yml
View File

@ -79,7 +79,6 @@ fr:
from_time: "De" # context: time. eg. "from 18:00 to 21:00" from_time: "De" # context: time. eg. "from 18:00 to 21:00"
to_date: "au" # context: date. eg: "from 01/01 to 01/05" to_date: "au" # context: date. eg: "from 01/01 to 01/05"
to_time: "à" # context: time. eg. "from 18:00 to 21:00" to_time: "à" # context: time. eg. "from 18:00 to 21:00"
_the_general_terms_and_conditions: "les conditions générales de vente."
messages: messages:
you_will_lose_any_unsaved_modification_if_you_quit_this_page: "Vous perdrez les modifications non enregistrées si vous quittez cette page" you_will_lose_any_unsaved_modification_if_you_quit_this_page: "Vous perdrez les modifications non enregistrées si vous quittez cette page"
@ -143,6 +142,7 @@ fr:
stripe: stripe:
# fenêtre de paiement stripe # fenêtre de paiement stripe
i_have_read_and_accept_: "J'ai bien pris connaissance, et accepte" i_have_read_and_accept_: "J'ai bien pris connaissance, et accepte"
_the_general_terms_and_conditions: "les conditions générales de vente."
enter_your_card_number: "Saisissez votre numéro de carte" enter_your_card_number: "Saisissez votre numéro de carte"
confirm_my_payment_of_: "Valider mon paiement de" # contexte : valider mon paiement de 20,00 € confirm_my_payment_of_: "Valider mon paiement de" # contexte : valider mon paiement de 20,00 €