From e726064993695dee25d1c107cfe80b61f7cb924d Mon Sep 17 00:00:00 2001
From: Vishal <vishal@bluebash.co>
Date: Fri, 4 Aug 2023 18:40:52 +0530
Subject: [PATCH 1/7] Remive deface dependency and upgrade it with spreee 4.6

---
 .../add_documents_to_main_navigation.rb       | 17 ----
 ...print_invoice_links_to_admin_order_tabs.rb |  8 --
 ..._invoice_to_admin_configuration_sidebar.rb |  9 --
 .../spree/admin/shared/_main_menu.html.erb    | 95 +++++++++++++++++++
 .../spree/admin/shared/_order_tabs.html.erb   | 93 ++++++++++++++++++
 .../admin/shared/menu/_documents_tab.html.erb |  2 +-
 .../shared/sub_menu/_configuration.html.erb   | 20 ++++
 .../sub_menu/_documents_sub_menu.html.erb     |  2 +-
 8 files changed, 210 insertions(+), 36 deletions(-)
 delete mode 100644 app/overrides/add_documents_to_main_navigation.rb
 delete mode 100644 app/overrides/add_print_invoice_links_to_admin_order_tabs.rb
 delete mode 100644 app/overrides/add_print_invoice_to_admin_configuration_sidebar.rb
 create mode 100644 app/views/spree/admin/shared/_main_menu.html.erb
 create mode 100644 app/views/spree/admin/shared/_order_tabs.html.erb
 create mode 100644 app/views/spree/admin/shared/sub_menu/_configuration.html.erb

