ish_manager 0.1.8.468 → 0.1.8.470

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a492c50e41c699fff1935a0b1ad87337f6087cab2698ec5f5f3a6f4402db423f
-  data.tar.gz: 8fcde4b2cb64b7861af5f4833e5b45d8abdf716ebd8d35c79bda5262ac0775ce
+  metadata.gz: 83591733d1b01247d332cf8f8530b2054de05f46cc11dba6869193a5b32a1ccb
+  data.tar.gz: 4f1443e9c20101dc1b24a7a889478b85933c95c4587e356849bbb49ccbd43711
 SHA512:
-  metadata.gz: 4a90d269c7d3290e3867d83e7bd47d2ec8f20c7505930f5d1e93155cc72ef7f722d6b2589adc27f3803d03b1fc0df2f607708c403ee904370e3cb6ce6e38636d
-  data.tar.gz: 16cd96ad71d52fcfda0f8753f2cdd21d1043aa0b28e114fe04c0c222b3f78654c1f615b08c48e440aadd08cb40b193d604164d6a621b5bdb5324cfd857c02664
+  metadata.gz: b1af535f9b4559c5c884741f743a5b6ca0b14bc59b409b7db34ce92d4de345648275ea3826b17f12b43fcad1ed828b6588d538ea3d78e3035a0fb4a6436cf4b4
+  data.tar.gz: 5c148eddff5913d73ec126c112801ef1881e868a796b90d8414e30b61012b66f55804bb09cd145f2f19c6b2f569919ca866729e6b2ef39dc79b5c712bdb48d51

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

@@ -415,7 +415,8 @@ textarea.large {
   z-index: -1;
 }
 
