change

Unibase.Web.Server.deps.json

           "SPRL": "1.0.0",
           "UniConnect.Objects": "1.0.0",
           "UniConnect.WebApis": "1.0.0",
-          "UniMail.Core": "1.0.0",
-          "UniMail.Helpers.ApiHelper": "1.0.0",
-          "UniMail.UniMailProvider": "1.0.0",
-          "UniMail.WebApis.publish": "1.0.0",
           "Unibase.Core": "1.0.0",
           "Unibase.Core.Web": "1.0.0",
           "Unibase.DbProviders.MongoDbProvider": "1.0.0",
           "UniConnect.WebApis.dll": {}
         }
       },
-      "UniMail.Core/1.0.0": {
-        "dependencies": {
-          "Unibase.Core": "1.0.0"
-        },
-        "compile": {
-          "UniMail.Core.dll": {}
-        }
-      },
-      "UniMail.Helpers.ApiHelper/1.0.0": {
-        "dependencies": {
-          "Newtonsoft.Json": "13.0.1",
-          "RestSharp": "106.11.7",
-          "UniMail.Core": "1.0.0"
-        },
-        "compile": {
-          "UniMail.Helpers.ApiHelper.dll": {}
-        }
-      },
-      "UniMail.UniMailProvider/1.0.0": {
-        "dependencies": {
-          "UniMail.Helpers.ApiHelper": "1.0.0",
-          "Unibase.Core": "1.0.0"
-        },
-        "compile": {
-          "UniMail.UniMailProvider.dll": {}
-        }
-      },
-      "UniMail.WebApis.publish/1.0.0": {
-        "dependencies": {
-          "Microsoft.AspNetCore.Mvc.Core": "2.2.5",
-          "RestSharp": "106.11.7",
-          "UniMail.Core": "1.0.0",
-          "UniMail.UniMailProvider": "1.0.0",
-          "Unibase.Core": "1.0.0"
-        },
-        "compile": {
-          "UniMail.WebApis.publish.dll": {}
-        }
-      },
       "Unibase.Itext.barcodes/7.2.1.0": {
         "compile": {
           "Unibase.Itext.barcodes.dll": {}
           "SPRL": "1.0.0",
           "UniConnect.Objects": "1.0.0",
           "UniConnect.WebApis": "1.0.0",
-          "UniMail.Core": "1.0.0",
-          "UniMail.Helpers.ApiHelper": "1.0.0",
-          "UniMail.UniMailProvider": "1.0.0",
-          "UniMail.WebApis.publish": "1.0.0",
           "Unibase.Core": "1.0.0",
           "Unibase.Core.Web": "1.0.0",
           "Unibase.DbProviders.MongoDbProvider": "1.0.0",
           "UniConnect.WebApis.dll": {}
         }
       },