diff --git a/app/overrides/add_documents_to_main_navigation.rb b/app/overrides/add_documents_to_main_navigation.rb
deleted file mode 100644
index cc514835..00000000
--- a/app/overrides/add_documents_to_main_navigation.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-if Spree.version.to_f < 4.0
-  Deface::Override.new(
-    virtual_path: 'spree/layouts/admin',
-    insert_bottom: '#main-sidebar',
-    partial: 'spree/admin/shared/menu/documents_tab',
-    name: 'documents_tab'
-  )
-else
-  Deface::Override.new(
-    virtual_path: 'spree/admin/shared/_main_menu',
-    insert_bottom: 'nav',
-    partial: 'spree/admin/shared/menu/documents_tab',
-    name: 'documents_tab'
-  )
-end
diff --git a/app/overrides/add_print_invoice_links_to_admin_order_tabs.rb b/app/overrides/add_print_invoice_links_to_admin_order_tabs.rb
deleted file mode 100644
index cf7382df..00000000
--- a/app/overrides/add_print_invoice_links_to_admin_order_tabs.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-Deface::Override.new(
-  virtual_path: 'spree/admin/shared/_order_tabs',
-  name: 'print_invoice_order_tab_links',
-  insert_bottom: '[data-hook="admin_order_tabs"]',
-  partial: 'spree/admin/orders/print_invoice_order_tab_links'
-)
diff --git a/app/overrides/add_print_invoice_to_admin_configuration_sidebar.rb b/app/overrides/add_print_invoice_to_admin_configuration_sidebar.rb
deleted file mode 100644
index 9c143549..00000000
--- a/app/overrides/add_print_invoice_to_admin_configuration_sidebar.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-Deface::Override.new(
-  virtual_path: 'spree/admin/shared/sub_menu/_configuration',
-  name: 'print_invoice_admin_configurations_menu',
-  insert_bottom: '[data-hook="admin_configurations_sidebar_menu"]',
-  text: '<%= configurations_sidebar_menu_item Spree.t(:settings, scope: :print_invoice),
-                      spree.edit_admin_print_invoice_settings_path %>'
-)
diff --git a/app/views/spree/admin/shared/_main_menu.html.erb b/app/views/spree/admin/shared/_main_menu.html.erb
new file mode 100644
index 00000000..2cf4c443
--- /dev/null
+++ b/app/views/spree/admin/shared/_main_menu.html.erb
@@ -0,0 +1,95 @@
+<nav class="pb-3 pt-lg-3 px-1">
+  <div class="text-right d-lg-none pl-3 py-2 border-bottom d-flex align-items-center">
+    <div class="d-flex flex-grow-1 text-primary"></div>
+    <button
+      id="sidebar-close"
+      class="btn btn-link d-flex"
+      type="button"
+      aria-expanded="false"
+      aria-label="Toggle navigation">
+      <%= svg_icon name: "cancel.svg", width: '20', height: '20', classes: 'p-0 m-0' %>
+    </button>
+  </div>
+
+  <ul class="nav nav-sidebar" id="sidebarDashboard">
+    <%= tab Spree.t('admin.home'), url: spree.admin_dashboard_path, match_path: '/dashboard', icon: 'house-door-fill.svg' %>
+  </ul>
+
+  <% if can? :admin, Spree::Order %>
+    <ul class="nav nav-sidebar" id="sidebarOrder">
+      <%= main_menu_tree Spree.t(:orders), icon: "inbox-fill.svg", sub_menu: "orders", url: "#sidebar-orders" %>
+    </ul>
+  <% end %>
+
+  <% if can?(:admin, Spree::ReturnAuthorization) || can?(:admin, Spree::CustomerReturn) %>
+    <ul class="nav nav-sidebar" id="sidebarReturn">
+      <%= main_menu_tree Spree.t(:returns), icon: "reply-fill.svg", sub_menu: "returns", url: "#sidebar-returns" %>
+    </ul>
+  <% end %>
+
+  <% if can? :admin, Spree::Product %>
+    <ul class="nav nav-sidebar" id="sidebarProduct">
+      <%= main_menu_tree Spree.t(:products), icon: "tags-fill.svg", sub_menu: "product", url: "#sidebar-product" %>
+    </ul>
+  <% end %>
+
+  <% if can?(:admin, Spree::StockLocation) || can?(:admin, Spree::StockTransfer) %>
+    <ul class="nav nav-sidebar" id="sidebarStock">
+      <%= main_menu_tree Spree.t(:stock), icon: "box-seam.svg", sub_menu: "stock", url: "#sidebar-stock" %>
+    </ul>
+  <% end %>
+
+  <% if can? :admin, Spree::Admin::ReportsController %>
+    <ul class="nav nav-sidebar" id="sidebarReport">
+      <%= tab *Spree::Backend::Configuration::REPORT_TABS, icon: 'pie-chart-fill.svg' %>
+    </ul>
+  <% end %>
+
+  <% if can? :admin, Spree::Promotion %>
+    <ul class="nav nav-sidebar" id="sidebarPromotion">
+      <%= main_menu_tree Spree.t(:promotions), icon: "percent.svg", sub_menu: "promotion", url: "#sidebar-promotions" %>
+    </ul>
+  <% end %>
+
+  <% if defined?(Spree::Vendor) && can?(:manage, Spree::Vendor) && can?(:index, Spree::Vendor) %>
+    <ul class="nav nav-sidebar" id="sidebarOrganizations">
+      <%= main_menu_tree Spree.t(:organizations), icon: "building.svg", sub_menu: "organizations", url: "#sidebar-organizations" %>
+    </ul>
+  <% end %>
+
+  <% if Spree.user_class && can?(:admin, Spree.user_class) %>
+    <ul class="nav nav-sidebar" id="sidebarUser">
+      <%= tab *Spree::Backend::Configuration::USER_TABS, url: spree.admin_users_path, icon: 'people-fill.svg' %>
+    </ul>
+  <% end %>
+
+  <% if can? :admin, Spree::Menu %>
+    <ul class="nav nav-sidebar" id="sidebarMenu">
+      <%= main_menu_tree Spree.t('admin.tab.content'), icon: "card-heading.svg", sub_menu: "content", url: "#sidebar-content" %>
+    </ul>
+  <% end %>
+
+  <% if can?(:admin, Spree::Webhooks::Subscriber) || can?(:admin, Spree::PaymentMethod) %>
+    <ul class="nav nav-sidebar" id="sidebarIntegrations">
+      <%= main_menu_tree Spree.t('admin.tab.integrations'), icon: "stack.svg", sub_menu: "integrations", url: "#sidebar-integrations" %>
+    </ul>
+  <% end %>
+
+  <% if can? :admin, Spree::OauthApplication %>
+    <ul class="nav nav-sidebar" id="sidebarApps">
+      <%= main_menu_tree Spree.t('admin.tab.apps'), icon: "terminal-fill.svg", sub_menu: "apps", url: "#sidebar-apps" %>
+    </ul>
+  <% end %>
+
+  <% if can? :admin, current_store %>
+    <ul class="nav nav-sidebar" id="sidebarConfiguration">
+      <%= main_menu_tree Spree.t('admin.settings'), icon: "gear-fill.svg", sub_menu: "configuration", url: "#sidebar-configuration" %>
+    </ul>
+  <% elsif defined?(current_spree_vendor) && current_spree_vendor.present? %>
+    <ul class="nav nav-sidebar" id="sidebarConfiguration">
+      <%= main_menu_tree Spree.t('admin.settings'), icon: "gear-fill.svg", sub_menu: "vendor_configuration", url: "#sidebar-configuration" %>
+    </ul>
+  <% end %>
+
+  <%= render partial: 'spree/admin/shared/menu/documents_tab'%>
+</nav>
diff --git a/app/views/spree/admin/shared/_order_tabs.html.erb b/app/views/spree/admin/shared/_order_tabs.html.erb
new file mode 100644
index 00000000..1b9d8d79
--- /dev/null
+++ b/app/views/spree/admin/shared/_order_tabs.html.erb
@@ -0,0 +1,93 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_orders_path %>
+  <%= @order.number %>
+<% end %>
+
+<% content_for :page_tabs do %>
+  <% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
+    <li class="nav-item" data-hook='admin_order_tabs_cart_details'>
+      <%= link_to_with_icon 'cart-check.svg',
+        Spree.t(:cart),
+        cart_admin_order_url(@order),
+        class: "#{'active' if current == :cart} nav-link" %>
+    </li>
+  <% end %>
+
+  <% if can? :update, @order %>
+    <li class="nav-item" data-hook='admin_order_tabs_channel_details'>
+      <%= link_to_with_icon 'funnel.svg',
+        Spree.t(:channel),
+        channel_admin_order_url(@order),
+        class: "#{'active' if current == :channel} nav-link" %>
+    </li>
+  <% end %>
+
+  <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
+    <li class="nav-item" data-hook='admin_order_tabs_customer_details'>
+      <%= link_to_with_icon 'person-lines-fill.svg',
+        Spree.t(:customer),
+        spree.admin_order_customer_url(@order),
+        class: "#{'active' if current == :customer_details} nav-link" %>
+    </li>
+  <% end %>
+
+  <% if can? :update, @order %>
+    <li class="nav-item" data-hook='admin_order_tabs_shipment_details'>
+      <%= link_to_with_icon 'truck.svg',
+        Spree.t(:shipments),
+        edit_admin_order_url(@order),
+        class: "#{'active' if current == :shipments} nav-link" %>
+    </li>
+  <% end %>
+
+  <% if can? :index, Spree::Adjustment %>
+    <li class="nav-item" data-hook='admin_order_tabs_adjustments'>
+      <%= link_to_with_icon 'adjust.svg',
+        Spree.t(:adjustments),
+        spree.admin_order_adjustments_url(@order),
+        class: "#{'active' if current == :adjustments} nav-link" %>
+    </li>
+  <% end %>
+
+  <% if can?(:index, Spree::Payment) %>
+    <li class="nav-item" data-hook='admin_order_tabs_payments'>
+      <%= link_to_with_icon 'credit-card.svg',
+        Spree.t(:payments),
+        spree.admin_order_payments_url(@order),
+        class: "#{'active' if current == :payments} nav-link" %>
+    </li>
+  <% end %>
+
+  <% if can? :index, Spree::ReturnAuthorization %>
+    <% if @order.completed? %>
+      <li class="nav-item" data-hook='admin_order_tabs_return_authorizations'>
+        <%= link_to_with_icon 'enter.svg',
+          Spree.t(:return_authorizations),
+          spree.admin_order_return_authorizations_url(@order),
+          class: "#{'active' if current == :return_authorizations} nav-link" %>
+      </li>
+    <% end %>
+  <% end %>
+
+  <% if can? :index, Spree::CustomerReturn %>
+    <% if @order.completed? %>
+      <li class="nav-item">
+        <%= link_to_with_icon 'returns.svg',
+          Spree.t(:customer_returns),
+          spree.admin_order_customer_returns_url(@order),
+          class: "#{'active' if current == :customer_returns} nav-link" %>
+      </li>
+    <% end %>
+  <% end %>
+
+  <% if can? :update, @order %>
+    <li class="nav-item" data-hook='admin_order_tabs_state_changes'>
+      <%= link_to_with_icon 'calendar3.svg',
+        Spree::StateChange.human_attribute_name(:state_changes),
+        spree.admin_order_state_changes_url(@order),
+        class: "#{'active' if current == :state_changes} nav-link" %>
+    </li>
+  <% end %>
+
+  <%= render  partial: 'spree/admin/orders/print_invoice_order_tab_links', locals: { current: current } %>
+<% end %>
diff --git a/app/views/spree/admin/shared/menu/_documents_tab.html.erb b/app/views/spree/admin/shared/menu/_documents_tab.html.erb
index 7b8556fa..b3832290 100644
--- a/app/views/spree/admin/shared/menu/_documents_tab.html.erb
+++ b/app/views/spree/admin/shared/menu/_documents_tab.html.erb
@@ -1,3 +1,3 @@
-<ul class="nav nav-sidebar border-bottom">
+<ul class="nav nav-sidebar">
   <%= main_menu_tree Spree.t(:documents, scope: [:print_invoice]), url: '#sidebar-documents', icon: 'file.svg', sub_menu: 'documents_sub_menu' %>
 </ul>
