From c98abd8e94bde7384496ea5907bb0a5749d95856 Mon Sep 17 00:00:00 2001
From: Vishal <vishal@bluebash.co>
Date: Thu, 12 May 2022 14:10:03 +0530
Subject: [PATCH 1/2] Added standard as default value in stripe connect account
 type

---
 .../spree/admin/vendors_controller_decorator.rb   |  5 +++--
 .../admin/shared/_stripe_onboarding.html.erb      | 11 +++++++++--
 .../admin/vendors/stripe_account_type.html.erb    | 15 +++++++++++++++
 bin/rails                                         |  2 +-
 config/routes.rb                                  |  1 +
 ...hange_default_value_for_stripe_account_type.rb |  5 +++++
 6 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 app/views/spree/admin/vendors/stripe_account_type.html.erb
 create mode 100644 db/migrate/20220512055755_change_default_value_for_stripe_account_type.rb

diff --git a/app/controllers/spree_stripe_connect_onboarding/spree/admin/vendors_controller_decorator.rb b/app/controllers/spree_stripe_connect_onboarding/spree/admin/vendors_controller_decorator.rb
index a83f851..d5b6f4b 100644
--- a/app/controllers/spree_stripe_connect_onboarding/spree/admin/vendors_controller_decorator.rb
+++ b/app/controllers/spree_stripe_connect_onboarding/spree/admin/vendors_controller_decorator.rb
@@ -14,8 +14,9 @@ def stripe_connect_url
           redirect_to redirect_callback_uri
         end
 
-        def account_information
-        end
+        def stripe_account_type; end
+
+        def account_information; end
 
         private
 
diff --git a/app/views/spree/admin/shared/_stripe_onboarding.html.erb b/app/views/spree/admin/shared/_stripe_onboarding.html.erb
index 6bccbd9..9a5e2c5 100644
--- a/app/views/spree/admin/shared/_stripe_onboarding.html.erb
+++ b/app/views/spree/admin/shared/_stripe_onboarding.html.erb
@@ -1,13 +1,20 @@
 <% content_for :sidebar do %>
   <ul class="nav flex-column nav-pills" data-hook="stripe_onboarding">
-    <% unless @vendor.stripe_connect_id.present? %>
+    <% if !@vendor.stripe_connect_id.present? && !current_spree_user.admin? %>
       <li data-hook='admin_order_tabs_cart_details'>
         <%= link_to_with_icon 'add.svg',
           Spree.t(:stripe_onboarding),
-          onboarding_admin_vendor_setting_url(@vendor),
+          stripe_connect_url_admin_vendor_path(@vendor),
           class: "nav-link" %>
       </li>
     <% end %>
+    <% if !@vendor.stripe_connect_id.present? && current_spree_user.admin? %>
+      <%= link_to_with_icon 'add.svg',
+          Spree.t(:stripe_account_type),
+          stripe_account_type_admin_vendor_url(@vendor),
+          class: "nav-link" %>
+    <% end %>
+
     <% if @vendor.stripe_connect_id.present? %>
       <li data-hook='admin_order_tabs_cart_details'>
         <%= link_to_with_icon 'info.svg',
diff --git a/app/views/spree/admin/vendors/stripe_account_type.html.erb b/app/views/spree/admin/vendors/stripe_account_type.html.erb
new file mode 100644
index 0000000..eaf5c52
--- /dev/null
+++ b/app/views/spree/admin/vendors/stripe_account_type.html.erb
@@ -0,0 +1,15 @@
+<h4 class="pt-5"> Stripe Account Type </h4>
+
+<%= form_for([:admin, @vendor], url: admin_vendor_url, method: :put) do |f| %>
+  <div class="form-group">
+    <%= f.field_container :stripe_account_type do %>
+      <%= f.label :stripe_account_type %>
+      <%= f.select :stripe_account_type, Spree::Vendor.stripe_account_types.keys.map{ |x| [x.titleize, x] }, {:include_blank => true}, {class: 'select2 form-control', "data-placeholder" => Spree.t(:stripe_account_type)} %>
+    <% end %>
+  </div>
+  <div class="form-actions" data-hook="buttons">
+    <%= f.submit "Submit", class: "btn btn-primary", "data-turbo": "false"%>
+    <span class="or"><%= Spree.t(:or) %></span>
+    <%= button_link_to Spree.t('actions.cancel'), edit_admin_vendor_url(@vendor), icon: 'delete' %>
+  </div>
+<% end %>
diff --git a/bin/rails b/bin/rails
index 5a97809..a3e5aad 100755
--- a/bin/rails
+++ b/bin/rails
@@ -2,7 +2,7 @@
 # This command will automatically be run when you run "rails" from the root of your extension
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree_stripe_connect_standard_onboarding/engine', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/spree_stripe_connect_onboarding/engine', __FILE__)
 
 require 'rails/all'
 require 'rails/engine/commands'
diff --git a/config/routes.rb b/config/routes.rb
index de0e8de..2a87751 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,7 @@
         member do
           get :stripe_connect_url
           get :account_information
+          get :stripe_account_type
         end
       end
 
diff --git a/db/migrate/20220512055755_change_default_value_for_stripe_account_type.rb b/db/migrate/20220512055755_change_default_value_for_stripe_account_type.rb
new file mode 100644
index 0000000..88124ad
--- /dev/null
+++ b/db/migrate/20220512055755_change_default_value_for_stripe_account_type.rb
@@ -0,0 +1,5 @@
+class ChangeDefaultValueForStripeAccountType < ActiveRecord::Migration[6.1]
+  def change
+    change_column :spree_vendors, :stripe_account_type, :string, default: 0
+  end
+end

From d4ebe3101ef6d6221e342e402542d090e2600ab1 Mon Sep 17 00:00:00 2001
From: Vishal <vishal@bluebash.co>
Date: Thu, 12 May 2022 16:39:30 +0530
Subject: [PATCH 2/2] =?UTF-8?q?1.2=20release=20=F0=9F=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/spree_stripe_connect_onboarding/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/spree_stripe_connect_onboarding/version.rb b/lib/spree_stripe_connect_onboarding/version.rb
index 530388a..1bb8c67 100644
--- a/lib/spree_stripe_connect_onboarding/version.rb
+++ b/lib/spree_stripe_connect_onboarding/version.rb
@@ -1,5 +1,5 @@
 module SpreeStripeConnectOnboarding
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 
   module_function