ish_manager 0.1.8.485 → 0.1.8.487

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02678fe84b00fba305b44750200135609fd9a241f201559c5cebf9b1883882e0'
-  data.tar.gz: '0584dbda773a9d2767f6f8c444bf23874c1a9d26cfe6f5d0ffdc4c92568c05eb'
+  metadata.gz: 33e51b9b4ac4f6e3ec605e6668b6b2688a840a7bca1672ae916a127e8392415d
+  data.tar.gz: 01e58fe707cc02dc8addb155cd08390653a09b159c5ca035adef3ed238e430f4
 SHA512:
-  metadata.gz: a46b672da3150b86baa338ccbfc90847b8cf9a277386bddc0ac3d379ce2f90ccf76d002ef56f2ce5f6c1afb6513b69f4bf6bb161b7955e44d3d1c2ceed2e9aa9
-  data.tar.gz: 34940ee437929577ef05d699a8ea1705a379ff4d500695591924439498cc2610068f72e9c838b6185ec71b026cc572841f2e359292ced736d5ebf65aa0d8c261
+  metadata.gz: 3244e5262927a77611abe82f489a93e9f3179e5fe1ac4d93b65d944530f4785206de0a61e0d0214345905a34f767a9919bfec9b391411bed67ecc74b309d2713
+  data.tar.gz: 6701257ddbf4376754f7a33fc26a6f32663c684475e85e234a8acdd9861d7a4da6e9df7398e04c041b1bcf7445fbce6f84e6cbe6b19ab36dabad7390fc958f82

data/app/controllers/ish_manager/lead_action_templates_controller.rb

@@ -1,6 +1,7 @@
 
 class IshManager::LeadActionTemplatesController < IshManager::ApplicationController
 
+
   def create
     authorize! :create, Office::LeadActionTemplate
     @tmpl = ::Office::LeadActionTemplate.new params[:tmpl].permit!
@@ -23,5 +24,10 @@ class IshManager::LeadActionTemplatesController < IshManager::ApplicationControl
     @new_lat = ::Office::LeadActionTemplate.new
   end
 
+  def new
+    authorize! :new, Office::LeadActionTemplate
+    @tmpl = ::Office::LeadActionTemplate.new
+  end
+
 end
 

data/app/controllers/ish_manager/lead_actions_controller.rb

@@ -1,8 +1,16 @@
 
 class IshManager::LeadActionsController < IshManager::ApplicationController
 
+  def edit
+    @lead_action = Office::LeadAction.find params[:id]
+    @olats_list = OLAT.list
+    @leads_list = Lead.list
+    authorize! :edit, @lead_action
+  end
+
   def index
     authorize! :index, Office::LeadAction
+    @lead_action_templates = Office::LeadActionTemplate.all
     @lead_actions = Office::LeadAction.all
   end
 

data/app/controllers/ish_manager/unsubscribes_controller.rb

@@ -0,0 +1,13 @@
+
+class ::IshManager::UnsubscribesController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, Ish::EmailUnsubscribe
+    @unsubscribes = Ish::EmailUnsubscribe.all
+    lead_ids = @unsubscribes.map(&:lead_id).compact
+    @leads_h = Lead.find_to_h( lead_ids )
+    puts! @leads_h, 'ddz'
+  end
+
+end
+

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

@@ -92,23 +92,19 @@
 
       %ul
         %li
+          = link_to 'OLATs', lead_action_templates_path
+          = link_to '[+]', new_lead_action_template_path
           = 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.all.length})", email_campaigns_path
           = link_to '[+]', new_email_campaign_path
         %li
           = link_to "OActions (#{Office::Action.all.length})", office_actions_path
           = link_to '[+]', new_office_action_path
-
-      %ul
         %li
-          = link_to 'Products & Prices', products_path
-        %li
-          = link_to 'Subscriptions', subscriptions_path
-          = link_to '[+]', new_wco_subscription_path
+          = link_to 'Unsubs', unsubscribes_path
 
     .c
 
@@ -122,6 +118,14 @@
           = link_to 'Appliance\'s', appliances_path
         %li
           = link_to 'Serverhost\'s', serverhosts_path
+      %ul
+        %li
+          = link_to 'Products & Prices', products_path
+        %li
+          = link_to 'Subscriptions', subscriptions_path
+          = link_to '[+]', new_wco_subscription_path
+
+
     .c
 
 

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