diff --git a/app/views/spree/admin/shared/sub_menu/_configuration.html.erb b/app/views/spree/admin/shared/sub_menu/_configuration.html.erb
new file mode 100644
index 00000000..ab8a3e79
--- /dev/null
+++ b/app/views/spree/admin/shared/sub_menu/_configuration.html.erb
@@ -0,0 +1,20 @@
+<ul data-hook="admin_configurations_sidebar_menu" class="collapse nav nav-pills nav-stacked" id="sidebar-configuration">
+  <%= configurations_sidebar_menu_item(Spree.t(:store), spree.edit_admin_store_path(current_store), { is_selected: controller_name == 'stores' }) if can? :manage, current_store %>
+  <%= configurations_sidebar_menu_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can? :manage, Spree::TaxCategory %>
+  <%= configurations_sidebar_menu_item(Spree.t(:tax_rates), spree.admin_tax_rates_path) if can? :manage, Spree::TaxRate %>
+  <%= configurations_sidebar_menu_item(Spree.t(:zones), spree.admin_zones_path) if can? :manage, Spree::Zone %>
+  <%= configurations_sidebar_menu_item(Spree.t(:countries), spree.admin_countries_path) if can? :manage, Spree::Country %>
+
+  <% if country = current_store.default_country %>
+    <%= configurations_sidebar_menu_item(Spree.t(:states), spree.admin_country_states_path(country)) if can? :manage, Spree::Country %>
+  <% end %>
+
+  <%= configurations_sidebar_menu_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path) if can? :manage, Spree::ShippingMethod %>
+  <%= configurations_sidebar_menu_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can? :manage, Spree::ShippingCategory %>
+  <%= configurations_sidebar_menu_item(Spree.t(:store_credit_categories), spree.admin_store_credit_categories_path) if can? :manage, Spree::StoreCreditCategory %>
+  <%= configurations_sidebar_menu_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can? :manage, Spree::RefundReason %>
+  <%= configurations_sidebar_menu_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can? :manage, Spree::ReimbursementType %>
+  <%= configurations_sidebar_menu_item(Spree.t(:return_authorization_reasons), spree.admin_return_authorization_reasons_path) if can? :manage, Spree::ReturnAuthorizationReason %>
+  <%= configurations_sidebar_menu_item(Spree.t(:roles), spree.admin_roles_path) if can? :manage, Spree::Role %>
+  <%= configurations_sidebar_menu_item Spree.t(:settings, scope: :print_invoice), spree.edit_admin_print_invoice_settings_path %>
+</ul>
diff --git a/app/views/spree/admin/shared/sub_menu/_documents_sub_menu.html.erb b/app/views/spree/admin/shared/sub_menu/_documents_sub_menu.html.erb
index 0a7878b6..c76566ba 100644
--- a/app/views/spree/admin/shared/sub_menu/_documents_sub_menu.html.erb
+++ b/app/views/spree/admin/shared/sub_menu/_documents_sub_menu.html.erb
@@ -1,4 +1,4 @@
-<ul id="sidebar-documents" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_documents_sub_tabs">
+<ul id="sidebar-documents" class="collapse nav nav-pills nav-stacked" data-hook="admin_documents_sub_tabs">
   <%= tab :invoices, url: spree.admin_bookkeeping_documents_path(q: { template_eq: 'invoice' }) %>
   <%= tab :packaging_slips, url: spree.admin_bookkeeping_documents_path(q: { template_eq: 'packaging_slip' }) %>
 </ul>

From 103432f23966e09e21a7aaf9d59dc495f038d370 Mon Sep 17 00:00:00 2001
From: Vishal <vishal@bluebash.co>
Date: Fri, 25 Aug 2023 17:54:11 +0530
Subject: [PATCH 2/7] Fixes related to the print invoice pathname

---
 app/views/spree/printables/shared/_header.pdf.prawn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/spree/printables/shared/_header.pdf.prawn b/app/views/spree/printables/shared/_header.pdf.prawn
index 53d8af04..531f1ca3 100644
--- a/app/views/spree/printables/shared/_header.pdf.prawn
+++ b/app/views/spree/printables/shared/_header.pdf.prawn
@@ -1,6 +1,7 @@
+require 'uri'
 im = (Rails.application.assets || ::Sprockets::Railtie.build_environment(Rails.application)).find_asset(Spree::PrintInvoice::Config[:logo_path])
-
-if im && File.exist?(im.pathname)
+im_path = URI(im.uri).path
+if im && File.exist?(im_path)
   pdf.image im.filename, vposition: :top, height: 40, scale: Spree::PrintInvoice::Config[:logo_scale]
 end
 

From b90486a9aaa62ffd933e7b2ba98384e90d7b50d5 Mon Sep 17 00:00:00 2001
From: Shrey <shrey.gupta@bluebash.co>
Date: Tue, 10 Sep 2024 17:57:27 +0530
Subject: [PATCH 3/7] Upgrade dependencies for Spree 4.8

---
 .../spree/admin/bookkeeping_documents_controller.rb      | 9 ++++++++-
 app/models/spree/bookkeeping_document.rb                 | 7 ++++++-
 app/models/spree/order_decorator.rb                      | 3 ++-
 app/views/spree/printables/shared/_header.pdf.prawn      | 7 +++----
 config/locales/en.yml                                    | 1 +
 lib/spree_print_invoice/engine.rb                        | 2 +-
 spree-print-invoice.gemspec                              | 4 ++--
 7 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/controllers/spree/admin/bookkeeping_documents_controller.rb b/app/controllers/spree/admin/bookkeeping_documents_controller.rb
index fd074f83..5f8ef9a6 100644
--- a/app/controllers/spree/admin/bookkeeping_documents_controller.rb
+++ b/app/controllers/spree/admin/bookkeeping_documents_controller.rb
@@ -8,7 +8,10 @@ class BookkeepingDocumentsController < ResourceController
       def show
         respond_with(@bookkeeping_document) do |format|
           format.pdf do
-            send_data @bookkeeping_document.pdf, type: 'application/pdf', disposition: 'inline'
+            send_data @bookkeeping_document.pdf,
+                      type: 'application/pdf',
+                      disposition: 'inline',
+                      filename: pdf_filename
           end
         end
       end
