From 0ad958d8a8b84bdcc02fde2868716f4fc15457e2 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 7 Nov 2017 11:03:19 +0630
Subject: [PATCH] del migrating no need commission

---
 app/views/origami/surveys/index.html.erb          |  7 ++-----
 app/views/origami/surveys/new.html.erb            |  2 +-
 db/migrate/20170825093252_createss_commissions.rb | 15 ---------------
 3 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100755 db/migrate/20170825093252_createss_commissions.rb

diff --git a/app/views/origami/surveys/index.html.erb b/app/views/origami/surveys/index.html.erb
index 5ffcbff5..ec28b822 100755
--- a/app/views/origami/surveys/index.html.erb
+++ b/app/views/origami/surveys/index.html.erb
@@ -1,6 +1,6 @@
 <div class="page-header">
  <ol class="breadcrumb">
-  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>"><%= t("views.right_panel.button.home") %></a></li>
+  <li class="breadcrumb-item"><a href="<%= origami_path  %>"><%= t("views.right_panel.button.home") %></a></li>
   <li class="breadcrumb-item active"><%= t("views.right_panel.detail.account") %></li>
   <span class="float-right">
     <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
@@ -10,9 +10,6 @@
 
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
-    <div class="m-b-10 clearfix">
-      <%= link_to t("views.btn.new"),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
-    </div>
     <div class="card">
       <table class="table table-striped">
         <thead>
@@ -31,7 +28,7 @@
           <% @settings_accounts.each do |account| %>
           <tr>
             <td><%= account.title %></td>
-            <td><%=  %><%= account.account_type == 1 ? "Expense" : "Income"%></td>
+            <td><%= account.account_type == 1 ? "Expense" : "Income"%></td>
             <td><%= account.discount %></td>
             <td><%= account.point %></td>
             <td><%= account.bonus %></td>
diff --git a/app/views/origami/surveys/new.html.erb b/app/views/origami/surveys/new.html.erb
index 630ae543..c7185018 100755
--- a/app/views/origami/surveys/new.html.erb
+++ b/app/views/origami/surveys/new.html.erb
@@ -1,6 +1,6 @@
 <div class="page-header">
   <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= origami_path %>"><%= t("views.right_panel.button.home") %></a></li>
     <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>"><%= t("views.right_panel.detail.account") %></a></li>
     <li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
     <span class="float-right">
diff --git a/db/migrate/20170825093252_createss_commissions.rb b/db/migrate/20170825093252_createss_commissions.rb
deleted file mode 100755
index bfa1c6ed..00000000
--- a/db/migrate/20170825093252_createss_commissions.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class CreateCommissions < ActiveRecord::Migration[5.1]
-  # rake db:migrate:down VERSION=20170825093252
-  def change
-    create_table :commissions, id: false do |t|
-      t.string :commission_id, limit: 16, primary_key: true # custom primary key
-      t.string :name
-      t.string :product_type
-      t.json    :product_code
-      t.string :commission_type
-      t.integer :amount
-      t.boolean :is_active, default: true
-      t.timestamps
-    end
-  end
-end