ish_manager 0.1.8.454 → 0.1.8.456

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc91675a3fe4a13904b9afe625c1319e6b80f8488ed948d33a86295a2eeac6c5
-  data.tar.gz: 75852ed84a3471fd35c874b0a80154b2a9ec1db79cef31291aa630451e57c0d1
+  metadata.gz: 79c932faeddeefda4f1437498571c30b2d358386997d10449a9e162f8d4fa341
+  data.tar.gz: 2629ac8f4ce3b648984405c54a99ec0e9ddc84bf43c2a4e447a676594c38254d
 SHA512:
-  metadata.gz: 8678024b34818b07b884f6cbe8be12abffe791471a6d55817cd898a6af3abb043aaebdd1981302a861c8e705672234920e63dd4a1036e436217c12e42a84fa2b
-  data.tar.gz: d048bea2933f6bb1e44bd212591cee8895b1053f0400601818adb2326221bee29a0c6bf90176f3f4eb003c1dde812e0eaa58041af74d50f26139d714c7c88e03
+  metadata.gz: ab7d4cb93368830b0ff2e76d50a780f3778d2b96d2d450ff31384db6dbc1fcd6f447b35fd7d30d29301b2991075091f2f4afcdc51da4d1810cea4c4070858d39
+  data.tar.gz: 1e06bb8b2b6c3db7f9edf87a94c9cdd9337afdaa5e75399a7bff0d92d4701eefea21abc80df0bbe5dd0250a89df01212543c928810fcb35b74de9884621a1b99

data/app/controllers/ish_manager/application_controller.rb

@@ -94,6 +94,7 @@ class IshManager::ApplicationController < ActionController::Base
     @office_actions_list  = [[nil,nil]] + Office::Action.all.map { |a| [ a.slug, a.id ] }
     @profiles_list        = Ish::UserProfile.list
     @reports_list         = Report.all.list
+    @tags_list            = [[nil,nil]] + WpTag.all.map { |t| [ t.name, t.id ] }
     @user_profiles_list   = Ish::UserProfile.list
     @videos_list          = Video.all.list
   end
@@ -109,20 +110,3 @@ end
 
 
 
-
-
-  # ## @TODO: obsolete, remove _vp_ 2022-10-15
-  # def update_profile_pic
-  #   return unless params[:photo]
-  #   @photo = Photo.new :photo => params[:photo]
-  #   @photo.user_profile = @current_profile
-  #   flag = @photo.save
-  #   @resource.profile_photo = @photo
-  #   flagg = @resource.save
-  #   if flag && flagg
-  #     flash[:notice] = 'Success'
-  #   else
-  #     flash[:alert] = "No Luck. #{@photo.errors.messages} #{@resource.errors.messages}"
-  #   end
-  # end
-

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -13,7 +13,9 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
     if params[:not_slug]
       @email_conversations = @email_conversations.not_in_emailtag(params[:not_slug])
     end
-    @email_conversations = @email_conversations.order_by( latest_at: :desc ).page( params[:conv_page] ).per( 25 )
+    @email_conversations = @email_conversations.order_by( latest_at: :desc
+      ).page( params[:conv_page]
+      ).per( current_profile.per_page )
   end
 
   def show

data/app/controllers/ish_manager/galleries_controller.rb

@@ -1,7 +1,7 @@
 class IshManager::GalleriesController < IshManager::ApplicationController
 
   before_action :set_lists
-  before_action :set_gallery, only: %w|destroy edit j_show show update update_ordering|
+  before_action :set_gallery, only: %w| destroy edit j_show show update update_ordering |
 
   # Alphabetized! : )
 
@@ -126,6 +126,9 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     end
   end
 
+  ##
+  ## private
+  ##
   private
 
   def set_gallery

data/app/controllers/ish_manager/leads_controller.rb

@@ -36,14 +36,33 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
   end
 
   def create
+    param_lead_tags = params[:lead].delete :lead_tags
+    param_photo     = params[:lead].delete :photo
     @lead = ::Lead.new params[:lead].permit!
     authorize! :create, @lead
+
+    param_lead_tags.delete ''
+    lead_tags = LeadTag.where({ lead_id: @lead.id })
+    if param_lead_tags.map(&:to_i).sort != lead_tags.map(&:term_id).sort
+      lead_tags.map(&:destroy)
+      param_lead_tags.each do |lt|
+        LeadTag.create({ lead_id: @lead.id, term_id: lt })
+      end
+    end
+
+    if param_photo
+      photo = Photo.create photo: param_photo
+      @lead.photo_id  = photo.id
+      # @lead.photo_url = photo.photo.url(:small)
+    end
+
     if @lead.save
       flash[:notice] = "created lead"
