disco_app 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6522ecc2e564a8205469ef204144629cf288a990892987fc55c6bbb99d47f4d
-  data.tar.gz: 89e1e030f3a3b1e984bf99044418fdf21322eb69e0a1781a174e41e7b2fb0d1d
+  metadata.gz: c93d48179fec89b4944ae9428138e3c12827ba628c525af2742afa9532af6abe
+  data.tar.gz: 944da37163b8fbfaa4db0cd5626e76a5a5ff1680284fff69cebd0dddd105d754
 SHA512:
-  metadata.gz: 22d9ab526b4c13feb425d3089d3ad51797361293cd1fe3d41dd3d7b6ef8949d7cf2b8f19025d3fb5d2dfc132893ba021b4c8c79497cbd40fdf71dda7efc9a98f
-  data.tar.gz: b00bca43bfdf3baf2358c9c9275730db0f1df34a295b056e229a4cb7c96e98c893a04af5b977e2290a0641830bdbe0659a042f6fa39c691f756a9631437858a3
+  metadata.gz: 23e9f5235c6867c3c77557ed229ddd3de0a3b9d3660ff80a3f06c971ce10d8ab867d30fec229c836542e8865ddb24647282a0cb29049d526e52bc8fd9c641f79
+  data.tar.gz: b3bce74312f85aff46bca48ed90d53b1344e6e82461321bc962e790c5cd9bbd9f21edb53f4e4359e1a3e7db980d0d4899142307534d190a432e4d26273c825c5

data/app/assets/javascripts/disco_app/components/custom/filterable_shop_list.js.jsx

@@ -52,6 +52,7 @@ var FilterableShopList = React.createClass({
         return (
             <div className="next-card">
               <ShopFilterTabs filterTabs={this.props.filterTabs} filter={this.state.filter} onFilterReplace={this.onFilterReplace} />
+              <ShopFilterQuery filter={this.state.filter} onFilterSet={this.onFilterSet} />
               <ShopList shopsUrl={this.props.shopsUrl} editShopUrl={this.props.editShopUrl} editSubscriptionUrl={this.props.editSubscriptionUrl} filter={this.state.filter} />
             </div>
         );

data/app/assets/javascripts/disco_app/components/custom/shop_filter_query.js.jsx

@@ -0,0 +1,13 @@
+const ShopFilterQuery = ({ filter, onFilterSet }) => {
+
+  const onChange = (value) => {
+    onFilterSet('filter[query]', value);
+  };
+
+  return (
+    <CardSection>
+      <InputText label="Search" placeholder="Start typing to search for stores..." labelHidden={true} value={filter.query} onChange={onChange} />
+    </CardSection>
+  );
+
+};

data/app/controllers/disco_app/admin/concerns/subscriptions_controller.rb

@@ -10,7 +10,7 @@ module DiscoApp::Admin::Concerns::SubscriptionsController
 
   def update
     if @subscription.update_attributes(subscription_params)
-      redirect_to edit_admin_shop_subscription(@subscription.shop, @subscription)
+      redirect_to edit_admin_shop_subscription_path(@subscription.shop, @subscription)
     else
       render 'edit'
     end

data/app/resources/disco_app/admin/resources/concerns/shop_resource.rb

@@ -12,7 +12,7 @@ module DiscoApp::Admin::Resources::Concerns::ShopResource
 
     model_name 'DiscoApp::Shop'
 
-    filters :status
+    filters :query, :status
 
     # Adjust the base records method to ensure only models for the authenticated domain are retrieved.
     def self.records(options = {})
@@ -26,6 +26,8 @@ module DiscoApp::Admin::Resources::Concerns::ShopResource
 
       # Perform appropriate filtering.
       case filter
+        when :query
+          return records.where('name LIKE ? OR shopify_domain LIKE ? OR domain LIKE ?', "%#{value.first}%", "%#{value.first}%", "%#{value.first}%")
         when :status
           return records.where(status: value.map { |v| DiscoApp::Shop.statuses[v.to_sym] } )
         else

data/db/migrate/20160513140727_add_name_to_disco_app_shops.rb

@@ -0,0 +1,5 @@
+class AddNameToDiscoAppShops < ActiveRecord::Migration
+  def change
+    add_column :disco_app_shops, :name, :string
+  end
+end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160426033520) do
+ActiveRecord::Schema.define(version: 20160513140727) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -99,6 +99,7 @@ ActiveRecord::Schema.define(version: 20160426033520) do
     t.string   "timezone"
     t.string   "iana_timezone"
     t.boolean  "has_storefront"
+    t.string   "name"
   end
 
   add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true, using: :btree

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Gavin Ballard
@@ -318,6 +318,7 @@ files:
 - app/assets/javascripts/disco_app/components/custom/filterable_shop_list.js.jsx
 - app/assets/javascripts/disco_app/components/custom/inline-radio-options.es6.jsx
 - app/assets/javascripts/disco_app/components/custom/rules-editor.es6.jsx
+- app/assets/javascripts/disco_app/components/custom/shop_filter_query.js.jsx
 - app/assets/javascripts/disco_app/components/custom/shop_filter_tab.js.jsx
 - app/assets/javascripts/disco_app/components/custom/shop_filter_tabs.js.jsx
 - app/assets/javascripts/disco_app/components/custom/shop_list.js.jsx
@@ -466,6 +467,7 @@ files:
 - db/migrate/20160401045551_add_amount_and_plan_code_to_disco_app_subscriptions.rb
 - db/migrate/20160425205211_add_source_to_disco_app_subscriptions.rb
 - db/migrate/20160426033520_add_trial_period_days_to_disco_app_subscriptions.rb
+- db/migrate/20160513140727_add_name_to_disco_app_shops.rb
 - lib/disco_app.rb
 - lib/disco_app/configuration.rb
 - lib/disco_app/constants.rb