ish_manager 0.1.8.428 → 0.1.8.429

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f691435726734a9202b8266f28b7fb9c62b8090f9f75ea1ba7c706c474a68c
-  data.tar.gz: 873c4604a16c7612130fe758882aa97e6485fcbe74c391399a6ea10f39fb1b3a
+  metadata.gz: a0abc37d22ccfddfa3800f1fed6895e74277e0a4d7c830daad34db5d1adf6764
+  data.tar.gz: 715a9713d49199bc20908be318498bbb0626b709bf085a7e333099082f06cd83
 SHA512:
-  metadata.gz: afb5335ab24acfccd4dab998bd8c56e0418376208687ca06f93fc04d4842e385814c4b73c36bf261eff750687df4709fba794fc1bf36995db5761e103865dc27
-  data.tar.gz: 23fe9362978d688d0fb6576b6fde208155dd48748889b9f2bb437ab10976ca47ce4f9822bea5511f51cd0817139b472ab1acbcf4373193a058f04c272c1b2b41
+  metadata.gz: 12a1ef887def22ebf1b016dd0aa5b1a5dfaf4fd3baa3675d3bba651fc60ae2353949bf6f51623d9c57d60efd2624bee8ad303199bbf8439481e7c54ab37a93a9
+  data.tar.gz: ba86068a4bc4f2c00a9cb3aaf292952f87dec3da30708408d67937cf794bafea23d871354eec685fd712aff2edc95eb8a74d5c3f2bdf34bb5f4d4b14795384f2

data/app/assets/stylesheets/ish_manager/email.scss

@@ -12,6 +12,7 @@
 .emails-ns, // emails namespace
 .iro-purses-my,
 .leads-edit,
+.leads--index,
 .leads-index,
 .leads-show,
 .scheduled-email-actions--form,

data/app/controllers/ish_manager/categories_controller.rb

@@ -14,6 +14,12 @@ class ::IshManager::CategoriesController < IshManager::ApplicationController
     @category = WpTag.find params[:id]
     authorize! :show, @category
 
+    ## same as in leads#index
+    @leads = @category.leads
+    if params[:q].present?
+      @leads = @leads.where(" email LIKE ? ", "%#{params[:q]}%" )
+    end
+    @leads = @leads.page( params[:leads_page] ).per( current_profile.per_page )
   end
 
 end

data/app/controllers/ish_manager/email_campaigns_controller.rb

@@ -38,6 +38,11 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
   def show
     @campaign = Ish::EmailCampaign.find params[:id]
     authorize! :show, @campaign
+    @leads = @campaign.leads
+    if params[:q].present?
+      @leads = @leads.where(" email LIKE ? ", "%#{params[:q]}%" )
+    end
+    @leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
   end
 
   def update

data/app/views/ish_manager/categories/show.haml

@@ -3,8 +3,5 @@
   .header
     %h2.title Category/Tag `#{@category.slug}`
 
