Merge branch 'master' into m-series-get-app-fail

dashboard/src2/components/ObjectList.vue

@@ -1,11 +1,8 @@
 <template>
 	<div>
-		<AlertBanner
-			v-if="banner"
-			:title="banner.title"
-			:type="banner.type"
-			class="mb-4"
-		/>
+		<AlertBanner v-if="banner" v-bind="banner" class="mb-4">
+			<Button v-if="banner.button" v-bind="banner.button" class="ml-auto" />
+		</AlertBanner>
 		<div class="flex items-center justify-between">
 			<slot name="header-left" v-bind="context">
 				<div v-if="showControls" class="flex items-center space-x-2">

dashboard/src2/objects/site.js

@@ -561,6 +561,43 @@ export default {
 							type: 'Badge'
 						}
 					],
+					banner({ documentResource: site }) {
+						if (site.doc.broken_domain_error) {
+							return {
+								title:
+									'There was an error fetching an https certificate for your domain.',
+								type: 'error',
+								button: {
+									label: 'View Error',
+									variant: 'outline',
+									onClick() {
+										renderDialog(
+											h(
+												GenericDialog,
+												{
+													options: {
+														title: 'Error fetching certificate',
+														size: 'xl'
+													}
+												},
+												{
+													default: () => {
+														return h('pre', {
+															class:
+																'whitespace-pre-wrap text-sm rounded border-2 p-3 border-gray-200 bg-gray-100',
+															innerHTML: site.doc.broken_domain_error
+														});
+													}
+												}
+											)
+										);
+									}
+								}
+							};
+						} else {
+							return null;
+						}
+					},
 					primaryAction({ listResource: domains, documentResource: site }) {
 						return {
 							label: 'Add Domain',

press/press/doctype/invoice/invoice.py

@@ -276,6 +276,8 @@ def finalize_invoice(self):
 					)
 				)
 
+		self.save()
+
 		if self.amount_due > 0:
 			if self.payment_mode == "Prepaid Credits":
 				self.add_comment(
@@ -287,8 +289,6 @@ def finalize_invoice(self):
 			if self.payment_mode == "Card":
 				self.create_stripe_invoice()
 
-		self.save()
-
 		if self.status == "Paid":
 			self.submit()
 			self.unsuspend_sites_if_applicable()
@@ -385,6 +385,7 @@ def create_stripe_invoice(self):
 				)
 				self.stripe_invoice_id = ""
 				self.stripe_invoice_url = ""
+				self.save()
 
 		if self.amount_due_with_tax <= 0:
 			return

press/press/doctype/site/site.py

@@ -227,6 +227,14 @@ def get_doc(self, doc):
 		doc.server_title = server.title
 		doc.inbound_ip = self.inbound_ip
 		doc.is_dedicated_server = is_dedicated_server(self.server)
+
+		if broken_domain_tls_certificate := frappe.db.get_value(
+			"Site Domain", {"site": self.name, "status": "Broken"}, "tls_certificate"
+		):
+			doc.broken_domain_error = frappe.db.get_value(
+				"TLS Certificate", broken_domain_tls_certificate, "error"
+			)
+
 		return doc
 
 	def site_action(allowed_status: List[str]):

press/press/doctype/virtual_machine/virtual_machine.py

@@ -539,7 +539,7 @@ def update_servers(self):
 			"Pending": "Pending",
 			"Running": "Active",
 			"Terminated": "Archived",
-			"Stopped": "Archived",
+			"Stopped": "Pending",
 		}
 		for doctype in self.server_doctypes:
 			server = frappe.get_all(doctype, {"virtual_machine": self.name}, pluck="name")

press/press/doctype/virtual_machine_image/virtual_machine_image.json

@@ -18,6 +18,7 @@
   "platform",
   "series",
   "copied_from",
+  "public",
   "credentials_section",
   "mariadb_root_password"
  ],
@@ -121,11 +122,17 @@
    "fieldtype": "Data",
    "label": "Snapshot ID",
    "read_only": 1
+  },
+  {
+   "default": "1",
+   "fieldname": "public",
+   "fieldtype": "Check",
+   "label": "Public"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-12-11 18:02:20.719052",
+ "modified": "2024-07-04 12:26:14.185070",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Virtual Machine Image",

press/press/doctype/virtual_machine_image/virtual_machine_image.py

@@ -28,6 +28,7 @@ class VirtualMachineImage(Document):
 		instance_id: DF.Data
 		mariadb_root_password: DF.Password | None
 		platform: DF.Data | None
+		public: DF.Check
 		region: DF.Link
 		series: DF.Literal["n", "f", "m", "c", "p", "e", "r"]
 		size: DF.Int
@@ -170,6 +171,7 @@ def get_available_for_series(
 			frappe.qb.from_(images)
 			.select("name")
 			.where(images.status == "Available")
+			.where(images.public == 1)
 			.where(
 				images.series == series,
 			)