lesli 5.0.13 → 5.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e09c65f2654f5b1bf015bea9a64aa911d8037503c10af1972bb91ca9511db8e1
-  data.tar.gz: 508e55c468892569ee3825e65a9d4da6116b986f1ce0d70ab30715b2f0b63861
+  metadata.gz: e263589d96d2eba1edcd75463c595ec8862626c6ca044f418bba462fe681e17f
+  data.tar.gz: 255ea3108a0a2c8102f89808aa9fd560becd962e85cdbcd3e938e8e9df50fd84
 SHA512:
-  metadata.gz: 8cf347004a6045dd488511449336e4bac0ce379136892ef2a6865adccee50e3bf8d1223ee281eb06fc7af1ec6e451c86c9333f81dd23b18d61ee643108b44449
-  data.tar.gz: ac613f038fb2957e10d1858baf0e0f7304905b34267ce5d18ca2d46428def63025f10de797a0ea096708e989f8488709db8912184a8c35c6b518f092d9a8c4b2
+  metadata.gz: 0f63e07db9f952946a3c78833125b4c432d920ea0c6e5d0800ea93f2104463f31b843c052d47b7b8ae707e93348df7605d43cd4900b5ed0073cda37ed7575e2e
+  data.tar.gz: 802ab7f0cccd22808fd648c2f9468b9980db314ada31b4e2972047ea475be6257d63d67c521f0e3cb1533d1b9c73383a23e61bdd3ae515624abd95ef804c5559

data/app/assets/config/lesli_manifest.js

@@ -36,10 +36,7 @@ Building a better future, one line of code at a time.
 //= link_tree ../images/lesli .jpg
 //= link_tree ../images/lesli .svg
 
-
-// · Framework asssets
+// · 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
-//= link lesli/templates/public.css
-//= link lesli/templates/application.css
-
-//= link lesli/i18n.js
+//= link lesli/application.css
+//= link lesli/application.js

data/app/assets/images/lesli/brand/app-icon.svg