@@ -45,7 +45,6 @@
         %th From emails
         %th Subject
         %th Datetime
-        %th Tags
 
     - @email_conversations.each do |conv|
       %tr{ class: [ conv.state ] }
@@ -66,12 +65,6 @@
               .date= pp_date conv.latest_at
               .time= pp_time conv.latest_at
 
-          %td
-            .tags
-              <tags>
-              -# - conv.tags.each do |tag|
-              -#   .chip
-              -#     = tag.name
 
   %br
   = render 'paginate',  resource: @email_conversations, param_name: :conv_page, views_prefix: :ish_manager

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

@@ -0,0 +1,12 @@
+
+<table cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td align="center">
+      <br />
+      <img
+        src="https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/09/29185755/259x66-WasyaCo-Logo-YellowShadow.png"
+        alt="Wasya Co [logo]" />
+    </td>
+  </tr>
+</table>
+<br /><br />

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

@@ -45,11 +45,6 @@
 			text-decoration: underline;
 		}
 
-
-
-
-
-
     p {
       margin: 10px 0;
       padding: 0;
@@ -827,6 +822,9 @@
                 <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer">
                   <tr>
                     <td valign="top" class="bodyContainer">
+
+                      <%= render 'ish_manager/email_templates/header_logo' %>
+
                       <table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnTextBlock"
                         style="min-width:100%;">
                         <tbody class="mcnTextBlockOuter">
@@ -1096,7 +1094,7 @@
                                     <td valign="top" class="mcnTextContent"
                                       style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-                                      <p style="font-size:18px !important;">Thank you! Your response will help us improve the way we provide value to our customers!</p>
+                                      <p style="font-size:18px !important;">Thank you! Your response will help us improve the way we provide value to our customers.</p>
 
                                     </td>
                                   </tr>

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

@@ -853,18 +853,7 @@
 															<td align="right" valign="top" class="mcnTextContent"
 																style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-																<table cellpadding="0" cellspacing="0" width="100%">
-																	<tr>
-																		<td align="center">
-																			<br />
-																			<img
-																				src="https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/09/29185755/259x66-WasyaCo-Logo-YellowShadow.png"
-																				alt="Wasya Co [logo]" />
-																		</td>
-																	</tr>
-																</table>
-																<br /><br />
-
+																<%= render 'ish_manager/email_templates/header_logo' %>
 
 																<!-- 2023-09-23 BEGIN -->
 																<table border="0" cellpadding="0" cellspacing="0" width="100%"

data/app/views/ish_manager/lead_action_templates/_list.haml

@@ -0,0 +1,12 @@
+
+.lead-action-templates--list
+  .flex-row
+    - @lead_action_templates.each do |lat|
+      .card
+        .flex-row
+          = link_to '[~]', edit_lead_action_template_path( lat )
+          = lat.slug
+        %ul
+          -# - %w| slug kind |
+          - %w| config_json action_exe |.each do |k|
+            %li <b>#{k}:</b> #{lat[k]}

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

@@ -2,10 +2,7 @@
 .lead-action-templates-index.maxwidth
   %h5 Lead Action Templates
 
-  %ul
-    - @tmpls.each do |tmpl|
-      %li
-        = link_to "[~ #{tmpl.slug}]", edit_lead_action_template_path( tmpl )
+  = render 'ish_manager/lead_action_templates/list'
 
   %hr
   = render 'form', tmpl: @new_lat

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

@@ -0,0 +1,5 @@
+
+.lead-action-templates-edit.maxwidth
+  %h5 New Lead Action Template
+
+  = render 'form', tmpl: @tmpl

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

@@ -0,0 +1,19 @@
+
+- url = lead_action.new_record? ? lead_actions_path : lead_action_path( lead_action )
+.lead-actions--form
+  = form_for lead_action, url: url, as: :lead_action do |f|
+
+    .field
+      %label tmpl
+      = f.select :lead_action_template, options_for_select( @olats_list, selected: lead_action.tmpl_id ), {}, class: :select2
+
+    .field
+      %label lead
+      = f.select :lead_id, options_for_select( @leads_list, selected: lead_action.lead_id ), {}, class: :select2
+
+    .field
+      %label params
+      = f.text_area :params, class: 'large', value: JSON.pretty_generate( JSON.parse( lead_action.params ))
+
+    .actions
+      = f.submit 'Submit'

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

@@ -0,0 +1,5 @@
+
+.lead-actions-edit.maxwidth
+  %h5 Edit Lead Action
+
+  = render 'form', lead_action: @lead_action

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

@@ -1,12 +1,29 @@
 
 .lead-actions-index.maxwidth
-  %h5 Lead Actions
+
+  %h5.collapse-expand#lats
+    Lead Action Templates
+    = link_to '[+]', new_lead_action_template_path
+
+  = render 'ish_manager/lead_action_templates/list'
+
+  %hr
+
+  %h5.collapse-expand#las
+    Lead Actions
+    = link_to '[+]', new_lead_action_path
 
   %ul
     - @lead_actions.each do |la|
       %li
+        = link_to '[~]', edit_lead_action_path( la )
         %ul
-          - JSON.parse( la.params ).each do |k, v|
-            %li
-              = k
-              = v
+          - %w| tmpl lead |.each do |k|
+            %li <b>#{k}:</b> #{la.send( k )}
+          %li
+            <b>params:</b>
+            %ul
+              - JSON.parse( la.params ).each do |k, v|
+                %li
+                  = k
+                  = v

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

@@ -0,0 +1,20 @@
+
+.unsubscribes-index.maxwidth
+  %h5 Unsubscribes
+
+  %table.bordered.data-table
+    %thead
+      %tr
+        %td Lead
+        %td Date
+        %td campaign_id
+        %td template_id
+
+
+    - @unsubscribes.each do |i|
+      %tr
+        %td= @leads_h[i.lead_id]
+        %td= i.unsubscribed_at
+        %td= i.campaign
+        %td= i.template
+

data/config/routes.rb

@@ -150,6 +150,11 @@ IshManager::Engine.routes.draw do
   get 'subscriptions/new_wco',    to: 'subscriptions#new_wco',    as: :new_wco_subscription
   resources :subscriptions
 
+  ##
+  ## U
+  ##
+  resources :unsubscribes
+
   resources :user_profiles do
     resources :newsitems
   end
@@ -157,6 +162,9 @@ IshManager::Engine.routes.draw do
     # resources :newsitems
   end
 
+  ##
+  ## V
+  ##
   resources :videos
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.485
+  version: 0.1.8.487
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -521,6 +521,7 @@ files:
 - app/controllers/ish_manager/scheduled_email_actions_controller.rb
 - app/controllers/ish_manager/serverhosts_controller.rb
 - app/controllers/ish_manager/subscriptions_controller.rb
+- app/controllers/ish_manager/unsubscribes_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/videos_controller.rb
 - app/helpers/ish_manager/application_helper.rb
@@ -638,6 +639,7 @@ files:
 - app/views/ish_manager/email_templates/_form_mini.haml
 - app/views/ish_manager/email_templates/_form_reply_mini.haml
 - app/views/ish_manager/email_templates/_form_schedule_mini.haml
+- app/views/ish_manager/email_templates/_header_logo.html.erb
 - app/views/ish_manager/email_templates/_index.haml
 - app/views/ish_manager/email_templates/_m20221201react.html.erb
 - app/views/ish_manager/email_templates/_m20221222merryxmas.html.erb
@@ -753,8 +755,12 @@ files:
 - app/views/ish_manager/kaminari/_paginator.html.erb
 - app/views/ish_manager/kaminari/_prev_page.html.erb
 - app/views/ish_manager/lead_action_templates/_form.haml
+- app/views/ish_manager/lead_action_templates/_list.haml
 - app/views/ish_manager/lead_action_templates/edit.haml
 - app/views/ish_manager/lead_action_templates/index.haml
+- app/views/ish_manager/lead_action_templates/new.haml
+- app/views/ish_manager/lead_actions/_form.haml
+- app/views/ish_manager/lead_actions/edit.haml
 - app/views/ish_manager/lead_actions/index.haml
 - app/views/ish_manager/leads/_form.haml
 - app/views/ish_manager/leads/_form_import.haml
@@ -848,6 +854,7 @@ files:
 - app/views/ish_manager/trash/email_campaigns-trash/edit.haml
 - app/views/ish_manager/trash/email_campaigns-trash/index.haml
 - app/views/ish_manager/trash/email_campaigns-trash/new.haml
+- app/views/ish_manager/unsubscribes/index.haml
 - app/views/ish_manager/user_profiles/_form.haml
 - app/views/ish_manager/user_profiles/_show.haml
 - app/views/ish_manager/user_profiles/edit.haml