Merge pull request #193 from awesomemotive/release/4.6.7

`release/4.6.7`
awesomemotive · Jan 24, 2023 · 4e325c8 · 4e325c8
2 parents 65840e2 + 79f5d89
commit 4e325c8
Show file tree

Hide file tree

Showing 197 changed files with 5,359 additions and 4,148 deletions.
diff --git a/includes/core/admin/class-assets.php b/includes/core/admin/class-assets.php
@@ -215,7 +215,7 @@ public function register() {
 							'pluginError'           => esc_html__(
 								'Could not install the plugin automatically. Please download and install it manually.',
 								'stripe'
-							 ),
+							),
 							'pluginInstallActivate' => esc_html__(
 								'Install and Activate',
 								'stripe'
@@ -224,7 +224,11 @@ public function register() {
 								'Activate',
 								'stripe'
 							),
-						)
+							'trashFormConfirm'      => esc_html__(
+								'Warning: Removing a payment form will prevent active subscriptions from sending upcoming invoice and invoice receipt emails. It is recommended to leave payment forms that have accepted Live Mode payments published.',
+								'stripe'
+							),
+						),
 					)
 				);
 			}

diff --git a/includes/core/admin/class-menus.php b/includes/core/admin/class-menus.php
@@ -112,7 +112,7 @@ public static function plugin_action_links( $action_links, $file ) {
 
 			// Documentation.
 			$documentation_url = simpay_ga_url(
-				'https://docs.wpsimplepay.com/',
+				'https://wpsimplepay.com/docs/',
 				'plugin-listing-link',
 				'Documentation'
 			);

diff --git a/includes/core/assets/css/admin/admin-dashboard-widget-report.scss b/includes/core/assets/css/admin/admin-dashboard-widget-report.scss
@@ -5,92 +5,16 @@
 @import "~@wordpress/base-styles/animations";
 @import "~@wordpress/base-styles/z-index";
 
+@import "./charts.scss";
+
 .simpay-admin-dashboard-widget-report {
+
 	* {
 		box-sizing: border-box;
 	}
 
-	&__chart {
-		min-height: 300px;
-	}
-
-	&__no-data {
-		position: absolute;
-		top: 0;
-		left: 0;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: rgba(255, 255, 255, 0.5);
-		z-index: 2;
-
-		> div {
-			text-align: center;
-			padding: $grid-unit-30;
-			background: #fff;
-			border: 1px solid #c3c3c3;
-			box-shadow: 0 2px 6px rgb(0, 0, 0, 0.10);
-			border-radius: 2px;
-			max-width: 60%;
-		}
-
-		strong {
-			font-size: 15px;
-			margin-bottom: 2px;
-			display: block;
-		}
-	}
-
-	&__tooltip {
-		position: absolute;
-		background: #fff;
-		border: 1px solid #c3c3c3;
-		box-shadow: 0 2px 6px rgb(0, 0, 0, 0.05);
-		border-radius: 2px;
-		padding: 9px 14px;
-		z-Index: 10000;
-		width: 175px;
-
-		> div {
-			margin-bottom: 5px;
-
-			&:last-child {
-				margin-bottom: 0;
-			}
-		}
-	}
-
-	&__badge {
-		font-size: 11px;
-		font-weight: 600;
-		color: #3f3f46;
-		text-align: center;
-		line-height: 1;
-		padding: 3px 5px;
-		border-radius: 2px;
-		background: #e4e4e7;
-		border: 0;
-		box-shadow: none;
-		display: inline-flex;
-		align-items: center;
-
-		&.is-positive {
-			color: #0e6245;
-			background: #cbf4c9;
-		}
-
-		&.is-negative {
-			color: #983705;
-			background: #f8e5b9;
-		}
-	}
-
-	&__chart {
-
-	}
-
 	&__data {
-		margin: 30px -12px -12px;
+		margin: 20px -12px -12px;
 		padding: 12px;
 		border-top: 1px solid $gray-200;
 		position: relative;
@@ -102,12 +26,6 @@
 		justify-content: space-between;
 		align-items: center;
 
-		span {
-			color: $gray-900;
-			font-size: 14px;
-			font-weight: 500;
-		}
-
 		.components-base-control__field {
 			margin-bottom: 0;
 		}
@@ -121,10 +39,6 @@
 		> * {
 			margin-right: $grid-unit-10;
 		}
-
-		svg {
-			fill: $gray-600;
-		}
 	}
 
 	&__data-filter-controls {

diff --git a/includes/core/assets/css/admin/admin.scss b/includes/core/assets/css/admin/admin.scss
@@ -6,6 +6,7 @@
 @import "~@wordpress/base-styles/z-index";
 
 @import './settings.scss';
+@import './charts.scss';
 
 .button.button-large.simpay-button-large {
 	font-size: 14px;
@@ -2036,6 +2037,19 @@ select.simpay-currency-symbol {
 		margin-top: 5px;
 	}
 
+	::-webkit-input-placeholder {
+		color: #b7bec7;
+	}
+
+	::-moz-placeholder {
+		color: #b7bec7;
+		opacity: 1;
+	}
+
+	:-ms-input-placeholder {
+		color: #b7bec7;
+	}
+
 	> * {
 		margin-right: 8px;
 	}

diff --git a/includes/core/assets/css/admin/charts.scss b/includes/core/assets/css/admin/charts.scss
@@ -0,0 +1,125 @@
+@import "~@wordpress/base-styles/colors";
+@import "~@wordpress/base-styles/variables";
+
+.simpay-admin-charts-period-over-period {
+	position: relative;
+	padding-bottom: $grid-unit-15;
+
+	* {
+		box-sizing: border-box;
+	}
+
+	&__tooltip {
+		position: absolute;
+		background: #fff;
+		border: 1px solid #c3c3c3;
+		box-shadow: 0 2px 6px rgb(0, 0, 0, 0.05);
+		border-radius: 2px;
+		padding: 10px 14px;
+		display: flex;
+		flex-direction: column;
+		z-Index: 10000;
+		min-width: 175px;
+
+		&-data {
+			white-space: nowrap;
+			margin-bottom: $grid-unit;
+			display: grid;
+			grid-template-columns: 1fr auto;
+			grid-auto-rows: auto;
+			column-gap: $grid-unit-20;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			&[data-dataset="1"] {
+				opacity: 0.65;
+			}
+
+			em {
+				font-style: normal;
+				text-align: right;
+			}
+		}
+
+		&-delta {
+			font-size: 12px;
+			margin: 0 -14px -10px;
+			padding: 8px 14px;
+			border-top: 1px solid #eee;
+			background: #fdfdfd;
+			border-radius: 2px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.simpay-admin-charts-badge {
+				margin-right: 4px;
+			}
+
+			strong.is-positive {
+				color: #006908;
+			}
+
+			strong.is-negative {
+				color: #b3093c;
+			}
+		}
+	}
+}
+
+.simpay-admin-charts-badge {
+	color: $gray-800;
+	font-size: 12px;
+	font-weight: 500;
+	font-style: normal;
+	line-height: 1;
+	padding: 3px 6px;
+	display: inline-flex;
+	align-items: center;
+	background: $gray-100;
+	border-radius: 100px;
+
+	&.is-positive {
+		color: #006908;
+		background-color: #d7f7c2;
+	}
+
+	&.is-negative {
+		color: #b3093c;
+		background-color: #ffe7f2;
+	}
+
+	&__icon {
+		width: 15px;
+		height: 15px;
+	}
+}
+
+.simpay-admin-charts-no-data {
+	position: absolute;
+	top: 0;
+	left: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background: rgba(255, 255, 255, 0.5);
+	z-index: 2;
+
+	> div {
+		text-align: center;
+		padding: $grid-unit-30;
+		background: #fff;
+		border: 1px solid #c3c3c3;
+		box-shadow: 0 2px 6px rgb(0, 0, 0, 0.10);
+		border-radius: 2px;
+		max-width: 60%;
+	}
+
+	strong {
+		font-size: 15px;
+		margin-bottom: $grid-unit;
+		display: block;
+	}
+}