Merge pull request #256 from wpswings/v1.7.0

V1.7.0

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://img.shields.io/travis/twbs/bootstrap/v4-dev.svg)](https://travis-ci.org/twbs/bootstrap) ![Active installs](https://img.shields.io/badge/Active-9000%2B-brightgreen)![License](https://img.shields.io/badge/License-GPLv3%20or%20later-yellowgreen) ![WP tested](https://img.shields.io/badge/WP%20tested-6.5.3-brightgreen)![WC tested](https://img.shields.io/badge/WC%20tested-8.9.1-brightgreen)![Requires PHP](https://img.shields.io/badge/Requires%20PHP-7.3.5-blue)
+[![Build Status](https://img.shields.io/travis/twbs/bootstrap/v4-dev.svg)](https://travis-ci.org/twbs/bootstrap) ![Active installs](https://img.shields.io/badge/Active-10000%2B-brightgreen)![License](https://img.shields.io/badge/License-GPLv3%20or%20later-yellowgreen) ![WP tested](https://img.shields.io/badge/WP%20tested-6.6.1-brightgreen)![WC tested](https://img.shields.io/badge/WC%20tested-9.1.4-brightgreen)![Requires PHP](https://img.shields.io/badge/Requires%20PHP-7.3.5-blue)
 # Subscriptions For WooCommerce – Subscription Plugin for Collecting Recurring Revenue, Sell Membership Subscription Services and products
 ![Subscriptions For WooCommerce](https://ps.w.org/subscriptions-for-woocommerce/assets/banner-772x250.png?rev=2672125)
 * Contributors: WP Swings
@@ -87,7 +87,7 @@ The Wallet system enables a digital wallet on your eCommerce store for users. It
 5) Subscriptions for WooCommerce WPML compatibility enable the admin to create text in different languages. It allows simple language translation in your store. 
 
 6) WooCommerce Subscription Payment Gateway Compatible
-Our Subscription WordPress plugin is compatible with the [**WooCommerce Stripe Payment Gateway**](https://wordpress.org/plugins/woocommerce-gateway-stripe/), and [**WooCommerce PayPal Checkout Payment Gateway**](https://wordpress.org/plugins/woocommerce-gateway-paypal-express-checkout/). We will try to add more official payment gateways with different updates. However, you can [**Contact us**](https://wpswings.com/contact-us/?utm_source=wpswings-subs-contact-us&utm_medium=subs-github-page&utm_campaign=contact-us) for customized payment compatibility.
+Our Subscription WordPress plugin is compatible with the [**WooCommerce Stripe Payment Gateway**](https://wordpress.org/plugins/woocommerce-gateway-stripe/), and. We will try to add more official payment gateways with different updates. However, you can [**Contact us**](https://wpswings.com/contact-us/?utm_source=wpswings-subs-contact-us&utm_medium=subs-github-page&utm_campaign=contact-us) for customized payment compatibility.
 
 7) Subscription for WooCommerce is fully compatible with WooCommerce High-Performance Order Storage (HPOS) is an easy-to-understand solid database structure that uses WooCommerce CRUD design, allowing you to store order data in custom order tables to easily handle bulk orders and ensure the smooth workflow of your WooCommerce store.
 

README.txt

@@ -6,14 +6,12 @@ Requires at least: 5.1.0
 Tested up to: 6.6.1
 WC requires at least: 5.1.0
 WC tested up to: 9.1.4
-Stable tag: 1.6.9
+Stable tag: 1.7.0
 Requires PHP: 7.3.5 
 License: GNU General Public License v3.0 
 License URI: http://www.gnu.org/licenses/gpl-3.0.html 
 
 
-
-
 With Subscriptions for WooCommerce, turn your physical or online store into a WooCommerce product subscription store and avail recurring revenue.
 
 
@@ -68,7 +66,7 @@ Our Subscription and Membership plugins are among the top-rated plugins, when co
 **2)  Recurring Subscriptions Info on Cart and Checkout Page:** Customers will receive details regarding their recurring subscriptions on both the cart and checkout pages. This will enhance transparency and provide clarity regarding the total amount, tax details, and renewal period, making management easier for recurring subscriptions during the checkout process.
 
 
-**3) Create Products as Subscription Products With Subscriptions for WooCommerce:** With WordPress subscriptions plugin you can assign a subscription label to simple products by checking a box. The selected product will then be available as a WooCommerce subscription simple product, without creating a specific subscription-type product.
+**3) Create Products as Subscription Products With Subscriptions for WooCommerce:** With the WordPress subscriptions plugin you can assign a subscription label to simple products by checking a box. The selected product will then be available as a WooCommerce subscription simple product, without creating a specific subscription-type product.
 
 **4) Set Subscription Frequency for Subscription-Based Products:** WP subscription plugin allows you to set the recurring frequency option on subscribed products. Payment plans for these subscription-based products can be configured monthly, weekly, or yearly. Additionally, you can manage the frequency of Subscription free trials.
 
