Merge branch 'release/1.5.3'

saeloun · Apr 17, 2024 · c3146c8 · c3146c8
2 parents cc19dd5 + 9c219fc
commit c3146c8
Show file tree

Hide file tree

Showing 29 changed files with 333 additions and 557 deletions.
diff --git a/app/controllers/internal_api/v1/timesheet_entry/bulk_action_controller.rb b/app/controllers/internal_api/v1/timesheet_entry/bulk_action_controller.rb
@@ -13,8 +13,11 @@ def update
 
   def destroy
     timesheet_entries = policy_scope(TimesheetEntry)
-    if timesheet_entries.where(id: ids_params).destroy_all
+    timesheet_entries_discarded = timesheet_entries.where(id: ids_params).discard_all
+    if timesheet_entries_discarded
       render json: { notice: I18n.t("timesheet_entry.destroy.message") }
+    else
+      render json: { notice: "Some of the timesheet entries were failed to delete" }
     end
   end
 

diff --git a/app/controllers/internal_api/v1/timesheet_entry_controller.rb b/app/controllers/internal_api/v1/timesheet_entry_controller.rb
@@ -34,7 +34,7 @@ def update
 
   def destroy
     authorize current_timesheet_entry
-    render json: { notice: I18n.t("timesheet_entry.destroy.message") } if current_timesheet_entry.destroy
+    render json: { notice: I18n.t("timesheet_entry.destroy.message") } if current_timesheet_entry.discard!
   end
 
   private
@@ -44,7 +44,7 @@ def current_project
     end
 
     def current_timesheet_entry
-      @_current_timesheet_entry ||= current_company.timesheet_entries.find(params[:id])
+      @_current_timesheet_entry ||= current_company.timesheet_entries.kept.find(params[:id])
     end
 
     def timesheet_entry_params

diff --git a/app/javascript/src/components/Invoices/common/InvoiceForm/SendInvoice/index.tsx b/app/javascript/src/components/Invoices/common/InvoiceForm/SendInvoice/index.tsx
@@ -78,6 +78,11 @@ const SendInvoice = ({
             <XIcon size={16} weight="bold" />
           </button>
         </div>
+        {!invoiceEmail?.recipients?.length && (
+          <div className="mb-6 w-full items-center justify-center rounded bg-miru-alert-pink-400 p-2 text-center font-manrope text-xs tracking-xs-widest text-miru-alert-red-1000">
+            <p>Please add email from client settings page</p>
+          </div>
+        )}
         <form className="space-y-4">
           <fieldset className="field_with_errors flex flex-col">
             <label className="form__label mb-2" htmlFor="to">

diff --git a/app/javascript/src/components/Profile/LeaveBalance/CalendarHeader.tsx b/app/javascript/src/components/Profile/LeaveBalance/CalendarHeader.tsx
diff --git a/app/javascript/src/components/Profile/LeaveBalance/QuarterlyCalendar.tsx b/app/javascript/src/components/Profile/LeaveBalance/QuarterlyCalendar.tsx
diff --git a/app/javascript/src/components/Profile/LeaveBalance/TileContent.tsx b/app/javascript/src/components/Profile/LeaveBalance/TileContent.tsx
diff --git a/app/javascript/src/components/Profile/LeaveBalance/index.tsx b/app/javascript/src/components/Profile/LeaveBalance/index.tsx