ish_manager 0.1.8.503 → 0.1.8.505

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7465feb8b71a19de0c55e39cbf14d4016792bdcd20f5c0d10ab90397defcffb
-  data.tar.gz: 700d28696374331c9e7c8f3b1f87e74a13392c350a81e89588a4fdb48dfbb0bd
+  metadata.gz: 908f6d6ce27dbc1350b08012a104e71691b39108e4b01e0005ae36a65802626c
+  data.tar.gz: f2172c6fd2554c9ab133cd6041b2fa1b328a09356f8f177a54d44e56f52c8e84
 SHA512:
-  metadata.gz: 29c2cd6c9c46744212e9f23b1b4e7890bd72da84783445270284c79c3b3d1ae06b91297c26d17695325be998daf30da7865162615274fc290533f2149843f209
-  data.tar.gz: c4350008f57978f1e09b13ebc0340b8953c01735c9a28b1d9e351b5c1e66bcc5fbf5261dd68e89b9c128c1d0260180becf271954e9664d1263cf9b935696d525
+  metadata.gz: d6b6733574d3c87c0a0934cd354de908d511a8c46481e577a1fd32fe3b0126497fa69c8946613b2025576d47944e0f51f33c37dda8fed7e3c7c3de729cde70e7
+  data.tar.gz: 708286a7b172966900febcf9addd6798635354125e16de175eb3e0855f2c34a54bdd56daa69e711d254744a0533f42ca93cc0021b59859ecfe3768c29d24f697

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

@@ -60,15 +60,18 @@ $(document).ready(() => {
       out.push(val)
     })
 
