feat(wallet): same as previous, but also for already logged in commoners

Author: Pietro

app/controllers/groups_controller.rb

@@ -1,6 +1,6 @@
 class GroupsController < ApplicationController
   before_action :set_group, only: [:show, :edit, :update, :destroy, :leave, :affiliation, :affiliate]
-  before_action :set_commoner, only: [:new, :create, :leave]
+  before_action :set_commoner, only: [:new, :create, :leave, :join_and_associate_qr_wallet]
 
   # GET /groups
   # GET /groups.json
@@ -78,6 +78,20 @@ def affiliate
     end
   end
 
+  def join_and_associate_qr_wallet
+    if params[:hash_id].present?
+      wallet = Wallet.find_by(hash_id: params[:hash_id])
+      respond_to do |format|
+        if wallet.present? && !@commoner.member_of?(wallet.currency.group)
+          associate_commoner_to_wallet(@commoner, wallet)
+          format.html { redirect_to wallet_short_path(wallet.hash_id), notice: _('Good! This wallet has been associated to your account') }
+        else
+          format.html { redirect_to wallet_short_path(wallet.hash_id), alert: _('Oh no, an error occurred') }
+        end
+      end
+    end
+  end
+
   # POST /groups
   # POST /groups.json
   def create

app/models/ability.rb

@@ -49,6 +49,9 @@ def initialize(user)
         can :join, Group do |group|
           !commoner.member_of? group
         end
+        can :join_and_associate_qr_wallet, Group do |group|
+          !commoner.member_of? group
+        end
         cannot [:affiliation, :affiliate], Group
         can :create, JoinRequest do |join_request|
           # commoner must not be a member and there must be no pending requests

app/views/wallets/_join_and_associate_qr_wallet_modal.html.erb

@@ -0,0 +1,23 @@
+<!-- Modal -->
+<div class="modal fade" id="joinAndAssociateQrWalletModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title red-title" id="exampleModalLabel"><%= s_('Title|Please read before proceeding') %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div class="row">
+          <div class="col">
+            <%= _("After having associated this wallet to this Commonfare account, you will also become a member of the group <strong>#{@wallet.currency.group.name}</strong>. Click the button below to proceed.").html_safe %>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <%= link_to s_('Title|Associate to this Commonfare account'), group_join_and_associate_qr_wallet_path(@wallet.currency.group, @wallet.hash_id), class: 'btn btn-cf btn-block' %>
+      </div>
+    </div>
+  </div>
+</div>

app/views/wallets/view.html.erb

@@ -18,6 +18,7 @@
     <%= link_to(s_('Button|Daily takings'), daily_takings_commoner_wallet_path(@commoner, @wallet, {day_start: get_day_start_for_wallet(@wallet)}), class: 'btn btn-outline-secondary btn-block') if can? :daily_takings, @wallet %>
     <%= link_to s_('Button|Activate account'), affiliation_group_path(@wallet.currency.group, { commoner_name: @wallet.holder.name}), class: 'btn btn-cf btn-block' if can_activate_account_for_group?(@wallet.currency.group, @wallet.holder) %>
     <%= link_to s_('Button|Associate to your Commonfare account'), new_user_session_path({ hash_id: @wallet.hash_id}), class: 'btn btn-cf btn-block' if can_activate_account_for_group?(@wallet.currency.group, @wallet.holder) %>
+    <%= link_to s_('Button|Associate to this Commonfare account'), '#', class: 'btn btn-cf btn-block', data: { toggle: "modal", target: "#joinAndAssociateQrWalletModal" } if can? :join_and_associate_qr_wallet, @wallet.currency.group %>
 
     <% if can_top_up_wallet? %>
       <%= link_to(s_('Button|Withdraw'), withdraw_commoner_transactions_path(@wallet.walletable, { from_wallet_id: @wallet.id, currency: @wallet.currency.id }), class: 'btn btn btn-cf btn-block') %>
@@ -48,3 +49,4 @@
 </div>
 
 <%= render 'wallets/qr_modal' if can_view_qr_code? %>
+<%= render 'wallets/join_and_associate_qr_wallet_modal' if can? :join_and_associate_qr_wallet, @wallet.currency.group %>

config/routes.rb

@@ -106,6 +106,7 @@
         get 'transaction_confirm', to: 'transactions#confirm'
         resources :transactions, except: [:edit, :update, :destroy]
       end
+      match 'join_and_associate_qr_wallet/:hash_id', to: 'groups#join_and_associate_qr_wallet', via: :get, as: 'join_and_associate_qr_wallet'
     end
     resources :conversations, except: [:edit, :update, :destroy] do
       resources :messages, only: [:create, :destroy]