-  .leads
-    %h3 Leads (#{@category.leads.length})
-    %ol
-      - @category.leads.each do |lead|
-        %li= link_to lead.email, lead_path(lead)
+  = render 'ish_manager/leads/index', leads: @leads, email_contexts: {}, search_path: category_path(@category)
+

data/app/views/ish_manager/email_campaigns/show.haml

@@ -14,10 +14,4 @@
     -# %li Send At: #{@campaign.send_at}
 
   .collapse-expand#campaignLeads Email Campaign leads (#{@campaign.campaign_leads.length})
-  %ul.email-campaign-leads.items.browser-default
-    - @campaign.campaign_leads.each do |clead|
-      %li.item
-        .inline-block= button_to '[x]', email_campaign_lead_path(clead), method: :delete, :data => { :confirm => 'Are you sure?' }
-        = link_to clead.lead.email, lead_path(clead.lead.id)
-        (#{clead.lead.email_contexts.length} ctxs)
-
+  = render 'ish_manager/leads/index', leads: @leads, search_path: email_campaign_path(@campaign), email_contexts: {}

data/app/views/ish_manager/leads/_index.haml

@@ -0,0 +1,60 @@
+
+-#
+-# receives locals: leads , email_contexts , search_path
+-#
+.leads--index.padded
+  .header
+    %h2.title
+      Leads (#{leads.total_count})
+      = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
+
+  .float-right= render 'search', path: search_path
+  = form_tag leads_bulkop_path do
+    = label_tag 'Act on Selected:'
+    = select_tag :op, options_for_select( [[nil,nil]] + Lead::OPS )
+    = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
+    = submit_tag 'Go'
+
+    = paginate leads, param_name: :leads_page
+    %table.bordered
+      %thead
+        %tr
+          %th &nbsp;
+          %th Name/Email
+          %th.company Company
+          %th Phone, address
+          %th Tag
+          %th created_at
+          %th Ctx
+          %th Sch
+
+      %tbody
+        - leads.each do |lead|
+          %tr
+            %td= check_box_tag 'lead_ids[]', lead.id
+            %td= link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
+            %td.company
+              = lead.company.company_url
+              - if lead.company.name.present?
+                <br /><b>#{lead.company.name}</b>
+            %td
+              .a= lead.phone   if lead.phone.present?
+              .a= lead.address if lead.address.present?
+            %td= lead.wp_tags.map(&:name).join(", ")
+            %td= lead.created_at.to_s[0..10]
+            %td.ctx
+              = email_contexts[lead.email] || '-'
+            %td.sch
+              = lead.scheduled_email_actions.length
+              = link_to '[+]', new_scheduled_email_action_path( lead_id: lead.id )
+              -# %ul
+              -#   - lead.scheduled_email_actions.map do |sch_a|
+              -#     %li
+              -#       = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
+              -#       [x]
+
+    = paginate leads, param_name: :leads_page
+
+
+
+

data/app/views/ish_manager/leads/index.haml

@@ -1,57 +1,2 @@
 
-.leads-index.padded
-  .header
-    %h2.title
-      #{link_to 'Kept Leads', leads_path} (#{::Lead.kept.count}, #{::Lead.all.count})
-      = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
-
-  = render 'search', resource: ::Lead
-  = form_tag leads_bulkop_path do
-    = label_tag 'Act on Selected:'
-    = select_tag :op, options_for_select( [[nil,nil]] + Lead::OPS )
-    = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
-    = submit_tag 'Go'
-
-    = paginate @leads, param_name: :leads_page
-    %table.bordered
-      %thead
-        %tr
-          %th &nbsp;
-          %th Name/Email
-          %th.company Company
-          %th Phone, address
-          %th Tag
-          %th created_at
-          %th Ctx
-          %th Sch
-
-      %tbody
-        - @leads.each do |lead|
-          %tr
-            %td= check_box_tag 'lead_ids[]', lead.id
-            %td= link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
-            %td.company
-              = lead.company.company_url
-              - if lead.company.name.present?
-                <br /><b>#{lead.company.name}</b>
-            %td
-              .a= lead.phone   if lead.phone.present?
-              .a= lead.address if lead.address.present?
-            %td= lead.wp_tags.map(&:name).join(", ")
-            %td= lead.created_at.to_s[0..10]
-            %td.ctx
-              = @email_contexts[lead.email] || '-'
-            %td.sch
-              = lead.scheduled_email_actions.length
-              = link_to '[+]', new_scheduled_email_action_path( lead_id: lead.id )
-              -# %ul
-              -#   - lead.scheduled_email_actions.map do |sch_a|
-              -#     %li
-              -#       = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
-              -#       [x]
-
-    = paginate @leads, param_name: :leads_page
-
-
-
-
+= render 'index', leads: @leads, email_contexts: @email_contexts, search_path: leads_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.428
+  version: 0.1.8.429
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -654,6 +654,7 @@ files:
 - app/views/ish_manager/kaminari/_prev_page.html.erb
 - app/views/ish_manager/leads/_form.haml
 - app/views/ish_manager/leads/_form_import.haml
+- app/views/ish_manager/leads/_index.haml
 - app/views/ish_manager/leads/_index_rows.haml
 - app/views/ish_manager/leads/edit.haml
 - app/views/ish_manager/leads/index.haml