+      redirect_to action: :show, id: @lead.id
     else
       flash[:alert] = "Cannot create lead: #{@lead.errors.messages}"
+      render action: :new
     end
-    redirect_to :action => 'index'
   end
 
   def edit
@@ -66,7 +85,19 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
     authorize! :index, ::Lead
     @leads = ::Lead.kept.includes( :company )
     if params[:q].present?
-      @leads = @leads.where(" email LIKE ? ", "%#{params[:q]}%" )
+      @leads = @leads.where(" email LIKE ? or name LIKE ? ", "%#{params[:q]}%", "%#{params[:q]}%" )
+    end
+    if params[:q_tag_ids].present?
+      carry = nil
+      params[:q_tag_ids].each do |term_id|
+        lts = LeadTag.where({ term_id: term_id }).map(&:lead_id)
+        if carry
+          carry = carry & lts
+        else
+          carry = lts
+        end
+      end
+      @leads = Lead.where({ :id.in => carry })
     end
     @leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
 
@@ -106,18 +137,38 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
     @schs = Sch.where( lead_id: @lead.id )
     @ctxs = Ctx.where( lead_id: @lead.id )
     @msgs = Msg.where( from: @lead.email )
+    @galleries = @lead.galleries.page( params[:galleries_page] ).per( current_profile.per_page )
+    @videos    = @lead.videos.page( params[:videos_page]       ).per( current_profile.per_page )
   end
 
   def update
+    param_lead_tags = params[:lead].delete :lead_tags
+    param_photo     = params[:lead].delete :photo
     @lead = ::Lead.find params[:id]
     authorize! :update, @lead
+
+    param_lead_tags.delete ''
+    lead_tags = LeadTag.where({ lead_id: @lead.id })
+    if param_lead_tags.map(&:to_i).sort != lead_tags.map(&:term_id).sort
+      lead_tags.map(&:destroy)
+      param_lead_tags.each do |lt|
+        LeadTag.create({ lead_id: @lead.id, term_id: lt })
+      end
+    end
+
+    if param_photo
+      photo = Photo.create photo: param_photo
+      @lead.photo_id  = photo.id
+      # @lead.photo_url = photo.photo.url(:small)
+    end
+
     if @lead.update_attributes params[:lead].permit!
       flash[:notice] = 'Successfully updated lead.'
+      redirect_to :action => 'show', id: @lead.id
     else
       flash[:alert] = "Cannot update lead: #{@lead.errors.messages}"
+      render action: :edit
     end
-    ## 2023-05-14 NOT redirecting to index anymore.
-    redirect_to :action => 'show', id: @lead.id
   end
 
 end

data/app/controllers/ish_manager/leadsets_controller.rb

@@ -51,10 +51,12 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
   def show
     @leadset = Leadset.find params[:id]
     authorize! :show, @leadset
+
     @email_contexts = {}
     @leadset.employees.each do |lead|
       @email_contexts[lead.email] = lead.email_contexts
     end
+
     @employees = @leadset.employees.page( params[:leads_page] ).per( current_profile.per_page )
   end
 

data/app/controllers/ish_manager/subscriptions_controller.rb

@@ -5,6 +5,27 @@ class IshManager::SubscriptionsController < IshManager::ApplicationController
 
   # alphabetized : )
 
+  def create
+    authorize! :create, Wco::Subscription
+    @subscription = Wco::Subscription.new params[:subscription].permit!
+    @stripe_subscription = Stripe::Subscription.create({
+      customer: params[:subscription][:customer_id],
+      items: [
+        { price: params[:subscription][:price_id] },
+      ],
+    })
+    puts! @stripe_subscription, '@stripe_subscription'
+
+    # flag = @subscription.save
+    # if flag
+    #   flash[:notice] = 'Created the subscription.'
+    #   redirect_to action: :show, id: @subscription.id
+    # else
+    #   flash[:alert] = "Cannot create the subscription: #{@subscription.errors.full_messages.join(', ')}."
+    #   render action: :new
+    # end
+  end
+
   def index
     authorize! :index, Wco::Subscription
 
@@ -13,8 +34,28 @@ class IshManager::SubscriptionsController < IshManager::ApplicationController
 
     emails = @stripe_customers.map &:email
     @leadsets = Leadset.find_by( email: emails )