-.max-width {
+.max-width,
+.maxwidth {
   max-width: 1140px;
   width: 100%;
   margin: auto;
@@ -539,4 +540,10 @@ div.set-jwt-token {
   .jwt-token {
     flex-grow: 1;
   }
-}
+}
+
+/* V */
+
+.valign-top {
+  align-items: flex-start;
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -106,7 +106,6 @@ class IshManager::ApplicationController < ActionController::Base
     @email_actions_list   = [[nil,nil]] + Office::EmailAction.all.map { |a| [ a.slug, a.id ] }
     @email_templates_list = [[nil,nil]] + Ish::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
     @email_tags_list      = [[nil,nil]] + WpTag.email_tags.map { |t| [ t.name, t.id ] }
-    @galleries_list       = Gallery.all.list
     @leads_list           = Lead.list
     @leadsets_list        = Leadset.list
     @locations_list       = ::Gameui::Map.list
@@ -117,14 +116,13 @@ class IshManager::ApplicationController < ActionController::Base
     @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
 
   def set_title
     @page_title = "#{ params[:controller].gsub('ish_manager/', '') } #{params[:action]} #{params[:slug]||params[:id]} ".gsub("  ", " ")
   end
 
-
 end
 
 

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -7,6 +7,13 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
     authorize! :email_conversations_index, IshManager::Ability
     @email_conversations = ::Office::EmailConversation.all
 
+    if current_profile.per_page > 100
+      flash_notice "Cannot display more than 100 conversations per page."
+      per_page = 100
+    else
+      per_page = current_profile.per_page
+    end
+
     if params[:slug]
       @email_conversations = @email_conversations.in_emailtag( params[:slug] )
     end
@@ -15,9 +22,10 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
     end
     @email_conversations = @email_conversations.order_by( latest_at: :desc
       ).page( params[:conv_page]
-      ).per( current_profile.per_page )
+      ).per( per_page )
   end
 
+
   def show
     authorize! :email_conversations_show, IshManager::Ability
     @email_conversation = ::Office::EmailConversation.find( params[:id] )

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -35,8 +35,8 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
       Ish::EmailTemplate.find_by({ slug: params[:id] })
     authorize! :iframe_src, @email_template
 
-    pox = Lead.find_by({ email: 'poxlovi@gmail.com' })
-    @ctx = Ctx.new({ email_template: @tmpl, lead_id: pox.id })
+    @lead = Lead.find_by({ email: 'poxlovi@gmail.com' })
+    @ctx = Ctx.new({ email_template: @tmpl, lead_id: @lead.id })
 
     @utm_tracking_str = {
       'cid'          => @ctx.lead_id,
@@ -45,6 +45,22 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
       'utm_source'   => @ctx.tmpl.slug,
     }.map { |k, v| "#{k}=#{v}" }.join("&")
 
+    to = Ishapi::Engine.routes.url_helpers.email_unsubscribes_url({
+      template_id: @ctx.tmpl.id,
+      lead_id:     @lead.id,
+      token:       @lead.unsubscribe_token,
+    })
+    obf = Office::ObfuscatedRedirect.find_or_create_by({ to: to })
+    @unsubscribe_url = Ishapi::Engine.routes.url_helpers.obf_url( obf.id )
+
+    to = Ishapi::Engine.routes.url_helpers.users_dashboard_url({
+      lead_id: @lead.id,
+    })
+    obf = Office::ObfuscatedRedirect.find_or_create_by({ to: to })
+    @update_preferences_url = Ishapi::Engine.routes.url_helpers.obf_url( obf.id )
+
+    eval( @ctx.tmpl.config_exe )
+
     render layout: false
   end
 

data/app/controllers/ish_manager/lead_action_templates_controller.rb

@@ -0,0 +1,27 @@
+
+class IshManager::LeadActionTemplatesController < IshManager::ApplicationController
+
+  def create
+    authorize! :create, Office::LeadActionTemplate
+    @tmpl = ::Office::LeadActionTemplate.new params[:tmpl].permit!
+    if @tmpl.save
+      flash_notice 'saved'
+    else
+      flash_alert "cannot save: #{@tmpl.errors.full_messages.join(', ')}."
+    end
+    redirect_to action: :index
+  end
+
+  def edit
+    @tmpl = Office::LeadActionTemplate.find params[:id]
+    authorize! :edit, @tmpl
+  end
+
+  def index
+    authorize! :index, Office::LeadActionTemplate
+    @tmpls = ::Office::LeadActionTemplate.all
+    @new_lat = ::Office::LeadActionTemplate.new
+  end
+
+end
+

data/app/controllers/ish_manager/lead_actions_controller.rb

@@ -0,0 +1,10 @@
+
+class IshManager::LeadActionsController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, Office::LeadAction
+    @lead_actions = Office::LeadAction.all
+  end
+
+end
+

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -57,11 +57,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
   def edit
     @newsitem = Newsitem.find( params[:id] )
     authorize! :edit, @newsitem
-
-    ## @TODO: what on earth is this?
-    out = Gallery.unscoped.where( :is_trash => false, :user_profile => @current_profile ).order_by( :created_at => :desc )
-    @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
-
   end
 
   def index
@@ -99,5 +94,23 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
 
   end
 
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+
+    ## NO SUPER!
+    # super
+
+    # out = Gallery.unscoped.where( :is_trash => false, :user_profile => @current_profile ).order_by( :created_at => :desc )
+    # @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
+
+    @galleries_list       = Gallery.all.list
+    @videos_list          = Video.all.list
+
+  end
+
 end
 

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -18,9 +18,9 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
       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"
+      flash_notice "Created profile."
     else
-      flash[:alert] = "Cannot create profile: #{@user_profile.errors.messages}"
+      flash_alert "Cannot create profile: #{@user_profile.errors.messages} ."
     end
     redirect_to :action => :index
   end
@@ -67,9 +67,9 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     flag = @profile.update_attributes params[:profile].permit!
 
     if flag
-      flash[:notice] = "Updated profile #{@profile.email}"
+      flash_notice "Updated profile #{@profile.email} ."
     else
-      flash[:alert] = "Cannot update profile: #{@profile.errors.full_messages}"
+      flash_alert "Cannot update profile: #{@profile.errors.full_messages} ."
     end
     if params[:redirect_to]
       redirect_to params[:redirect_to]

data/app/helpers/ish_manager/application_helper.rb

@@ -34,6 +34,20 @@ module IshManager
     #   "/manager/email_contexts/for_lead/#{lead.id.to_s}"
     # end
 
+    ##
+    ## O
+    ##
+
+    def obfuscate link
+      puts! link, 'obfuscate helper'
+      obf = Office::ObfuscatedRedirect.find_or_create_by({ to: link })
+      return Ishapi::Engine.routes.url_helpers.obf_url( obf.id )
+    end
+
+    ##
+    ## P
+    ##
+
     def pp_errors errors
       return errors
     end

data/app/mailers/ish_manager/application_mailer.rb

@@ -1,7 +1,7 @@
 
 module IshManager
   class ApplicationMailer < ActionMailer::Base
-    default from: 'WasyaCo Consulting <no-reply@wasya.co>'
+    default from: 'WasyaCo Consulting <no-reply@wco.com.de>'
     layout 'mailer'
 
     def shared_galleries profiles, gallery

data/app/mailers/ish_manager/office_mailer.rb

@@ -1,6 +1,6 @@
 
 class IshManager::OfficeMailer < IshManager::ApplicationMailer
-  default from: 'WasyaCo Consulting & Software Development <no-reply@mail.wasyaco.com>'
+  default from: 'WasyaCo Mailer <no-reply@wco.com.de>'
 
   ## 2023-04-02 _vp_ Continue.
   def send_context_email ctx_id
@@ -13,25 +13,30 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
       'utm_source'   => @ctx.tmpl.slug,
     }.map { |k, v| "#{k}=#{v}" }.join("&")
 
