ish_manager 0.1.8.424 → 0.1.8.426

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f719990ed551e21801a3925e5769adfa6f578a24424f51df63af32cc7d3cc770
-  data.tar.gz: 2c1d7378d0af53ab187ea9218a4bc3730cec919396a8d00847c12a5080c37344
+  metadata.gz: 873763e62f82d25aebc1ecee3361aae94eeae90b70ba2147836be99083f3ca6f
+  data.tar.gz: 10356d458981cc8287da48bc6314453cd3d871afeb911ccd8ab19f15002dd754
 SHA512:
-  metadata.gz: b96471ab9c81af410f44c43a873f7557028a6863f23fc0dbd509c323164c080a2052ff4196c041e2161f022ef3a147b1157ae04896d31d57af7fdf7d819738e0
-  data.tar.gz: 204884de41f385bac01412e08436cae28b906236a3fb76dce566366785e20577388046075975f4ff7bc68754817f3eafeea34dfa52ed8d9982eb14aa80bced7b
+  metadata.gz: 1b4a34dd8c6db5649dddcc0138530842771aa1ec1cd147b70ab10f30d93c96797c76b90d694b81ac1feb2ce9784425313b5805bce95d88cec02335975518bc94
+  data.tar.gz: 82bface07eb16718c492f93267e00acbdaa6440a6498026abb3ec31cb8ebcf54d03ca6040b00187b122af1271f0dbe7dd49dacf159fc903cc0ce1b4d59b261c9

data/app/controllers/ish_manager/email_campaigns_controller.rb

@@ -3,16 +3,6 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
 
   before_action :set_lists
 
-  def index
-    authorize! :index, Ish::EmailCampaign
-    @campaigns = Ish::EmailCampaign.all
-  end
-
-  def new
-    @campaign = Ish::EmailCampaign.new
-    authorize! :new, @campaign
-  end
-
   def create
     @campaign = Ish::EmailCampaign.new params[:campaign].permit!
     authorize! :create, @campaign
@@ -30,14 +20,24 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
     @campaign.do_send
   end
 
-  def show
+  def edit
     @campaign = Ish::EmailCampaign.find params[:id]
-    authorize! :show, @campaign
+    authorize! :edit, @campaign
   end
 
-  def edit
+  def index
+    authorize! :index, Ish::EmailCampaign
+    @campaigns = Ish::EmailCampaign.all
+  end
+
+  def new
+    @campaign = Ish::EmailCampaign.new
+    authorize! :new, @campaign
+  end
+
+  def show
     @campaign = Ish::EmailCampaign.find params[:id]
-    authorize! :edit, @campaign
+    authorize! :show, @campaign
   end
 
   def update

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -67,8 +67,7 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
 
   def index
     authorize! :index, ::Ish::EmailContext
-    @ctxs = ::Ish::EmailContext.all.page( params[:ctxs_page] ).per( 100 )
-
+    @ctxs = ::Ish::EmailContext.all.page( params[:ctxs_page] ).per( current_profile.per_page )
 
     if my_truthy? params[:sent]
       @ctxs = @ctxs.where( :sent_at.ne => nil )
@@ -109,7 +108,6 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
         render layout: false
       end
     end
-
   end
 
   def update

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -49,7 +49,7 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
 
   def index
     authorize! :index, Ish::EmailTemplate
-    @templates = Ish::EmailTemplate.all.order_by( slug: :asc ).page( params[:templates_page] )
+    @templates = Ish::EmailTemplate.all.order_by( slug: :asc ).page( params[:templates_page] ).per( current_profile.per_page )
   end
 
   def new

data/app/controllers/ish_manager/image_assets_controller.rb

@@ -1,9 +1,12 @@
 
+##
+## trash?! _vp_ 2023-05-10
+##
 class IshManager::ImageAssetsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Ish::ImageAsset
-    @image_assets = Ish::ImageAsset.all.order_by( created_at: :desc ).limit(10)
+    @image_assets = Ish::ImageAsset.all.order_by( created_at: :desc )
   end
 
 end

data/app/controllers/ish_manager/leads_controller.rb

@@ -64,7 +64,11 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
 
   def index
     authorize! :index, ::Lead
-    @leads = ::Lead.kept.includes( :company ).page( params[:leads_page ] ).per( current_profile.per_page )
+    @leads = ::Lead.kept.includes( :company )
+    if params[:q].present?
+      @leads = @leads.where(" email LIKE ? ", "%#{params[:q]}%" )
+    end
+    @leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
 
     @email_contexts = {}
     # lead_emails = @leads.map( &:email ).compact.reject(&:empty?)