-      "UniMail.Core/1.0.0": {
-        "dependencies": {
-          "Unibase.Core": "1.0.0"
-        },
-        "runtime": {
-          "UniMail.Core.dll": {}
-        }
-      },
-      "UniMail.Helpers.ApiHelper/1.0.0": {
-        "dependencies": {
-          "Newtonsoft.Json": "13.0.1",
-          "RestSharp": "106.11.7",
-          "UniMail.Core": "1.0.0"
-        },
-        "runtime": {
-          "UniMail.Helpers.ApiHelper.dll": {}
-        }
-      },
-      "UniMail.UniMailProvider/1.0.0": {
-        "dependencies": {
-          "UniMail.Helpers.ApiHelper": "1.0.0",
-          "Unibase.Core": "1.0.0"
-        },
-        "runtime": {
-          "UniMail.UniMailProvider.dll": {}
-        }
-      },
-      "UniMail.WebApis.publish/1.0.0": {
-        "dependencies": {
-          "Microsoft.AspNetCore.Mvc.Core": "2.2.5",
-          "RestSharp": "106.11.7",
-          "UniMail.Core": "1.0.0",
-          "UniMail.UniMailProvider": "1.0.0",
-          "Unibase.Core": "1.0.0"
-        },
-        "runtime": {
-          "UniMail.WebApis.publish.dll": {}
-        }
-      },
       "Unibase.Itext.barcodes/7.2.1.0": {
         "runtime": {
           "Unibase.Itext.barcodes.dll": {
       "serviceable": false,
       "sha512": ""
     },
-    "UniMail.Core/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "UniMail.Helpers.ApiHelper/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "UniMail.UniMailProvider/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "UniMail.WebApis.publish/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
     "Unibase.Itext.barcodes/7.2.1.0": {
       "type": "reference",
       "serviceable": false,

wwwroot/apps/sprl/managers/salesinvoice/sprlpaymentmanager.js

                 class SprlPaymentManager extends Unibase.Platform.Core.BaseManager {
                     makePayment(obj) {
                         return __awaiter(this, void 0, void 0, function* () {
-                            const url = 'apis/v4/bizgaze/transact/payments/paymentrequest';
+                            const url = 'apis/v4/bizgaze/sprl/payments/paymentrequest';
                             return yield this.dataHelper().postAsync(url, obj).then(function (response) {
                                 if (response.result !== null)
                                     response.result = JSON.parse(response.result);
                     }
                     getPaymentStatus(obj) {
                         return __awaiter(this, void 0, void 0, function* () {
-                            const url = 'apis/v4/bizgaze/transact/payments/Decrypt';
+                            const url = 'apis/v4/bizgaze/sprl/payments/Decrypt';
                             return yield this.dataHelper().postAsync(url, obj).then(function (response) {
                                 if (response.result !== null)
                                     response.result = JSON.parse(response.result);
                     }
                     updatePaymentStatus(obj) {
                         return __awaiter(this, void 0, void 0, function* () {
-                            const url = 'apis/v4/bizgaze/transact/payments/updatepaymentstatus';
+                            const url = 'apis/v4/bizgaze/sprl/payments/updatepaymentstatus';
                             return yield this.dataHelper().postAsync(url, obj).then(function (response) {
                                 if (response.result !== null)
                                     response.result = JSON.parse(response.result);
                             });
                         });
                     }
+                    loadPaymentTermItems(invoiceid) {
+                        return __awaiter(this, void 0, void 0, function* () {
+                            const url = 'apis/v4/bizgaze/sprl/payments/getpaymenttermitemsbyinvoiceid/invoiceid/' + invoiceid;
+                            return yield this.dataHelper().getAsync(url).then(function (response) {
+                                if (response.result !== null)
+                                    response.result = JSON.parse(response.result);
+                                return response;
+                            });
+                        });
+                    }
                     static Instance() {
                         return new SprlPaymentManager();
                     }

wwwroot/apps/transact/controls/inventory/dcitem.component.js

                                             }
                                             else {
                                                 $('.dc-item-list').empty();
+                                                $('.dc-item-list-added').remove();
                                                 if (instance.IsFromOrder) {
                                                     instance.OrderItemIds = [0];
                                                     instance.bindDcItems(instance.OrderId, instance.IsFromOrder, instance.IsFromInvoice);
                                     $("#txt_plus" + rowid).addClass('hidden');
                                     $("#txt_minus" + rowid).addClass('hidden');
                                 }
-                                if (instance.CheckAvailability && instance.DctypeId == Bizgaze.Apps.Transact.Enums.DcType.Outward && $("#hdn_IsBoMItem_" + rowid).val() == "false" && Number($("#availableqty_" + rowid).val().toString()) == 0) {
+                                if (instance.CheckAvailability && instance.DctypeId == Bizgaze.Apps.Transact.Enums.DcType.Outward && $("#hdn_IsBoMItem_" + rowid).val() == "false" && Number($("#availableqty_" + rowid).val().toString()) <= 0) {
                                     $("#txt_Cartons" + rowid).prop('disabled', true);
                                     $("#txt_Quantity" + rowid).prop('disabled', true);
                                     $("#txt_Pieces" + rowid).prop('disabled', true);
                                         }
                                         else {
                                             $('.dc-item-list').empty();
+                                            $('.dc-item-list-added').remove();
                                             if (instance.IsFromOrder) {
                                                 instance.bindDcItems(instance.OrderId, instance.IsFromOrder, instance.IsFromInvoice);
                                             }
                         if ($("#hdn_IsBoMChildItem_" + rowid).val() == "true") {
                             instance.disabletxt(rowid);
                         }
-                        if ((instance.CheckAvailability && row.ItemId != 0 && row.ExchangeDC == false && (row.Avail_Qty == "0" || row.Avail_Qty == 0) && (instance.DctypeId == Bizgaze.Apps.Transact.Enums.DcType.Outward || instance.DctypeId == Bizgaze.Apps.Transact.Enums.DcType.ClaimOutward))) {
+                        if ((instance.CheckAvailability && row.ItemId != 0 && row.ExchangeDC == false && (row.Avail_Qty == "0" || row.Avail_Qty <= 0) && (instance.DctypeId == Bizgaze.Apps.Transact.Enums.DcType.Outward || instance.DctypeId == Bizgaze.Apps.Transact.Enums.DcType.ClaimOutward))) {
                             if (row.InventoryTypeId == Bizgaze.Apps.Transact.Enums.InventoryType.Item && row.IsBoMItem == false) {
                                 instance.disabletxt(rowid);
                                 if (!instance.IsEditDC)
                         $(".btn_Save_Form").addClass('hidden');
                         $(".txt_refno").val('');
                         $('.dc-item-list').empty();
+                        $('.dc-item-list-added').remove();
                         DcItem.instance.ItemIds = [0];
                         if (DcItem.instance.DcId == 0)
                             DcItem.instance.LoBId = 0;
                                     element.closest('.dc-item-list-added').find(".Item_Availqty").text(Number(data.AvailableQty));
                                     element.closest('.dc-item-list-added').find(".availableqty").val(Number(data.AvailableQty));
                                     $("#pendingquantity_" + rowid).text(data.PendingQty);
-                                    if (quantity == 0) {
+                                    if (quantity <= 0) {
                                         $("#txt_Quantity" + rowid).prop('disabled', true);
                                         $("#txt_plus" + rowid).addClass('hidden');
                                         $("#txt_minus" + rowid).addClass('hidden');

wwwroot/apps/transact/controls/subscriptions/orderdetails.component.js

                                             if (periodTime != undefined || PlanId != undefined || TenureId != undefined) {
                                                 Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().period_change(PlanId, TenureId, periodTime);
                                             }
+                                            $(".item-quantity").text(`(` + OrderDetails.instance.planItemPrice + `-0)=` + OrderDetails.instance.planItemPrice);
                                         });
                                         Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().bindTenure(itemid, tenureid);
                                         Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().cartItemsList(res);
                             OrderDetails.instance.TenureId = tenureid;
                             Bizgaze.Apps.Transact.Managers.Subscriptions.SubscriptionManager.Instance().getItem(itemid, tenureid).then(function (response) {
                                 var res = response.result;
+                                OrderDetails.instance.OneTimeCost = res.SetupFee;
                                 var html = ``;
                                 html += `<div class="add-on-products-sec">
                 <div class="add-on-content-wrap biz-custom-scrollbar mx-0">
                                     var res = response.result;
                                     OrderDetails.instance.planItemPrice = response.result.Price;
                                     if (OrderDetails.instance.CartItems[0].subscriptionItemType == 1) {
-                                        OrderDetails.instance.CartItems[0].unitPrice = OrderDetails.instance.planItemPrice;
+                                        OrderDetails.instance.CartItems[0].unitPrice = OrderDetails.instance.planItemPrice + OrderDetails.instance.OneTimeCost;
                                     }
                                     Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().checkout_cartAmount();
+                                    $(".item-quantity").html(`( ` + OrderDetails.instance.planItemPrice + ` - 0% ) = <span class="inr-sign">` + OrderDetails.instance.planItemPrice + `<span>`);
                                 });
                             });
                         }

wwwroot/platform/analytics/components/reportbuilder/style.reportbuilder.css

             padding: 1.25rem;
         }
 
-._bizgaze_popup_container .biz-pg-wrapper {
-    margin-top: 0px !important;
-}
 
 .select2-container--default .select2-results > #select2-RptGroup_AutoComplete-results {
     max-height: 115px !important;
 
 .biz-bldr-wrap.chart_view .reportbuilder-main-wrap {
     overflow: hidden;
+}
+
+.biz-reportbuilder-wrap .biz-drawer {
+    width: 290px;
+}
+
+.biz-reportbuilder-wrap.biz-drawer-push.biz-drawer-pushright .biz-pg-wrapper {
+    margin-right: 290px;
 }

wwwroot/platform/analytics/components/reportfolder.js

                         });
                         let searchReports = [];
                         for (let i = 0; i < this.allReports[0].length; i++) {
-                            let reportName = this.allReports[0][i].ReportName.toLowerCase();
+                            let reportName;
+                            if (this.allReports[0][i].DisplayName == "" || this.allReports[0][i].DisplayName == null) {
+                                reportName = this.allReports[0][i].ReportName.toLowerCase();
+                            }
+                            else {
+                                reportName = this.allReports[0][i].DisplayName.toLowerCase();
+                            }
                             if (searchText != '') {
                                 if (reportName.includes(searchText)) {
                                     searchReports.push(this.allReports[0][i]);

wwwroot/platform/analytics/components/reportviewer/_reportviewer.js

                                                 if (reportInfo.PinDynamicFilters || $(`#unPinDynamicFiltersIcon_${containerid}`).is(':visible')) {
                                                     instance.pinDynamicFiltersHandler(reportid, containerid);
                                                 }
+                                                instance.noDataMessage(rv_instance.dynamicFilters, reportInfo.IsAutoData, containerid);
                                             }
                                             else {
                                                 var _chartviewer = Unibase.Platform.Analytics.Charts.ChartViewer.Instance();
                                         let tableViewer = Unibase.Platform.Analytics.Viewers.TableViewer.Instance();
                                         if (response.result.ReportInfo.PivotTypeId != 0 && !response.result.ReportInfo.IsTreeExpand) {
                                             tableViewer.loadView(response, reportid, rv_instance.ViewerSettings.selectedViewerTypeId, instance.Page, instance.PageSize, containerid, rv_instance.ViewerSettings, null, rv_instance.reportWidgetData);
+                                            instance.noDataMessage(rv_instance.dynamicFilters, rv_instance.reportResponse.result.ReportInfo.IsAutoData, containerid);
                                         }
                                         else {
                                             let responseData = filterresponse.Result.Data;
                                                 if (!responseData.length) {
                                                     $("#btn-list-load-more_div_" + containerid).addClass('hidden');
                                                     $(`#Viewer_${containerid} .report-viewer-footer`).addClass('hidden');
-                                                    if (!rv_instance.dynamicFilters.length && !rv_instance.reportResponse.result.ReportInfo.IsAutoData)
-                                                        $("#" + containerid).find(".tabulator-placeholder").children().children().text("Select filter to show data");
-                                                    else
-                                                        $("#" + containerid).find(".tabulator-placeholder").children().children().text("No data available");
+                                                    instance.noDataMessage(rv_instance.dynamicFilters, rv_instance.reportResponse.result.ReportInfo.IsAutoData, containerid);
                                                 }
                                                 else {
                                                     $(`#Viewer_${containerid} .report-viewer-footer`).removeClass('hidden');
                             });
                         });
                     }
+                    noDataMessage(dynamicFilters, isAutoData, containerid) {
+                        if (!dynamicFilters.length && !isAutoData)
+                            $("#" + containerid).find(".tabulator-placeholder").children().children().text("Select filter to show data");
+                        else
+                            $("#" + containerid).find(".tabulator-placeholder").children().children().text("No data available");
+                    }
                     clearGlobalDateFilter(containerId, reportId) {
                         var dateTimeHelper = Unibase.Platform.Helpers.DateTimeHelper.Instance();
                         let user = Unibase.Platform.Membership.Infos.Identity.currentUser;

wwwroot/platform/analytics/components/tableviewer/tableviewer.js

                     }
                     tableCellClick(e, cell, level, mainreportid, subres, containerid) {
                         var instance = this;
-                        var filter = [];
+                        var appliedFilters = [];
                         if (subres.length != 0) {
                             var subrpt = subres.find(s => s.AliasName == cell["_cell"].column.definition.field);
                             if (subrpt) {
                                 var row = cell.getRow();
                                 let row_data = row.getData();
                                 if (subrpt.SubReportTypeId == Unibase.Platform.Analytics.Reports.Enums.SubReportType.Detail) {
-                                    var onclick = "Unibase.Platform.Helpers.NavigationHelper.Instance().loadDetail({{" + subrpt.PrimaryKeyColumn + "}},{{appinstalledappid}},null,null);";
+                                    var onclick = `Unibase.Platform.Helpers.NavigationHelper.Instance().loadDetail({{${subrpt.PrimaryKeyColumn}}},{{appinstalledappid}},null,null);`;
                                     onclick = onclick.replace("{{appinstalledappid}}", subrpt.InstalledAppId);
                                     onclick = onclick.replace("{{" + subrpt.PrimaryKeyColumn + "}}", row_data[subrpt.PrimaryKeyColumn]);
                                     var templateScript = Handlebars.compile(onclick);
                                             dynamicFilters.forEach(filter => {
                                                 filter.IsSubReportFilter = true;
                                             });
-                                            filter = filter.concat(dynamicFilters);
+                                            appliedFilters = appliedFilters.concat(dynamicFilters);
                                         }
-                                        var filters = JSON.parse(subrpt.Filters);
-                                        for (var i = 0; i < filters.length; i++) {
-                                            let fill = filters[i];
+                                        var subRepFilters = JSON.parse(subrpt.Filters);
+                                        subRepFilters = subRepFilters.filter(item1 => appliedFilters.some(item2 => item1.ParameterName === item2.ParameterName));
+                                        for (var i = 0; i < subRepFilters.length; i++) {
+                                            let fill = subRepFilters[i];
                                             let value = row_data[fill.ParameterName.trim()];
                                             let expid = instance.getExpId(fill.Operator);
                                             if (fill.Isvalue)
                                                 value = fill.ParameterName;
-                                            filter.push({
+                                            appliedFilters.push({
                                                 ParameterName: fill.ParameterValue.trim(),
                                                 ParameterValue: value.toString(),
                                                 ExpOp: expid, IsSubReportFilter: true
                                             });
                                         }
-                                        instance._reportViewer.dynamicFilters = filter.filter((f, i, a) => a.findIndex(f2 => (f.ParameterName === f2.ParameterName)) === i);
+                                        instance._reportViewer.dynamicFilters = appliedFilters.filter((f, i, a) => a.findIndex(f2 => (f.ParameterName === f2.ParameterName)) === i);
                                         instance._reportViewer.isSubReport = true;
                                         return instance._reportViewer.report_ViewAll(subrpt.ChildReportId, 0, "_linkedreport_" + subrpt.ChildReportId);
                                     }

wwwroot/platform/bundle/index.reportviewer.js

                                                 if (reportInfo.PinDynamicFilters || $(`#unPinDynamicFiltersIcon_${containerid}`).is(':visible')) {
                                                     instance.pinDynamicFiltersHandler(reportid, containerid);
                                                 }
+                                                instance.noDataMessage(rv_instance.dynamicFilters, reportInfo.IsAutoData, containerid);
                                             }
                                             else {
                                                 var _chartviewer = Unibase.Platform.Analytics.Charts.ChartViewer.Instance();
                                         let tableViewer = Unibase.Platform.Analytics.Viewers.TableViewer.Instance();
                                         if (response.result.ReportInfo.PivotTypeId != 0 && !response.result.ReportInfo.IsTreeExpand) {
                                             tableViewer.loadView(response, reportid, rv_instance.ViewerSettings.selectedViewerTypeId, instance.Page, instance.PageSize, containerid, rv_instance.ViewerSettings, null, rv_instance.reportWidgetData);
+                                            instance.noDataMessage(rv_instance.dynamicFilters, rv_instance.reportResponse.result.ReportInfo.IsAutoData, containerid);
                                         }
                                         else {
                                             let responseData = filterresponse.Result.Data;
                                                 if (!responseData.length) {
                                                     $("#btn-list-load-more_div_" + containerid).addClass('hidden');
                                                     $(`#Viewer_${containerid} .report-viewer-footer`).addClass('hidden');
-                                                    if (!rv_instance.dynamicFilters.length && !rv_instance.reportResponse.result.ReportInfo.IsAutoData)
-                                                        $("#" + containerid).find(".tabulator-placeholder").children().children().text("Select filter to show data");
-                                                    else
-                                                        $("#" + containerid).find(".tabulator-placeholder").children().children().text("No data available");
+                                                    instance.noDataMessage(rv_instance.dynamicFilters, rv_instance.reportResponse.result.ReportInfo.IsAutoData, containerid);
                                                 }
                                                 else {
                                                     $(`#Viewer_${containerid} .report-viewer-footer`).removeClass('hidden');
                             });
                         });
                     }
+                    noDataMessage(dynamicFilters, isAutoData, containerid) {
+                        if (!dynamicFilters.length && !isAutoData)
+                            $("#" + containerid).find(".tabulator-placeholder").children().children().text("Select filter to show data");
+                        else
+                            $("#" + containerid).find(".tabulator-placeholder").children().children().text("No data available");
+                    }
                     clearGlobalDateFilter(containerId, reportId) {
                         var dateTimeHelper = Unibase.Platform.Helpers.DateTimeHelper.Instance();
                         let user = Unibase.Platform.Membership.Infos.Identity.currentUser;

wwwroot/platform/bundle/index.subscriptions.min.js

                             </div>
                         </div>
                     </div>
-                </div>`;$(".orderitemsdiv").html(html);$("#btn_Proceed1").hide();$("#select_period").on("change",function(){var periodTime=$("#select_period").val(),PlanId=itemid,TenureId=tenureid;(periodTime!=undefined||PlanId!=undefined||TenureId!=undefined)&&Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().period_change(PlanId,TenureId,periodTime)});Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().bindTenure(itemid,tenureid);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().cartItemsList(res);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().setCartAddonHeight();sf=$(".price").val().toString();$(".TotalPrice").text(sf);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().checkout();Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().getAddons(res.ItemId,id,tenureid);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().LoadingOrderAddons()})})});OrderDetails.instance.organizationId=Number(id);var instance=this;instance.fileCacheHelper.loadJsFiles(["apps/crm/companies/managers/companymanager.js","apps/crm/contacts/managers/contactmanager.js"],function(){id!=0&&Bizgaze.Apps.Crm.Contacts.Managers.ContactManager.Instance().getOrganizationById(id).then(function(response){var data=response.result,contactid=data.DefaultOrgContactId;Bizgaze.Apps.CRM.Companies.Managers.CompanyManager.Instance().getUserBranches(contactid).then(function(orgresponse){var branchId=orgresponse.result[0].BranchId;OrderDetails.instance.BranchId=branchId})})})}getAddons(itemid,id,tenureid){let instance=this;this.fileCacheHelper.loadJsFile("apps/transact/managers/subscriptions/subscriptionmanager.js",function(){Bizgaze.Apps.Transact.Managers.Subscriptions.SubscriptionManager.Instance().getAddonsItems(itemid,tenureid).then(function(response){var res=response.result,cartItemsList=[],i,imageurl,image1,html,cartId;for($(".OrderAddonItems").find(".li_OrderAddonItems").each(function(){var addonItemId=Number($(this).find("#hf_ItemId").val());cartItemsList.push({ItemIds:addonItemId})}),i=0;i<res.length;i++)imageurl=res[i].AddonImage,imageurl!=null&&imageurl!=undefined&&imageurl!=""&&(image1=imageurl.split("~"),instance.AddonImage=image1[0]),res[i].SalesPrice!=0&&(html=`<div class="col-md-3"><div class="product-card CartItems adoonsItems AddonValue-row" id="li_AddOnsItems_Details" data-search-term="${res[i].ItemName.toLowerCase()}"">
+                </div>`;$(".orderitemsdiv").html(html);$("#btn_Proceed1").hide();$("#select_period").on("change",function(){var periodTime=$("#select_period").val(),PlanId=itemid,TenureId=tenureid;(periodTime!=undefined||PlanId!=undefined||TenureId!=undefined)&&Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().period_change(PlanId,TenureId,periodTime);$(".item-quantity").text(`(`+OrderDetails.instance.planItemPrice+`-0)=`+OrderDetails.instance.planItemPrice)});Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().bindTenure(itemid,tenureid);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().cartItemsList(res);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().setCartAddonHeight();sf=$(".price").val().toString();$(".TotalPrice").text(sf);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().checkout();Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().getAddons(res.ItemId,id,tenureid);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().LoadingOrderAddons()})})});OrderDetails.instance.organizationId=Number(id);var instance=this;instance.fileCacheHelper.loadJsFiles(["apps/crm/companies/managers/companymanager.js","apps/crm/contacts/managers/contactmanager.js"],function(){id!=0&&Bizgaze.Apps.Crm.Contacts.Managers.ContactManager.Instance().getOrganizationById(id).then(function(response){var data=response.result,contactid=data.DefaultOrgContactId;Bizgaze.Apps.CRM.Companies.Managers.CompanyManager.Instance().getUserBranches(contactid).then(function(orgresponse){var branchId=orgresponse.result[0].BranchId;OrderDetails.instance.BranchId=branchId})})})}getAddons(itemid,id,tenureid){let instance=this;this.fileCacheHelper.loadJsFile("apps/transact/managers/subscriptions/subscriptionmanager.js",function(){Bizgaze.Apps.Transact.Managers.Subscriptions.SubscriptionManager.Instance().getAddonsItems(itemid,tenureid).then(function(response){var res=response.result,cartItemsList=[],i,imageurl,image1,html,cartId;for($(".OrderAddonItems").find(".li_OrderAddonItems").each(function(){var addonItemId=Number($(this).find("#hf_ItemId").val());cartItemsList.push({ItemIds:addonItemId})}),i=0;i<res.length;i++)imageurl=res[i].AddonImage,imageurl!=null&&imageurl!=undefined&&imageurl!=""&&(image1=imageurl.split("~"),instance.AddonImage=image1[0]),res[i].SalesPrice!=0&&(html=`<div class="col-md-3"><div class="product-card CartItems adoonsItems AddonValue-row" id="li_AddOnsItems_Details" data-search-term="${res[i].ItemName.toLowerCase()}"">
                                                    <div class="product-card-body">
                                                       <div class="product-img-wrap">
                                                         <img src="${instance.AddonImage}" alt="" class="product-img">
                                                          <input type="hidden" class="Description" id = "hf_Description" value = ${res[i].Description} />`,cartId=cartItemsList.filter(el=>el.ItemIds===res[i].ItemId),html+=cartId.length==0?`<a href="javascript:;" class="btn btnremove_${res[i].ItemId} cart-btn add-cart-btn btnTxt" onclick="Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().btnChange('btnremove_${res[i].ItemId}','${tenureid}');">Add</a>`:`<a href="javascript:;" class="btn btnremove_${res[i].ItemId} cart-btn remove-cart-btn btnTxt" onclick="Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().btnChange('btnremove_${res[i].ItemId}','${tenureid}');">Remove</a>`,html+=`</div>
                                                      <div class="offer-percentage">0%</div>
 <input type="hidden" id="hf_addonQuantity" value=${res[i].SubscriptionAddonsQuantity} /> <input type="hidden" id="hf_addonSku" value=${res[i].Sku} /> <input type="hidden" id="hf_addonItemId" value=${res[i].ItemId} />
-                                                  </div></div>`,$(".addonslist:first").append(html))})})}getPlanItem_List(itemid,tenureid){OrderDetails.instance.CartItems=[];OrderDetails.instance.TenureId=tenureid;Bizgaze.Apps.Transact.Managers.Subscriptions.SubscriptionManager.Instance().getItem(itemid,tenureid).then(function(response){var res=response.result,html=``,carthtml;html+=`<div class="add-on-products-sec">
+                                                  </div></div>`,$(".addonslist:first").append(html))})})}getPlanItem_List(itemid,tenureid){OrderDetails.instance.CartItems=[];OrderDetails.instance.TenureId=tenureid;Bizgaze.Apps.Transact.Managers.Subscriptions.SubscriptionManager.Instance().getItem(itemid,tenureid).then(function(response){var res=response.result,html,carthtml;OrderDetails.instance.OneTimeCost=res.SetupFee;html=``;html+=`<div class="add-on-products-sec">
                 <div class="add-on-content-wrap biz-custom-scrollbar mx-0">
                     <div class="Uaddonitems px-0 pr-md-10 pr-lg-20 mb-30 mb-md-0 pr-xl-30">
                         <div class="addons-wrap ">
                                                 <span>Net Total</span>
                                                 <span id="lblSummary_NetTotal">₹${res.NetTotal}/-</span>
                                             </li>
-                                        </ul>`;$("#cartSummaryFooter").html(footerHtml)}yield Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().createOrder_Item(instance.organizationId)})})})}bindTenure(itemid,tenureid){let instance=this;this.fileCacheHelper.loadJsFile("apps/transact/managers/subscriptions/subscriptionmanager.js",function(){Bizgaze.Apps.Transact.Managers.Subscriptions.SubscriptionManager.Instance().getTenureList(itemid,tenureid).then(function(response){var res=response.result,tenureName,i;for(res,i=0;i<res.length;i++)if(res[i].Price!=0){tenureName=tenureid==2?"M":"Y";let html;html=i==0?'<option value="'+response.result[i].TenurePeriod+'" selected>'+response.result[i].TenurePeriod+tenureName+"<\/option>":'<option value="'+response.result[i].TenurePeriod+'"> '+response.result[i].TenurePeriod+tenureName+"<\/option>";$("#select_period").append(html)}})})}period_change(PlanId,TenureId,Periode){let instance=this;var data=Periode.split("M")[0],Period_Duration=Number(Periode);this.fileCacheHelper.loadJsFile("apps/transact/managers/subscriptions/subscriptionmanager.js",function(){Bizgaze.Apps.Transact.Managers.Subscriptions.SubscriptionManager.Instance().getTenurePeriodAndPrice(PlanId,TenureId,Period_Duration).then(function(response){var res=response.result;OrderDetails.instance.planItemPrice=response.result.Price;OrderDetails.instance.CartItems[0].subscriptionItemType==1&&(OrderDetails.instance.CartItems[0].unitPrice=OrderDetails.instance.planItemPrice);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().checkout_cartAmount()})})}checkout_cartAmount(){var instance=this,defaultaddressid,Organizationid,i,orderobj;for($(".cartcount").text(OrderDetails.instance.CartItems.length),defaultaddressid="",OrderDetails.instance.OrderData=[],OrderDetails.instance.ItemData=[],Organizationid=Number(OrderDetails.instance.organizationId),i=0;i<OrderDetails.instance.CartItems.length;++i){var addonQuantity=OrderDetails.instance.CartItems[i].addonQuantity,addonSku=OrderDetails.instance.CartItems[i].addonSku,addonItemId=OrderDetails.instance.CartItems[i].addonItemId,unitPrice=OrderDetails.instance.CartItems[i].unitPrice,discountPercent=OrderDetails.instance.CartItems[i].discountPercent,discountValue=OrderDetails.instance.CartItems[i].discountValue;isNaN(addonItemId)||OrderDetails.instance.ItemData.push({SKU:addonSku,Quantity:1,ItemId:addonItemId,UnitPrice:unitPrice,DiscountPercent:isNaN(discountPercent)?0:discountPercent,DiscountValue:isNaN(discountValue)?0:discountValue,ExchangeDC:!1,PackCount:1,PackSize:1,Packs:1,Pieces:0,TaxGroupId:0})}orderobj={BranchId:0,InventoryApplyType:1,IsCalculateTax:!0,IsCompositePrice:!1,IsPiecePrice:!1,IsTaxInclusive:!1,OrderTypeId:1,BillingAddressId:Number(0),OrderItems:OrderDetails.instance.ItemData};instance.fileCacheHelper.loadJsFile("apps/transact/managers/orders/ordermanager.js",function(){Bizgaze.Apps.Transact.Managers.OrderManager.Instance().getTotals(orderobj).then(function(response){var res=response.result;if(OrderDetails.instance.NetTotal=res.NetTotal,res!=null){let footerHtml=`<ul class="detail-list">
+                                        </ul>`;$("#cartSummaryFooter").html(footerHtml)}yield Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().createOrder_Item(instance.organizationId)})})})}bindTenure(itemid,tenureid){let instance=this;this.fileCacheHelper.loadJsFile("apps/transact/managers/subscriptions/subscriptionmanager.js",function(){Bizgaze.Apps.Transact.Managers.Subscriptions.SubscriptionManager.Instance().getTenureList(itemid,tenureid).then(function(response){var res=response.result,tenureName,i;for(res,i=0;i<res.length;i++)if(res[i].Price!=0){tenureName=tenureid==2?"M":"Y";let html;html=i==0?'<option value="'+response.result[i].TenurePeriod+'" selected>'+response.result[i].TenurePeriod+tenureName+"<\/option>":'<option value="'+response.result[i].TenurePeriod+'"> '+response.result[i].TenurePeriod+tenureName+"<\/option>";$("#select_period").append(html)}})})}period_change(PlanId,TenureId,Periode){let instance=this;var data=Periode.split("M")[0],Period_Duration=Number(Periode);this.fileCacheHelper.loadJsFile("apps/transact/managers/subscriptions/subscriptionmanager.js",function(){Bizgaze.Apps.Transact.Managers.Subscriptions.SubscriptionManager.Instance().getTenurePeriodAndPrice(PlanId,TenureId,Period_Duration).then(function(response){var res=response.result;OrderDetails.instance.planItemPrice=response.result.Price;OrderDetails.instance.CartItems[0].subscriptionItemType==1&&(OrderDetails.instance.CartItems[0].unitPrice=OrderDetails.instance.planItemPrice+OrderDetails.instance.OneTimeCost);Bizgaze.Apps.Transact.Controls.Subscriptions.OrderDetails.Instance().checkout_cartAmount();$(".item-quantity").html(`( `+OrderDetails.instance.planItemPrice+` - 0% ) = <span class="inr-sign">`+OrderDetails.instance.planItemPrice+`<span>`)})})}checkout_cartAmount(){var instance=this,defaultaddressid,Organizationid,i,orderobj;for($(".cartcount").text(OrderDetails.instance.CartItems.length),defaultaddressid="",OrderDetails.instance.OrderData=[],OrderDetails.instance.ItemData=[],Organizationid=Number(OrderDetails.instance.organizationId),i=0;i<OrderDetails.instance.CartItems.length;++i){var addonQuantity=OrderDetails.instance.CartItems[i].addonQuantity,addonSku=OrderDetails.instance.CartItems[i].addonSku,addonItemId=OrderDetails.instance.CartItems[i].addonItemId,unitPrice=OrderDetails.instance.CartItems[i].unitPrice,discountPercent=OrderDetails.instance.CartItems[i].discountPercent,discountValue=OrderDetails.instance.CartItems[i].discountValue;isNaN(addonItemId)||OrderDetails.instance.ItemData.push({SKU:addonSku,Quantity:1,ItemId:addonItemId,UnitPrice:unitPrice,DiscountPercent:isNaN(discountPercent)?0:discountPercent,DiscountValue:isNaN(discountValue)?0:discountValue,ExchangeDC:!1,PackCount:1,PackSize:1,Packs:1,Pieces:0,TaxGroupId:0})}orderobj={BranchId:0,InventoryApplyType:1,IsCalculateTax:!0,IsCompositePrice:!1,IsPiecePrice:!1,IsTaxInclusive:!1,OrderTypeId:1,BillingAddressId:Number(0),OrderItems:OrderDetails.instance.ItemData};instance.fileCacheHelper.loadJsFile("apps/transact/managers/orders/ordermanager.js",function(){Bizgaze.Apps.Transact.Managers.OrderManager.Instance().getTotals(orderobj).then(function(response){var res=response.result;if(OrderDetails.instance.NetTotal=res.NetTotal,res!=null){let footerHtml=`<ul class="detail-list">
                                             <li class="detail-item">
                                                 <span>Gross Amount</span>
                                                 <span id="lblSummary_GrossAmount">₹${res.GrossAmount}/-</span>

wwwroot/platform/connect/components/chat.js

                                     if (response.result.messageDeliveredDate != null) {
                                         var b = Unibase.Platform.Helpers.DateTimeHelper.Instance().formatServerDateTime(response.result.messageDeliveredDate);
                                         var ddate = Unibase.Platform.Helpers.DateTimeHelper.Instance().formatLocalDateTimeWithT(b);
-                                        var html = `<li class="list-group-item px-1 py-2 flex-between-center position-relative delivered-user">
-                                         <a href="javascript:;" class="d-flex align-items-center c-gap-10 w-100 mnw-0">
-                                         <div class="media-body flex-grow-1 mnw-0 d-flex flex-column justify-content-center"><div class="flex-between-center c-gap-10 text-dark font-weight-500 font-15" title="${ddate}"><span class="text-truncate">${ddate}</span></div>
+                                        var html = `<li class="list-group-item px-1 py-2 flex-between-center position-relative delivered-user">
+                                         <a href="javascript:;" class="d-flex align-items-center c-gap-10 w-100 mnw-0">
+                                         <div class="media-body flex-grow-1 mnw-0 d-flex flex-column justify-content-center"><div class="flex-between-center c-gap-10 text-dark font-weight-500 font-15" title="${ddate}"><span class="text-truncate">${ddate}</span></div>
                                          <div class="user-about hidden"></div></div></a></li>`;
                                         $('.delivereduserslist').html(html).removeClass('hidden');
                                         if (response.result.messageReadDate != null) {
                                             var b = Unibase.Platform.Helpers.DateTimeHelper.Instance().formatServerDateTime(response.result.messageReadDate);
                                             var rdate = Unibase.Platform.Helpers.DateTimeHelper.Instance().formatLocalDateTimeWithT(b);
-                                            var html = `<li class="list-group-item px-1 py-2 flex-between-center position-relative delivered-user">
-                                          <a href="javascript:;" class="d-flex align-items-center c-gap-10 w-100 mnw-0">
-                                          <div class="media-body flex-grow-1 mnw-0 d-flex flex-column justify-content-center"><div class="flex-between-center c-gap-10 text-dark font-weight-500 font-15" title="${rdate}"><span class="text-truncate">${rdate}</span></div>
+                                            var html = `<li class="list-group-item px-1 py-2 flex-between-center position-relative delivered-user">
+                                          <a href="javascript:;" class="d-flex align-items-center c-gap-10 w-100 mnw-0">
+                                          <div class="media-body flex-grow-1 mnw-0 d-flex flex-column justify-content-center"><div class="flex-between-center c-gap-10 text-dark font-weight-500 font-15" title="${rdate}"><span class="text-truncate">${rdate}</span></div>
                                           <div class="user-about hidden"></div></div></a></li>`;
                                             $('.readuserslist').html(html).removeClass('hidden');
                                         }
                                                 if (contact != null) {
                                                     const contactName = contact.contactName;
                                                     const avatarHtml = instance._chatTemplate.getUserAvatarHtml(contact);
-                                                    deliveredUsersHtml += `<li class="list-group-item px-1 py-2 flex-between-center position-relative delivered-user" id="deliveredUser_${recievedusers[i]}">
-                            <a href="javascript:;" class="d-flex align-items-center c-gap-10 w-100 mnw-0">${avatarHtml}
-                            <div class="media-body flex-grow-1 mnw-0 d-flex flex-column justify-content-center"><div class="flex-between-center c-gap-10 text-dark font-weight-500 font-15" title="${contactName}"><span class="text-truncate">${contactName}</span></div>
+                                                    deliveredUsersHtml += `<li class="list-group-item px-1 py-2 flex-between-center position-relative delivered-user" id="deliveredUser_${recievedusers[i]}">
+                            <a href="javascript:;" class="d-flex align-items-center c-gap-10 w-100 mnw-0">${avatarHtml}
+                            <div class="media-body flex-grow-1 mnw-0 d-flex flex-column justify-content-center"><div class="flex-between-center c-gap-10 text-dark font-weight-500 font-15" title="${contactName}"><span class="text-truncate">${contactName}</span></div>
                             <div class="user-about hidden"></div></div></a></li>`;
                                                 }
                                             }
                                                 const contact = Chat.grpdetails.find(x => x.recipientId == readusers[i]);
                                                 const contactName = contact.contactName;
                                                 const avatarHtml = instance._chatTemplate.getUserAvatarHtml(contact);
-                                                readUserHtml += `<li class="list-group-item px-1 py-2 flex-between-center position-relative delivered-user" id="readUser_${readusers[i]}">
-                            <a href="javascript:;" class="d-flex align-items-center c-gap-10 w-100 mnw-0">${avatarHtml}
-                            <div class="media-body flex-grow-1 mnw-0 d-flex flex-column justify-content-center"><div class="flex-between-center c-gap-10 text-dark font-weight-500 font-15" title="${contactName}"><span class="text-truncate">${contactName}</span></div>
+                                                readUserHtml += `<li class="list-group-item px-1 py-2 flex-between-center position-relative delivered-user" id="readUser_${readusers[i]}">
+                            <a href="javascript:;" class="d-flex align-items-center c-gap-10 w-100 mnw-0">${avatarHtml}
+                            <div class="media-body flex-grow-1 mnw-0 d-flex flex-column justify-content-center"><div class="flex-between-center c-gap-10 text-dark font-weight-500 font-15" title="${contactName}"><span class="text-truncate">${contactName}</span></div>
                             <div class="user-about hidden"></div></div></a></li>`;
                                             }
                                             $('.readuserslist').html(readUserHtml).removeClass('hidden');
                             audio: true
                         }).then(function (stream) {
                             gumStream = stream;
+                            recorder.ondataavailable = function (e) {
+                                chunks.push(e.data);
+                                let blob = new Blob(chunks, { type: 'audio/webm' });
+                                var reader = new FileReader();
+                                reader.addEventListener("load", function () {
+                                    var audiofile = Chat.Instance().dataURLtoFile(reader.result, Chat.Instance().getUniqueAudioName());
+                                    var item = {
+                                        Files: audiofile,
+                                        Index: Chat.attachments.length
+                                    };
+                                    Chat.attachments.push(item);
+                                    Chat.Instance().sendfiles();
+                                }, false);
+                                reader.readAsDataURL(blob);
+                            };
+                            recorder.start();
                         });
                         $('.voicemsg-send-btn').click(function () {
                             document.getElementById('minutes').innerText = '0';
                             document.getElementById('seconds').innerText = '0';
                             $('.record_div').addClass('hidden');
+                            if (recorder.state != 'inactive') {
+                                recorder.stop();
+                                gumStream.getAudioTracks()[0].stop();
+                            }
                             clearInterval(x);
                         });
                     }
                         let popUpHtml = '';
                         if (!jQuery.isEmptyObject(config)) {
                             const buttons = config.buttons;
-                            popUpHtml += `<div class="modal fade chat-popup biz-custom-scrollbar" id="chatPopUp" ${!Chat.isFullScreen ? 'data-backdrop="false"' : ''}>
-            <div class="modal-dialog modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    ${config.message && `<div class="modal-body pa-10">
-                    <div class="chat-popup-msg font-weight-500 text-dark">${config.message}</div>
-                    </div>`}
-                    ${config.buttons && `<div class="modal-footer pa-10">
-                        <a href="javascript:;" class="${buttons.cancel.className || 'btn btn-outline-danger'} btn-sm cancel-btn" id="chatPopupCancelBtn">${buttons.cancel.label || 'Close'}</a>
-                        <a href="javascript:;" class="${buttons.confirm.className || 'btn btn-primary'} btn-sm confirm-btn" id="chatPopupConfirmBtn">${buttons.confirm.label || 'Save'}</a>
-                    </div>`}
-                </div>
-            </div>
+                            popUpHtml += `<div class="modal fade chat-popup biz-custom-scrollbar" id="chatPopUp" ${!Chat.isFullScreen ? 'data-backdrop="false"' : ''}>
+            <div class="modal-dialog modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    ${config.message && `<div class="modal-body pa-10">
+                    <div class="chat-popup-msg font-weight-500 text-dark">${config.message}</div>
+                    </div>`}
+                    ${config.buttons && `<div class="modal-footer pa-10">
+                        <a href="javascript:;" class="${buttons.cancel.className || 'btn btn-outline-danger'} btn-sm cancel-btn" id="chatPopupCancelBtn">${buttons.cancel.label || 'Close'}</a>
+                        <a href="javascript:;" class="${buttons.confirm.className || 'btn btn-primary'} btn-sm confirm-btn" id="chatPopupConfirmBtn">${buttons.confirm.label || 'Save'}</a>
+                    </div>`}
+                </div>
+            </div>
         </div>`;
                             popUpHtml += '<div class="modal-backdrop fade show position-absolute chat-popup-backdrop" id="chatPopupBackdrop"></div>';
                             $('#chatAppWrap').append(popUpHtml);
                         else {
                             contact = Chat.AllContacts.find(x => x.chatGroupId == Chat.chatGroupId);
                         }
-                        const popupHtml = `<div class="modal fade chat-img-preview-modal chat-popup panel-preview" id="chatImgPreviewModal" tabindex="-1" role="dialog" data-backdrop="false">
-                          <div class="modal-dialog h-100 my-0" role="document">
-                            <div class="modal-content h-100">
-                              <div class="modal-body h-100">
-                                <img src="${contact.photoUrl}" class="preview-img img-fluid" onerror="ReloadImage(event)" data-dynamic="1" data-loaded="0">
-                              </div>
-                            </div>
-                          </div>
-                        </div>
+                        const popupHtml = `<div class="modal fade chat-img-preview-modal chat-popup panel-preview" id="chatImgPreviewModal" tabindex="-1" role="dialog" data-backdrop="false">
+                          <div class="modal-dialog h-100 my-0" role="document">
+                            <div class="modal-content h-100">
+                              <div class="modal-body h-100">
+                                <img src="${contact.photoUrl}" class="preview-img img-fluid" onerror="ReloadImage(event)" data-dynamic="1" data-loaded="0">
+                              </div>
+                            </div>
+                          </div>
+                        </div>
                         <div class="modal-backdrop fade show position-absolute" id="chatPopupBackdrop"></div>`;
                         $('#chatAppWrap').append(popupHtml);
                         $('#chatImgPreviewModal').modal();

wwwroot/platform/connect/components/chat.template.js

         <section class="message-info chat-flex-column h-100 hidden" id="messageInfoSection"></section>
     </div>${isFullScreen ? this.getChatFullScreenHtml() : ''}
     <div class="webcam hidden"></div>
+    <div class="audio_controls hidden" style="position:absolute;top:85%;left:10%;"></div>
 </div>`;
                         return _template;
                     }
                     </a>
                 </div>
             </div>
+         <div class="record_div ml-6 hidden" style="position: absolute;background-color: #b5c9a6;width: 96%;height: 48px;border-radius: 10px;font-size: 20px;z-index: 1;display: flex;">
+              <span class="ml-10 ">Recording.......</span>
+              <span class="" style="width: 30px;">
+                <ul style="display:flex;">
+                  <li><span id="minutes"></span></li>
+                  <p>:</p>
+                  <li><span id="seconds"></span></li>
+               </ul>
+              </span>
+              <a href="javascript:;" class="btn btn-icon btn-primary btn-rounded d-30 voicemsg-send-btn  cursor-pointer  mt-10 ml-120">
+                <span class="btn-icon-wrap"><i class="las la-paper-plane msg-option font-20"></i></span></a>
+            </div>
             <div class="msg-option-container d-flex align-items-center c-gap-15 font-20">
                 <div class="msg-compose-options align-items-center c-gap-15">
                     <div class="btn-file msg-option attachments-btn cursor-pointer">
                         <span class="btn-icon-wrap"> <i class="las la-paper-plane msg-option font-20"></i></span>
                     </a>
                 </div>
+               <div class="voicemsg_icon" id="recordaudio">
+                   <a href="javascript:;" class="btn btn-icon btn-primary btn-rounded d-30 msg-send-btn"  onclick="Unibase.Platform.Connect.Components.Chat.Instance().voicemsg()">
+                        <span class="btn-icon-wrap"><i class="fa fa-microphone msg-option font-20"></i></span>
+                   </a>
+                </div>
             </div>
         </div>
         <div class="msg-multiaction-btns hidden">
                         return _template;
                     }
                     getprofilebody() {
+                        var imginput = '';
                         var contact = Components.Chat.contacts.find(x => x.contactId == Components.Chat.contactId);
                         if (Components.Chat.contactId == 0) {
                             contact = Components.Chat.recentChats.find(x => x.chatGroupId == Components.Chat.chatGroupId);
                         let avatarHtml = this.getUserAvatarHtml(contact, false, true);
                         avatarHtml = avatarHtml.replace('avatar-sm', 'avatar-xl d-100');
                         if (!Components.Chat.isPrivate) {
-                            avatarHtml += '<input type="file" id="profileImageInput" class="Profile_image hidden" onchange="Unibase.Platform.Connect.Components.Chat.Instance().changeProfileImage(this);" accept="image/png,image/jpeg">';
+                            imginput = '<span class="btn btn-icon btn-icon-circle btn-primary btn-xs d-20" style="position:absolute;top:10%;z-index:1;left:56%;"><i class="fa fa-pencil"></i></span><input type="file" id="profileImageInput" class="Profile_image hidden" onchange="Unibase.Platform.Connect.Components.Chat.Instance().changeProfileImage(this);" accept="image/png,image/jpeg">';
                         }
-                        const template = `<div class="profile-details-wrap" id="profileDetailsWrap"><div class="user-profile-info flex-center flex-column r-gap-10" id="userProfileInfo"><label class="profile-header-img flex-center flex-shrink-0 my-0 cursor-pointer" for="profileImageInput" imgchatUser_${Components.Chat.chatGroupId} title="Upload Image">${avatarHtml}</label>
+                        const template = `<div class="profile-details-wrap" id="profileDetailsWrap"><div class="user-profile-info flex-center flex-column r-gap-10" id="userProfileInfo"><label class="profile-header-img flex-center flex-shrink-0 my-0 cursor-pointer" for="profileImageInput" imgchatUser_${Components.Chat.chatGroupId} title="Upload Image">${imginput}</label>${avatarHtml}
                             <div class="div-user-group-Name d-flex flex-column justify-content-center mnw-0 r-gap-5 w-100">
                             <div class="profile-name-wrap position-relative flex-center c-gap-10"><span class="Profile_name grpname_${Components.Chat.chatGroupId} font-weight-500 font-18 text-center text-dark">${contactName}</span><div class="edit-group-input-wrap position-relative mb-5 hidden" id="editGroupInputWrap"><input type="text" class="custom-chat-input text-dark font-weight-500 edit_groupdetailsInput pr-30" value="${contactName} " data-prevvalue="${contactName} "></a>
                             <a href="javascript:;" class="save_changes btn btn-flush-biz-theme btn-icon btn-rounded flush-soft-hover d-26" onclick="Unibase.Platform.Connect.Components.Chat.Instance().changeGroupName();"><span class="btn-icon-wrap"><i class="icon dripicons-checkmark"></i></span></a></div><a href="javascript:;" class="edit_grpdetails btn btn-flush-biz-theme btn-icon btn-rounded flush-soft-hover d-26 hidden" onclick="Unibase.Platform.Connect.Components.Chat.Instance().EditgroupDetails('${contactName}');"><span class="btn-icon-wrap"><i class="fa fa-pencil font-14"></i></span></a></div>
                         return _template;
                     }
                     getUserAvatarHtml(contactInfo, isOnlineVisible = false, isPrivateWindow = false) {
-                        let avatarHtml = '<div class="media-img-wrap avatar ImagePng_' + contactInfo.chatGroupId + ' avatar-sm flex-shrink-0">';
+                        let avatarHtml = '<div class="media-img-wrap avatar ImagePng_' + contactInfo.chatGroupId + ' avatar-sm flex-shrink-0 cursor-pointer" onclick="Unibase.Platform.Connect.Components.Chat.Instance().showProfileImgPreview()" title="Preview Profile">';
                         if (!contactInfo.photoUrl) {
                             let avatarTxt = "";
                             let headingTxt = contactInfo.contactName;

wwwroot/platform/connect/managers/chatmanager.js

                             });
                         });
                     }
-                    mediafiles(chatgroupid) {
-                        return __awaiter(this, void 0, void 0, function* () {
-                            const url = 'apis/uniconnect/chats/getmediafiles/chatgroupid/' + chatgroupid;
-                            return yield this.dataHelper().getAsync(url).then(function (response) {
-                                return response;
-                            });
-                        });
-                    }
-                    documentfiles(chatgroupid) {
-                        return __awaiter(this, void 0, void 0, function* () {
-                            const url = 'apis/uniconnect/chats/getdocumentfiles/chatgroupid/' + chatgroupid;
-                            return yield this.dataHelper().getAsync(url).then(function (response) {
-                                return response;
-                            });
-                        });
-                    }
-                    getlinks(chatgroupid) {
-                        return __awaiter(this, void 0, void 0, function* () {
-                            const url = 'apis/uniconnect/chats/getlinks/chatgroupid/' + chatgroupid;
-                            return yield this.dataHelper().getAsync(url).then(function (response) {
-                                return response;
-                            });
-                        });
-                    }
                     changeGroupName(chatgroupid, groupname) {
                         return __awaiter(this, void 0, void 0, function* () {
                             const url = 'apis/uniconnect/chats/changegroupname/chatgroupid/' + chatgroupid + '/groupname/' + groupname;

wwwroot/platform/core/helpers/routes/routehelper.js

                                 Unibase.Platform.Communications.Managers.ReminderManager.Instance().changeReminderStatus(reminderid, status).then(function (response) {
                                 });
                             }
+                            else {
+                                Unibase.Themes.Compact.Components.Index.Instance().isIframeObj.isListDetailPage = false;
+                            }
                             Unibase.Themes.Compact.Components.Index.Instance().isIframe = true;
                             Unibase.Themes.Compact.Components.Index.Instance().isIframeObj.isListPage = true;
                             RouteHelper.Instance().navHelper.loadList(installedAppId, null);

wwwroot/platform/forms/components/formviewer/formviewer.js

                                         if (Unibase.Themes.Compact.Components.Index.Instance().isIframe) {
                                             Unibase.Platform.Helpers.FileCacheHelper.Instance().loadJsFile('tenants/themes/compact/components/popupdetails/popupdetails.js', function () {
                                                 Unibase.Themes.Compact.Components.Index.Instance().isIframeObj.isPopupPage = true;
+                                                window.parent.postMessage(`save-form-success/${ViewerObject.FormId}`, '*');
                                                 Unibase.Platform.Helpers.NavigationHelper.Instance().popup(0, '', Unibase.Platform.Membership.Components.PopupDetails.Instance(), function () {
                                                     let formid = ViewerObject.FormId;
                                                     let appconfigid = ViewerObject.AppConfigurationId;

wwwroot/tenants/themes/compact/components/details/details.js

                         instance.appmanager = Unibase.Platform.Apps.Managers.AppManager.Instance();
                         instance.doctypemanager = Unibase.Platform.DataSources.Managers.DocTypeManager.Instance();
                         $("#" + containerid).find(".detail-close").click(function () {
-                            window.parent.postMessage('clickToBack', '*');
+                            if (!Unibase.Themes.Compact.Components.Index.Instance().isIframeObj.isListDetailPage) {
+                                window.parent.postMessage('List-Details-page', '*');
+                            }
+                            else {
+                                window.parent.postMessage('clickToBack', '*');
+                            }
                             $('.txt_global_search').show();
                             $('.search_icon').removeClass("hidden");
                             $(this).removeClass("hidden");

wwwroot/tenants/themes/compact/index.js

                         this.currentUser = Unibase.Platform.Membership.Infos.Identity.currentUser;
                         this.isTouchScreen = ('ontouchstart' in window) || (navigator.msMaxTouchPoints > 0);
                         this.isIframe = false;
-                        this.isIframeObj = { "isDetailsPage": false, "isNotifiPage": false, "isListPage": false, "isForm": false, "isPopupPage": false, "isDetailsForm": false };
+                        this.isIframeObj = { "isDetailsPage": false, "isNotifiPage": false, "isListPage": false, "isForm": false, "isPopupPage": false, "isDetailsForm": false, "isListDetailPage": true };
                     }
                     init(callback) {
                         const instance = this;

wwwroot/tenants/themes/compact/js/navigation/navigationhelper.js

                                 $("#" + panel).find('.modal-header .close').click();
                                 window.parent.postMessage('closeForm', '*');
                             });
-                            $("#" + panel).find("#btnDynamicSave").on("click", function () {
-                                let formid = $("#" + panel + ' .modal-header #hf_FormId').val();
-                                window.parent.postMessage(`save-form/${formid}`, '*');
-                            });
                         }
                         if (Unibase.Themes.Providers.DetailHelper.isListStages) {
                             $("#" + panel).find(".btn_CloseForm ").on("click", function () {