-    ac   = ActionController::Base.new
-    ac.instance_variable_set( :@ctx, @ctx )
-    ac.instance_variable_set( :@lead, @ctx.lead )
-    ac.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
+    @domain         = Rails.application.config.action_mailer.default_url_options[:host]
+    @origin         = "https://#{Rails.application.config.action_mailer.default_url_options[:host]}"
+
+    renderer = ActionController::Base.new
+    renderer.instance_variable_set( :@ctx,              @ctx )
+    renderer.instance_variable_set( :@lead,             @ctx.lead )
+    renderer.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
+
+    eval( @ctx.tmpl.config_exe )
 
     if 'plain' == @ctx.tmpl.layout
       rendered_str = ERB.new( @ctx.body ).result( @ctx.get_binding )
     else
-      rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
+      rendered_str = renderer.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
     end
     @ctx.update({
       rendered_str: rendered_str,
       sent_at: Time.now.to_s,
     })
 
-    mail( from: @ctx.from_email,
-          to: @ctx.to_email,
+    mail( from:    @ctx.from_email,
+          to:      @ctx.to_email,
           subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
-          body: rendered_str,
+          body:    rendered_str,
           content_type: "text/html" )
   end
 

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

@@ -3,6 +3,8 @@
 .application--main-header-admin.main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
   %i.fa.fa-compress.collapse-expand#collapseHeaderMain
     Piousbox Suite
+    = link_to '[Current Issue]', '/'
+    = link_to '[Dashboard]', '/manager'
   .container
 
     %i.fa.fa-compress.collapse-expand#collapseHeaderPiCMS
@@ -64,8 +66,6 @@
             = form_tag leadsets_path, method: :get do
               = text_field_tag :q
           = link_to '[+]', new_leadset_path
-
-
         %li
           = link_to "EActions (#{Office::EmailAction.count})", email_actions_path
           = link_to '[+]', new_email_action_path
@@ -91,8 +91,11 @@
           = link_to '[+]', new_scheduled_email_action_path
 
       %ul
-        %li  
-        %li  
+        %li
+          = link_to 'Lead Actions', lead_actions_path
+        %li
+          = link_to 'Lead Action Templatess', lead_action_templates_path
+          -# = link_to '[+]', new_lead_action_template_path
         %li
           = link_to "Campaigns (#{Ish::EmailCampaign.count})", email_campaigns_path
           = link_to '[+]', new_email_campaign_path

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

@@ -1,8 +1,15 @@
 
-.application-home.max-width
-  %h5 Welcome home
+- yesterday  = (Time.now - 1.day    ).strftime('%Y-%m-%d')
+- month_ago  = (Time.now - 28.days  ).strftime('%Y-%m-%d')
+- month2_ago = (Time.now - 56.days  ).strftime('%Y-%m-%d')
+- month4_ago = (Time.now - 112.days ).strftime('%Y-%m-%d')
 
-  .a
+.application-home
+
+  .center
+    %h2 Welcome Home
+
+  .maxwidth.flex-row.justify-content-center
 
     .bordered-card
       = form_tag "https://www.cgtrader.com/free-3d-models", method: :get, target: :_blank do
@@ -23,11 +30,84 @@
         = text_field_tag "search"
         = submit_tag 'search'
 
+  .flex-row.valign-top.justify-content-center
+
+    .bordered-card
+      %h5.center Wasya Co KPI's
+      %ul
+        %li
+          = link_to 'Visits 1,2 mo', "https://analytics.wasya.co/index.php?module=CoreHome&action=index&idSite=2&period=day&date=yesterday#?period=range&date=#{month_ago},#{yesterday}&category=Dashboard_Dashboard&subcategory=1&comparePeriods%5B%5D=range&compareDates%5B%5D=#{month2_ago},#{month_ago}", target: :_blank
+        %li
+          = link_to 'Visits 2,4 mo', "https://analytics.wasya.co/index.php?module=CoreHome&action=index&idSite=2&period=day&date=yesterday#?period=range&date=#{month2_ago},#{yesterday}&category=Dashboard_Dashboard&subcategory=1&comparePeriods%5B%5D=range&compareDates%5B%5D=#{month4_ago},#{month2_ago}", target: :_blank
+        %li
+          = link_to 'Google Webmasters', 'https://search.google.com/search-console?utm_source=about-page&resource_id=https://wasya.co/'
+        %li
+          = link_to 'Bing Webmasters', 'https://www.bing.com/webmasters/home?siteUrl=https://wasya.co/'
+        %li
+          = link_to 'Persistent advertisement messages ', '#'
+          %br
+          (CL, maybe reddit?)
+        %li= link_to 'N Sitemap Pages', '#'
+        %li= link_to 'N Email Messages', '#'
+        %li= link_to 'N Email Filters', '#'
+        %li= link_to 'N Email Autoresponds', '#'
+        %li= link_to 'N Email templates', '#'
+        %li= link_to 'N Email campaigns', '#'
+
+        %hr
+
+        %li= link_to 'N mautic form responses', '#'
+
+        %hr
+
+        %li= link_to 'this month revenue', '#'
+        %li= link_to 'possible future revenue', '#'
 
     .bordered-card
-      %h5.center KPI's
+      %h5.center Piousbox KPI's
       %ul
-        %li= link_to 'WasyaCo Visits', '#'
+        %li
+          = link_to 'Visits', "https://analytics.wasya.co/index.php?module=CoreHome&action=index&idSite=3&period=day&date=yesterday#?period=day&date=yesterday&category=Dashboard_Dashboard&subcategory=1&idSite=3"
+        %li
+          = link_to 'Visits 2,4 mo', "https://analytics.wasya.co/index.php?module=CoreHome&action=index&idSite=3&period=day&date=yesterday#?period=range&date=#{month2_ago},#{yesterday}&category=Dashboard_Dashboard&subcategory=1&comparePeriods%5B%5D=range&compareDates%5B%5D=#{month4_ago},#{month2_ago}", target: :_blank
+        %li
+          = link_to 'Google Webmasters', 'https://search.google.com/search-console?resource_id=sc-domain%3Apiousbox.com'
+        %li
+          = link_to 'Bing Webmasters', 'https://www.bing.com/webmasters/home?siteUrl=https://piousbox.com'
+        %li= link_to 'N Sitemap Pages', '#'
+
+        %hr
+        %li= link_to 'Gym', '#'
+        %li
+          = link_to 'Aggressive Twice-a-day', '#'
+          = link_to '[~]', '#'
+
+
+    .bordered-card
+      %h5.center Infinite Shelter KPI's
+      %ul
+        %li
+          = link_to 'Visits', "https://analytics.wasya.co/index.php?module=CoreHome&action=index&idSite=5&period=day&date=yesterday#?period=day&date=yesterday&category=Dashboard_Dashboard&subcategory=1&idSite=3"
+        %li
+          = link_to 'Google Webmasters', 'https://search.google.com/search-console?resource_id=sc-domain%3Ainfiniteshelter.com'
+        %li
+          = link_to 'Bing Webmasters', 'https://www.bing.com/webmasters/home?siteUrl=https://infiniteshelter.com'
+        %li= link_to 'N contributed content', '#'
+
+    .bordered-card
+      %h5.center DemmiTV KPI's
+      %ul
+        %li
+          = link_to 'Visits', "https://analytics.wasya.co/index.php?module=CoreHome&action=index&idSite=5&period=day&date=yesterday#?period=day&date=yesterday&category=Dashboard_Dashboard&subcategory=1&idSite=3"
+        %li
+          = link_to 'Google Webmasters', 'https://search.google.com/search-console?resource_id=sc-domain%3Ainfiniteshelter.com'
+        %li
+          = link_to 'Bing Webmasters', 'https://www.bing.com/webmasters/home?siteUrl=https://infiniteshelter.com'
+        %li= link_to 'N Sitemap Pages', '#'
+
+        %li= link_to 'N contributed content', '#'
+
+  .maxwidth.flex-row.justify-content-center
 
     .bordered-card
       %h5.center KPI sent contexts

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

@@ -21,7 +21,7 @@
 
     .field
       = f.label "From"
-      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: campaign.from_email), {}, class: 'select2'
+      = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: campaign.from_email), {}, class: 'select2'
 
     .actions
       = f.submit 'Submit'

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

