git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

del migrating no need commission

Browse Source
This commit is contained in:
Yan
2017-11-07 11:03:19 +06:30
parent 17afb039cb
commit 0ad958d8a8
3 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/origami/surveys/index.html.erb
View File

@@ -1,6 +1,6 @@
<div class="page-header"> <div class="page-header">
<ol class="breadcrumb"> <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> <li class="breadcrumb-item active"><%= t("views.right_panel.detail.account") %></li>
<span class="float-right"> <span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %> <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
@@ -10,9 +10,6 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9"> <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"> <div class="card">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
@@ -31,7 +28,7 @@
<% @settings_accounts.each do |account| %> <% @settings_accounts.each do |account| %>
<tr> <tr>
<td><%= account.title %></td> <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.discount %></td>
<td><%= account.point %></td> <td><%= account.point %></td>
<td><%= account.bonus %></td> <td><%= account.bonus %></td>

2
app/views/origami/surveys/new.html.erb
View File

@@ -1,6 +1,6 @@
<div class="page-header"> <div class="page-header">
<ol class="breadcrumb"> <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"><a href="<%= settings_accounts_path %>"><%= t("views.right_panel.detail.account") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.new") %></li> <li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
<span class="float-right"> <span class="float-right">

15
db/migrate/20170825093252_createss_commissions.rb
View File

@@ -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