From cca5aa8a96ec9a3e03b580711d7e9233db552ff9 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 13 Aug 2024 16:28:07 +0530 Subject: [PATCH] chore: resolve conflict --- .../doctype/subscription/subscription.js | 35 ++++--------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/erpnext/accounts/doctype/subscription/subscription.js b/erpnext/accounts/doctype/subscription/subscription.js index 48bbc733fe4..caaa60b5757 100644 --- a/erpnext/accounts/doctype/subscription/subscription.js +++ b/erpnext/accounts/doctype/subscription/subscription.js @@ -29,7 +29,6 @@ frappe.ui.form.on("Subscription", { }, refresh: function (frm) { -<<<<<<< HEAD if (!frm.is_new()) { if (frm.doc.status !== "Cancelled") { frm.add_custom_button(__("Cancel Subscription"), () => @@ -38,39 +37,17 @@ frappe.ui.form.on("Subscription", { frm.add_custom_button(__("Fetch Subscription Updates"), () => frm.events.get_subscription_updates(frm) ); + + frm.add_custom_button( + __("Force-Fetch Subscription Updates"), + () => frm.trigger("force_fetch_subscription_updates"), + __("Actions") + ); } else if (frm.doc.status === "Cancelled") { frm.add_custom_button(__("Restart Subscription"), () => frm.events.renew_this_subscription(frm) ); } -======= - if (frm.is_new()) return; - - if (frm.doc.status !== "Cancelled") { - frm.add_custom_button( - __("Fetch Subscription Updates"), - () => frm.trigger("get_subscription_updates"), - __("Actions") - ); - - frm.add_custom_button( - __("Force-Fetch Subscription Updates"), - () => frm.trigger("force_fetch_subscription_updates"), - __("Actions") - ); - - frm.add_custom_button( - __("Cancel Subscription"), - () => frm.trigger("cancel_this_subscription"), - __("Actions") - ); - } else if (frm.doc.status === "Cancelled") { - frm.add_custom_button( - __("Restart Subscription"), - () => frm.trigger("renew_this_subscription"), - __("Actions") - ); ->>>>>>> 1ef890db73 (fix: force fetch updates for subcription) } },