From 626a12d8c55f80bee4497b7d08f707729d2918b2 Mon Sep 17 00:00:00 2001
From: Vishal <vishal@bluebash.co>
Date: Thu, 10 Aug 2023 18:43:22 +0530
Subject: [PATCH 1/2] Spree Dynamic email compatible with spree 4.6

---
 app/mailers/spree/custom_mailer.rb            |  2 +-
 app/mailers/spree/order_mailer.rb             |  6 +-
 app/mailers/spree/reimbursement_mailer.rb     |  2 +-
 .../spree/return_authorization_mailer.rb      |  2 +-
 app/mailers/spree/shipment_mailer.rb          |  2 +-
 app/models/spree/email_template.rb            |  2 +-
 .../spree/admin/add_mail_tab_to_main_menu.rb  | 12 ---
 .../spree/admin/shared/_main_menu.html.erb    | 99 +++++++++++++++++++
 .../admin/shared/sub_menu/_template.html.erb  |  2 +-
 spree_dynamic_emails.gemspec                  |  2 +-
 10 files changed, 109 insertions(+), 22 deletions(-)
 delete mode 100644 app/overrides/spree/admin/add_mail_tab_to_main_menu.rb
 create mode 100644 app/views/spree/admin/shared/_main_menu.html.erb

diff --git a/app/mailers/spree/custom_mailer.rb b/app/mailers/spree/custom_mailer.rb
index 97fa8bb..11a7120 100644
--- a/app/mailers/spree/custom_mailer.rb
+++ b/app/mailers/spree/custom_mailer.rb
@@ -2,7 +2,7 @@
 
 module Spree
   class CustomMailer < ::Spree::BaseMailer
-    def custom_email(resend = false, test: false, id: nil, email_to: nil)
+    def custom_email(record=nil, test=false, id=nil, email_to=nil)
       @test_mail = test
       find_template(id)
       email = email_to
diff --git a/app/mailers/spree/order_mailer.rb b/app/mailers/spree/order_mailer.rb
index ddaf361..e54904f 100644
--- a/app/mailers/spree/order_mailer.rb
+++ b/app/mailers/spree/order_mailer.rb
@@ -2,7 +2,7 @@
 
 module Spree
   class OrderMailer < ::Spree::BaseMailer
-    def confirm_email(order, resend = false, test: false, id: nil, email_to: nil)
+    def confirm_email(order, test=false, id=nil, email_to=nil)
       @order = order.respond_to?(:id) ? order : ::Spree::Order.find(order)
       @test_mail = test
       current_store = @order.store
@@ -11,7 +11,7 @@ def confirm_email(order, resend = false, test: false, id: nil, email_to: nil)
       mail(to: email, from: from_address, subject: @subject, store_url: current_store.url)
     end
 
-    def store_owner_notification_email(order, test: false, id: nil, email_to: nil)
+    def store_owner_notification_email(order, test=false, id=nil, email_to=nil)
       @order = order.respond_to?(:id) ? order : ::Spree::Order.find(order)
       @test_mail = test
       current_store = @order.store
@@ -20,7 +20,7 @@ def store_owner_notification_email(order, test: false, id: nil, email_to: nil)
       mail(to: email, from: from_address, subject: @subject, store_url: current_store.url)
     end
 
-    def cancel_email(order, resend = false, test: false, id: nil, email_to: nil)
+    def cancel_email(order, test=false, id=nil, email_to=nil)
       @order = order.respond_to?(:id) ? order : ::Spree::Order.find(order)
       @test_mail = test
       current_store = @order.store
diff --git a/app/mailers/spree/reimbursement_mailer.rb b/app/mailers/spree/reimbursement_mailer.rb
index d9d061f..44e5439 100644
--- a/app/mailers/spree/reimbursement_mailer.rb
+++ b/app/mailers/spree/reimbursement_mailer.rb
@@ -2,7 +2,7 @@
 
 module Spree
   class ReimbursementMailer < BaseMailer
-    def reimbursement_email(reimbursement, resend = false, test: false, id: nil, email_to: nil)
+    def reimbursement_email(reimbursement, test=false, id=nil, email_to=nil)
       @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
       @test_mail = test
       @order = @reimbursement.order
diff --git a/app/mailers/spree/return_authorization_mailer.rb b/app/mailers/spree/return_authorization_mailer.rb
index 1746ebd..55168dc 100644
--- a/app/mailers/spree/return_authorization_mailer.rb
+++ b/app/mailers/spree/return_authorization_mailer.rb
@@ -2,7 +2,7 @@
 
 module Spree
   class ReturnAuthorizationMailer < BaseMailer
-    def return_authorization_email(return_authorization, test = false, id: nil, email_to: nil)
+    def return_authorization_email(return_authorization, test= false, id= nil, email_to=nil)
       @return_authorization = return_authorization.respond_to?(:id) ? return_authorization : Spree::ReturnAuthorization.find(return_authorization)
       @test_mail = test
       @order = @return_authorization.order
