Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/lib/console/admin/model_search.rb b/lib/console/admin/model_search.rb
- index 6bddbf4..26b15ff 100644
- --- a/lib/console/admin/model_search.rb
- +++ b/lib/console/admin/model_search.rb
- @@ -90,7 +90,7 @@ class Console::Admin::ModelSearch < Console::ModelSearch
- contract_details.survey_response_limit
- contract_details.merchant_cost
- contract_details.disabled ),
- - 'merchant' => %w(name rf_value short_id id test_acct disabled expires_at created_at email_verified_at expires_at resellers.name city state country address1 postal_code paid_account package_names_view.package_name package_names_view.signup_method marketing_ppcs.rfv marketing_ppcs.src marketing_ppcs.cid marketing_ppcs.kw marketing_interesteds.customer marketing_interesteds.email marketing_interesteds.survey),
- + 'merchant' => %w(name rf_value short_id id test_acct disabled expires_at created_at email_verified_at expires_at resellers.name city state country address1 postal_code paid_account package_names_view.package_name package_names_view.signup_method marketing_ppcs.rfv marketing_ppcs.src marketing_ppcs.cid marketing_ppcs.kw marketing_interesteds.customer marketing_interesteds.email marketing_interesteds.survey, promo_codes.code),
- 'url' => %w(address merchants.disabled merchants.test_acct merchants.expires_at merchants.name),
- 'sku' => %w(sku_friendly_description term cost_retail),
- 'order' => %w(id partner_order_id reseller_id created_at expires_at status merchants.disabled merchants.test_acct order_details.sku_id order_details.sku_friendly_description order_details.term order_details.cost_retail merchants.expires_at payment_transactions.status payment_transactions.transaction_id merchants.name),
- @@ -147,6 +147,8 @@ class Console::Admin::ModelSearch < Console::ModelSearch
- left outer join package_names_view on merchants.id = package_names_view.id
- left outer join marketing_ppcs on merchants.id = marketing_ppcs.merchant_id
- left outer join marketing_interesteds on merchants.id = marketing_interesteds.merchant_id
- + left outer join orders on merchants.id = orders.merchant_id
- + left outer join promo_codes on promo_codes.id = orders.promo_code_id
- ',
- "distinct merchants.*, resellers.name as partner, package_names_view.package_name as account_type, package_names_view.signup_method as signup_method, marketing_ppcs.rfv as referer, marketing_ppcs.kw as keyword, marketing_ppcs.cid, marketing_ppcs.src, marketing_interesteds.customer as m_customer, marketing_interesteds.email as m_email, marketing_interesteds.survey as m_survey",
- %w(resellers.name package_names_view.package_name package_names_view.signup_method)],
Add Comment
Please, Sign In to add comment