Merge pull request #8 from ZeusWPI/remote_transaction
Make transaction form remote
This commit is contained in:
commit
e3a5e46938
4 changed files with 26 additions and 20 deletions
|
@ -19,7 +19,6 @@
|
||||||
ready = function() {
|
ready = function() {
|
||||||
$(".select2-selector").select2({
|
$(".select2-selector").select2({
|
||||||
width: 'resolve',
|
width: 'resolve',
|
||||||
allowClear: true,
|
|
||||||
placeholder: "Ontvanger"
|
placeholder: "Ontvanger"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,17 @@
|
||||||
# Place all the behaviors and hooks related to the matching controller here.
|
# Place all the behaviors and hooks related to the matching controller here.
|
||||||
# All this logic will automatically be available in application.js.
|
# All this logic will automatically be available in application.js.
|
||||||
# You can use CoffeeScript in this file: http://coffeescript.org/
|
# You can use CoffeeScript in this file: http://coffeescript.org/
|
||||||
|
ready = ->
|
||||||
|
$("#new_transaction").on("ajax:success", (e, data, status, xhr) ->
|
||||||
|
console.log("success")
|
||||||
|
).on("ajax:error", (e, xhr, status, error) ->
|
||||||
|
console.log(e)
|
||||||
|
console.log(xhr)
|
||||||
|
console.log("failed")
|
||||||
|
)
|
||||||
|
$.ajaxSetup({
|
||||||
|
dataType: 'json'
|
||||||
|
})
|
||||||
|
|
||||||
|
$(document).ready(ready)
|
||||||
|
$(document).on('page:load', ready)
|
||||||
|
|
|
@ -20,21 +20,11 @@ class TransactionsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@transaction = Transaction.new(transaction_params)
|
transaction = Transaction.new(transaction_params)
|
||||||
respond_to do |format|
|
if transaction.save
|
||||||
format.html do
|
head :created
|
||||||
@user = current_user
|
|
||||||
if @transaction.save
|
|
||||||
flash[:success] = "Transaction created"
|
|
||||||
redirect_to current_user
|
|
||||||
else
|
else
|
||||||
render "users/show"
|
render json: transaction.errors.full_messages, status: :unprocessable_entity
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
format.json do
|
|
||||||
head(@transaction.save ? :created : :unprocessable_entity)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
= render 'partials/form_errors', object: @transaction
|
= render 'partials/form_errors', object: @transaction
|
||||||
= form_for @transaction, html: { class: "pure-form" } do |f|
|
= form_for @transaction, remote: true, html: { class: "pure-form" } do |f|
|
||||||
- if current_user.penning
|
- if current_user.penning
|
||||||
= f.collection_select :debtor, User.all, :name, :name,
|
= f.collection_select :debtor, User.all, :name, :name,
|
||||||
{ selected: @transaction.debtor.try(:name) || current_user.name }, { class: 'select2-selector'}
|
{ selected: @transaction.debtor.try(:name) || current_user.name }, { class: 'select2-selector'}
|
||||||
|
@ -8,10 +8,13 @@
|
||||||
= f.select :creditor,
|
= f.select :creditor,
|
||||||
options_from_collection_for_select(User.all.order(:name), :name, :name),
|
options_from_collection_for_select(User.all.order(:name), :name, :name),
|
||||||
{ include_blank: true },
|
{ include_blank: true },
|
||||||
{ class: 'select2-selector', size: 50, required: true }
|
{ class: 'select2-selector', size: 50 }
|
||||||
= f.text_field :message, required: true, placeholder: "Message", size: 75
|
-# { class: 'select2-selector', size: 50, required: true }
|
||||||
|
= f.text_field :message, placeholder: "Message", size: 75
|
||||||
|
-# = f.text_field :message, required: true, placeholder: "Message", size: 75
|
||||||
%fieldset.pure-group-inline
|
%fieldset.pure-group-inline
|
||||||
%span.euro.pure-group-addon
|
%span.euro.pure-group-addon
|
||||||
= f.number_field :euros, value: amount(@transaction.amount),
|
= f.number_field :euros, value: amount(@transaction.amount),
|
||||||
placeholder: "Bedrag", step: 0.01, min: 0.01, class: "pure-group-addon price", size: 20, required: true
|
placeholder: "Bedrag", step: 0.01, min: 0.01, class: "pure-group-addon price", size: 20
|
||||||
|
-# placeholder: "Bedrag", step: 0.01, min: 0.01, class: "pure-group-addon price", size: 20, required: true
|
||||||
= f.submit "Send it!", class: "pure-button pure-button-primary"
|
= f.submit "Send it!", class: "pure-button pure-button-primary"
|
||||||
|
|
Loading…
Reference in a new issue