Merge pull request #197 from TycheSoftwares/revert-182-custom_development

Revert "Custom work"

Author: Shasvat7

woocommerce-delivery-notes/includes/class-wcdn-print.php

@@ -169,12 +169,6 @@ public function __construct() {
 					'type' => 'default',
 					'path' => WooCommerce_Delivery_Notes::$plugin_path . 'templates/print-order/',
 					'url'  => WooCommerce_Delivery_Notes::$plugin_url . 'templates/print-order/',
-				),
-				array(
-					'name' => __( 'Custom template', 'woocommerce-delivery-notes' ),
-					'type' => 'new_template',
-					'path' => WooCommerce_Delivery_Notes::$plugin_path . 'templates/new-template/',
-					'url'  => WooCommerce_Delivery_Notes::$plugin_url . 'templates/new-template/',
 				)
 			);
 
@@ -321,17 +315,10 @@ public function parse_request( $wp ) {
 		 * Build the template locations
 		 */
 		public function build_template_locations() {
+			$wc_template_directory = WC_TEMPLATE_PATH . 'print-order/';
+
 			// Get the paths for custom styles.
-			$settings_type = get_option( 'wcdn_template_style', '' );
-			if ( 'default' === $settings_type || '' === $settings_type ) {
-				$wc_template_directory = WC_TEMPLATE_PATH . 'print-order/';
-				$plugin_path           = self::$template_styles[0]['path'];
-				$plugin_url            = self::$template_styles[0]['url'];
-			} elseif ( 'new_template' === $settings_type ) {
-				$wc_template_directory = WC_TEMPLATE_PATH . 'new-template/';
-				$plugin_path           = self::$template_styles[1]['path'];
-				$plugin_url            = self::$template_styles[1]['url'];
-			}
+			$settings_type = get_option( 'wcdn_template_style' );
 			$settings_path = null;
 			$settings_url  = null;
 			if ( isset( $settings_type ) && 'default' !== $settings_type ) {
@@ -362,10 +349,11 @@ public function build_template_locations() {
 				),
 
 				'plugin'      => array(
-					'path' => $plugin_path,
-					'url'  => $plugin_url,
+					'path' => self::$template_styles[0]['path'],
+					'url'  => self::$template_styles[0]['url'],
 				),
 			);
+
 			return $locations;
 		}