@@ -12,7 +12,7 @@
 
     .field
       = f.label "From"
-      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: ctx.from_email)
+      = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: ctx.from_email)
 
     .field.flex-row
       = f.label "To lead"

data/app/views/ish_manager/email_templates/_footer_unsubscribe.html.erb

@@ -0,0 +1,26 @@
+<table align="left" border="0" cellpadding="0" cellspacing="0"
+  style="max-width:100%; min-width:100%;" width="100%"
+  class="mcnTextContentContainer">
+  <tbody>
+    <tr>
+
+      <td valign="top" class="mcnTextContent"
+        style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
+
+        <em>Copyright © Wasya Co</em><br><br>
+
+        <strong>Our mailing address is:</strong><br>
+
+        201 W 5th St 11th Floor, Austin, TX 78701<br><br>
+
+        Want to change how you receive these emails?<br>
+
+        You can <%= link_to 'update your preferences', @update_preferences_url %> or
+
+        <%= link_to 'unsubscribe from this list', @unsubscribe_url %>.<br><br>
+
+      </td>
+
+    </tr>
+  </tbody>
+</table>

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

@@ -15,13 +15,16 @@
       .col-md-4
         .field
           = f.label "From"
-          = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
+          = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: email_template.from_email)
     .field.field-subject
       = f.label :subject
       = f.text_field :subject
     .field
       = f.label :preview_str
       = f.text_field :preview_str
