ish_manager 0.1.8.414 → 0.1.8.416

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ad6332705588cd6755bfb1bc2523291c5fa58240f548f7b7d0596123b280918
-  data.tar.gz: 4fdb537240ff5f95220dc2337f8e2dd49bf3d2cdc05b8ffee7eada2e660d53d6
+  metadata.gz: dc54a836a0fb0b1a3c99d313011c26d16e22ba75b6c631b82eec0dcd2854ac7c
+  data.tar.gz: aa7e5a284ebb5646eb2288e4e1e9009b4409ed22b08e09895a3a8b1aaec5f78a
 SHA512:
-  metadata.gz: feadba78e9e42914933a39332d4f8bdb377c1b75e1d5b61e72511c03f99617b4f8e9b0c396c0e181edf5e3ed4e4a8c72d95bb7034e206a3d8714cb8677ea5102
-  data.tar.gz: 2b6cbd12bfbdd15717f0400a4ed97e58960ae10668a376a95b95a598f39a64a532296e84a4ce44db4719f3627e2296e0771a9a55985de35165da12ecd0c9b33f
+  metadata.gz: 75e169cb64cb20dec6c015c9c8e9c9057cecb7a62549ae25ca6144a90259fcc0c98c99391350b85d25973403eb61ca679305e2fd4195dd905fda28a5e4a5fee9
+  data.tar.gz: 15badb0af441666f1b14c3d874e4c9b7dd6e31a7d8a540f8a5f2915fea7f6c041fee9c47f74c0384458a362b04f96c46bee2f67311d5dbb26b8561da34361d28

data/app/assets/javascripts/ish_manager/iro.js

