Count usage charges as recurring option

app/controllers/imports_controller.rb

@@ -16,8 +16,8 @@ def new
 
   def create
     @import = current_user.imports.new(source: Import.sources[:csv_file], **import_params)
-
-    if @import.save!
+    @import.user.count_usage_charges_as_recurring = import_params.dig(:user_attributes, :count_usage_charges_as_recurring)
+    if @import.save
       redirect_to @import, notice: "Import successfully created."
     else
       flash.now[:alert] = "Import failed to create."
@@ -37,7 +37,11 @@ def set_import
   end
 
   def import_params
-    params.require(:import).permit(:import_type, :payouts_file)
+    params.require(:import).permit(
+      :import_type,
+      :payouts_file,
+      user_attributes: [:count_usage_charges_as_recurring]
+    )
   end
 
   def redirect_if_import_in_progress

app/controllers/partner_api_credentials_controller.rb

@@ -25,7 +25,7 @@ def create
 
   def update
     if @partner_api_credential.update(partner_api_credential_params)
-      redirect_to @partner_api_credential, notice: "Partner api credential was successfully updated.", status: :see_other
+      redirect_to edit_partner_api_credential_path(@partner_api_credential), notice: "Partner api credential was successfully updated.", status: :see_other
     else
       render :edit, status: :unprocessable_entity
     end

app/javascript/libraries/dirty-form.js