diff --git a/app/mailers/spree/shipment_mailer.rb b/app/mailers/spree/shipment_mailer.rb
index 73fa394..61c8113 100644
--- a/app/mailers/spree/shipment_mailer.rb
+++ b/app/mailers/spree/shipment_mailer.rb
@@ -2,7 +2,7 @@
 
 module Spree
   class ShipmentMailer < BaseMailer
-    def shipped_email(shipment, resend = false, test: false, id: nil, email_to: nil)
+    def shipped_email(shipment, test=false, id=nil, email_to=nil)
       @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
       @test_mail = test
       @order = @shipment.order
diff --git a/app/models/spree/email_template.rb b/app/models/spree/email_template.rb
index 391f267..48797af 100644
--- a/app/models/spree/email_template.rb
+++ b/app/models/spree/email_template.rb
@@ -18,7 +18,7 @@ def render_body(resource, options)
     end
 
     def send_mail
-      mailer_class.constantize.send(template_name, record, test: true, id: id).deliver_now
+      mailer_class.constantize.send(template_name, record, true, id, nil).deliver_now
     end
 
     def record
diff --git a/app/overrides/spree/admin/add_mail_tab_to_main_menu.rb b/app/overrides/spree/admin/add_mail_tab_to_main_menu.rb
deleted file mode 100644
index c5baea7..0000000
--- a/app/overrides/spree/admin/add_mail_tab_to_main_menu.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-Deface::Override.new(
-  virtual_path: 'spree/admin/shared/_main_menu',
-  name: 'add_mail_tab_to_main_menu',
-  insert_before: "ul#sidebarConfiguration",
-  text: <<-HTML
-    <% if can? :admin, current_store %>
-      <ul class="nav nav-sidebar border-bottom" id="sidebarEmail">
-        <%= main_menu_tree Spree.t(:email), icon: "envelope.svg", sub_menu: "template", url: "#sidebar-email" %>
-      </ul>
-    <% end %>
-  HTML
-)
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 0000000..fc079e3
--- /dev/null
+++ b/app/views/spree/admin/shared/_main_menu.html.erb
@@ -0,0 +1,99 @@
+<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="sidebarEmail">
+      <%= main_menu_tree Spree.t(:email), icon: "envelope.svg", sub_menu: "template", url: "#sidebar-email" %>
+    </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 %>
+</nav>
diff --git a/app/views/spree/admin/shared/sub_menu/_template.html.erb b/app/views/spree/admin/shared/sub_menu/_template.html.erb
index 5cbc105..ea20d2e 100644
--- a/app/views/spree/admin/shared/sub_menu/_template.html.erb
+++ b/app/views/spree/admin/shared/sub_menu/_template.html.erb
@@ -1,4 +1,4 @@
-<ul id="sidebar-email" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="email_settings">
+<ul id="sidebar-email" class="bg-white collapse nav nav-pills nav-stacked" data-hook="email_settings">
   <%= tab :email_templates, match_path: '/email_templates' %>
   <%= tab :campaigns, match_path: '/campaigns' %>
 </ul>
diff --git a/spree_dynamic_emails.gemspec b/spree_dynamic_emails.gemspec
index 9dc82a9..20b4eb7 100644
--- a/spree_dynamic_emails.gemspec
+++ b/spree_dynamic_emails.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree', '>= 4.4.0'
+  s.add_dependency 'spree', '>= 4.6.0'
   s.add_dependency 'spree_extension'
 
   s.add_development_dependency 'spree_dev_tools'

From 0279576922ff93a822bb044e402017047b3c4f90 Mon Sep 17 00:00:00 2001
From: Vishal <vishal@bluebash.co>
Date: Fri, 25 Aug 2023 17:50:12 +0530
Subject: [PATCH 2/2] Fixes related to the email template body.

---
 app/jobs/email_send_job.rb                   | 4 ++--
 lib/mailer_previews/custom_mailer_preview.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/jobs/email_send_job.rb b/app/jobs/email_send_job.rb
index 0e2ee6d..1ae44fc 100644
--- a/app/jobs/email_send_job.rb
+++ b/app/jobs/email_send_job.rb
@@ -13,8 +13,8 @@ def recepients(template, id)
     emails = @campaign.send(rule) if rule.present?
     emails = @campaign&.to&.split(',') unless emails.present?
     emails&.each do |to|
-      response = template.mailer_class.constantize.send(template.template_name, template.record, id: template.id,
-                                                                                                 email_to: to).deliver_now
+      response = template.mailer_class.constantize.send(template.template_name, template.record, false, template.id,
+                                                                                                  to).deliver_now
       create_log(response)
     end
   end
diff --git a/lib/mailer_previews/custom_mailer_preview.rb b/lib/mailer_previews/custom_mailer_preview.rb
index fd062c6..e102f32 100644
--- a/lib/mailer_previews/custom_mailer_preview.rb
+++ b/lib/mailer_previews/custom_mailer_preview.rb
@@ -2,6 +2,6 @@
 
 class CustomMailerPreview < ActionMailer::Preview
   def custom_email
-    ::Spree::CustomMailer.custom_email(id: params[:template_id])
+    ::Spree::CustomMailer.custom_email(nil, false, params[:template_id], nil)
   end
 end