+    let data = {
+      ids: out,
+      jwt_token: jwt_token,
+      emailtag: emailtag,
+    }
+    if ($("#is_move").prop('checked')) {
+      data.is_move = true
+    }
     $.ajax({
       url: action_path,
       type: 'POST',
-      data: {
-        ids: out,
-        jwt_token: jwt_token,
-        emailtag: emailtag,
-
-      },
+      data: data,
       success: e => {
         logg((e||{}).responseText, 'Ok')
         location.reload()

data/app/controllers/ish_manager/prices_controller.rb

@@ -4,6 +4,37 @@
 
 class IshManager::PricesController < IshManager::ApplicationController
 
+  def create
+    @price   = Wco::Price.new params[:price].permit( :amount_cents, :interval, :product_id )
+    puts! @price, '@price'
+    authorize! :create, @price
+    if !params[:price][:interval].present?
+      @price.interval = nil
+    end
+    @product       = Wco::Product.find @price.product_id
+    stripe_product = Stripe::Product.retrieve( @product.product_id )
+    price_hash = {
+      product:     stripe_product.id,
+      unit_amount: @price.amount_cents,
+      currency:    'usd',
+    }
+    if @price.interval.present?
+      price_hash[:recurring] = { interval: @price.interval }
+    end
+    stripe_price = Stripe::Price.create( price_hash )
+    # puts! stripe_price, 'stripe_price'
+
+    flash_notice 'Created stripe price.'
+    @price.product = @product
+    @price.price_id = stripe_price[:id]
+    if @price.save
+      flash_notice @price
+    else
+      flash_alert @price
+    end
+    redirect_to controller: :products, action: :index
+  end
+
   def update
 
     # if !params[:price][:interval].present?

data/app/controllers/ish_manager/products_controller.rb

@@ -5,15 +5,12 @@ class IshManager::ProductsController < IshManager::ApplicationController
 
   # Alphabetized : )
 
+
+
   def create
     @product = Wco::Product.new params[:product].permit( :name )
-    @price   = Wco::Price.new params[:price].permit( :amount_cents, :interval )
     authorize! :create, @product
 
-    if !params[:price][:interval].present?
-      @price.interval = nil
-    end
-
     stripe_product = Stripe::Product.create({ name: @product.name })
     # puts! stripe_product, 'stripe_product'
     flash_notice 'Created stripe product.'
@@ -24,26 +21,6 @@ class IshManager::ProductsController < IshManager::ApplicationController
     else
       flash_alert "Cannot create wco product: #{@product.errors.full_messages.join(', ')}."
     end
-
-    price_hash = {
-      product:     stripe_product.id,
-      unit_amount: @price.amount_cents,
-      currency:    'usd',
-    }
-    if @price.interval.present?
-      price_hash[:recurring] = { interval: @price.interval }
-    end
-    stripe_price = Stripe::Price.create( price_hash )
-    # puts! stripe_price, 'stripe_price'
-    flash_notice 'Created stripe price.'
-    @price.product = @product
-    @price.price_id = stripe_price[:id]
-    if @price.save
-      flash_notice @price
-    else
-      flash_alert @price
-    end
-
     redirect_to action: :index
   end
 

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

@@ -37,6 +37,8 @@
 
     .bordered.inline-block
       = select_tag :emailtag, options_for_select(@emailtags_list)
+      = check_box_tag :is_move
+      %label move?
       %a.btn.add-tag-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/addtag" } }
         %i.material-icons add
         Addtag

data/app/views/ish_manager/invoices/new_stripe.haml

@@ -23,8 +23,8 @@
           -#   = f.select :email, options_for_select([[nil,nil]] + @leadset.employees.map { |i| [ i.email, i.email ] } )
 
         .input-row
-          %label item
-          = select_tag 'invoice[items][][product_id]', options_for_select( @products_list ), class: 'products'
+          %label item (product)
+          = select_tag 'invoice[items][][product_id]', options_for_select( @products_list ), class: 'products select2'
 
           %label price
           = select_tag 'invoice[items][][price_id]'

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

@@ -15,12 +15,11 @@
   = render 'ish_manager/leads/index', leads: @employees
   %hr
 
-  .row
-    .col-md-6
-      = render 'ish_manager/serverhosts/index', serverhosts: @leadset.serverhosts
-
-    .col-md-6
-      = render 'ish_manager/appliances/index', appliances: @leadset.appliances
+  -# .row
+  -#   .col-md-6
+  -#     = render 'ish_manager/serverhosts/index', serverhosts: @leadset.serverhosts
+  -#   .col-md-6
+  -#     = render 'ish_manager/appliances/index', appliances: @leadset.appliances
 
   .row
     .col-md-6

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

@@ -0,0 +1,10 @@
+
+- url = price.new_record? ? prices_path : price_path( price )
+
+.products--prices-form.inline-block
+  = form_for price, as: :price, url: url do |f|
+    = hidden_field_tag 'price[product_id]', price.product_id
+
+    %label amount cents
+    = f.number_field :amount_cents
+    = f.submit '>'

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

@@ -8,21 +8,23 @@
       %label Name
       = text_field_tag 'product[name]'
 
-    .form-field
-      %label Price in cents
-      = text_field_tag 'price[amount_cents]'
-
-    .form-field
-      %label Recurring?
-      = select_tag 'price[interval]', options_for_select(Wco::Price::INTERVALS)
+    -# .form-field
+    -#   %label Price in cents
+    -#   = text_field_tag 'price[amount_cents]'
 
     -# .form-field
-    -#   %label Stripe product_id
-    -#   = f.text_field :product_id
+    -#   %label Recurring?
+    -#   = select_tag 'price[interval]', options_for_select(Wco::Price::INTERVALS)
+
+    .form-field
+      %label Stripe product_id
+      -# = f.text_field :product_id
+      = product.product_id
 
     -# .form-field
     -#   %label Stripe price_id
-    -#   = f.text_field :price_id
+    -#   -# = f.text_field :price_id
+    -#   = product.price_id
 
     .actions
       = f.submit 'Submit'

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

@@ -20,6 +20,9 @@
         - else
           = product.name
         %ul
+          %li
+            New price:
+            = render 'ish_manager/prices/form', price: Wco::Price.new({ product: product[:wco_product] })
           - product[:prices].each do |price_id, price|
             %li
               %span.gray= price.id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.503
+  version: 0.1.8.505
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -826,6 +826,7 @@ files:
 - app/views/ish_manager/photos/new.haml
 - app/views/ish_manager/photos/show.haml
 - app/views/ish_manager/photos/without_gallery.haml
+- app/views/ish_manager/prices/_form.haml
 - app/views/ish_manager/products/_form.haml
 - app/views/ish_manager/products/_index_list.haml
 - app/views/ish_manager/products/_index_table.haml