@@ -27,7 +27,12 @@ class DirtyForm {
 
   setupFieldsTracking() {
     this.fields.forEach(field => {
-      this.initialValues[field.name] = field.value
+      // If input save value, if checkbox save checked
+      if (field.type == 'checkbox') {
+        this.initialValues[field.name] = field.checked
+      } else {
+        this.initialValues[field.name] = field.value
+      }
 
       switch (field.tagName) {
         case 'TRIX-EDITOR':
@@ -91,7 +96,13 @@ class DirtyForm {
 
   valueChanged = (event) => {
     const field = event.target
-    if (this.initialValues[field.name] != field.value) {
+    let value
+    if (field.type == 'checkbox') {
+      value = field.checked
+    } else {
+      value = field.value
+    }
+    if (this.initialValues[field.name] != value) {
       this.markAsDirty()
     }
   }

app/models/import.rb

@@ -7,6 +7,8 @@ class Import < ApplicationRecord
   has_one_attached :payouts_file, dependent: :destroy
   has_one :partner_api_credential, through: :user
 
+  accepts_nested_attributes_for :user, update_only: true
+
   ACCEPTED_FILE_TYPES = %w[text/csv application/zip].freeze
 
   enum source: {
@@ -74,8 +76,8 @@ def broadcast_status_update
     broadcast_replace_to(
       [user, :imports],
       target: dom_id(self, :status),
-      partial: "imports/status",
-      locals: {import: self}
+      partial: "shared/status",
+      locals: {resource: self}
     )
   end
 end

app/views/imports/_form.html.erb

@@ -34,10 +34,16 @@
                 multiple: false,
               ) %>
             <% end %>
+
             <%= form_layout.with_item do %>
               <%= polaris_text(variant: :bodySm, color: :subdued) { t(".payouts_file_help_text") } %>
             <% end %>
 
+            <%= form_layout.with_item do %>
+              <%= render "users/count_usage_charges_as_recurring_fields", form: form %>
+            <% end %>
+
+
             <%= form_layout.with_item do %>
               <%= polaris_button(
                 submit: true,

app/views/partner_api_credentials/_form.html.erb

@@ -32,7 +32,11 @@
             <% end %>
 
             <% form_layout.with_item do %>
-              <%= form.polaris_text_field :access_token, label: t(".access_token"), type: :password, required: true %>
+              <%= form.polaris_text_field :access_token, value: partner_api_credential.access_token, label: t(".access_token"), type: :password, required: true %>
+            <% end %>
+
+            <%= form_layout.with_item do %>
+              <%= render "users/count_usage_charges_as_recurring_fields", form: form %>
             <% end %>
 
             <%= form_layout.with_item do %>

app/views/users/_count_usage_charges_as_recurring_fields.html.erb

@@ -0,0 +1,6 @@
+<%= form.fields_for current_user do |user_fields| %>
+  <%= user_fields.polaris_check_box :count_usage_charges_as_recurring,
+    label: t('user.count_usage_charges_as_recurring'),
+    help_text: t('user.count_usage_charges_as_recurring_help_text')
+    %>
+<% end %>

config/credentials.yml.enc

@@ -1 +1 @@
-XL60N/R5cI7fYEzAjH4H9WHEEw5zd4XBvOmwJXmUKH2x5/4Npf4Q+LN5mRHr6zE6EqHAl6T/brKvWmNxVdp9e9H/jhNsgssfjjeVPUDbHcEgX6GMiYnX+jve18Az/eEGLSxwAmdiZ86y2UzfWa3CB0ZL/b5SKqt9CqpyMAsBcgwHHF9OO3PgnnZsgMdvUyRyCgsQnHzx4q2ppszj/0P3iZyjHzJUWjs7Xvk3NFPWD5jfyo1sn9lY6Ro0TvfAqJ8Qi5Rla4N7kbrxttQjTOaJQf0cb49rGMgDW4YxjcJv4vn5d2Q24ph31fKwY6+0MAuaDRLcYYAphZDUIqB7xHxSeCDAK+m6QrEDpceNeT0C42LdnVZe9s7kjOC2j27ESbx6/VaN4cG0hV3kv/3TJfxDdYOKdvFkgpcBcj9UPddY95ZVFYcgGfnJra0YmLA4dv/Hm0Tbp9uYS14y6jf8ivV5y9DslNamm74PBFGzxFfcDADnfUXBH5EeJrJOSQDuCSy2rWmeRBTKikjw336WdjQcEUfWqxsHR0qbZ2FB2HngeMDMz4QsxAqksOgJz2+kmVFu6J3BXzYJr3MeC/YJK0eattMTOJgJhAtiC0iVfsNLguxfCLRBYixy9QTHfxzPm0q+XJkeszWQnS+ul9mp19arfsSgyoc33cjT9WJbFZlX3uJvDxswNjVJMLypkPhLVX0Y0BY3zTCmpdNLbkNlQFqR8UTnri6tuygd91032KmybUi0SrDxmfvIn8qyU70f1mPzFfF21gdQQ5dJEg3La5viR4icdLIMl/w0ox7EuZAXWOSUep13TTuOp+oTBQfuvlY4QUhxNew3FQFuXYYvKtD9BIsuGnEjzOShY9wzr2N7uRnDkNS0EQlZgYNOTPGoyzSIxjly73tQ1Z70jmLf9rO/p7ZlAQANifcNM0GR3e8VjNvZtXp7VDv15pChOfNatsyeQbDo7pq391Bzifg+lZLqDsvRx91bEr/csntZx5CLiU9OR+zCrIG6Aihx+RN8C89hQycb1Ae91Gzpl1RkofVaJoAsePJL3yAt4ABkgKCHlZGait0JZS8/DufrVgPUoo10p9vpXxhObBOEYdjOptn8SeWAPMwqTEN/0XwOtDrr5lPCndRu2o0WMmtYADuzNHVCDvNW27+mfbngFOQOheV2j+KOQygfpcKzHlDiCVFO6wi5l36IQc8PmSzGpa1iE57sMzmb1NIjK2B/sdbKnh33XeBBaTLKLa62WyHN+JwZ9eJzt2vfTX5hXJpEA9oXEvGIwZf4i+21wIgSo2AnukrQlJjVUHwDsREg/hN2LDG4V7dzsrJvWIpHMre+PzxXW/26vGNmdUlaFVvYz1JS5FZgXJZs+sne0lq+ZQq+K865EoM6C5UgGfe4P08JQlxUS6Ze8tYDgte5eM3cuEfCHq0oFWSK2XfbMuDsTdw0i+LaBCNRcpYiu2A+y+Q4hJNIacYJLxMOk3QTCsmFaUmFDSJNIy0zXvQYLXHH7tZoiBTYaQZzvcTVUQ7jGOA+K3aEZZs8Szpq21mbjeb+ZlwB+yEPPD0WG0LCQbLxhKwZd62+44o4YRv+lT/2nKXw2qVEDEPJH54Eww+3HcKE9EWRpaNh590wA41iQ1ZGnKkFbcvKcMe5u+WqGPVkc2r91hLRk5akFLioyt3atSbDi1fgqXLaWfdInEuNKut9TG56+uh8FAGMLdYBFYzZ8RFrelPeFYexZN4cUQMr--PdiXLxLhIe99ggns--rNGB+ScAWu0+5r9J/mIzLg==
+DXo4gBbGXP+JzWBEvgZJ8iUVRML+OcFcVHbdw2fCaSgRjp3qD0sIyG5+zt+sf5+32nsuhCP0MGlbQsqImulf+WFtGK2KI4MNl9Lnyh1uDWB9wZs277zarQy0EJNfwBlsm0Yz+ch94Y97dUGPtx/fi6T+PqMwbWfetBkjUJYkk78lcFpHfpv4S/MPyYW0J8tXe2rsrBWJY1JB+OAYSHn3qPOIVEbvKksO00HdGpFupXqMBAonfy/sIIb0SqW3JaceickZ6lBGC9BaC8n3ruB8UaurWzNUcJe1F2FWg4/HJNOir45Zv7vnE1BfPRbGYVT/0wMjhJYo5IjKcoI1Bvu//r3gvgaOmTgqRxsZ8ufkjoehEwdlmjuceFQzDoLQ59AGohjkklHAXM5ItsSW+t2sMhe3rhl9HxQvVtd9cVZatvY5E07AooOwcsh87EBuZWCY/lkvy1vbJj8pm0HQcgPht9j0+sAqnBiNg9evmINfwNrqwHMG3EwbgVCZ49mxAGJKZOWiUOxZGumE4sPXXVUwq00OoR8hKVV+ICZ7Am6gonF3mdHqk6Mrh+1NfnRXY6A3Xald1pR0v0i9GHufSCfBK4SHqNEa5tTO636OWxJaRARD8etKU3Lkta0yXkdmTLe3NS/2SCgvafCZx9LICHsajiKO4GzwvzVd/1Z4dYoUhoDSaat2EG+K1mhrYltivohPYf3uwhJsPc5AMViYvBTdgrFLe+QFXj59qHOBMBm4xxfXXxylN0HXTSdzaHiqfMOGYCXdn32wGuh529MLzlBieZRxUljqkeipjU4cHoJ7q2znrLbTJAtw6ZgGt674ucugdzynDZPtryZYGa03U8udkKtgKyN69SSLXnjoiebgz+rz7HyMn9lZ2ny6/qm9eVK2033LIbqzrM3JEmhIaFwbsKPTuENOGLyRo/lhnUU9t2bakxvaC+Kf07PNC5ZW3IiowAWtlBTpGncxqUe/LLXNXGfgI5izgNRxBOJeVt8yEc9MGjKe4koOWvyYDEsDhoH6vyRrx3bOBuQqR5JpcK/SaUeiu5YQO/hzdz2gzUWSor6jI7MB5sL4pymeIP0FG+MbPXqIIv3njBhPNlZ9uNBI/gScwFKgqhIw/1ZXF4hwWplxBVJU10vJzjkHSocG2V4WdivpXaDRfvtmkUz7u8h85J4q+dSsjhsYFCXD6POYDW5SQJw0kB/q5ud8FPnY1uz+K7zxX4dPXlswnKzXTlVVAs+xZcOwEB/Ey+qFu2TQvzZt0SbdFxAJTuMF0y112MSyubsMXiIY904T1oX6YpF6snwCJ4uJQZkUbgNyjOA/fTPY0LNZsqCzuGf8EgwKdwDt6Qo1phL2CrKSxKlgt7AzelbFgYxqbQdEhX1wp2URb2rkV8YYuUSuhcF7sdHVkbQaT/f/x0Co/SH3v+y0TWjF2x4h9Zy9rLdgeQ9zo9fXpT3LZjX4J4lMcpLpF3y1xyQk7qV11Mr8Y1ILHGRDAZ3S53Gw0FAAYtLMAZvL6QEWGjqdKA==--LLrijQWggZIixUnb--b5k/IfLJFg7ok6kWb7S0Xg==

config/locales/en.yml

@@ -24,6 +24,9 @@ en:
       title: "No %{resource} yet"
       description: "Import your payouts data to get started."
       footer_html: If you don’t want to upload historical data, connect your %{url} data source.
+  user:
+    count_usage_charges_as_recurring: "Count usage charges as recurring revenue"
+    count_usage_charges_as_recurring_help_text: "Usage charges are counted as one-time revenue by default."
   devise:
     sign_in: "Log in"
     sign_out: "Log out"

db/migrate/20230911110717_create_partner_api_credentials.rb

@@ -2,8 +2,8 @@ class CreatePartnerApiCredentials < ActiveRecord::Migration[7.0]
   def change
     create_table :partner_api_credentials do |t|
       t.references :user, null: false, foreign_key: true, index: {unique: true}
-      t.string :access_token, null: false
-      t.integer :organization_id, null: false
+      t.string :access_token, null: false, length: 510
+      t.string :organization_id, null: false, length: 510
       t.string :status, null: false
       t.text :status_message