@@ -114,7 +112,7 @@ For previous users, the WPS PayPal Payment option will appear in the payment sec
 == SUBSCRIPTIONS PLUGIN COMPATIBILITIES ==
 
 
-* **WooCommerce Payment Gateway Compatible**: Our Subscription WordPress plugin is compatible with the [**WooCommerce Stripe Payment Gateway**](https://wordpress.org/plugins/woocommerce-gateway-stripe/)(support for the credit card, debit card, Stripe SEPA Direct Debit),[**WooCommerce PayPal Checkout Payment Gateway**](https://wordpress.org/plugins/woocommerce-gateway-paypal-express-checkout/) and WPS PayPal Payment.
+* **WooCommerce Payment Gateway Compatible**: Our Subscription WordPress plugin is compatible with the [**WooCommerce Stripe Payment Gateway**](https://wordpress.org/plugins/woocommerce-gateway-stripe/)(support for the credit card, debit card, Stripe SEPA Direct Debit) and WPS PayPal Payment.
 
 
 * **Compatible With PayPal Standard**: The Subscriptions plugin works flawlessly with PayPal Standard to receive WooCommerce recurring payments. You can add it as one of the payment methods by entering your PayPal merchant account API keys
@@ -125,7 +123,6 @@ For previous users, the WPS PayPal Payment option will appear in the payment sec
 
 * [**Membership for WooCommerce Free**](https://wordpress.org/plugins/membership-for-woocommerce/) and [**Membership for WooCommerce Pro**](https://wpswings.com/product/membership-for-woocommerce-pro/?utm_source=wpswings-subs-membership-pro&utm_medium=subs-org-page&utm_campaign=membership-pro): Our WooCommerce Subscriptions plugin works seamlessly with the Membership for WooCommerce plugin. This integration allows you to sell subscription services and products as part of your membership plans. With our WordPress subscription plugin, you can easily create membership plans and offer exclusive discounts to your members.
 
-
 * [**Wallet System for WooCommerce Free**](https://wordpress.org/plugins/wallet-system-for-woocommerce/) and [**Wallet System for WooCommerce Pro**](https://wpswings.com/product/wallet-system-for-woocommerce-pro/?utm_source=wpswings-wallet-pro&utm_medium=subs-org-page&utm_campaign=wallet-pro/).
 The Wallet system compatibility allows users to pay for their recurring services and products via a WooCommerce wallet. Customers can buy subscriptions using the Wallet amount as a discount (not a payment gateway). The renewal order will also be discounted based on the wallet amount.
 
@@ -148,7 +145,7 @@ The Wallet system compatibility allows users to pay for their recurring services
 * With WooCommerce subscription plugin you can show the related subscription table to users on the Thank You page post-order placement.
 * With subscription premium plugin you can upgrade or downgrade plans of variable products.
 * Designation of WooCommerce subscription start date and expiration date by user or admin.
-* Compatibility with the [**Product Bundles plugin**](https://woocommerce.com/products/product-bundles/) allows you to offer subscription bundles on your store. 
+* Compatibility with the [**Product Bundles plugin**](https://woocommerce.com/products/product-bundles/) allows you to offer subscription bundles in your store. 
 * Automatic retrying for failed payments and automated WooCommerce subscription cancellation.          
 * Create exclusive WooCommerce subscription coupon types with Subscriptions for WooCommerce.
 * Ability to handle WooCommerce subscription proration.
@@ -319,6 +316,10 @@ Check out [**Subscriptions  for WooCommerce Knowledge Base**](https://support.wp
 
 == Changelog ==
 
+= 1.7.0 - Released on 09 August 2024 =
+* Override existing mail template to customer when renewal get failed
+* Add number of days left for the next renewal
+
 = 1.6.9 - Released on 29 July 2024 =
 * New : Latest WP(6.6.1) and WC(9.1.4) compatibility
 * New : Searching of Subscriptions using username or user email
@@ -698,13 +699,8 @@ Check out [**Subscriptions  for WooCommerce Knowledge Base**](https://support.wp
 * First version
 
 
-
-
 == Upgrade Notice ==
 
-= 1.6.9 - Released on 29 July 2024 =
-* New : Latest WP(6.6.1) and WC(9.1.4) compatibility
-* New : Searching of Subscriptions using username or user email
-* Fix : Translation issue
-* Fix : i tag closing issue
-* Fix : Singular and Plural string issue in the subscription price
+= 1.7.0 - Released on 09 August 2024 =
+* Override existing mail template to customer when renewal get failed
+* Add number of days left for the next renewal

admin/class-subscriptions-for-woocommerce-admin.php

@@ -66,7 +66,7 @@ public function wps_sfw_admin_enqueue_styles( $hook ) {
 			$pagescreen = $screen->id;
 		}
 
-		if ( isset( $screen->id ) && in_array( $screen->id, $wps_sfw_screen_ids )  || ( 'wp-swings_page_home' == $screen->id ) ) {
+		if ( isset( $screen->id ) && ( in_array( $screen->id, $wps_sfw_screen_ids ) || ( 'wp-swings_page_home' == $screen->id ) ) ) {
 			// Multistep form css.
 			if ( ! wps_sfw_check_multistep() ) {
 				$style_url        = SUBSCRIPTIONS_FOR_WOOCOMMERCE_DIR_URL . 'build/style-index.css';

admin/partials/class-subscriptions-for-woocommerce-admin-subscription-list.php

@@ -341,11 +341,11 @@ public function wps_sfw_get_subscription_list() {
 				),
 			);
 			if ( isset( $_REQUEST['s'] ) && ! empty( $_REQUEST['s'] ) ) {
-				// logic to fetch subscription using subscription id or parent id
+				// Logic to fetch subscription using subscription id or parent id.
 				$maybe_subscription_or_parent_id = (int) sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
 
 				$sub_id = wps_sfw_get_meta_data( $maybe_subscription_or_parent_id, 'wps_parent_order', true );
-				if( $sub_id ) {
+				if ( $sub_id ) {
 					$maybe_subscription_or_parent_id = $sub_id;
 				}
 				if ( $maybe_subscription_or_parent_id ) {
@@ -358,13 +358,13 @@ public function wps_sfw_get_subscription_list() {
 					);
 				} else {
 					$username_or_email = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
-					// logic to fetch subscription using username or email
+					// Logic to fetch subscription using username or email.
 
-					$user = get_user_by('email', $username_or_email );
-    
-					// If no user is found by email, try to get by username
-					if (! $user ) {
-						$user = get_user_by('login', $username_or_email );
+					$user = get_user_by( 'email', $username_or_email );
+
+					// If no user is found by email, try to get by username.
+					if ( ! $user ) {
+						$user = get_user_by( 'login', $username_or_email );
 					}
 					$customer_id = $user ? $user->ID : false;
 
@@ -395,11 +395,11 @@ public function wps_sfw_get_subscription_list() {
 			);
 
 			if ( isset( $_REQUEST['s'] ) && ! empty( $_REQUEST['s'] ) ) {
-				// logic to fetch subscription using subscription id or parent id
+				// Logic to fetch subscription using subscription id or parent id.
 				$maybe_subscription_or_parent_id = (int) sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
 
 				$sub_id = wps_sfw_get_meta_data( $maybe_subscription_or_parent_id, 'wps_parent_order', true );
-				if( $sub_id ) {
+				if ( $sub_id ) {
 					$maybe_subscription_or_parent_id = $sub_id;
 				}
 				if ( $maybe_subscription_or_parent_id ) {
@@ -412,13 +412,13 @@ public function wps_sfw_get_subscription_list() {
 					);
 				} else {
 					$username_or_email = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
-					// logic to fetch subscription using username or email
+					// Logic to fetch subscription using username or email.
+
+					$user = get_user_by( 'email', $username_or_email );
 
-					$user = get_user_by('email', $username_or_email );
-
-					// If no user is found by email, try to get by username
-					if (! $user ) {
-						$user = get_user_by('login', $username_or_email );
+					// If no user is found by email, try to get by username.
+					if ( ! $user ) {
+						$user = get_user_by( 'login', $username_or_email );
 					}
 					$customer_id = $user ? $user->ID : false;
 
@@ -434,7 +434,7 @@ public function wps_sfw_get_subscription_list() {
 			$wps_subscriptions = get_posts( $args );
 		}
 
-		// code to get the total item count.
+		// Code to get the total item count.
 		if ( OrderUtil::custom_orders_table_usage_is_enabled() ) {
 			$args2 = array(
 				'type'   => 'wps_subscriptions',
@@ -448,11 +448,11 @@ public function wps_sfw_get_subscription_list() {
 				'return' => 'ids',
 			);
 			if ( isset( $_REQUEST['s'] ) && ! empty( $_REQUEST['s'] ) ) {
-				// logic to fetch subscription using subscription id or parent id
+				// Logic to fetch subscription using subscription id or parent id.
 				$maybe_subscription_or_parent_id = (int) sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
 
 				$sub_id = wps_sfw_get_meta_data( $maybe_subscription_or_parent_id, 'wps_parent_order', true );
-				if( $sub_id ) {
+				if ( $sub_id ) {
 					$maybe_subscription_or_parent_id = $sub_id;
 				}
 				if ( $maybe_subscription_or_parent_id ) {
@@ -465,17 +465,16 @@ public function wps_sfw_get_subscription_list() {
 					);
 				} else {
 					$username_or_email = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
-					// logic to fetch subscription using username or email
+					// Logic to fetch subscription using username or email.
+
+					$user = get_user_by( 'email', $username_or_email );
 
-					$user = get_user_by('email', $username_or_email );
-
-					// If no user is found by email, try to get by username
-					if (! $user ) {
-						$user = get_user_by('login', $username_or_email );
+					// If no user is found by email, try to get by username.
+					if ( ! $user ) {
+						$user = get_user_by( 'login', $username_or_email );
 					}
 					$customer_id = $user ? $user->ID : false;
 
-
 					$args2['meta_query'] = array(
 						array(
 							'key'   => 'wps_customer_id',
@@ -501,11 +500,11 @@ public function wps_sfw_get_subscription_list() {
 				'fields' => 'ids',
 			);
 			if ( isset( $_REQUEST['s'] ) && ! empty( $_REQUEST['s'] ) ) {
-				// logic to fetch subscription using subscription id or parent id
+				// Logic to fetch subscription using subscription id or parent id.
 				$maybe_subscription_or_parent_id = (int) sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
 
 				$sub_id = wps_sfw_get_meta_data( $maybe_subscription_or_parent_id, 'wps_parent_order', true );
-				if( $sub_id ) {
+				if ( $sub_id ) {
 					$maybe_subscription_or_parent_id = $sub_id;
 				}
 				if ( $maybe_subscription_or_parent_id ) {
@@ -518,17 +517,16 @@ public function wps_sfw_get_subscription_list() {
 					);
 				} else {
 					$username_or_email = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) );
-					// logic to fetch subscription using username or email
+					// Logic to fetch subscription using username or email.
+
+					$user = get_user_by( 'email', $username_or_email );
 
-					$user = get_user_by('email', $username_or_email );
-
-					// If no user is found by email, try to get by username
-					if (! $user ) {
-						$user = get_user_by('login', $username_or_email );
+					// If no user is found by email, try to get by username.
+					if ( ! $user ) {
+						$user = get_user_by( 'login', $username_or_email );
 					}
 					$customer_id = $user ? $user->ID : false;
 
-
 					$args2['meta_query'] = array(
 						array(
 							'key'   => 'wps_customer_id',
@@ -568,7 +566,7 @@ public function wps_sfw_get_subscription_list() {
 
 				$parent_order_id   = wps_sfw_get_meta_data( $id, 'wps_parent_order', true );
 				if ( function_exists( 'wps_sfw_check_valid_order' ) && ! wps_sfw_check_valid_order( $parent_order_id ) ) {
-					$total_count = --$total_count;	
+					$total_count = --$total_count;
 					continue;
 				}
 				$wps_subscription_status = wps_sfw_get_meta_data( $id, 'wps_subscription_status', true );

admin/partials/subscription-for-woocommerce-api.php

@@ -54,7 +54,7 @@
 	<!-- To get user points -->
 	<h4><?php esc_html_e( 'To Retrive All Subscription', 'subscriptions-for-woocommerce' ); ?></h4>
 	<div class="wps_sfw_rest_api_response">
-		<p><strong><?php esc_html_e( 'Base Url to get all subscription  : ', 'subscriptions-for-woocommerce' ) ?></strong>{site_url}/wp-json/wsp-route/v1/wsp-view-subscription</p>
+		<p><strong><?php esc_html_e( 'Base Url to get all subscription  : ', 'subscriptions-for-woocommerce' ); ?></strong>{site_url}/wp-json/wsp-route/v1/wsp-view-subscription</p>
 		<p>
 			<strong>
 			<?php

build/index.asset.php

@@ -1,20 +1,4 @@
-<?php
-/**
- * Provide a admin area view for the plugin
- *
- * This file is used to markup the html field for general tab.
- *
- * @link       https://wpswings.com/
- * @since      1.0.0
- *
- * @package    Subscriptions_For_Woocommerce
- * @subpackage Subscriptions_For_Woocommerce/public
- */
-
-return array(
-	'dependencies' => array(
-		'wp-element',
-		'wp-polyfill',
-	),
-	'version' => '380e03d354daff6fbc07b176985cba7e',
+<?php return array(
+	'dependencies' => array( 'wp-element', 'wp-polyfill' ),
+	'version' => 'c18eb6767e641a7522507a86d9c71475',
 );