data/app/controllers/ish_manager/leadsets_controller.rb

@@ -33,7 +33,7 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Leadset
-    @leadsets = Leadset.all.kept # where( :profile => @current_profile, :is_trash => false )
+    @leadsets = Leadset.all.kept.page( params[:leadsets_page] ).per( current_profile.per_page )
   end
 
   def new

data/app/controllers/ish_manager/scheduled_email_actions_controller.rb

@@ -24,7 +24,7 @@ class IshManager::ScheduledEmailActionsController < IshManager::ApplicationContr
 
   def index
     authorize! :scheduled_emails_index, ::IshManager
-    @scheduled_email_actions = ::Office::ScheduledEmailAction.all
+    @schs = @scheduled_email_actions = ::Office::ScheduledEmailAction.all
   end
 
   def new

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -3,6 +3,33 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  def create
+    @user = User.find_or_create_by( :email => params[:profile][:email] )
+    @user.password ||= (0...12).map { rand(100) }.join
+    @user_profile = Ish::UserProfile.new params[:profile].permit!
+    authorize! :create, @user_profile
+
+    if params[:photo]
+      photo = Photo.new :photo => params[:photo]
+      @user_profile.profile_photo = photo
+    end
+
+    if !@user.save
+      raise "cannot save profile.user: #{@user.errors.full_messages} profile errors: #{@user_profile.errors.full_messages}"
+    end
+    if @user_profile.save
+      flash[:notice] = "Created profile"
+    else
+      flash[:alert] = "Cannot create profile: #{@user_profile.errors.messages}"
+    end
+    redirect_to :action => :index
+  end
+
+  def edit
+    @profile = Ish::UserProfile.find params[:id]
+    authorize! :edit, @profile
+  end
+
   def index
     @user_profiles = Ish::UserProfile.all
     authorize! :index, Ish::UserProfile
@@ -11,14 +38,14 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     end
   end
 
-  def show
-    @profile = Ish::UserProfile.find params[:id]
-    authorize! :show, @profile
+  def new
+    @profile = Ish::UserProfile.new
+    authorize! :new, @profile
   end
 
-  def edit
+  def show
     @profile = Ish::UserProfile.find params[:id]
-    authorize! :edit, @profile
+    authorize! :show, @profile
   end
 
   def update
@@ -44,32 +71,5 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     end
   end
 
-  def new
-    @profile = Ish::UserProfile.new
-    authorize! :new, @profile
-  end
-
-  def create
-    @user = User.find_or_create_by( :email => params[:profile][:email] )
-    @user.password ||= (0...12).map { rand(100) }.join
-    @user_profile = Ish::UserProfile.new params[:profile].permit!
-    authorize! :create, @user_profile
-
-    if params[:photo]
-      photo = Photo.new :photo => params[:photo]
-      @user_profile.profile_photo = photo
-    end
-
-    if !@user.save
-      raise "cannot save profile.user: #{@user.errors.full_messages} profile errors: #{@user_profile.errors.full_messages}"
-    end
-    if @user_profile.save
-      flash[:notice] = "Created profile"
-    else
-      flash[:alert] = "Cannot create profile: #{@user_profile.errors.messages}"
-    end
-    redirect_to :action => :index
-  end
-
 end
 

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -79,6 +79,9 @@
 
         %li
           = link_to "Leads (#{Lead.kept.length})", leads_path
+          .inline-search
+            = form_tag leads_path, method: :get do
+              = text_field_tag :q
           = link_to '[+]', new_lead_path
         %li
           = link_to "Schs (#{Sch.active.length})", scheduled_email_actions_path

data/app/views/ish_manager/application/_search.haml

@@ -1,4 +1,6 @@
 
+-# - path ||= "#{resource.name.downcase.pluralize}"
+- path ||= resource
 .application--search
   = form_tag path, :method => :get, :class => :search do
     .field.search_words

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

@@ -1,22 +1,25 @@
 
