lato 0.1.17 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab858e111115e6d96dccd40d65f12b249847b0c6ea90d82e9eaaf6027eb70c7e
-  data.tar.gz: ccfc3c5ffed16097f8d8e10bace117d42376ae56798f5370dc2e3cc1ed7c4e4a
+  metadata.gz: ad4feff73a5b285980cad936d0fee7d95760fb60849a99bd0c3d0176142e3a21
+  data.tar.gz: 3adc8605691d718271b8d166e6ed47117a8c18c608087b90cbec8695c1cbf2be
 SHA512:
-  metadata.gz: c6efd8f148357ae917cf2469a7e59024904c7b3c0b2d1112dfaa3dba69f9a9818c183f1620225d9d39ff7a004df7c15106622fba2f9819c3c3282d5ce38a45fb
-  data.tar.gz: df91762636fc90ed103c2499992b659d810876f33ee202ecfcaee8fb55f999e8dba29a09c17d906af0d4493130cede3c42549227286c1ae73792c4c18d00fa23
+  metadata.gz: 4eb0a4e4238e1785feaff6835fa58a23d5005ec42f3e089ad78b9ad4bb5acc1ec23d20a845a092857178fa25081ed9191880b248c4cfc0af24447af9032de3ec
+  data.tar.gz: a679295a0941f082ebb1a51c836a22c23f9a75a43484797f05842f0f8bc871a417555d0cfcb3b27992656c3019fc5afb160a729a7af8d921ce89d1ad2552e80e

data/app/controllers/lato/account_controller.rb

@@ -57,7 +57,7 @@ module Lato
 
     def update_accepted_privacy_policy_version_action
       respond_to do |format|
-        if @session.user.update(params.require(:user).permit(:accepted_privacy_policy_version))
+        if @session.user.update_accepted_privacy_policy_version(params.require(:user).permit(:confirm))
           format.html { redirect_to lato.account_path }
           format.json { render json: @session.user }
         else
@@ -69,7 +69,7 @@ module Lato
 
     def update_accepted_terms_and_conditions_version_action
       respond_to do |format|
-        if @session.user.update(params.require(:user).permit(:accepted_terms_and_conditions_version))
+        if @session.user.update_accepted_terms_and_conditions_version(params.require(:user).permit(:confirm))
           format.html { redirect_to lato.account_path }
           format.json { render json: @session.user }
         else

data/app/models/lato/user.rb

@@ -46,7 +46,7 @@ module Lato
     end
 
     def valid_accepted_terms_and_conditions_version?
-      @valid_accepted_terms_and_conditions_version ||= accepted_terms_and_conditions_version >= Lato.config.legal_privacy_policy_version
+      @valid_accepted_terms_and_conditions_version ||= accepted_terms_and_conditions_version >= Lato.config.legal_terms_and_conditions_version
     end
 
     # Helpers
@@ -162,5 +162,23 @@ module Lato
 
       update(params.permit(:password, :password_confirmation))
     end
+
+    def update_accepted_privacy_policy_version(params)
+      unless params[:confirm]
+        errors.add(:base, 'Per accettare la privacy policy devi selezionare la checkbox di conferma')
+        return
+      end
+
+      update(accepted_privacy_policy_version: Lato.config.legal_privacy_policy_version)
+    end
+
+    def update_accepted_terms_and_conditions_version(params)
+      unless params[:confirm]
+        errors.add(:base, 'Per accettare i termini e condizioni devi selezionare la checkbox di conferma')
+        return
+      end
+
+      update(accepted_terms_and_conditions_version: Lato.config.legal_terms_and_conditions_version)
+    end
   end
 end

data/app/views/lato/account/_alert-accepted-privacy-policy-version.html.erb

@@ -7,9 +7,9 @@
       Ti informiamo che è stato rilasciato un <b>aggiornamento della nostra privacy policy</b>.<br>
       Per continuare a utilizzare <%= Lato.config.application_title %> è necessario prendere visione e accettare la nuova privacy policy.<br>
       </p>
-      <%= form_with method: :patch, url: lato.account_update_accepted_privacy_policy_version_action_path, data: { turbo_frame: '_self' } do |form| %>
+      <%= form_with model: @session.user, url: lato.account_update_accepted_privacy_policy_version_action_path, data: { turbo_frame: '_self' } do |form| %>
         <%= lato_form_errors @session.user, class: %w[mb-3] %>
-        <%= lato_form_item_input_check form, :accepted_privacy_policy_version, "Dichiaro di aver letto e accettato la <a href=#{Lato.config.legal_privacy_policy_url} target=_blank>privacy policy</a>.", checked: false, value: Lato.config.legal_privacy_policy_version, required: true %>
+        <%= lato_form_item_input_check form, :confirm, "Dichiaro di aver letto e accettato la <a href=#{Lato.config.legal_privacy_policy_url} target=_blank>privacy policy</a>.", checked: false, required: true %>
 
         <div class="mt-3">
           <%= lato_form_submit form, 'Conferma' %>

data/app/views/lato/account/_alert-accepted-terms-and-conditions-version.html.erb

@@ -7,9 +7,9 @@
       Ti informiamo che è stato rilasciato un <b>aggiornamento dei nostri termini e condizioni</b> di utilizzo.<br>
       Per continuare a utilizzare <%= Lato.config.application_title %> è necessario prendere visione e accettare i nuovi termini.<br>
       </p>
-      <%= form_with method: :patch, url: lato.account_update_accepted_terms_and_conditions_version_action_path, data: { turbo_frame: '_self' } do |form| %>
+      <%= form_with model: @session.user, url: lato.account_update_accepted_terms_and_conditions_version_action_path, data: { turbo_frame: '_self' } do |form| %>
         <%= lato_form_errors @session.user, class: %w[mb-3] %>
-        <%= lato_form_item_input_check form, :accepted_terms_and_conditions_version, "Dichiaro di aver letto e accettato i <a href=#{Lato.config.legal_terms_and_conditions_url} target=_blank>termini e condizioni</a> di utilizzo.", checked: false, value: Lato.config.legal_terms_and_conditions_version, required: true %>
+        <%= lato_form_item_input_check form, :confirm, "Dichiaro di aver letto e accettato i <a href=#{Lato.config.legal_terms_and_conditions_url} target=_blank>termini e condizioni</a> di utilizzo.", checked: false, required: true %>
 
         <div class="mt-3">
           <%= lato_form_submit form, 'Conferma' %>

data/lib/lato/config.rb

@@ -36,9 +36,9 @@ module Lato
       @email_from = 'lato@example.com'
 
       @legal_privacy_policy_url = '#'
-      @legal_privacy_policy_version = 1
+      @legal_privacy_policy_version = 3
       @legal_terms_and_conditions_url = '#'
-      @legal_terms_and_conditions_version = 1
+      @legal_terms_and_conditions_version = 2
     end
   end
 end

data/lib/lato/version.rb

@@ -1,3 +1,3 @@
 module Lato
-  VERSION = "0.1.17"
+  VERSION = "0.1.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lato
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.19
 platform: ruby
 authors:
 - Gregorio Galante