Merge pull request #231 from coopdevs/disable-auto-payment

Disable auto payment

Author: enricostano

Gemfile

@@ -64,7 +64,11 @@ end
 group :test do
   # Needed for TravisCI
   gem 'rake'
-  gem "database_cleaner"
+
+  # Do not upgrade until
+  # https://github.com/DatabaseCleaner/database_cleaner/issues/317 is fixed
+  gem "database_cleaner", '1.3.0'
+
   gem 'shoulda', ">= 3.5"
   gem 'fabrication'
   gem 'faker'

Gemfile.lock

@@ -111,7 +111,7 @@ GEM
     concurrent-ruby (1.0.1)
     daemons (1.1.9)
     dalli (2.7.2)
-    database_cleaner (1.4.0)
+    database_cleaner (1.3.0)
     debug_inspector (0.0.2)
     devise (3.5.6)
       bcrypt (~> 3.0)
@@ -360,7 +360,7 @@ DEPENDENCIES
   capybara (~> 2.4.4)
   coffee-rails
   dalli
-  database_cleaner
+  database_cleaner (= 1.3.0)
   devise (= 3.5.6)
   dotenv-rails
   elasticsearch-model

app/controllers/transfers_controller.rb

@@ -1,8 +1,16 @@
 class TransfersController < ApplicationController
   def create
     @source = find_source
-    Transfer.create(transfer_params.merge source: @source)
     @account = Account.find(transfer_params[:destination])
+    transfer = Transfer.new(
+      transfer_params.merge(source: @source, destination: @account)
+    )
+
+    begin
+      transfer.save!
+    rescue ActiveRecord::RecordInvalid
+      flash[:error] = transfer.errors.full_messages.to_sentence
+    end
     redirect_to redirect_target
   end
 

app/models/transfer.rb

@@ -17,6 +17,8 @@ class Transfer < ActiveRecord::Base
   belongs_to :operator, class_name: "User"
   has_many :movements
 
+  validate :different_source_and_destination
+
   after_create :make_movements
 
   def make_movements
@@ -39,4 +41,9 @@ def source_id
   def destination_id
     destination.respond_to?(:id) ? destination.id : destination
   end
+
+  def different_source_and_destination
+    return unless source == destination
+    errors.add(:base, :same_account)
+  end
 end

app/views/users/show.html.erb

@@ -93,9 +93,11 @@
               <%= strip_tags(post.rendered_description.to_html) %>
             </div>
             <div class="col-sm-1">
-              <%= link_to glyph(:time),
-                          give_time_user_path(@user, offer: post.id),
-                          title: t("global.give_time") %>
+              <% if @user != current_user %>
+                <%= link_to give_time_user_path(@user, offer: post.id) do %>
+                  <%= glyph :time %>
+                <% end %>
+              <% end %>
             </div>
           </div>
         <% end %>

config/locales/ca.yml

@@ -102,6 +102,10 @@ ca:
           attributes:
             web:
               url_format_invalid: Format de URL no vàlid
+        transfer:
+          attributes:
+            base:
+              same_account: No es pot fer una transacció al mateix compte
 
   # ETIQUETAS VARIADAS EN PLANTILLAS
 

config/locales/en.yml

@@ -102,6 +102,10 @@ en:
           attributes:
             web:
               url_format_invalid: invalid URL format
+        transfer:
+          attributes:
+            base:
+              same_account: A transfer cannot be made to the same account
 
   # ETIQUETAS VARIADAS EN PLANTILLAS
 

config/locales/es.yml

@@ -102,6 +102,10 @@ es:
           attributes:
             web:
               url_format_invalid: Formato de URL no válido
+        transfer:
+          attributes:
+            base:
+              same_account: No se puede hacer una transacción a la misma cuenta
 
   # ETIQUETAS VARIADAS EN PLANTILLAS