-%h3.center.collapse-expand#emailTemplatesIndex
-  Email Templates (#{Ish::EmailTemplate.all.count})
+.email-templates--index.max-width
 
-.email-templates-index.max-width
-  %table.bordered
-    %tr
-      %th
-      %th Slug
-      %th Created
-      %th Updated
+  %h3.center.collapse-expand#emailTemplatesIndex
+    Email Templates (#{Ish::EmailTemplate.all.count})
 
-    - @templates.each do |tmpl|
+  = paginate @templates, :param_name => :templates_page, :views_prefix => 'ish_manager'
+  .email-templates-index.max-width
+    %table.bordered
       %tr
-        %td
-          = link_to '[use]', new_email_context_path({ email_template_id: tmpl.id })
-          = link_to '[~]', edit_email_template_path({ id: tmpl })
-          = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
-        %td= link_to tmpl.slug, email_template_path({ id: tmpl })
-        %td= pp_date tmpl.created_at
-        %td= pp_date tmpl.updated_at
+        %th
+        %th Slug
+        %th Created
+        %th Updated
 
+      - @templates.each do |tmpl|
+        %tr
+          %td
+            = link_to '[use]', new_email_context_path({ email_template_id: tmpl.id })
+            = link_to '[~]', edit_email_template_path({ id: tmpl })
+            = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
+          %td= link_to tmpl.slug, email_template_path({ id: tmpl })
+          %td= pp_date tmpl.created_at
+          %td= pp_date tmpl.updated_at
+  = paginate @templates, :param_name => :templates_page, :views_prefix => 'ish_manager'

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

@@ -5,13 +5,14 @@
       #{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
 
-  = paginate @leads, param_name: :leads_page
+  = 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
@@ -48,8 +49,8 @@
               -#     %li
               -#       = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
               -#       [x]
-  .c
-  = paginate @leads, param_name: :leads_page
+
+    = paginate @leads, param_name: :leads_page
 
 
 

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

@@ -13,6 +13,7 @@
       .n-selected -
     = button_tag 'Delete', method: :delete, class: 'delete-btn'
 
+  = paginate @leadsets, :param_name => :leadsets_page, :views_prefix => 'ish_manager'
   %table
     %thead
       %tr
@@ -76,5 +77,5 @@
                     .chip
                       .interval= sch.interval
                       .tmpl= sch.email_template.slug
-
+  = paginate @leadsets, :param_name => :leadsets_page, :views_prefix => 'ish_manager'
 

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

@@ -3,21 +3,29 @@
   .header
     %h2
       Scheduled Email Actions
-      -# (#{Sch.kept.count})
       (#{Sch.all.count})
       = link_to '[+]', new_scheduled_email_action_path
 
-  .items
-    - @scheduled_email_actions.each do |sch|
-      .item.Card
-        .flex-row
-          .gray= sch.id
-          = link_to '[~]', edit_scheduled_email_action_path(sch)
+  %table.bordered.data-table
+    %thead
+      %tr
+        %td
+        %td Active?
+        %td From
+        %td To
+        %td Tmpl
+        %td Perform at
+    %tbody
+      - @schs.each do |sch|
+        %tr
+          %td= link_to '[~]', edit_scheduled_email_action_path(sch)
+          %td= sch.state == 'active' ? 'Y' : '-'
+          %td= sch.email_action.email_template.from_email
+          %td= link_to sch.lead.email, lead_path(sch.lead)
+          %td= sch.email_action.email_template.slug
+          %td= sch.perform_at.in_time_zone
+
+
+
+
 
-        %ul
-          %li <b>EAct:</b> #{link_to sch.email_action.slug, edit_email_action_path(sch.email_action)}
-          %li <b>Tmpl:</b> #{sch.email_action.email_template.slug}
-          - if sch.lead_id
-            %li <b>Lead:</b> #{link_to sch.lead.email, lead_path(sch.lead) }
-          %li <b>State:</b> #{sch.state}
-          %li <b>Perform at:</b> #{sch.perform_at.in_time_zone}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.424
+  version: 0.1.8.426
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -618,7 +618,6 @@ files:
 - app/views/ish_manager/galleries/_thumbs.haml
 - app/views/ish_manager/galleries/_title.haml
 - app/views/ish_manager/galleries/edit.haml
-- app/views/ish_manager/galleries/index_ajax.haml-trash
 - app/views/ish_manager/galleries/index_thumbs.haml
 - app/views/ish_manager/galleries/index_titles.haml
 - app/views/ish_manager/galleries/new.haml

data/app/views/ish_manager/galleries/index_ajax.haml-trash

@@ -1,9 +0,0 @@
-
-- content_for :title do
-  Manager Galleries Index
-
-- content_for :menu do
-  = render 'search'
-
-= render 'manager/galleries/menu_secondary'
-