Merge branch 'master' of github.com:domify/registry

app/controllers/admin/bank_statements_controller.rb

@@ -22,6 +22,22 @@ class Admin::BankStatementsController < AdminController
   def create
     @bank_statement = BankStatement.new(bank_statement_params)
 
+    if @bank_statement.save
+      flash[:notice] = I18n.t('record_created')
+      redirect_to [:admin, @bank_statement]
+    else
+      flash.now[:alert] = I18n.t('failed_to_create_record')
+      render 'new'
+    end
+  end
+
+  def import
+    @bank_statement = BankStatement.new
+  end
+
+  def create_from_import
+    @bank_statement = BankStatement.new(bank_statement_params)
+
     if @bank_statement.import
       flash[:notice] = I18n.t('record_created')
       redirect_to [:admin, @bank_statement]
@@ -53,6 +69,6 @@ class Admin::BankStatementsController < AdminController
   end
 
   def bank_statement_params
-    params.require(:bank_statement).permit(:th6_file)
+    params.require(:bank_statement).permit(:th6_file, :bank_code, :iban)
   end
 end

app/controllers/admin/bank_transactions_controller.rb

@@ -1,6 +1,25 @@
 class Admin::BankTransactionsController < AdminController
   load_and_authorize_resource
 
+  def new
+    @bank_statement = BankStatement.find(params[:bank_statement_id])
+    @bank_transaction = BankTransaction.new(currency: 'EUR')
+  end
+
+  def create
+    @bank_transaction = BankTransaction.new(
+      bank_transaction_params.merge(bank_statement_id: params[:bank_statement_id])
+    )
+
+    if @bank_transaction.save
+      flash[:notice] = I18n.t('record_created')
+      redirect_to [:admin, @bank_transaction]
+    else
+      flash.now[:alert] = I18n.t('failed_to_create_record')
+      render 'new'
+    end
+  end
+
   def update
     if @bank_transaction.update(bank_transaction_params)
       flash[:notice] = I18n.t('record_updated')
@@ -24,6 +43,10 @@ class Admin::BankTransactionsController < AdminController
   private
 
   def bank_transaction_params
-    params.require(:bank_transaction).permit(:description, :sum, :reference_no)
+    params.require(:bank_transaction).permit(
+      :description, :sum, :reference_no, :document_no,
+      :bank_reference, :iban, :buyer_bank_code, :buyer_iban,
+      :buyer_name, :currency, :paid_at
+    )
   end
 end

app/controllers/admin/invoices_controller.rb

@@ -1,6 +1,24 @@
 class Admin::InvoicesController < AdminController
   load_and_authorize_resource
 
+  def new
+    @deposit = Deposit.new
+  end
+
+  def create
+    r = Registrar.find_by(id: deposit_params[:registrar_id])
+    @deposit = Deposit.new(deposit_params.merge(registrar: r))
+    @invoice = @deposit.issue_prepayment_invoice
+
+    if @invoice.persisted?
+      flash[:notice] = t(:record_created)
+      redirect_to [:admin, @invoice]
+    else
+      flash[:alert] = t(:failed_to_create_record)
+      render 'new'
+    end
+  end
+
   def index
     @q = Invoice.includes(:account_activity).search(params[:q])
     @q.sorts  = 'id desc' if @q.sorts.empty?
@@ -20,4 +38,10 @@ class Admin::InvoicesController < AdminController
       render :show
     end
   end
+
+  private
+
+  def deposit_params
+    params.require(:deposit).permit(:amount, :description, :registrar_id)
+  end
 end