+    .field
+      = f.label :can_unsubscribe
+      = f.check_box :can_unsubscribe
 
 
     .tab-labels
@@ -36,6 +39,13 @@
           -# .descr= render "ish_manager/email_templates/#{email_template.layout}", ctx: Ish::EmailContext.new, tmpl: email_template
           %iframe{ src: email_template_iframe_path(email_template), width: '100%', height: '100%' }
 
+    .field
+      = f.label :config_json
+      = f.text_area :config_json
+
+    .field
+      = f.label :config_exe
+      = f.text_area :config_exe
 
     .actions
       = f.submit 'Save'

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

@@ -3,6 +3,7 @@
 
   %h3.center.collapse-expand#emailTemplatesIndex
     Email Templates (#{Ish::EmailTemplate.all.count})
+    = link_to '[+]', new_email_template_path
 
   = paginate @templates, :param_name => :templates_page, :views_prefix => 'ish_manager'
   .email-templates-index.max-width

data/app/views/ish_manager/email_templates/_m20221201react.html.erb

@@ -840,7 +840,7 @@
                                     <td align="center" valign="middle" class="mcnButtonContent"
                                       style="font-family: Helvetica; font-size: 18px; padding: 18px;">
                                       <a class="mcnButton " title="Wasya Co Project Intake for ReactJs Development"
-                                        href="https://wasya.co/contact-us-2/" target="_blank"
+                                        href="https://wasyaco.com/contact-us-2/" target="_blank"
                                         style="font-weight: bold;letter-spacing: -0.5px;line-height: 100%;text-align: center;text-decoration: none;color: #FFFFFF;"
                                       >Tell us About your Project!</a>
                                     </td>
@@ -1040,7 +1040,7 @@
                                                       style="font-family: Helvetica; font-size: 18px;">
                                                       <a class="mcnButton "
                                                         title="Wasya Co Project Intake for ReactJs Development"
-                                                        href="https://wasya.co/our-work/" target="_blank"
+                                                        href="https://wasyaco.com/our-work/" target="_blank"
                                                         style="padding: 18px; font-weight: bold;letter-spacing: -0.5px;line-height: 100%;text-align: center;text-decoration: none;color: #FFFFFF;"
                                                       >See Our Successful <br />ReactJs Deliveries</a>
                                                     </td>