ish_manager 0.1.8.497 → 0.1.8.499

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc91f9b554ed9df6ac0f58a31e304f1724621e5a67f2e3e5215dd7ea30df711
-  data.tar.gz: 0725043735f539fab19f79235727127af569245611e84cc2c6747a24fc51ec93
+  metadata.gz: 4c8f159ec2732b781f592e2fc7ba5af7a641abd6167a148bf3b7a64c99fdc5fb
+  data.tar.gz: 71273db7ddcea1fe38a5e497112c5a8c63366e9ba039fa48388ac293a69e1ee1
 SHA512:
-  metadata.gz: 2f548df9bc7bb60a6a5a840e94c0e09f12eab494828c4125e3b9a57eec47c6c38be959aa5f69ec1625278254cd808c3c55d3d73edb1e103a52919b52583bf7c5
-  data.tar.gz: 76e9ba931280138047f57289577c31ee19b11ad4cd874af6f52d073f68ee03adf7f7d6a286687d48c4570eb6af831c8abe06aa4d46d53ea755f47677014210d6
+  metadata.gz: 4bc1fed6a98ffb9f8e8dd76937e9055c73112d75cae9d109d3eefaf04c6503a3b39c8ca45a4787586571f041f3dd45203d31cd92e372aab107d6196f83ad158a
+  data.tar.gz: 4f2b8af32eed52b4c19e36017b01d88ba39c3d3a50b368532daf7cc03ad28a3d832dff68100563b4a39b1875e7f94d2de51e05b15e38c4f1b6aa4855811f59bb

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

@@ -1,4 +1,6 @@
 
+-# = ctx.inspect
+
 .email-contexts--form
   - url = ctx.new_record? ? email_contexts_path : email_context_path(ctx)
   = form_for ctx, as: :ctx, url: url do |f|
@@ -11,16 +13,25 @@
         layout: #{ctx.tmpl.layout}
 
     .field.flex-row
-      = f.label "From"
+      %label From
       = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: ctx.from_email), {}, { class: 'select2' }
 
     .field.flex-row
-      = f.label "To lead"
+      %label To lead
       = f.select :lead_id, options_for_select( @leads_list, selected: ctx.lead_id ), {}, { class: 'select2' }
 
+    .field.flex-row
+      %label cc
+      = f.text_field :cc, class: 'w-100'
+
+    -## unused b/c ccs is an array, i'm dealing with strings only here.
+    -# .field.flex-row
+    -#   %label cc's
+    -#   = f.text_field :ccs
+
     .field.field-subject
       = f.label :subject
-      = f.text_field :subject
+      = f.text_field :subject, class: 'w-100'
 
 
 
@@ -30,7 +41,7 @@
       .label-save-preview= f.submit 'Save & Preview'
     .tabs
       .tab-raw
-        = f.text_area :body
+        = f.text_area :body, class: 'tinymce'
       .tab-preview
         - if ctx.new_record?
           New record...

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

@@ -7,11 +7,19 @@
         - @email_messages.each do |msg|
           - lead = msg.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
 
+          - if msg.to
+            - new_from_email = Ish::EmailTemplate::FROM_EMAILS.select { |p| p.include?( msg.to ) }
+          - if new_from_email.blank?
+            - new_from_email = Ish::EmailTemplate::DEFAULT_FROM_EMAIL
+
+          - all_ccs = (msg.tos||[]) + (msg.ccs||[]) + (msg.froms||[])
+
           .item.msg-container{ data: { msg: { id: msg.id } } }
             .gray.row
               .col-md-6
                 .a <b>From:</b> #{lead.email}
-                .a <b>To:</b> #{msg.to}
+                .a <b>to's:</b> #{msg.tos&.join(", ")}
+                .a <b>cc's:</b> #{msg.ccs&.join(", ")}
               .col-md-6
                 .a <b>msg.id:</b> #{msg.id}
                 .a <b>object_key:</b> #{msg.object_key}
@@ -40,9 +48,18 @@
                 %iframe{ name: msg.message_id }
 
                 = render 'ish_manager/email_contexts/form_reply', lead: lead
+
                 .collapse-expand.wco-collapse Reply
                 .bordered.mt-3.wco-collapsed
-                  = render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank_template, from_email: msg.to, subject: msg.subject, body: (msg.part_html||msg.part_txt) }), lead: lead
+                  - new_ctx = Ctx.new({ email_template: Tmpl.blank_template })
+                  - new_ctx[:lead_id] = lead.id
+                  - new_ctx[:from_email] = new_from_email
+                  - new_ctx[:subject] = msg.subject
+                  - new_ctx[:body] = Ish::EmailTemplate::SIGNATURE + (msg.part_html||msg.part_txt||'')
+                  - new_ctx[:cc] = all_ccs.join(', ')
+                  = render 'ish_manager/email_contexts/form', ctx: new_ctx
+
+
                 -# = button_to 'Reply'
                 -# = button_to 'Reply All'
                 -# = button_to 'New Template'
@@ -80,3 +97,9 @@
             .relative.inline-block
               %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
               .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
+
+      .actions.email-conversation-actions
+        = form_tag Ishapi::Engine.routes.url_helpers.email_conversations_path, method: :delete do
+          = hidden_field_tag :jwt_token, @jwt_token
+          = hidden_field_tag 'ids[]', @email_conversation.id
+          = submit_tag 'Delete', data: { confirm: 'Are you sure?' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.497
+  version: 0.1.8.499
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-29 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails