merge with master

2017-06-12 10:01:36 +06:30
parent f834911587 5ee3ae257a
commit 09f9a29cde
33 changed files with 537 additions and 384 deletions
--- a/db/migrate/20170608104900_create_settings_membership_actions.rb
+++ b/db/migrate/20170608104900_create_settings_membership_actions.rb
@@ -1,14 +1,14 @@
-class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1]
+class CreateMembershipActions < ActiveRecord::Migration[5.1]
  def change
-    create_table :settings_membership_actions do |t|
-      t.string :membership_type
+    create_table :membership_actions do |t|
+    	t.string :membership_type
      t.boolean :is_active
      t.string :gateway_communication_type
      t.string :gateway_url
      t.string :auth_token
      t.string :merchant_account_id
      t.string :created_by
-      t.string :additional_parameter
+      t.json :additional_parameter

      t.timestamps
    end