-    puts! @leadsets, '@leadsets'
+  end
+
+  def show
+    authorize! :show, Wco::Subscription
+    @subscription = Wco::Subscription.find params[:id]
+  end
+
+  def new
+    authorize! :new, Wco::Subscription
+    @subscription = Wco::Subscription.new
+  end
+
+  ##
+  ## private
+  ##
+  private
 
+  def set_lists
+    super
+    @products_list = Wco::Product.list
+    @customer_ids_list = Leadset.where( "customer_id IS NOT NULL" ).map { |i| [ i.company_url, i.customer_id ] }
+    @price_ids_list = Wco::Product.all.map { |i| [ i.name, i.price_id ] }
   end
 
 end

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

@@ -10,7 +10,7 @@
     .a
       %ul
         %li
-          = render 'ish_manager/galleries/menu'
+          = render 'ish_manager/galleries/menu', count: Gallery.all.count
         %li
           = link_to 'Reports',   reports_path
           .inline-search

data/app/views/ish_manager/galleries/_form.haml

@@ -7,10 +7,10 @@
 
 = form_for gallery, :url => url do |f|
   .row
-    .col.s6
+    .col-md-6
       = f.label :name
       = f.text_field :name
-    .col.s6
+    .col-md-6
       = f.label :slug
       = f.text_field :slug
 
@@ -18,10 +18,14 @@
 
 
   .row
-    = f.label :subhead
-    = f.text_area :subhead
-  .row
-    = f.text_area :descr, class: :tinymce
+    .col-md-4
+      = f.label :subhead
+      = f.text_area :subhead
+    .col-md-4
+      = f.text_area :descr, class: :tinymce
+    .col-md-4
+      %label Lead
+      = f.select :lead_id, options_for_select(@leads_list, selected: gallery.lead_id), {}, class: :select2
 
   .row
     .col.s3

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

@@ -8,16 +8,17 @@
 
 .galleries--index
   .max-width
-    = render 'ish_manager/galleries/menu', count: @galleries.count
+    = render 'ish_manager/galleries/menu', count: galleries.count
+  %hr
 
   .padded
-    - if @galleries.length > 0
+    - if galleries.length > 0
 
-      - if @galleries.respond_to? :total_pages
-        = paginate @galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
+      - if galleries.respond_to? :total_pages
+        = paginate galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
 
       .row
-        - @galleries.each do |g|
+        - galleries.each do |g|
           .col-sm-12.col-md-6
             .bordered-card
               %h5
@@ -32,8 +33,8 @@
                   - g.photos.limit( n_thumbs ).each do |photo|
                     = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
 
-      - if @galleries.respond_to? :total_pages
-        = paginate @galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
+      - if galleries.respond_to? :total_pages
+        = paginate galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
 
     - else
       %h5 No Galleries

data/app/views/ish_manager/galleries/_index_title.haml

@@ -1 +1,2 @@
+
 = render 'ish_manager/galleries/index'

data/app/views/ish_manager/galleries/_menu.haml

@@ -1,7 +1,7 @@
 
 .galleries--menu
 
-  = link_to "Galleries (#{Gallery.all.length})", galleries_path
+  = link_to "Galleries (#{count})", galleries_path
 
   .inline-search
     = form_tag galleries_path, method: :get do

data/app/views/ish_manager/galleries/index_thumbs.haml

@@ -1 +1,2 @@
-= render 'index'
+
+= render 'index', galleries: @galleries

data/app/views/ish_manager/galleries/index_titles.haml

@@ -1,5 +1,5 @@
 
-= render 'menu'
+= render 'ish_manager/galleries/menu', count: @galleries.count
 
 %table#dataTable
   %thead

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

@@ -1,7 +1,7 @@
 
 - url = lead.new_record? ? leads_path : lead_path( lead.id )
 
-= form_for lead, :as => :lead, :url => url do |f|
+= form_for lead, html: { multipart: true }, as: :lead, url: url do |f|
 
   .field
     = f.label :name
@@ -21,15 +21,24 @@
 
   .field
     = f.label "Leadset (company)"
-    = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, { class: 'select2' }
+    = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, { class: :select2 }
+
+  .field
+    %label Rating
+    = f.number_field :rating
 
   .field
     = f.label :comment
-    = f.text_area :comment
+    = f.text_area :comment, class: :tinymce
 