@@ -39,6 +42,10 @@ def order_focused?
       def load_order
         @order = Spree::Order.find_by(number: params[:order_id])
       end
+
+      def pdf_filename
+        "#{@bookkeeping_document.template}_#{@bookkeeping_document.number}_#{@bookkeeping_document.printable.bill_address.firstname}_#{@bookkeeping_document.printable.completed_at.to_i}.pdf"
+      end
     end
   end
 end
diff --git a/app/models/spree/bookkeeping_document.rb b/app/models/spree/bookkeeping_document.rb
index bbe3c76e..b839920d 100644
--- a/app/models/spree/bookkeeping_document.rb
+++ b/app/models/spree/bookkeeping_document.rb
@@ -8,6 +8,10 @@ class BookkeepingDocument < ActiveRecord::Base
       :number
     ]
 
+    def self.ransackable_attributes(auth_object = nil)
+      ["created_at", "email", "firstname", "id", "id_value", "lastname", "number", "printable_id", "printable_type", "template", "total", "updated_at"]
+    end
+
     # Spree::BookkeepingDocument cares about creating PDFs. Whenever it needs to know
     # anything about the document to send to the view, it asks a view object.
     #
@@ -108,7 +112,8 @@ def storage_path
     #
     def render_pdf
       ApplicationController.render(
-        template: "#{template_name}.pdf.prawn",
+        template: template_name,
+        formats: [:pdf],
         assigns: { doc: self }
       )
     end
diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index e6bed8d1..07d3b8c5 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -42,9 +42,10 @@ def pdf_storage_path(template)
     end
 
     def invoice_for_order
+      return if bookkeeping_documents.exists?(template: 'invoice') && bookkeeping_documents.exists?(template: 'packaging_slip')
       bookkeeping_documents.create(template: 'invoice')
       bookkeeping_documents.create(template: 'packaging_slip')
     end
   end
 end
-::Spree::Order.prepend Spree::OrderDecorator
\ No newline at end of file
+::Spree::Order.prepend Spree::OrderDecorator
diff --git a/app/views/spree/printables/shared/_header.pdf.prawn b/app/views/spree/printables/shared/_header.pdf.prawn
index 531f1ca3..14bb7f61 100644
--- a/app/views/spree/printables/shared/_header.pdf.prawn
+++ b/app/views/spree/printables/shared/_header.pdf.prawn
@@ -1,7 +1,6 @@
-require 'uri'
 im = (Rails.application.assets || ::Sprockets::Railtie.build_environment(Rails.application)).find_asset(Spree::PrintInvoice::Config[:logo_path])
-im_path = URI(im.uri).path
-if im && File.exist?(im_path)
+
+if im && File.exist?(im.filename)
   pdf.image im.filename, vposition: :top, height: 40, scale: Spree::PrintInvoice::Config[:logo_scale]
 end
 
@@ -12,4 +11,4 @@ pdf.grid([0,3], [1,4]).bounding_box do
   pdf.text Spree.t(:invoice_number, scope: :print_invoice, number: printable.number), align: :right
   pdf.move_down 2
   pdf.text Spree.t(:invoice_date, scope: :print_invoice, date: I18n.l(printable.date)), align: :right
-end
+end
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 112c5070..fca880cb 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1,7 @@
 ---
 en:
   spree:
+    printable_number: Printable Number
     admin:
       tab:
         invoices: Invoices