@@ -7,18 +7,22 @@ $(document).ready(function () {
 
 
   $(".gameuiW").each( function (idx, w) {
+    // logg($(w).data(), 'data')
+
+    let ans
 
     let ccStrike = $(w).data('ccStrike')
     let ccStartPrice = $(w).data('ccStartprice') // e.g. 0.88
     let ccCurrentPrice = $(w).data('ccCurrentprice')
-    let cUS = $(w).data('cus')
+    let cUS = $(w).data('ccCus')
 
     $(".c-u-s").each(function (idx, elem) {
       $(elem).html(cUS)
     })
 
     $(".windW").each(function (idx, elem) {
-      $(elem).css('left', (origin - cUS)*scale)
+      ans = ( origin - cUS ) * scale
+      $(elem).css('left', ans)
     })
 
     $($(w).find('.elephantW')).css('left', (origin - ccStrike)* scale )
@@ -28,24 +32,37 @@ $(document).ready(function () {
     $(w).find('.riderStart').css('left', -1 * scale * ccStartPrice )
     $(w).find('.riderStart2').css('width', scale * ccStartPrice )
 
-    let currentAmount = ((ccStartPrice - ccCurrentPrice)*100).toPrecision(1)/100
+    let currentAmount = ((ccStartPrice - ccCurrentPrice)*100).toPrecision(2)/100
     let ccCurrentGain = ccStartPrice - ccCurrentPrice
-    // logg(ccCurrentGain, 'ccCurrentGain')
-    // logg(currentAmount, 'currentAmount')
     $(w).find('.riderCurrent > .amount').html( " $" + currentAmount )
-    let ans = `${-1*ccCurrentGain*scale}px`
-    logg(ans, 'ans')
+    ans = `${-1*ccCurrentGain*scale}px`
     $(w).find('.riderW').css('left', ans)
 
     if (ccCurrentGain > 0) {
       $(w).find('.riderCurrent').css('width', scale * ccCurrentGain )
     } else {
-      ccCurrentGain = -1 * ccCurrentGain
-      $(w).find('.riderCurrent').css('width', scale * ccCurrentGain )
-      $(w).find('.riderCurrent').css('background', 'red')
-      $(w).find('.riderCurrent').css('right', `-${ccCurrentGain*scale}px`)
+      $(w).find('.riderCurrent').css('display', 'none')
+      $(w).find('.riderCurrent2').css('display', 'block')
+      $(w).find('.riderCurrent2').css('width', -1 * scale * ccCurrentGain )
       $(w).find('.rider').addClass('riderF')
     }
   })
 
+
+
+  $(".gameuiW.next-position").each( function (idx, w) {
+    logg($(w).data(), 'next-position')
+
+    let ans
+
+    let gainp = $(w).data('ccGainp')
+    if (gainp > 0) {
+      $(w).find('.elephant').css('border-width', `${gainp*200 + 1}px` )
+      $(w).find('.elephantLoss').css('display', 'none')
+    } else {
+      gainp = -1 * gainp
+      $(w).find('.elephantLoss').css('border-width', `${gainp*200 + 1}px` )
+    }
+  })
+
 })

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

@@ -122,6 +122,7 @@
 
 /*
  * GameUI in Purse
+ * 2023-04-06 _vp_ Continue
 **/
 .gameuiW {
   border: 1px solid #ff9966;
@@ -146,8 +147,8 @@
     left: 50%;
     width: 600px;
 
-    .gameuiC {
-      // border: 2px solid red;
+    .gameuiC { /* 1/2 of the ground */
+      // border: 2px solid #ff9900;
 
       background-color: brown;
 
@@ -181,6 +182,7 @@
     .elephantW {
       border: 2px solid black;
       position: absolute;
+      bottom: 0;
       // left: ?? ; /* data: cc strike */
     }
 
@@ -214,9 +216,6 @@
       .elephantC {
         // border: 10px solid black;
 
-        // width: 10px;
-        // height: 10px;
-
         z-index: 1;
         position: absolute;
         color: #333;
@@ -235,23 +234,8 @@
           top: -25px;
         }
       }
-
-
     }
 
-    .elephantNext {
-      // border: 5px solid white;
-      border-radius: 50%;
-
-      display: none;
-
-      position: absolute;
-      bottom: -50px;
-      margin-left: 50px;
-      transform: scale(1.2);
-      opacity: 0.33;
-      background-color: green;
-    }
 
     .groundedW {
       position: absolute;
@@ -294,15 +278,21 @@
     }
 
     .riderCurrent {
-      display: none;
-
-      position: absolute;
       background: #339933;
-      bottom: -7px;
-      height: 5px;
-      right: 0;
-      // width: 105px;
+      left: 0;
+    }
 
+    .riderCurrent,
+    .riderCurrent2,
+    ._ {
+      position: absolute;
+      bottom: 7px;
+      top: -7px;
+    }
+    .riderCurrent2 {
+      display: none;
+      lefts: 0;
+      background: #993333;
     }
     .riderStart {
       // border: 2px solid #cc33ff;
@@ -387,7 +377,7 @@
       border: 2px solid blue;
 
       position: absolute;
-      left: 232px; /* Data: current underlying strike */
+      // left: 232px; /* Data: current underlying strike */
       bottom: 0;
 
 
@@ -439,3 +429,32 @@
     }
   }
 }
+.next-position {
+  .elephant {
+    border: 1px solid white; /* 4.5% more */
+    border-radius: 50% 50% 0 0;
+    // background-size: 120%;
+
+    background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04103931/200x125-elephant-1rmTiny.png');
+    width: 200px;
+    height: 125px;
+
+    padding-left: 100px;
+
+    position: absolute;
+    left: -100px;
+    bottom: 0;
+
+    z-index: 1;
+  }
+  .elephantLoss {
+    border: 1px solid red;
+    border-radius: 50% 50% 0 0;
+    width: 200px;
+    height: 125px;
+
+    position: absolute;
+    left: 0;
+    bottom: 0;
+  }
+}

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -33,8 +33,26 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
   def iframe_src
     @tmpl = @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
       Ish::EmailTemplate.find_by({ slug: params[:id] })
-    @ctx = Ctx.new({ email_template: @tmpl })
     authorize! :iframe_src, @email_template
+
+    @ctx = Ctx.new({ email_template: @tmpl, lead_id: 999 })
+
+    @utm_tracking_str = {
+      # 'v'   => 1,
+      # 'tid' => 'UA-53077236-2',
+      'cid' => @ctx.lead_id,
+      # 'uid' => @ctx.lead_id,
+      # 't'   => 'event',
+      # 'ec'  => 'email',
+      # 'ea'  => 'open',
+      # 'cn'  => @campaign.slug,
+      # 'ci'  => @campaign.slug,
+      # 'cm'  => 'email',
+      # 'utm_source'   => @campaign.slug,
+      'utm_medium'   => 'email',
+      'utm_campaign' => 'campaign-1', # @campaign.slug,
+    }.map { |k, v| "#{k}=#{v}" }.join("&")
+
     render layout: false
   end
 

data/app/controllers/ish_manager/iro_positions_controller.rb

@@ -28,6 +28,15 @@ class ::IshManager::IroPositionsController < IshManager::ApplicationController
     authorize! :new, @position
   end
 
+  ## prepare to roll
+  def roll
+    @position = Iro::Position.find( params[:id] )
+    # puts! @position, 'zze'
+
+    authorize! :roll, @position
+    @next_positions = Iro::Position.find( 13, 14, 15, 16 )
+  end
+
   def update
     @position = Iro::Position.find params[:id]
     authorize! :update, @position

data/app/controllers/ish_manager/iro_purses_controller.rb

@@ -34,9 +34,11 @@ class ::IshManager::IroPursesController < IshManager::ApplicationController
 
     @strategies = @purse.strategies
 
+
     underlyings = Tda::Stock.get_quotes( @strategies.map(&:ticker).compact.uniq.join(",") )
-    # json_puts! underlyings, 'out'
+    json_puts! underlyings, 'out'
     underlyings.each do |ticker, v|
+      puts! v[:mark], 'ze mark'
       Iro::CoveredCallStrategy.where( ticker: ticker ).update( current_underlying_strike: v[:mark] )
     end
 

data/app/controllers/ish_manager/iro_strategies_controller.rb

@@ -31,7 +31,7 @@ class ::IshManager::IroStrategiesController < IshManager::ApplicationController
     flag = @strategy.update params[:iro_strategy].permit!
     if flag
       flash[:notice] = 'Success.'
-      redirect_to my_purse_path
+      redirect_to controller: 'ish_manager/iro_purses', action: :show, id: @strategy.iro_purse_id
     else
       flash[:alert] = "No luck: #{@strategy.errors.full_messages.join(', ')}."
       render action: 'new'

data/app/mailers/ish_manager/office_mailer.rb

@@ -57,8 +57,16 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
   ## 2023-04-02 _vp_ Continue.
   def send_context_email ctx_id
     @ctx = Ctx.find ctx_id
+
+    @utm_tracking_str = {
+      'cid'          => @ctx.lead_id,
+      'utm_medium'   => 'email',
+      'utm_campaign' => @ctx.tmpl.slug,
+    }.map { |k, v| "#{k}=#{v}" }.join("&")
+
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@ctx, @ctx )
+    ac.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
 
     rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
     @ctx.update({

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

@@ -9,9 +9,9 @@
           = f.label :slug
           = f.text_field :slug
       .col-md-4
-        .field
+        .flex-row
           = f.label :layout
-          = f.select :layout, options_for_select(Ish::EmailTemplate::LAYOUTS, selected: email_template.layout)
+          = f.select :layout, options_for_select(Ish::EmailTemplate::LAYOUTS, selected: email_template.layout), {}, class: 'select2'
       .col-md-4
         .field
           = f.label "From"

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

@@ -0,0 +1,749 @@
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+    <head>
+        <!--[if gte mso 15]>
+        <xml>
+            <o:OfficeDocumentSettings>
+            <o:AllowPNG/>
+            <o:PixelsPerInch>96</o:PixelsPerInch>
+            </o:OfficeDocumentSettings>
+        </xml>
+        <![endif]-->
+        <meta charset="UTF-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title><%= @ctx.subject -%></title>
+
+    <style type="text/css">
+		p{
+			margin:10px 0;
+			padding:0;
+		}
+		table{
+			border-collapse:collapse;
+		}
+		h1,h2,h3,h4,h5,h6{
+			display:block;
+			margin:0;
+			padding:0;
+		}
+		img,a img{
+			border:0;
+			height:auto;
+			outline:none;
+			text-decoration:none;
+		}
+		body,#bodyTable,#bodyCell{
+			height:100%;
+			margin:0;
+			padding:0;
+			width:100%;
+		}
+		.mcnPreviewText{
+			display:none !important;
+		}
+		#outlook a{
+			padding:0;
+		}
+		img{
+			-ms-interpolation-mode:bicubic;
+		}
+		table{
+			mso-table-lspace:0pt;
+			mso-table-rspace:0pt;
+		}
+		.ReadMsgBody{
+			width:100%;
+		}
+		.ExternalClass{
+			width:100%;
+		}
+		p,a,li,td,blockquote{
+			mso-line-height-rule:exactly;
+		}
+		a[href^=tel],a[href^=sms]{
+			color:inherit;
+			cursor:default;
+			text-decoration:none;
+		}
+		p,a,li,td,body,table,blockquote{
+			-ms-text-size-adjust:100%;
+			-webkit-text-size-adjust:100%;
+		}
+		.ExternalClass,.ExternalClass p,.ExternalClass td,.ExternalClass div,.ExternalClass span,.ExternalClass font{
+			line-height:100%;
+		}
+		a[x-apple-data-detectors]{
+			color:inherit !important;
+			text-decoration:none !important;
+			font-size:inherit !important;
+			font-family:inherit !important;
+			font-weight:inherit !important;
+			line-height:inherit !important;
+		}
+		#bodyCell{
+			padding:10px;
+		}
+		.templateContainer{
+			max-width:600px !important;
+		}
+		a.mcnButton{
+			display:block;
+		}
+		.mcnImage,.mcnRetinaImage{
+			vertical-align:bottom;
+		}
+		.mcnTextContent{
+			word-break:break-word;
+		}
+		.mcnTextContent img{
+			height:auto !important;
+		}
+		.mcnDividerBlock{
+			table-layout:fixed !important;
+		}
+	/*
+	@tab Page
+	@section Background Style
+	@tip Set the background color and top border for your email. You may want to choose colors that match your company's branding.
+	*/
+		body,#bodyTable{
+			/*@editable*/background-color:#FAFAFA;
+		}
+	/*
+	@tab Page
+	@section Background Style
+	@tip Set the background color and top border for your email. You may want to choose colors that match your company's branding.
+	*/
+		#bodyCell{
+			/*@editable*/border-top:0;
+		}
+	/*
+	@tab Page
+	@section Email Border
+	@tip Set the border for your email.
+	*/
+		.templateContainer{
+			/*@editable*/border:0;
+		}
+	/*
+	@tab Page
+	@section Heading 1
+	@tip Set the styling for all first-level headings in your emails. These should be the largest of your headings.
+	@style heading 1
+	*/
+		h1{
+			/*@editable*/color:#202020;
+			/*@editable*/font-family:Helvetica;
+			/*@editable*/font-size:26px;
+			/*@editable*/font-style:normal;
+			/*@editable*/font-weight:bold;
+			/*@editable*/line-height:125%;
+			/*@editable*/letter-spacing:normal;
+			/*@editable*/text-align:left;
+		}
+	/*
+	@tab Page
+	@section Heading 2
+	@tip Set the styling for all second-level headings in your emails.
+	@style heading 2
+	*/
+		h2{
+			/*@editable*/color:#202020;
+			/*@editable*/font-family:Helvetica;
+			/*@editable*/font-size:22px;
+			/*@editable*/font-style:normal;
+			/*@editable*/font-weight:bold;
+			/*@editable*/line-height:125%;
+			/*@editable*/letter-spacing:normal;
+			/*@editable*/text-align:left;
+		}
+	/*
+	@tab Page
+	@section Heading 3
+	@tip Set the styling for all third-level headings in your emails.
+	@style heading 3
+	*/
+		h3{
+			/*@editable*/color:#202020;
+			/*@editable*/font-family:Helvetica;
+			/*@editable*/font-size:20px;
+			/*@editable*/font-style:normal;
+			/*@editable*/font-weight:bold;
+			/*@editable*/line-height:125%;
+			/*@editable*/letter-spacing:normal;
+			/*@editable*/text-align:left;
+		}
+	/*
+	@tab Page
+	@section Heading 4
+	@tip Set the styling for all fourth-level headings in your emails. These should be the smallest of your headings.
+	@style heading 4
+	*/
+		h4{
+			/*@editable*/color:#202020;
+			/*@editable*/font-family:Helvetica;
+			/*@editable*/font-size:18px;
+			/*@editable*/font-style:normal;
+			/*@editable*/font-weight:bold;
+			/*@editable*/line-height:125%;
+			/*@editable*/letter-spacing:normal;
+			/*@editable*/text-align:left;
+		}
+	/*
+	@tab Preheader
+	@section Preheader Style
+	@tip Set the background color and borders for your email's preheader area.
+	*/
+		#templatePreheader{
+			/*@editable*/background-color:#FAFAFA;
+			/*@editable*/background-image:none;
+			/*@editable*/background-repeat:no-repeat;
+			/*@editable*/background-position:center;
+			/*@editable*/background-size:cover;
+			/*@editable*/border-top:0;
+			/*@editable*/border-bottom:0;
+			/*@editable*/padding-top:9px;
+			/*@editable*/padding-bottom:9px;
+		}
+	/*
+	@tab Preheader
+	@section Preheader Text
+	@tip Set the styling for your email's preheader text. Choose a size and color that is easy to read.
+	*/
+		#templatePreheader .mcnTextContent,#templatePreheader .mcnTextContent p{
+			/*@editable*/color:#656565;
+			/*@editable*/font-family:Helvetica;
+			/*@editable*/font-size:12px;
+			/*@editable*/line-height:150%;
+			/*@editable*/text-align:left;
+		}
+	/*
+	@tab Preheader
+	@section Preheader Link
+	@tip Set the styling for your email's preheader links. Choose a color that helps them stand out from your text.
+	*/
+		#templatePreheader .mcnTextContent a,#templatePreheader .mcnTextContent p a{
+			/*@editable*/color:#656565;
+			/*@editable*/font-weight:normal;
+			/*@editable*/text-decoration:underline;
+		}
+	/*
+	@tab Header
+	@section Header Style
+	@tip Set the background color and borders for your email's header area.
+	*/
+		#templateHeader{
+			/*@editable*/background-color:#FFFFFF;
+			/*@editable*/background-image:none;
+			/*@editable*/background-repeat:no-repeat;
+			/*@editable*/background-position:center;
+			/*@editable*/background-size:cover;
+			/*@editable*/border-top:0;
+			/*@editable*/border-bottom:0;
+			/*@editable*/padding-top:9px;
+			/*@editable*/padding-bottom:0;
+		}
+	/*
+	@tab Header
+	@section Header Text
+	@tip Set the styling for your email's header text. Choose a size and color that is easy to read.
+	*/
+		#templateHeader .mcnTextContent,#templateHeader .mcnTextContent p{
+			/*@editable*/color:#202020;
+			/*@editable*/font-family:Helvetica;
+			/*@editable*/font-size:16px;
+			/*@editable*/line-height:150%;
+			/*@editable*/text-align:left;
+		}
+	/*
+	@tab Header
+	@section Header Link
+	@tip Set the styling for your email's header links. Choose a color that helps them stand out from your text.
+	*/
+		#templateHeader .mcnTextContent a,#templateHeader .mcnTextContent p a{
+			/*@editable*/color:#007C89;
+			/*@editable*/font-weight:normal;
+			/*@editable*/text-decoration:underline;
+		}
+	/*
+	@tab Body
+	@section Body Style
+	@tip Set the background color and borders for your email's body area.
+	*/
+		#templateBody{
+			/*@editable*/background-color:#FFFFFF;
+			/*@editable*/background-image:none;
+			/*@editable*/background-repeat:no-repeat;
+			/*@editable*/background-position:center;
+			/*@editable*/background-size:cover;
+			/*@editable*/border-top:0;
+			/*@editable*/border-bottom:2px solid #EAEAEA;
+			/*@editable*/padding-top:0;
+			/*@editable*/padding-bottom:9px;
+		}
+	/*
+	@tab Body
+	@section Body Text
+	@tip Set the styling for your email's body text. Choose a size and color that is easy to read.
+	*/
+		#templateBody .mcnTextContent,#templateBody .mcnTextContent p{
+			/*@editable*/color:#202020;
+			/*@editable*/font-family:Helvetica;
+			/*@editable*/font-size:16px;
+			/*@editable*/line-height:150%;
+			/*@editable*/text-align:left;
+		}
+	/*
+	@tab Body
+	@section Body Link
+	@tip Set the styling for your email's body links. Choose a color that helps them stand out from your text.
+	*/
+		#templateBody .mcnTextContent a,#templateBody .mcnTextContent p a{
+			/*@editable*/color:#007C89;
+			/*@editable*/font-weight:normal;
+			/*@editable*/text-decoration:underline;
+		}
+	/*
+	@tab Footer
+	@section Footer Style
+	@tip Set the background color and borders for your email's footer area.
+	*/
+		#templateFooter{
+			/*@editable*/background-color:#FAFAFA;
+			/*@editable*/background-image:none;
+			/*@editable*/background-repeat:no-repeat;
+			/*@editable*/background-position:center;
+			/*@editable*/background-size:cover;
+			/*@editable*/border-top:0;
+			/*@editable*/border-bottom:0;
+			/*@editable*/padding-top:9px;
+			/*@editable*/padding-bottom:9px;
+		}
+	/*
+	@tab Footer
+	@section Footer Text
+	@tip Set the styling for your email's footer text. Choose a size and color that is easy to read.
+	*/
+		#templateFooter .mcnTextContent,#templateFooter .mcnTextContent p{
+			/*@editable*/color:#656565;
+			/*@editable*/font-family:Helvetica;
+			/*@editable*/font-size:12px;
+			/*@editable*/line-height:150%;
+			/*@editable*/text-align:center;
+		}
+	/*
+	@tab Footer
+	@section Footer Link
+	@tip Set the styling for your email's footer links. Choose a color that helps them stand out from your text.
+	*/
+		#templateFooter .mcnTextContent a,#templateFooter .mcnTextContent p a{
+			/*@editable*/color:#656565;
+			/*@editable*/font-weight:normal;
+			/*@editable*/text-decoration:underline;
+		}
+	@media only screen and (min-width:768px){
+		.templateContainer{
+			width:600px !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		body,table,td,p,a,li,blockquote{
+			-webkit-text-size-adjust:none !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		body{
+			width:100% !important;
+			min-width:100% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnRetinaImage{
+			max-width:100% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnImage{
+			width:100% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnCartContainer,.mcnCaptionTopContent,.mcnRecContentContainer,.mcnCaptionBottomContent,.mcnTextContentContainer,.mcnBoxedTextContentContainer,.mcnImageGroupContentContainer,.mcnCaptionLeftTextContentContainer,.mcnCaptionRightTextContentContainer,.mcnCaptionLeftImageContentContainer,.mcnCaptionRightImageContentContainer,.mcnImageCardLeftTextContentContainer,.mcnImageCardRightTextContentContainer,.mcnImageCardLeftImageContentContainer,.mcnImageCardRightImageContentContainer{
+			max-width:100% !important;
+			width:100% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnBoxedTextContentContainer{
+			min-width:100% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnImageGroupContent{
+			padding:9px !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnCaptionLeftContentOuter .mcnTextContent,.mcnCaptionRightContentOuter .mcnTextContent{
+			padding-top:9px !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnImageCardTopImageContent,.mcnCaptionBottomContent:last-child .mcnCaptionBottomImageContent,.mcnCaptionBlockInner .mcnCaptionTopContent:last-child .mcnTextContent{
+			padding-top:18px !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnImageCardBottomImageContent{
+			padding-bottom:9px !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnImageGroupBlockInner{
+			padding-top:0 !important;
+			padding-bottom:0 !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnImageGroupBlockOuter{
+			padding-top:9px !important;
+			padding-bottom:9px !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnTextContent,.mcnBoxedTextContentColumn{
+			padding-right:18px !important;
+			padding-left:18px !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcnImageCardLeftImageContent,.mcnImageCardRightImageContent{
+			padding-right:18px !important;
+			padding-bottom:0 !important;
+			padding-left:18px !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+		.mcpreview-image-uploader{
+			display:none !important;
+			width:100% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Heading 1
+	@tip Make the first-level headings larger in size for better readability on small screens.
+	*/
+		h1{
+			/*@editable*/font-size:22px !important;
+			/*@editable*/line-height:125% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Heading 2
+	@tip Make the second-level headings larger in size for better readability on small screens.
+	*/
+		h2{
+			/*@editable*/font-size:20px !important;
+			/*@editable*/line-height:125% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Heading 3
+	@tip Make the third-level headings larger in size for better readability on small screens.
+	*/
+		h3{
+			/*@editable*/font-size:18px !important;
+			/*@editable*/line-height:125% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Heading 4
+	@tip Make the fourth-level headings larger in size for better readability on small screens.
+	*/
+		h4{
+			/*@editable*/font-size:16px !important;
+			/*@editable*/line-height:150% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Boxed Text
+	@tip Make the boxed text larger in size for better readability on small screens. We recommend a font size of at least 16px.
+	*/
+		.mcnBoxedTextContentContainer .mcnTextContent,.mcnBoxedTextContentContainer .mcnTextContent p{
+			/*@editable*/font-size:14px !important;
+			/*@editable*/line-height:150% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Preheader Visibility
+	@tip Set the visibility of the email's preheader on small screens. You can hide it to save space.
+	*/
+		#templatePreheader{
+			/*@editable*/display:block !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Preheader Text
+	@tip Make the preheader text larger in size for better readability on small screens.
+	*/
+		#templatePreheader .mcnTextContent,#templatePreheader .mcnTextContent p{
+			/*@editable*/font-size:14px !important;
+			/*@editable*/line-height:150% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Header Text
+	@tip Make the header text larger in size for better readability on small screens.
+	*/
+		#templateHeader .mcnTextContent,#templateHeader .mcnTextContent p{
+			/*@editable*/font-size:16px !important;
+			/*@editable*/line-height:150% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Body Text
+	@tip Make the body text larger in size for better readability on small screens. We recommend a font size of at least 16px.
+	*/
+		#templateBody .mcnTextContent,#templateBody .mcnTextContent p{
+			/*@editable*/font-size:16px !important;
+			/*@editable*/line-height:150% !important;
+		}
+
+}	@media only screen and (max-width: 480px){
+	/*
+	@tab Mobile Styles
+	@section Footer Text
+	@tip Make the footer content text larger in size for better readability on small screens.
+	*/
+		#templateFooter .mcnTextContent,#templateFooter .mcnTextContent p{
+			/*@editable*/font-size:14px !important;
+			/*@editable*/line-height:150% !important;
+		}
+
+}</style></head>
+    <body>
+        <!--[if !gte mso 9]><!----><span class="mcnPreviewText" style="display:none; font-size:0px; line-height:0px; max-height:0px; max-width:0px; opacity:0; overflow:hidden; visibility:hidden; mso-hide:all;"><%= @ctx.preview_str -%></span><!--<![endif]-->
+        <center>
+            <table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="bodyTable">
+                <tr>
+                    <td align="center" valign="top" id="bodyCell">
+                        <!-- BEGIN TEMPLATE // -->
+                        <!--[if (gte mso 9)|(IE)]>
+                        <table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;">
+                        <tr>
+                        <td align="center" valign="top" width="600" style="width:600px;">
+                        <![endif]-->
+                        <table border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer">
+
+
+
+
+
+
+														<!-- herehere begin -->
+														<tr>
+															<td valign="top" id="templateColumns">
+																	<!--[if (gte mso 9)|(IE)]>
+																	<table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;">
+																	<tr>
+																	<td align="center" valign="top" width="300" style="width:300px;">
+																	<![endif]-->
+																	<table align="left" border="0" cellpadding="0" cellspacing="0" width="300" class="columnWrapper">
+																			<tbody><tr>
+																					<td valign="top" class="columnContainer"><table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnImageCardBlock">
+	<tbody class="mcnImageCardBlockOuter">
+			<tr>
+					<td class="mcnImageCardBlockInner" valign="top" style="padding-top:9px; padding-right:18px; padding-bottom:9px; padding-left:18px;">
+
+
+<table align="left" border="0" cellpadding="0" cellspacing="0" width="100%" >
+	<tbody>
+		<tr>
+			<td valign="bottom" style="padding: 9px 18px; font-family: Helvetica; font-size: 14px; font-weight: normal;" width="246" height="300" >
+
+				<a href="https://wasya.co?<%= @utm_tracking_str -%>" target="_blank" >
+  				<img src="https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/09/29185755/259x66-WasyaCo-Logo-YellowShadow.png" width=228 alt="Wasya Co" />
+				</a>
+				<h1 style="margin-left: 30px" >ReactJS</h1>
+				<i style="color: #666; margin-left: 30px;">Web Application Development</i>
+				&nbsp;<br />&nbsp;<br />&nbsp;<br />
+			</td>
+		</tr>
+	</tbody>
+</table>
+
+
+
+
+					</td>
+			</tr>
+	</tbody>
+</table></td>
+																			</tr>
+																	</tbody></table>
+																	<!--[if (gte mso 9)|(IE)]>
+																	</td>
+																	<td align="center" valign="top" width="300" style="width:300px;">
+																	<![endif]-->
+																	<table align="left" border="0" cellpadding="0" cellspacing="0" width="300" class="columnWrapper">
+																			<tbody><tr>
+																					<td valign="top" class="columnContainer"><table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnImageCardBlock">
+	<tbody class="mcnImageCardBlockOuter">
+			<tr>
+					<td class="mcnImageCardBlockInner" valign="top" style="padding-top:9px; padding-right:18px; padding-bottom:9px; padding-left:18px;">
+
+<table align="left" border="0" cellpadding="0" cellspacing="0" class="mcnImageCardBottomContent" width="100%" >
+	<tbody><tr>
+			<td class="mcnImageCardBottomImageContent" align="left" valign="top" style="padding-top:0px; padding-right:0px; padding-bottom:0; padding-left:0px;">
+
+			</td>
+	</tr>
+	<tr>
+			<td class="mcnTextContent" valign="top" style="padding: 9px 18px; font-family: Helvetica; font-size: 14px; font-weight: normal; text-align: center;" width="246" height="300" >
+
+
+				<img align="center" alt="Poster Illustration" src="https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/06152121/200x300-poster-1tiny.png" width="200" style="max-width: 200px; padding-bottom: 0; display: inline !important; vertical-align: bottom;" alt="Illustrated Poster" class="mcnImage">
+
+
+			</td>
+	</tr>
+</tbody></table>
+
+
+
+
+					</td>
+			</tr>
+	</tbody>
+</table></td>
+																			</tr>
+																	</tbody></table>
+																	<!--[if (gte mso 9)|(IE)]>
+																	</td>
+																	</tr>
+																	</table>
+																	<![endif]-->
+															</td>
+													</tr>
+													<!-- herehere end -->
+
+
+
+
+                            <!-- herehere another begin -->
+                            <tr>
+                                <td valign="top" id="templateFooter"><table border="0" cellpadding="0" cellspacing="0" width="100%" style="min-width:100%;">
+    <tbody>
+        <tr>
+            <td align="center" valign="top" style="padding:9px" class="mcnFollowBlockInner">
+                <table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnFollowContentContainer" style="min-width:100%;">
+    <tbody><tr>
+			  <td width="100" >&nbsp;</td>
+        <td align="center" style="padding-left:9px;padding-right:9px;">
+
+					<h3><a href="https://wasya.co/our-services-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank" >https://wasya.co/w/our-services</a></h3>
+					<br />
+					<h3><a href="https://wasya.co/contact-us-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank"  >https://wasya.co/w/contact-us</a></h3>
+
+        </td>
+    </tr>
+</tbody></table>
+
+            </td>
+        </tr>
+    </tbody>
+</table><table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnDividerBlock" style="min-width:100%;">
+    <tbody class="mcnDividerBlockOuter">
+        <tr>
+            <td class="mcnDividerBlockInner" style="min-width: 100%; padding: 10px 18px 25px;">
+                <table class="mcnDividerContent" border="0" cellpadding="0" cellspacing="0" width="100%" style="min-width: 100%;border-top: 2px solid #EEEEEE;">
+                    <tbody><tr>
+                        <td>
+                            <span></span>
+                        </td>
+                    </tr>
+                </tbody></table>
+<!--
+                <td class="mcnDividerBlockInner" style="padding: 18px;">
+                <hr class="mcnDividerContent" style="border-bottom-color:none; border-left-color:none; border-right-color:none; border-bottom-width:0; border-left-width:0; border-right-width:0; margin-top:0; margin-right:0; margin-bottom:0; margin-left:0;" />
+-->
+            </td>
+        </tr>
+    </tbody>
+</table><table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnTextBlock" style="min-width:100%;">
+    <tbody class="mcnTextBlockOuter">
+        <tr>
+            <td valign="top" class="mcnTextBlockInner" style="padding-top:9px;">
+              	<!--[if mso]>
+				<table align="left" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100%;">
+				<tr>
+				<![endif]-->
+
+				<!--[if mso]>
+				<td valign="top" width="600" style="width:600px;">
+				<![endif]-->
+                <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 © 2023 Wasya Co</em>
+<br>
+    <strong>Our mailing address is:</strong>
+
+    201 W 5th St 11th Floor, Austin, TX 78701
+
+    <br>
+	Want to change how you receive these emails?
+    You can <a href="https://wasya.co/unsubscribe-1?<%= @utm_tracking_str -%>">click to unsubscribe</a>.
+
+                        </td>
+                    </tr>
+                </tbody></table>
+				<!--[if mso]>
+				</td>
+				<![endif]-->
+
+				<!--[if mso]>
+				</tr>
+				</table>
+				<![endif]-->
+            </td>
+        </tr>
+    </tbody>
+</table></td>
+                            </tr>
+														<!-- herehere another end -->
+
+                        </table>
+                        <!--[if (gte mso 9)|(IE)]>
+                        </td>
+                        </tr>
+                        </table>
+                        <![endif]-->
+                        <!-- // END TEMPLATE -->
+                    </td>
+                </tr>
+            </table>
+        </center>
+    </body>
+</html>

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

@@ -6,8 +6,8 @@
     %h2.title
       = @email_template.slug
       = link_to '[~]', edit_email_template_path( @email_template )
-      = link_to '[src ^]', '#'
-      = link_to '[preview ^]', '#'
-      = link_to '[use]', '#'
+      = link_to 'src', email_template_iframe_path(@email_template.slug), target: :_blank
+      -# = link_to '[preview ^]', '#'
+      -# = link_to '[use]', '#'
 
   %iframe{ src: email_template_iframe_path(@email_template.slug), width: '100%', height: '100%' }

data/app/views/ish_manager/iro_positions/roll.haml

@@ -0,0 +1,105 @@
+
+
+.iro-positions-roll.max-width
+
+  - p = @position
+  .gameuiW.show-amounts{ data: { cc: { strike: p.strike, startPrice: p.opened_price, currentPrice: p.current_price, cus: p.strategy.current_underlying_strike } } }
+    .gameui
+      .gameuiC
+        = link_to '[roll]', roll_iro_position_path(p)
+
+        .elephantW
+          .elephant
+            .elephantC
+
+              .amount
+
+              .q= p.quantity
+
+              .riderW
+                .rider
+                  .riderC
+
+              .riderStart
+                .amount
+                .riderCurrent
+                  .amount
+
+              .riderStart2
+                .amount
+                .riderCurrent2
+                  .amount
+
+
+            .sunflowerW
+              .sunflower
+                .sunflowerC
+
+                  .days-left= (p.expires_on.to_date - Time.now.to_date).to_i
+
+        .windW
+          .wind
+            .c-u-s= pp_currency p.strategy.current_underlying_strike
+            .windC
+
+
+        .spearW
+          .spear
+            .spearC
+              .spearStart
+                .spearCurrent
+  .c
+
+  -# next position
+  - @next_positions.each do |p|
+    - gainp = p.strike / @position.strike - 1
+    .gameuiW.next-position.show-amounts{ data: { cc: { gainp: gainp, strike: p.strike, startPrice: p.current_price, currentPrice: @position.current_price, cus: p.strategy.current_underlying_strike } } }
+      .gameui
+        .gameuiC
+          = link_to '[roll]', roll_iro_position_path(p)
+
+          .elephantW
+
+            .elephant
+              .elephantLoss
+              .elephantC
+
+                .amount
+
+                .q= p.quantity
+
+                .riderW
+                  .rider
+                    .riderC
+
+                .riderStart
+                  .amount
+                  .riderCurrent
+                    .amount
+
+                .riderStart2
+                  .amount
+                  .riderCurrent2
+                    .amount
+
+
+              .sunflowerW
+                .sunflower
+                  .sunflowerC
+
+                    .days-left= (p.expires_on.to_date - Time.now.to_date).to_i
+
+          .windW
+            .wind
+              .c-u-s= pp_currency p.strategy.current_underlying_strike
+              .windC
+
+
+          .spearW
+            .spear
+              .spearC
+                .spearStart
+                  .spearCurrent
+  .c
+
+

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

@@ -26,8 +26,6 @@
     Positions (#{@positions.length})
     = link_to '[+]', new_iro_position_path({ iro_purse_id: @purse.id })
   .positions
-
-
     %table.bordered
       %thead
         %tr
@@ -92,7 +90,8 @@
             %td.q= p.quantity
             %td.begin-on= pp_date p.opened_on
             %td.price= p.opened_price
-            %td.to-open= pp_amount( p.opened_price * 100 * p.quantity )
+            %td.to-open
+              -# pp_amount( p.opened_price * 100 * p.quantity )
             %td.begin-delta= sprintf('%.2f', p.opened_delta ) rescue nil
             %td= pp_money p.current_price
             %td.net= pp_money ( p.opened_price - p.current_price ) * 100 - 1.3

data/app/views/ish_manager/iro_purses/show_gameui.haml

@@ -9,10 +9,9 @@
 
   %h5.collapse-expand#iroPurseConfig
     Config
-    -# #{link_to '[~]', edit_iro_purse_path(@purse)}
   .config
-    -# %pre= @purse.config
     = render 'form', iro_purse: @purse
+  .c
 
   %h5.collapse-expand#strategies
     Strategies (#{@strategies.length})
@@ -20,12 +19,11 @@
   .strategies.items
     - @strategies.each do |strat|
       .strategy.item= render 'ish_manager/iro_strategies/form', strategy: strat
-
+  .c
 
   %h5.collapse-expand#gameuiPositions
     Gameui Positions (#{@positions.length})
     = link_to '[+]', new_iro_position_path({ iro_purse_id: @purse.id })
-
   .gameui-positions
     - @positions.each do |p|
 
@@ -33,6 +31,7 @@
       .gameuiW.show-amounts{ data: { cc: { strike: p.strike, startPrice: p.opened_price, currentPrice: p.current_price, cus: p.strategy.current_underlying_strike } } }
         .gameui
           .gameuiC
+            = link_to '[roll]', roll_iro_position_path(p)
 
             .elephantW
               .elephant
@@ -50,7 +49,12 @@
                     .amount
                     .riderCurrent
                       .amount
+
                   .riderStart2
+                    .amount
+                    .riderCurrent2
+                      .amount
+
 
                 .sunflowerW
                   .sunflower
@@ -69,14 +73,12 @@
                 .spearC
                   .spearStart
                     .spearCurrent
-
+  .c
 
   %h5.collapse-expand#spreadsheetPositions
     Positions (#{@positions.length})
     = link_to '[+]', new_iro_position_path({ iro_purse_id: @purse.id })
   .positions
-
-
     %table.bordered
       %thead
         %tr
@@ -99,7 +101,7 @@
           %td
             .begin-on Begin On
           %td
-            .price Price
+            .price Begin Price
           %td
             .to-open To Open
           %td
@@ -140,12 +142,15 @@
             %td.days-left= (p.expires_on.to_date - Time.now.to_date).to_i
             %td.q= p.quantity
             %td.begin-on= pp_date p.opened_on
-            %td.price= p.opened_price
-            %td.to-open= pp_amount( p.opened_price * 100 * p.quantity )
+            %td.price= pp_amount p.opened_price
+            %td.to-open
+              -# = pp_amount( p.opened_price * p.quantity )
             %td.begin-delta= sprintf('%.2f', p.opened_delta ) rescue nil
             %td= pp_money p.current_price
-            %td.net= pp_money ( p.opened_price - p.current_price ) * 100 - 1.3
-            %td.netp= pp_percent ( p.opened_price - p.current_price ) / p.opened_price
+            %td.net
+              = pp_money ( p.opened_price - p.current_price ) - 0.013
+            %td.netp
+              = pp_percent ( p.opened_price - p.current_price ) / p.opened_price
             %td= sprintf('%.2f', p.current_delta ) rescue nil
             %td= (p.expires_on.to_date - p.opened_on).to_i
             %td.must-roll= pp_bool p.must_roll?
@@ -157,5 +162,5 @@
             %td.next-delta= p.next_position[:delta]
             %td.next-outcome= pp_money p.next_outcome
             %td.state= p.status
-
+  .c
 

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

@@ -2,7 +2,8 @@
 - url = strategy.new_record? ? iro_strategies_path : iro_strategy_path(strategy)
 .iro-strategies--form
   = form_for strategy, url: url, as: :iro_strategy do |f|
-    = hidden_field_tag 'iro_strategy[iro_purse_id]', params[:iro_purse_id]
+    - if params[:iro_purse_id]
+      = hidden_field_tag 'iro_strategy[iro_purse_id]', params[:iro_purse_id]
     .field
       = "#{strategy.id}." if strategy.id
       = f.label :slug

data/config/routes.rb

@@ -24,6 +24,7 @@ IshManager::Engine.routes.draw do
   # end
   # resources :orders
 
+  get 'iro_positions/roll/:id', to: 'iro_positions#roll', as: :roll_iro_position
   resources :iro_positions
 
   resources :iro_watches

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.414
+  version: 0.1.8.416
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -418,6 +418,7 @@ files:
 - app/views/ish_manager/email_templates/_m20221201react.html.erb
 - app/views/ish_manager/email_templates/_m20221222merryxmas.html.erb
 - app/views/ish_manager/email_templates/_marketing_react_1.html
+- app/views/ish_manager/email_templates/_marketing_react_2.html.erb
 - app/views/ish_manager/email_templates/_marketing_ror_1.html
 - app/views/ish_manager/email_templates/_marketing_ror_2.html.erb
 - app/views/ish_manager/email_templates/_marketing_wordpress_1.html
@@ -467,6 +468,7 @@ files:
 - app/views/ish_manager/iro_positions/_form.haml
 - app/views/ish_manager/iro_positions/edit.haml
 - app/views/ish_manager/iro_positions/new.haml
+- app/views/ish_manager/iro_positions/roll.haml
 - app/views/ish_manager/iro_purses/_form.haml
 - app/views/ish_manager/iro_purses/edit.haml
 - app/views/ish_manager/iro_purses/new.haml