-  -# .field
-  -#   = f.label "Tags"
-  -#   = f.text_field :wp_tags
+  .field
+    = f.label "Tags"
+    = lead.wp_tags.inspect
+    = f.select :lead_tags, options_for_select(@tags_list, selected: lead.wp_tags.map(&:term_id) ), {}, { class: :select2, multiple: true }
+
+  .field
+    = f.label :photo
+    = f.file_field :photo
 
   .actions
     = f.submit

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

@@ -29,6 +29,7 @@
         %tr
           %th= check_box_tag :selectAll
           %th Name/Email
+          %th
           %th.company Company
           %th Phone, address
           %th Tag
@@ -43,6 +44,8 @@
             %td
               = link_to '[~]', edit_lead_path( lead )
               = link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
+            %td
+              = image_tag lead.photo.url(:thumb) if lead.photo
             %td.company
               = lead.company.company_url
               - if lead.company.name.present?

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

@@ -1,7 +1,7 @@
 
 .leads-edit.max-width
   .header
-    %h2.title Edit lead
+    %h2.title Edit lead #{ link_to @lead.name, lead_path(@lead) }
 
   = render 'form', :lead => @lead
 

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

@@ -1,3 +1,7 @@
 
-= @email_contexts
-= render 'index', leads: @leads, search_path: leads_path
+.leads-index.max-width
+  = form_tag leads_path, method: :get do
+    = select_tag :q_tag_ids, options_for_select(@tags_list, selected: params[:q_tag_ids]), { class: :select2, multiple: true }
+    = submit_tag 'tag-search'
+  %hr
+  = render 'index', leads: @leads, search_path: leads_path

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

@@ -6,13 +6,32 @@
       Lead ##{@lead.id}
       = link_to '[~]', edit_lead_path(@lead)
 
-  %ul
-    %li Name: #{@lead.name}
-    %li Email: #{@lead.email}
-    %li Company (leadset): #{ link_to @lead.company.company_url, leadset_path(@lead.company) }
-    %li Phone: #{@lead.phone}
-    %li Address: #{@lead.address}
-    %li Comment: #{raw @lead.comment}
+  .row
+    .col-md-6
+      %ul
+        %li Name: #{@lead.name}
+        %li Email: #{@lead.email}
+        %li Company (leadset): #{ link_to @lead.company.company_url, leadset_path(@lead.company) }
+        %li Rating: #{@lead.rating}
+        - if @lead.phone
+          %li Phone: #{@lead.phone}
+        - if @lead.address
+          %li Address: #{@lead.address}
+        - if @lead.shoe_size
+          %li Shoe size: #{@lead.shoe_size}
+        - if @lead.comment
+          %li Comment: #{raw @lead.comment}
+        - if @lead.photo
+          %li
+            = image_tag Photo.find( @lead.photo_id ).photo.url(:small)
+
+    .col-md-6
+      %h5 Tags
+      %ul
+        - @lead.lead_tags.each do |lt|
+          %li
+            = link_to category_path(lt.wp_tag.id) do
+              = "##{lt.wp_tag.id} - #{lt.wp_tag.name}"
 
   .row
     .col-md-6.ctxs