diff --git a/lib/spree_print_invoice/engine.rb b/lib/spree_print_invoice/engine.rb
index 1ceb6c29..f0e931a9 100644
--- a/lib/spree_print_invoice/engine.rb
+++ b/lib/spree_print_invoice/engine.rb
@@ -6,7 +6,7 @@ class Engine < Rails::Engine
 
     config.autoload_paths += %W(#{config.root}/lib)
 
-    initializer 'spree.print_invoice.preferences', before: :load_config_initializers do
+    config.after_initialize do
       Spree::PrintInvoice::Config = Spree::PrintInvoiceSetting.new
     end
 
diff --git a/spree-print-invoice.gemspec b/spree-print-invoice.gemspec
index 07157683..d456f7b0 100755
--- a/spree-print-invoice.gemspec
+++ b/spree-print-invoice.gemspec
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_runtime_dependency 'prawn-rails', '~> 1.3'
-  s.add_runtime_dependency 'spree_core', '>= 3.1.0', '< 5.0'
+  s.add_runtime_dependency 'prawn-rails', '~> 1.4.2'
+  s.add_runtime_dependency 'spree_core', '>= 4.8.0', '< 5.0'
   s.add_runtime_dependency 'spree_extension'
 
   s.add_development_dependency 'capybara'

From c599576cca21e5dff14c5dd37f32ab58f80d4202 Mon Sep 17 00:00:00 2001
From: Shrey <shrey.gupta@bluebash.co>
Date: Wed, 11 Sep 2024 13:03:11 +0530
Subject: [PATCH 4/7] Minor changes.

---
 ...default_configuration_builder_decorator.rb | 28 ++++++
 .../order_default_tabs_builder_decorator.rb   | 31 +++++++
 .../_print_invoice_order_tab_links.html.erb   | 12 ---
 .../spree/admin/shared/_order_tabs.html.erb   | 93 -------------------
 config/locales/en.yml                         |  3 +
 5 files changed, 62 insertions(+), 105 deletions(-)
 create mode 100644 app/models/spree/admin/main_menu/default_configuration_builder_decorator.rb
 create mode 100644 app/models/spree/admin/tabs/order_default_tabs_builder_decorator.rb
 delete mode 100755 app/views/spree/admin/orders/_print_invoice_order_tab_links.html.erb
 delete mode 100644 app/views/spree/admin/shared/_order_tabs.html.erb

diff --git a/app/models/spree/admin/main_menu/default_configuration_builder_decorator.rb b/app/models/spree/admin/main_menu/default_configuration_builder_decorator.rb
new file mode 100644
index 00000000..8d34764d
--- /dev/null
+++ b/app/models/spree/admin/main_menu/default_configuration_builder_decorator.rb
@@ -0,0 +1,28 @@
+module Spree
+  module Admin
+    module MainMenu
+      module DefaultConfigurationBuilderDecorator
+        def add_orders_section(root)
+          super
+
+          section = root.items.find { |s| s.key == 'orders' }
+          return unless section
+
+          section.items << ItemBuilder.new('bookkeeping_documents', admin_bookkeeping_documents_path).
+            with_manage_ability_check(Spree::BookkeepingDocument).
+            with_match_path('/bookkeeping_documents').
+            build
+
+            section.items << ItemBuilder.new('print_invoice_settings', edit_admin_print_invoice_settings_path).
+            with_manage_ability_check(Spree::PrintInvoiceSetting).
+            with_match_path('/print_invoice_settings/edit').
+            build
+        end
+      end
+    end
+  end
+end
+
+::Spree::Admin::MainMenu::DefaultConfigurationBuilder.prepend(
+  Spree::Admin::MainMenu::DefaultConfigurationBuilderDecorator
+)
diff --git a/app/models/spree/admin/tabs/order_default_tabs_builder_decorator.rb b/app/models/spree/admin/tabs/order_default_tabs_builder_decorator.rb
new file mode 100644
index 00000000..a4b56b3f
--- /dev/null
+++ b/app/models/spree/admin/tabs/order_default_tabs_builder_decorator.rb
@@ -0,0 +1,31 @@
+module Spree
+  module Admin
+    module Tabs
+      module OrderDefaultTabsBuilderDecorator
+        def build
+          root = super
+
+          add_bookkeeping_documents_tab(root)
+          root
+        end
+
+        private
+
+        def add_bookkeeping_documents_tab(root)
+          tab =
+            TabBuilder.new('documents', ->(resource) { admin_order_bookkeeping_documents_path(resource) }).
+            with_icon_key('file.svg').
+            with_active_check.
+            with_update_ability_check.
+            with_data_hook('admin_order_tabs_bookkeeping_documents').
+            build
+
+          root.add(tab)
+        end
+      end
+    end
+  end
+end
+::Spree::Admin::Tabs::OrderDefaultTabsBuilder.prepend(
+  Spree::Admin::Tabs::OrderDefaultTabsBuilderDecorator
+)
diff --git a/app/views/spree/admin/orders/_print_invoice_order_tab_links.html.erb b/app/views/spree/admin/orders/_print_invoice_order_tab_links.html.erb
deleted file mode 100755
index ccc6a9d2..00000000
--- a/app/views/spree/admin/orders/_print_invoice_order_tab_links.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% if can? :show, Spree::Order %>
-  <% if @order && @order.completed_at? %>
-    <li data-hook="admin_order_tabs_bookkeeping_documents">
-      <%=
-        link_to_with_icon 'file.svg',
-                          Spree.t(:documents, scope: [:print_invoice]),
-                          spree.admin_order_bookkeeping_documents_path(@order),
-                          { class: "nav-link #{'active' if current == :documents}" }
-      %>
-    </li>
-  <% end %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/spree/admin/shared/_order_tabs.html.erb b/app/views/spree/admin/shared/_order_tabs.html.erb
deleted file mode 100644
index 1b9d8d79..00000000
--- a/app/views/spree/admin/shared/_order_tabs.html.erb
+++ /dev/null
@@ -1,93 +0,0 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_orders_path %>
-  <%= @order.number %>
-<% end %>
-
-<% content_for :page_tabs do %>
-  <% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
-    <li class="nav-item" data-hook='admin_order_tabs_cart_details'>
-      <%= link_to_with_icon 'cart-check.svg',
-        Spree.t(:cart),
-        cart_admin_order_url(@order),
-        class: "#{'active' if current == :cart} nav-link" %>
-    </li>
-  <% end %>
-
-  <% if can? :update, @order %>
-    <li class="nav-item" data-hook='admin_order_tabs_channel_details'>
-      <%= link_to_with_icon 'funnel.svg',
-        Spree.t(:channel),
-        channel_admin_order_url(@order),
-        class: "#{'active' if current == :channel} nav-link" %>
-    </li>
-  <% end %>
-
-  <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
-    <li class="nav-item" data-hook='admin_order_tabs_customer_details'>
-      <%= link_to_with_icon 'person-lines-fill.svg',
-        Spree.t(:customer),
-        spree.admin_order_customer_url(@order),
-        class: "#{'active' if current == :customer_details} nav-link" %>
-    </li>
-  <% end %>
-
-  <% if can? :update, @order %>
-    <li class="nav-item" data-hook='admin_order_tabs_shipment_details'>
-      <%= link_to_with_icon 'truck.svg',
-        Spree.t(:shipments),
-        edit_admin_order_url(@order),
-        class: "#{'active' if current == :shipments} nav-link" %>
-    </li>
-  <% end %>
-
-  <% if can? :index, Spree::Adjustment %>
-    <li class="nav-item" data-hook='admin_order_tabs_adjustments'>
-      <%= link_to_with_icon 'adjust.svg',
-        Spree.t(:adjustments),
-        spree.admin_order_adjustments_url(@order),
-        class: "#{'active' if current == :adjustments} nav-link" %>
-    </li>
-  <% end %>
-
-  <% if can?(:index, Spree::Payment) %>
-    <li class="nav-item" data-hook='admin_order_tabs_payments'>
-      <%= link_to_with_icon 'credit-card.svg',
-        Spree.t(:payments),
-        spree.admin_order_payments_url(@order),
-        class: "#{'active' if current == :payments} nav-link" %>
-    </li>
-  <% end %>
-
-  <% if can? :index, Spree::ReturnAuthorization %>
-    <% if @order.completed? %>
-      <li class="nav-item" data-hook='admin_order_tabs_return_authorizations'>
-        <%= link_to_with_icon 'enter.svg',
-          Spree.t(:return_authorizations),
-          spree.admin_order_return_authorizations_url(@order),
-          class: "#{'active' if current == :return_authorizations} nav-link" %>
-      </li>
-    <% end %>
-  <% end %>
-
-  <% if can? :index, Spree::CustomerReturn %>
-    <% if @order.completed? %>
-      <li class="nav-item">
-        <%= link_to_with_icon 'returns.svg',
-          Spree.t(:customer_returns),
-          spree.admin_order_customer_returns_url(@order),
-          class: "#{'active' if current == :customer_returns} nav-link" %>
-      </li>
-    <% end %>
-  <% end %>
-
-  <% if can? :update, @order %>
-    <li class="nav-item" data-hook='admin_order_tabs_state_changes'>
-      <%= link_to_with_icon 'calendar3.svg',
-        Spree::StateChange.human_attribute_name(:state_changes),
-        spree.admin_order_state_changes_url(@order),
-        class: "#{'active' if current == :state_changes} nav-link" %>
-    </li>
-  <% end %>
-
-  <%= render  partial: 'spree/admin/orders/print_invoice_order_tab_links', locals: { current: current } %>
-<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fca880cb..77a1ccd6 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2,6 +2,9 @@
 en:
   spree:
     printable_number: Printable Number
+    bookkeeping_documents: Bookkeeping Documents
+    print_invoice_settings: Print Invoice Settings
+    documents: Documents
     admin:
       tab:
         invoices: Invoices

From 297333dae2318b2ba2661f321a3f2707a1421202 Mon Sep 17 00:00:00 2001
From: Shrey <shrey.gupta@bluebash.co>
Date: Tue, 15 Oct 2024 13:08:57 +0530
Subject: [PATCH 5/7] Minor Changes

---
 app/views/spree/printables/shared/invoice/_items.pdf.prawn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/spree/printables/shared/invoice/_items.pdf.prawn b/app/views/spree/printables/shared/invoice/_items.pdf.prawn
index 65d90444..8a2d73f6 100644
--- a/app/views/spree/printables/shared/invoice/_items.pdf.prawn
+++ b/app/views/spree/printables/shared/invoice/_items.pdf.prawn
@@ -12,7 +12,7 @@ invoice.items.each do |item|
   row = [
     item.sku,
     item.name,
-    item.options_text,
+    item.options_text.join(','),
     item.display_price.to_s,
     item.quantity,
     item.display_total.to_s

From 056fda459a119da8f0f6cb2e5502ef92bc2c7189 Mon Sep 17 00:00:00 2001
From: mohit-bluebash <mohit@bluebash.co>
Date: Thu, 21 Nov 2024 12:24:20 +0530
Subject: [PATCH 6/7] code optimize

---
 ...default_configuration_builder_decorator.rb | 28 ------
 .../admin/main_menu/print_invoice_builder.rb  | 30 ++++++
 .../spree/admin/shared/_main_menu.html.erb    | 95 -------------------
 .../shared/invoice/_items.pdf.prawn           |  2 +-
 config/initializers/print_invoice.rb          | 11 +++
 5 files changed, 42 insertions(+), 124 deletions(-)
 delete mode 100644 app/models/spree/admin/main_menu/default_configuration_builder_decorator.rb
 create mode 100644 app/models/spree_print_invoice/admin/main_menu/print_invoice_builder.rb
 delete mode 100644 app/views/spree/admin/shared/_main_menu.html.erb
 create mode 100644 config/initializers/print_invoice.rb

diff --git a/app/models/spree/admin/main_menu/default_configuration_builder_decorator.rb b/app/models/spree/admin/main_menu/default_configuration_builder_decorator.rb
deleted file mode 100644
index 8d34764d..00000000
--- a/app/models/spree/admin/main_menu/default_configuration_builder_decorator.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module Spree
-  module Admin
-    module MainMenu
-      module DefaultConfigurationBuilderDecorator
-        def add_orders_section(root)
-          super
-
-          section = root.items.find { |s| s.key == 'orders' }
-          return unless section
-
-          section.items << ItemBuilder.new('bookkeeping_documents', admin_bookkeeping_documents_path).
-            with_manage_ability_check(Spree::BookkeepingDocument).
-            with_match_path('/bookkeeping_documents').
-            build
-
-            section.items << ItemBuilder.new('print_invoice_settings', edit_admin_print_invoice_settings_path).
-            with_manage_ability_check(Spree::PrintInvoiceSetting).
-            with_match_path('/print_invoice_settings/edit').
-            build
-        end
-      end
-    end
-  end
-end
-
-::Spree::Admin::MainMenu::DefaultConfigurationBuilder.prepend(
-  Spree::Admin::MainMenu::DefaultConfigurationBuilderDecorator
-)
diff --git a/app/models/spree_print_invoice/admin/main_menu/print_invoice_builder.rb b/app/models/spree_print_invoice/admin/main_menu/print_invoice_builder.rb
new file mode 100644
index 00000000..5bd633eb
--- /dev/null
+++ b/app/models/spree_print_invoice/admin/main_menu/print_invoice_builder.rb
@@ -0,0 +1,30 @@
+module SpreePrintInvoice
+  module Admin
+    module MainMenu
+      class PrintInvoiceBuilder
+        include ::Spree::Core::Engine.routes.url_helpers
+
+        def build
+          items = [
+            ::Spree::Admin::MainMenu::ItemBuilder.new('invoices', ::Spree::Core::Engine.routes.url_helpers.admin_bookkeeping_documents_path(q: { template_eq: 'invoice' })).
+              with_label_translation_key('admin.tab.invoices').
+              with_manage_ability_check(::Spree::BookkeepingDocument).
+              with_match_path('/bookkeeping_documents?q%5Btemplate_eq%5D=invoice').
+              build,
+            ::Spree::Admin::MainMenu::ItemBuilder.new('packaging_slips', ::Spree::Core::Engine.routes.url_helpers.admin_bookkeeping_documents_path(q: { template_eq: 'packaging_slip' })).
+              with_label_translation_key('admin.tab.packaging_slips').
+              with_manage_ability_check(::Spree::BookkeepingDocument).
+              with_match_path('/bookkeeping_documents?q%5Btemplate_eq%5D=packaging_slip').
+              build
+          ]
+
+          ::Spree::Admin::MainMenu::SectionBuilder.new('documents', 'file.svg').
+              with_manage_ability_check(::Spree::BookkeepingDocument).
+              with_label_translation_key('admin.documents').
+              with_items(items).
+              build
+        end
+      end
+    end
+  end
+end
diff --git a/app/views/spree/admin/shared/_main_menu.html.erb b/app/views/spree/admin/shared/_main_menu.html.erb
deleted file mode 100644
index 2cf4c443..00000000
--- a/app/views/spree/admin/shared/_main_menu.html.erb
+++ /dev/null
@@ -1,95 +0,0 @@
-<nav class="pb-3 pt-lg-3 px-1">
-  <div class="text-right d-lg-none pl-3 py-2 border-bottom d-flex align-items-center">
-    <div class="d-flex flex-grow-1 text-primary"></div>
-    <button
-      id="sidebar-close"
-      class="btn btn-link d-flex"
-      type="button"
-      aria-expanded="false"
-      aria-label="Toggle navigation">
-      <%= svg_icon name: "cancel.svg", width: '20', height: '20', classes: 'p-0 m-0' %>
-    </button>
-  </div>
-
-  <ul class="nav nav-sidebar" id="sidebarDashboard">
-    <%= tab Spree.t('admin.home'), url: spree.admin_dashboard_path, match_path: '/dashboard', icon: 'house-door-fill.svg' %>
-  </ul>
-
-  <% if can? :admin, Spree::Order %>
-    <ul class="nav nav-sidebar" id="sidebarOrder">
-      <%= main_menu_tree Spree.t(:orders), icon: "inbox-fill.svg", sub_menu: "orders", url: "#sidebar-orders" %>
-    </ul>
-  <% end %>
-
-  <% if can?(:admin, Spree::ReturnAuthorization) || can?(:admin, Spree::CustomerReturn) %>
-    <ul class="nav nav-sidebar" id="sidebarReturn">
-      <%= main_menu_tree Spree.t(:returns), icon: "reply-fill.svg", sub_menu: "returns", url: "#sidebar-returns" %>
-    </ul>
-  <% end %>
-
-  <% if can? :admin, Spree::Product %>
-    <ul class="nav nav-sidebar" id="sidebarProduct">
-      <%= main_menu_tree Spree.t(:products), icon: "tags-fill.svg", sub_menu: "product", url: "#sidebar-product" %>
-    </ul>
-  <% end %>
-
-  <% if can?(:admin, Spree::StockLocation) || can?(:admin, Spree::StockTransfer) %>
-    <ul class="nav nav-sidebar" id="sidebarStock">
-      <%= main_menu_tree Spree.t(:stock), icon: "box-seam.svg", sub_menu: "stock", url: "#sidebar-stock" %>
-    </ul>
-  <% end %>
-
-  <% if can? :admin, Spree::Admin::ReportsController %>
-    <ul class="nav nav-sidebar" id="sidebarReport">
-      <%= tab *Spree::Backend::Configuration::REPORT_TABS, icon: 'pie-chart-fill.svg' %>
-    </ul>
-  <% end %>
-
-  <% if can? :admin, Spree::Promotion %>
-    <ul class="nav nav-sidebar" id="sidebarPromotion">
-      <%= main_menu_tree Spree.t(:promotions), icon: "percent.svg", sub_menu: "promotion", url: "#sidebar-promotions" %>
-    </ul>
-  <% end %>
-
-  <% if defined?(Spree::Vendor) && can?(:manage, Spree::Vendor) && can?(:index, Spree::Vendor) %>
-    <ul class="nav nav-sidebar" id="sidebarOrganizations">
-      <%= main_menu_tree Spree.t(:organizations), icon: "building.svg", sub_menu: "organizations", url: "#sidebar-organizations" %>
-    </ul>
-  <% end %>
-
-  <% if Spree.user_class && can?(:admin, Spree.user_class) %>
-    <ul class="nav nav-sidebar" id="sidebarUser">
-      <%= tab *Spree::Backend::Configuration::USER_TABS, url: spree.admin_users_path, icon: 'people-fill.svg' %>
-    </ul>
-  <% end %>
-
-  <% if can? :admin, Spree::Menu %>
-    <ul class="nav nav-sidebar" id="sidebarMenu">
-      <%= main_menu_tree Spree.t('admin.tab.content'), icon: "card-heading.svg", sub_menu: "content", url: "#sidebar-content" %>
-    </ul>
-  <% end %>
-
-  <% if can?(:admin, Spree::Webhooks::Subscriber) || can?(:admin, Spree::PaymentMethod) %>
-    <ul class="nav nav-sidebar" id="sidebarIntegrations">
-      <%= main_menu_tree Spree.t('admin.tab.integrations'), icon: "stack.svg", sub_menu: "integrations", url: "#sidebar-integrations" %>
-    </ul>
-  <% end %>
-
-  <% if can? :admin, Spree::OauthApplication %>
-    <ul class="nav nav-sidebar" id="sidebarApps">
-      <%= main_menu_tree Spree.t('admin.tab.apps'), icon: "terminal-fill.svg", sub_menu: "apps", url: "#sidebar-apps" %>
-    </ul>
-  <% end %>
-
-  <% if can? :admin, current_store %>
-    <ul class="nav nav-sidebar" id="sidebarConfiguration">
-      <%= main_menu_tree Spree.t('admin.settings'), icon: "gear-fill.svg", sub_menu: "configuration", url: "#sidebar-configuration" %>
-    </ul>
-  <% elsif defined?(current_spree_vendor) && current_spree_vendor.present? %>
-    <ul class="nav nav-sidebar" id="sidebarConfiguration">
-      <%= main_menu_tree Spree.t('admin.settings'), icon: "gear-fill.svg", sub_menu: "vendor_configuration", url: "#sidebar-configuration" %>
-    </ul>
-  <% end %>
-
-  <%= render partial: 'spree/admin/shared/menu/documents_tab'%>
-</nav>
diff --git a/app/views/spree/printables/shared/invoice/_items.pdf.prawn b/app/views/spree/printables/shared/invoice/_items.pdf.prawn
index 8a2d73f6..65d90444 100644
--- a/app/views/spree/printables/shared/invoice/_items.pdf.prawn
+++ b/app/views/spree/printables/shared/invoice/_items.pdf.prawn
@@ -12,7 +12,7 @@ invoice.items.each do |item|
   row = [
     item.sku,
     item.name,
-    item.options_text.join(','),
+    item.options_text,
     item.display_price.to_s,
     item.quantity,
     item.display_total.to_s
diff --git a/config/initializers/print_invoice.rb b/config/initializers/print_invoice.rb
new file mode 100644
index 00000000..64ee4494
--- /dev/null
+++ b/config/initializers/print_invoice.rb
@@ -0,0 +1,11 @@
+Rails.application.config.after_initialize do
+  if Spree::Core::Engine.backend_available?
+    Rails.application.config.spree_backend.main_menu.insert_after('dashboard', ::SpreePrintInvoice::Admin::MainMenu::PrintInvoiceBuilder.new.build)
+
+     Rails.application.config.spree_backend.main_menu.add_to_section('settings',
+      ::Spree::Admin::MainMenu::ItemBuilder.new('print_invoice.settings', ::Spree::Core::Engine.routes.url_helpers.edit_admin_print_invoice_settings_path).
+        with_manage_ability_check(::Spree::BookkeepingDocument).
+        build
+      )
+  end
+end

From 83637f7d4156bdedcbbd3a5ebc6e59e369117781 Mon Sep 17 00:00:00 2001
From: mohit-bluebash <mohit@bluebash.co>
Date: Thu, 21 Nov 2024 13:33:53 +0530
Subject: [PATCH 7/7] Code Refactor

---
 .../order_default_tabs_builder_decorator.rb   | 31 -------------------
 .../order_decorator.rb                        |  5 +--
 .../admin/shared/menu/_documents_tab.html.erb |  3 --
 .../shared/sub_menu/_configuration.html.erb   | 20 ------------
 .../sub_menu/_documents_sub_menu.html.erb     |  4 ---
 config/initializers/print_invoice.rb          |  7 +++++
 6 files changed, 10 insertions(+), 60 deletions(-)
 delete mode 100644 app/models/spree/admin/tabs/order_default_tabs_builder_decorator.rb
 rename app/models/{spree => spree_print_invoice}/order_decorator.rb (95%)
 delete mode 100644 app/views/spree/admin/shared/menu/_documents_tab.html.erb
 delete mode 100644 app/views/spree/admin/shared/sub_menu/_configuration.html.erb
 delete mode 100644 app/views/spree/admin/shared/sub_menu/_documents_sub_menu.html.erb

diff --git a/app/models/spree/admin/tabs/order_default_tabs_builder_decorator.rb b/app/models/spree/admin/tabs/order_default_tabs_builder_decorator.rb
deleted file mode 100644
index a4b56b3f..00000000
--- a/app/models/spree/admin/tabs/order_default_tabs_builder_decorator.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module Spree
-  module Admin
-    module Tabs
-      module OrderDefaultTabsBuilderDecorator
-        def build
-          root = super
-
-          add_bookkeeping_documents_tab(root)
-          root
-        end
-
-        private
-
-        def add_bookkeeping_documents_tab(root)
-          tab =
-            TabBuilder.new('documents', ->(resource) { admin_order_bookkeeping_documents_path(resource) }).
-            with_icon_key('file.svg').
-            with_active_check.
-            with_update_ability_check.
-            with_data_hook('admin_order_tabs_bookkeeping_documents').
-            build
-
-          root.add(tab)
-        end
-      end
-    end
-  end
-end
-::Spree::Admin::Tabs::OrderDefaultTabsBuilder.prepend(
-  Spree::Admin::Tabs::OrderDefaultTabsBuilderDecorator
-)
diff --git a/app/models/spree/order_decorator.rb b/app/models/spree_print_invoice/order_decorator.rb
similarity index 95%
rename from app/models/spree/order_decorator.rb
rename to app/models/spree_print_invoice/order_decorator.rb
index 07d3b8c5..bc5e65cb 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree_print_invoice/order_decorator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Spree
+module SpreePrintInvoice
   module OrderDecorator
     def self.prepended(base)
       base.has_many :bookkeeping_documents, as: :printable, dependent: :destroy
@@ -48,4 +48,5 @@ def invoice_for_order
     end
   end
 end
-::Spree::Order.prepend Spree::OrderDecorator
+
+::Spree::Order.prepend SpreePrintInvoice::OrderDecorator
diff --git a/app/views/spree/admin/shared/menu/_documents_tab.html.erb b/app/views/spree/admin/shared/menu/_documents_tab.html.erb
deleted file mode 100644
index b3832290..00000000
--- a/app/views/spree/admin/shared/menu/_documents_tab.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<ul class="nav nav-sidebar">
-  <%= main_menu_tree Spree.t(:documents, scope: [:print_invoice]), url: '#sidebar-documents', icon: 'file.svg', sub_menu: 'documents_sub_menu' %>
-</ul>
diff --git a/app/views/spree/admin/shared/sub_menu/_configuration.html.erb b/app/views/spree/admin/shared/sub_menu/_configuration.html.erb
deleted file mode 100644
index ab8a3e79..00000000
--- a/app/views/spree/admin/shared/sub_menu/_configuration.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<ul data-hook="admin_configurations_sidebar_menu" class="collapse nav nav-pills nav-stacked" id="sidebar-configuration">
-  <%= configurations_sidebar_menu_item(Spree.t(:store), spree.edit_admin_store_path(current_store), { is_selected: controller_name == 'stores' }) if can? :manage, current_store %>
-  <%= configurations_sidebar_menu_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can? :manage, Spree::TaxCategory %>
-  <%= configurations_sidebar_menu_item(Spree.t(:tax_rates), spree.admin_tax_rates_path) if can? :manage, Spree::TaxRate %>
-  <%= configurations_sidebar_menu_item(Spree.t(:zones), spree.admin_zones_path) if can? :manage, Spree::Zone %>
-  <%= configurations_sidebar_menu_item(Spree.t(:countries), spree.admin_countries_path) if can? :manage, Spree::Country %>
-
-  <% if country = current_store.default_country %>
-    <%= configurations_sidebar_menu_item(Spree.t(:states), spree.admin_country_states_path(country)) if can? :manage, Spree::Country %>
-  <% end %>
-
-  <%= configurations_sidebar_menu_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path) if can? :manage, Spree::ShippingMethod %>
-  <%= configurations_sidebar_menu_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can? :manage, Spree::ShippingCategory %>
-  <%= configurations_sidebar_menu_item(Spree.t(:store_credit_categories), spree.admin_store_credit_categories_path) if can? :manage, Spree::StoreCreditCategory %>
-  <%= configurations_sidebar_menu_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can? :manage, Spree::RefundReason %>
-  <%= configurations_sidebar_menu_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can? :manage, Spree::ReimbursementType %>
-  <%= configurations_sidebar_menu_item(Spree.t(:return_authorization_reasons), spree.admin_return_authorization_reasons_path) if can? :manage, Spree::ReturnAuthorizationReason %>
-  <%= configurations_sidebar_menu_item(Spree.t(:roles), spree.admin_roles_path) if can? :manage, Spree::Role %>
-  <%= configurations_sidebar_menu_item Spree.t(:settings, scope: :print_invoice), spree.edit_admin_print_invoice_settings_path %>
-</ul>
diff --git a/app/views/spree/admin/shared/sub_menu/_documents_sub_menu.html.erb b/app/views/spree/admin/shared/sub_menu/_documents_sub_menu.html.erb
deleted file mode 100644
index c76566ba..00000000
--- a/app/views/spree/admin/shared/sub_menu/_documents_sub_menu.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<ul id="sidebar-documents" class="collapse nav nav-pills nav-stacked" data-hook="admin_documents_sub_tabs">
-  <%= tab :invoices, url: spree.admin_bookkeeping_documents_path(q: { template_eq: 'invoice' }) %>
-  <%= tab :packaging_slips, url: spree.admin_bookkeeping_documents_path(q: { template_eq: 'packaging_slip' }) %>
-</ul>
diff --git a/config/initializers/print_invoice.rb b/config/initializers/print_invoice.rb
index 64ee4494..6a235c4f 100644
--- a/config/initializers/print_invoice.rb
+++ b/config/initializers/print_invoice.rb
@@ -2,6 +2,13 @@
   if Spree::Core::Engine.backend_available?
     Rails.application.config.spree_backend.main_menu.insert_after('dashboard', ::SpreePrintInvoice::Admin::MainMenu::PrintInvoiceBuilder.new.build)
 
+    Rails.application.config.spree_backend.tabs[:order].add(
+        ::Spree::Admin::Tabs::TabBuilder.new(::Spree.t(:documents, scope: [:print_invoice]), ->(resource) { ::Spree::Core::Engine.routes.url_helpers.admin_order_bookkeeping_documents_path(resource) }).
+          with_icon_key('file.svg').
+          with_active_check.
+          build
+      )
+
      Rails.application.config.spree_backend.main_menu.add_to_section('settings',
       ::Spree::Admin::MainMenu::ItemBuilder.new('print_invoice.settings', ::Spree::Core::Engine.routes.url_helpers.edit_admin_print_invoice_settings_path).
         with_manage_ability_check(::Spree::BookkeepingDocument).