@@ -1,42 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-xmlns:dc="http://purl.org/dc/elements/1.1/"
-xmlns:cc="http://creativecommons.org/ns#"
-xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-xmlns:svg="http://www.w3.org/2000/svg"
-xmlns="http://www.w3.org/2000/svg"
-xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-inkscape:version="1.0 (4035a4f, 2020-05-01)"
-height="792.88586"
-width="913.88531"
-sodipodi:docname="lesli-icon.svg"
-version="1.1"
-viewBox="0 0 913.88531 792.88586"
-data-name="Layer 1"
-id="Layer_1">
-<sodipodi:namedview
-inkscape:current-layer="Layer_1"
-inkscape:window-maximized="1"
-inkscape:window-y="23"
-inkscape:window-x="0"
-inkscape:cy="396.44301"
-inkscape:cx="456.948"
-inkscape:zoom="0.85703125"
-showgrid="false"
-id="namedview19"
-inkscape:window-height="940"
-inkscape:window-width="1680"
-inkscape:pageshadow="2"
-inkscape:pageopacity="0"
-guidetolerance="10"
-gridtolerance="10"
-objecttolerance="10"
-borderopacity="1"
-bordercolor="#666666"
-pagecolor="#ffffff" />
-<defs id="defs12">
-<style id="style10">.cls-1{fill:#214FBD;}</style>
-</defs>
-<path style="stroke-width:1.6285" id="path16" d="M 913.8853,396.44306 A 179.92038,169.79974 0 0 0 765.26202,229.31696 179.85333,169.73645 0 0 0 456.44871,63.772899 179.80304,169.68899 0 0 0 147.68569,229.44353 a 179.85333,169.73645 0 0 0 0,333.99906 179.85333,169.73645 0 0 0 308.76302,165.67063 179.80304,169.68899 0 0 0 308.81331,-165.54406 179.92038,169.79974 0 0 0 148.62328,-167.1261 z m -446.00404,135.169 v 29.47331 H 412.56241 V 448.15975 A 32.654887,30.818028 0 0 0 379.84048,417.34173 H 260.18412 V 365.1346 h 119.65636 a 32.67165,30.833847 0 0 0 32.65488,-30.83385 V 221.32768 h 55.31885 v 112.9098 a 32.688413,30.849668 0 0 0 32.72194,30.83384 h 119.6396 v 52.20713 h -119.6396 a 32.67165,30.833847 0 0 0 -32.67165,30.81803 v 83.4523 z" class="cls-1" />
+   inkscape:version="1.4 (e7c3feb1, 2024-10-09)"
+   height="792.88586"
+   width="913.88531"
+   sodipodi:docname="app-icon.svg"
+   version="1.1"
+   viewBox="0 0 913.88531 792.88586"
+   data-name="Layer 1"
+   id="Layer_1"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     inkscape:current-layer="Layer_1"
+     inkscape:window-maximized="0"
+     inkscape:window-y="25"
+     inkscape:window-x="0"
+     inkscape:cy="396.13491"
+     inkscape:cx="457.9763"
+     inkscape:zoom="0.85703125"
+     showgrid="false"
+     id="namedview19"
+     inkscape:window-height="996"
+     inkscape:window-width="1792"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
+  <defs
+     id="defs12">
+    <style
+       id="style10">.cls-1{fill:#214FBD;}</style>
+  </defs>
+  <path
+     style="stroke-width:1.32288"
+     id="path16"
+     d="M 820.53981,396.44304 A 143.16576,140.81379 0 0 0 702.2777,257.84649 143.1124,140.76129 0 0 0 456.54962,120.56192 143.07239,140.72194 0 0 0 210.86154,257.95145 a 143.1124,140.76129 0 0 0 0,276.98318 A 143.1124,140.76129 0 0 0 456.54962,672.32416 143.07239,140.72194 0 0 0 702.2777,535.03958 143.16576,140.81379 0 0 0 820.53981,396.44304 Z M 465.64669,508.53778 v 24.44202 h -44.01816 v -93.64846 a 25.984058,25.557183 0 0 0 -26.03741,-25.55718 h -95.21263 v -43.29502 h 95.21263 a 25.997396,25.570302 0 0 0 25.98405,-25.5703 v -93.6878 h 44.01816 v 93.63533 a 26.010735,25.583422 0 0 0 26.03742,25.5703 h 95.1993 v 43.29502 h -95.1993 a 25.997396,25.570302 0 0 0 -25.9974,25.55718 v 69.20644 z"
+     class="cls-1" />
 </svg>

data/app/assets/javascripts/lesli/application.js

@@ -0,0 +1 @@
+import "@hotwired/turbo-rails";

data/app/controllers/lesli/abouts_controller.rb

@@ -33,26 +33,28 @@ Building a better future, one line of code at a time.
 module Lesli
     class AboutsController < ApplicationLesliController
 
+        # def status 
+        #     respond_with_successful({ :Lesli => "Ruby on Rails SaaS Development Framework." }) 
+        # end
+
         # GET /status
         def show
             respond_to do |format|
                 format.html {}
                 format.json { 
-                    if Rails.env.production?
-                        respond_with_successful({ :Lesli => "Ruby on Rails SaaS Development Framework." }) 
-                    else
-                        # get installed engines
-                        @lesli_engines = Lesli::System.engines.map { |engine, engine_info|
-                            {
-                                :name => engine_info[:name],
-                                :code => engine_info[:code],
-                                :path => engine_info[:path],
-                                :build => engine_info[:build],
-                                :version => engine_info[:version]
-                            }
+
+                    # get installed engines
+                    @lesli_engines = LesliSystem.engines.map { |engine, engine_info|
+                        {
+                            :name => engine_info[:name],
+                            :code => engine_info[:code],
+                            :path => engine_info[:path],
+                            :build => engine_info[:build],
+                            :version => engine_info[:version],
+                            :description => engine_info[:description]
                         }
-                        respond_with_successful(@lesli_engines) 
-                    end
+                    }
+                    respond_with_successful(@lesli_engines) 
                 }
             end
         end

data/app/controllers/lesli/application_controller.rb

@@ -34,6 +34,8 @@ module Lesli
     class ApplicationController < ActionController::Base
         layout "lesli/layouts/application-public"
 
+        add_flash_types(:info, :danger, :success, :warning)
+
         attr_reader :query
         attr_reader :engine_path
 
@@ -42,6 +44,17 @@ module Lesli
             @lesli = {}
         end
 
+        # Meta-programming to define flash setter methods dynamically
+        # success("Everything worked!")
+        # danger("Oops, there was an error.")
+        # info("Just an informational message.")
+        # warning("This is a warning.")
+        [:success, :danger, :warning, :info].each do |flash_type|
+            define_method(flash_type) do |message|
+                flash[flash_type] = message
+            end
+        end
+
         def language
 
             # check if param locale was sent by the user

data/app/controllers/lesli/application_devise_controller.rb

@@ -2,7 +2,7 @@
 
 Lesli
 
-Copyright (c) 2023, Lesli Technologies, S. A.
+Copyright (c) 2025, Lesli Technologies, S. A.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,25 +17,24 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see http://www.gnu.org/licenses/.
 
-Lesli · Your Smart Business Assistant. 
+Lesli · Ruby on Rails SaaS Development Framework.
 
-Made with ♥ by https://www.lesli.tech
+Made with ♥ by LesliTech
 Building a better future, one line of code at a time.
 
 @contact  hello@lesli.tech
-@website  https://lesli.tech
+@website  https://www.lesli.tech
 @license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
 
-// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
-// ·
-
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
 =end
 
 module Lesli
-    class ApplicationDeviseController < ActionController::Base
-        include Interfaces::Application::Responder
-        include Interfaces::Application::Requester
-        include Interfaces::Application::Logger
+    class ApplicationDeviseController < ApplicationController
+        include Lesli::ResponderInterface
+        include Lesli::RequesterInterface
+        include LesliAudit::LoggerInterface if defined?(LesliAudit)
         
         layout "lesli/layouts/application-devise"
 
@@ -49,6 +48,5 @@ module Lesli
             }
             super
         end
-
     end
 end

data/app/controllers/lesli/application_lesli_controller.rb

@@ -2,7 +2,7 @@
 
 Lesli
 
-Copyright (c) 2023, Lesli Technologies, S. A.
+Copyright (c) 2025, Lesli Technologies, S. A.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ along with this program. If not, see http://www.gnu.org/licenses/.
 
 Lesli · Ruby on Rails SaaS Development Framework.
 
-Made with ♥ by https://www.lesli.tech
+Made with ♥ by LesliTech
 Building a better future, one line of code at a time.
 
 @contact  hello@lesli.tech
@@ -31,27 +31,28 @@ Building a better future, one line of code at a time.
 =end
 
 module Lesli
-    class ApplicationLesliController < ApplicationController
-        include Interfaces::Application::Authorization
-        include Interfaces::Application::Customization
-        include Interfaces::Application::Responder
-        include Interfaces::Application::Requester
-        include Interfaces::Application::Logger
+    class ApplicationLesliController < ApplicationController        
+
+        include Lesli::ResponderInterface
+        include Lesli::RequesterInterface
+        include Lesli::CustomizationInterface
+        include LesliAudit::LoggerInterface if defined?(LesliAudit)
+        include LesliShield::AuthenticationInterface if defined?(LesliShield)
+        include LesliShield::AuthorizationInterface if defined?(LesliShield)
 
         protect_from_forgery with: :exception
 
         before_action :set_path
         before_action :set_locale
+        before_action :authenticate_request if defined?(LesliShield)
         before_action :authorize_request if defined?(LesliShield)
-        before_action :authorize_privilege if defined?(LesliSecurity)
         before_action :set_customizer
         before_action :set_requester
         after_action  :log_requests if defined?(LesliAudit)
 
         layout "lesli/layouts/application-lesli"
 
-        # Rescue from "ParameterMissing" when using required params
-        # in controllers
+        # Rescue from "ParameterMissing" when using required params in controllers
         rescue_from ActionController::ParameterMissing do |_e|
             respond_with_error("Missing params")
         end

data/app/controllers/lesli/apps_controller.rb

@@ -0,0 +1,6 @@
+module Lesli
+    class AppsController < ApplicationLesliController
+        def show
+        end
+    end
+end

data/app/controllers/lesli/roles_controller.rb

@@ -32,12 +32,12 @@ Building a better future, one line of code at a time.
 
 module Lesli
     class RolesController < ApplicationLesliController
-        before_action :set_role, only: [:show, :update, :destroy]
+        before_action :set_role, only: []
 
         def list
             respond_to do |format|
                 format.json { 
-                    respond_with_successful(Role.list(current_user, query, params)) 
+                    respond_with_successful(RoleService.new(current_user, query).list(params)) 
                 }
             end
         end

data/app/helpers/lesli/general_helper.rb

@@ -59,17 +59,22 @@ module Lesli
         # return a string with a css class to identify the body
         # example: builder engine-controller action
         def application_body_class
-            [lesli_instance_code, controller_path.gsub("/", "-"), action_name].join(" ")
+            [lesli_instance_code, controller_path.sub("_","-").split("/"), action_name].join(" ")
         end
 
         # build the text for the html document title
         # this helper works only for rails pages, for vue apps the title must be handled with JS
         def website_title
-            return @application_html_title if @application_html_title
+            # Use instance variable if set, otherwise construct a dynamic title
+            title = @application_html_title || controller_path.delete_prefix("lesli_")
 
-            title = controller_path.gsub("cloud", "").gsub("_", "")
-            name = @account.dig(:company, :name)
-            "#{title} - #{name}"
+            # Append action name unless it's "index"
+            title += "/#{action_name}" unless action_name == "index"
+
+            # Append company name if present
+            title += " · #{Lesli.config.company.dig(:name)}"
+
+            title
         end
 
         # build description using custom data from controller or engine gem description
@@ -79,5 +84,13 @@ module Lesli
             # Gem::Specification.find_by_name(engine_name).summary
             @application_html_description || ""
         end
+
+        def dd object
+            content_tag(:pre) do 
+                content_tag(:code) do
+                    h JSON.pretty_generate(object.as_json)
+                end 
+            end 
+        end
     end
 end

data/app/helpers/lesli/html_helper.rb

@@ -0,0 +1,8 @@
+
+module Lesli
+    module HtmlHelper
+        def turbo_link_to body, url, html_options = {}
+            link_to(body, url, class: "link", data: { turbo_frame: '_top' })
+        end
+    end
+end

data/app/helpers/lesli/navigation_helper.rb

@@ -42,15 +42,30 @@ module Lesli
 
         # Prints a html link inside a list item
         def navigation_item(path, label, icon = nil, reload: false)
-            content_tag(:li) do
+            content_tag(:li, { class: "navbar-item"}) do
                 navigation_link(path, label, icon, reload:reload)
             end
         end
 
         def navigation_link(path, label, icon = nil, reload: false)
+
+            #content_tag(html_element, html_options) do
+            link_to path, data: { turbo_frame: '_top' } do
+                # print a simple menu item (without icon)
+                concat content_tag(:span, label, class: "text iconless") unless icon
+
+                # print a full menu item if icon was requested
+                if icon
+                    concat content_tag(:span, nil, class: icon)
+                    concat content_tag(:span, label, class: "text")
+                end
+            end
+        end
+
+        def navigation_link_vue(path, label, icon = nil, reload: false)
             # default vue router links for single page applications
             html_element = "router-link"
-            html_options = { to: path, class: "navbar-item", 'active-class': "navigation-link-active" }
+            html_options = { to: path, 'active-class': "navigation-link-active" }
 
             # if reload is nedeed, we use a standard "a" tag
             if reload
@@ -94,8 +109,8 @@ module Lesli
 
         # 02.05 Mailer engine
         def navigation_engine_mailer(title: "Mailer", subtitle: "Email automation system")
-            return unless defined? CloudMailer
-            navigation_engine_item(title,subtitle,"mailer",cloud_mailer.root_path,controller_path.include?("cloud_mailer"))
+            return unless defined? LesliMailer
+            navigation_engine_item(title,subtitle,"mailer", lesli_mailer.root_path,controller_path.include?("lesli_mailer"))
         end
 
         # 02.08 Proposal engine
@@ -160,6 +175,12 @@ module Lesli
             navigation_engine_item(title,subtitle,"storage",cloud_storage.root_path,controller_path.include?("cloud_storage"))
         end
 
+        # 03.12 Papers engine
+        def navigation_engine_papers(title: "Papers", subtitle: "Smart Document Management")
+            return unless defined? LesliPapers
+            navigation_engine_item(title,subtitle,"papers",lesli_papers.root_path,controller_path.include?("lesli_papers"))
+        end
+
         # FINANCE
 
         # 04.01 Books engine
@@ -217,9 +238,7 @@ module Lesli
         # 07.02 Help engine
         def navigation_engine_support(title: "Support", subtitle: "Support Ticket System")
             return unless defined? LesliSupport
-
-            navigation_engine_item(title, subtitle, "support", lesli_support.root_path,
-                                   controller_path.include?("lesli_support"))
+            navigation_engine_item(title, subtitle, "support", lesli_support.root_path, controller_path.include?("lesli_support"))
         end
 
         # 07.03 Portal engine
@@ -241,13 +260,13 @@ module Lesli
         # SECURITY & PRIVACY
 
         # 08.01 Shield engine
-        def navigation_engine_shield(title: "Shield", subtitle: "Authentication & Authorization.")
+        def navigation_engine_shield(title: "Shield", subtitle: "Authentication & Authorization")
             return unless defined? LesliShield
             navigation_engine_item(title, subtitle, "shield", lesli_shield.root_path, controller_path.include?("lesli_shield"))
         end
 
         # 08.02 Security engine
-        def navigation_engine_security(title: "Security", subtitle: "Users, Privileges & Access Management.")
+        def navigation_engine_security(title: "Security", subtitle: "Users Authorization Management.")
             return unless defined? LesliSecurity
             navigation_engine_item(title, subtitle, "security", lesli_security.root_path, controller_path.include?("lesli_security"))
         end
@@ -256,7 +275,7 @@ module Lesli
         # INTEGRATIONS
 
         # 09.01 Babel engine
-        def navigation_engine_babel(title: "Babel", subtitle: "Translations")
+        def navigation_engine_babel(title: "Babel", subtitle: "Translation Management System")
             return unless defined? LesliBabel
 
             navigation_engine_item(title, subtitle, "babel", lesli_babel.root_path,
@@ -306,7 +325,7 @@ module Lesli
             return nil if modules_hidden.include?(path)
 
             # render module navigation item :)
-            content_tag(:a, href: path, class: is_active ? "is-active" : nil) do
+            content_tag(:a, id: path.gsub("/",""), href: path, class: is_active ? "is-active" : nil, data: { turbo: false }) do
                 lesli_svg("engine-#{icon}") << content_tag(:div) do
                     content_tag(:span, title) << content_tag(:p, subtitle)
                 end

data/app/helpers/lesli/system_helper.rb

@@ -41,12 +41,12 @@ module Lesli
         # example: lesli_cloud, deutsche_leibrenten, mitwerken_cloud
         def lesli_instance_code
             return "lesli"
-            Lesli::System.instance[:code]
+            #LesliSystem.instance[:code]
         end
 
         # return the information about the current engine
         def lesli_engine(property = nil)
-            Lesli::System.engine(lesli_controller, property)
+            LesliSystem.engine(lesli_controller, property)
         end
 
         # return true if the controller requested belongs to the administration area

data/app/helpers/lesli/turbo_helper.rb

@@ -0,0 +1,58 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails SaaS Development Framework.
+
+Made with ♥ by LesliTech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+=end
+
+module Lesli
+    module TurboHelper
+        def render_notifications_stream
+            turbo_stream.replace("application-lesli-notifications") do
+                render("lesli/partials/application-lesli-notifications")
+            end
+        end
+
+        def render_form_stream(partial_path, locals = {})
+
+            # Detect the current engine's namespace
+            engine_name = controller.class.module_parent_name.underscore
+
+            # Ensure the correct namespace is applied (only if not already present)
+            partial_path = "#{engine_name}/#{partial_path}"
+
+            # Convert the partial path to a valid DOM ID
+            partial_id = partial_path.tr("/", "-").tr("_", "-")
+
+            # Renders the stream to update the partial
+            turbo_stream.replace(partial_id) do
+                render(partial_path, locals)
+            end
+        end
+    end
+end

data/app/interfaces/lesli/customization_interface.rb

@@ -0,0 +1,42 @@
+module Lesli
+    module CustomizationInterface
+
+        # set customization only for lesli_cloud instance
+        def set_customizer
+=begin
+            # @account is only for html and pdf requests
+            return unless request.format.html? || request.format.pdf?
+
+            # return unless Lesli.instance[:code] == "lesli_cloud"
+
+            @lesli[:customization] = {}
+
+            logos = {}
+            # logo_identifiers = Account::File.file_types.keys
+            # custom_logos = current_user.account.files.where("file_type in (?)", logo_identifiers).order(id: :desc).all
+            # logo_identifiers.each do |logo_identifier|
+            #     custom_logo = custom_logos.find { |logo| logo.file_type == logo_identifier}
+            #     next unless custom_logo
+
+            #     custom_logo_url = "/administration/account/files/#{custom_logo.id}"
+            #     custo_logo_url = custom_logo.attachment_url if custom_logo.attachment_identifier
+            #     custom_logo_url = custom_logo.attachment_public_url if custom_logo.attachment_public_identifier
+
+            #     logos[logo_identifier.to_sym] = custom_logo_url
+            # end
+            @lesli[:customization][:logos] = logos
+
+            colors = {}
+            # color_identifiers = ::Account::Setting.theme_settings_keys
+            # custom_colors = current_user.account.settings.where("name in (?)", color_identifiers).all
+            # color_identifiers.each do |color_identifier|
+            #     custom_color = custom_colors.find { |color| color.name == color_identifier}
+            #     next unless custom_color
+
+            #     colors[color_identifier.to_sym] = custom_color.value
+            # end
+            @lesli[:customization][:colors] = colors
+=end
+        end
+    end
+end