@@ -50,10 +69,18 @@
   .row
     .col-md-12.msgs
       %h5 Email Messages (#{@msgs.length})
+      .descr @TODO: these used to be links, but now they are broken. _vp_ 2023-08-10
       %ul
         - @msgs.each do |msg|
-          %li= link_to msg.subject, email_conversation_path( msg.conv )
+          %li
+            = msg.subject
+            -#   = link_to msg.subject, email_conversation_path( msg.conv )
 
+  .row
+    .col-md-6
+      = render 'ish_manager/galleries/index', galleries: @galleries
+    .col-md-6
+      = render 'ish_manager/videos/index', videos: @videos
 
 
 

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

@@ -15,9 +15,9 @@
   -# .input-field
   -#   = f.label :tag
   -#   = f.text_field :tag
-  .input-field
-    %label Stripe customer_id
-    = f.text_field :customer_id
+  -# .input-field
+  -#   %label Stripe customer_id
+  -#   = f.text_field :customer_id
   .actions
     = f.submit
 

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

@@ -9,6 +9,7 @@
     %li <b>Email:</b> #{@leadset.email}
     %li <b>Stripe customer_id:</b> #{@leadset.customer_id}
     %li <b>company_url</b>: #{@leadset.company_url}
+    %li <b>customer_id</b>: #{@leadset.customer_id}
     %li
       = link_to invoices_path({ leadset_id: @leadset.id }) do
         Invoices

data/app/views/ish_manager/subscriptions/_form.haml

@@ -0,0 +1,16 @@
+
+- url = subscription.new_record? ? subscriptions_path : subscription_path(subscription)
+
+.subscriptions--form
+  = form_for subscription, as: :subscription, url: url do |f|
+
+    .input-group
+      %label Product (price):
+      = f.select :price_id, options_for_select(@price_ids_list, selected: subscription.price_id), {}, class: :select2
+
+    .input-group
+      %label Customer/Leadset
+      = f.select :customer_id, options_for_select(@customer_ids_list, selected: subscription.customer_id), {}, class: :select2
+
+    .actions
+      = f.submit 'Submit'

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

@@ -18,7 +18,9 @@
                       %li= sub.items.data[0].plan.product
 
     .col-md-6
-      %h5 Stripe Subscriptions
+      %h5
+        Stripe Subscriptions
+        = link_to '[+]', new_subscription_path
       %ul
         - @stripe_subscriptions.each do |sub|
           %li

data/app/views/ish_manager/subscriptions/new.haml

@@ -0,0 +1,4 @@
+
+.subscriptions-new.max-width
+  %h5 New Subscription
+  = render 'form', subscription: @subscription

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

@@ -0,0 +1,4 @@
+
+.subscriptions-show.max-width
+  %h5 Subscription
+  = @subscription.inspect

data/app/views/ish_manager/videos/_form.haml

@@ -1,36 +1,38 @@
 
 = form_for video do |f|
   .row
-    .col.m6
+    .col-sm-6
       .field
         = f.label :youtube_id
         = f.text_field :youtube_id
       .field
         = f.label :name
         = f.text_field :name
+      .input-group
+        = f.label :premium_tier
+        = f.number_field :premium_tier
+      .input-group
+        = f.check_box :is_trash
+        = f.label :is_trash
       .field
-        = f.label :descr
-        = f.text_area :descr
-    .col.m6
+        %label Lead
+        = f.select :lead_id, options_for_select(@leads_list, selected: video.lead_id), {}, class: :select2
+    .col-sm-6
       .field
         = f.label :video
         = f.file_field :video
       .field
         = f.label :thumb
         = f.file_field :thumb
-  .row
-    .col.s3
-      = f.label :premium_tier
-      = f.number_field :premium_tier
-    .col.s3
-      = f.label :user_profile
-      = f.select :user_profile_id, @user_profiles_list
+
+
+  = render 'ish_manager/application/form_nonpublic', f: f, model: video
   .row
     .col-md-6
-      = render 'ish_manager/application/form_nonpublic', f: f, model: video
-    .col-md-6
-      = f.check_box :is_trash
-      = f.label :is_trash
+      .field
+        = f.label :descr
+        = f.text_area :descr, class: :tinymce
+
 
   .action
     = f.submit

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

@@ -1,12 +1,18 @@
 
 - videos ||= @videos
+- this_videos_path ||= videos_path
 
 .videos--index
-  .header
-    %h5.title
-      Videos (#{videos.count})
-      = link_to '[+]', new_video_path
-    = render 'search', path: videos_path
+  .videos--menu
+    = link_to "Videos (#{videos.count})", this_videos_path
+
+    -# = render 'search', path: this_videos_path
+    .inline-search
+      = form_tag this_videos_path, method: :get do
+        = text_field_tag :q
+
+    = link_to '[+]', new_video_path
+    %hr
 
   = paginate videos, param_name: :videos_page, views_prefix: 'ish_manager'
 
@@ -26,7 +32,6 @@
 
         = render 'meta', item: video
 
-
   = paginate videos, param_name: :videos_page, views_prefix: 'ish_manager'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.454
+  version: 0.1.8.456
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -748,7 +748,10 @@ files:
 - app/views/ish_manager/scheduled_email_actions/index.haml
 - app/views/ish_manager/scheduled_email_actions/new.haml
 - app/views/ish_manager/scheduled_email_actions/show.haml
+- app/views/ish_manager/subscriptions/_form.haml
 - app/views/ish_manager/subscriptions/index.haml
+- app/views/ish_manager/subscriptions/new.haml
+- app/views/ish_manager/subscriptions/show.haml
 - app/views/ish_manager/trash/email_campaigns-trash/_form.haml
 - app/views/ish_manager/trash/email_campaigns-trash/edit.haml
 - app/views/ish_manager/trash/email_campaigns-trash/index.haml