Merge pull request #18 from UVLabs/development

chore: syncing

assets/admin/css/lpac-admin.css

@@ -11,4 +11,25 @@
 
  #lpac-rules{
 	cursor: move;
+ }
+
+ .lpac-button, .lpac-button:hover{
+	background: #f04e23;
+	border-radius: 3px;
+	color: #fff; 
+	padding: 10px; 
+	text-decoration: none;
+ }
+
+ .lpac-banner{
+	background: #fff; 
+	border-radius: 5px; 
+	margin-bottom: 20px; 
+	padding: 30px; 
+	text-align:center;
+ }
+
+ #lpac_export_btn{
+	cursor: pointer;
+	padding: 10px;
  }

assets/admin/js/lpac-admin.js

@@ -34,18 +34,18 @@
 		$("table#lpac-rules tbody").sortable({
 
 			update: function (event, ui) {
-				
+
 				$('#lpac-rules-saving-success').hide();
 				$('#lpac-rules-saving-failed').hide();
 				$('#lpac-rules-saving').show();
 				const order = $(this).sortable('toArray', { attribute: 'data-id' });
-			
+
 				wp.ajax.post("lpac_map_visibility_rules_order", { rulesOrder: order })
 					.done(function (response) {
 
 						$('#lpac-rules-saving').hide();
 						$('#lpac-rules-saving-failed').hide();
-						$('#lpac-rules-saving-success').show().delay(1000).fadeOut('slow');;
+						$('#lpac-rules-saving-success').show().delay(1000).fadeOut('slow');
 
 						// console.log(response);
 
@@ -60,100 +60,120 @@
 
 					});
 
-
 			}
 		});
 
-		function toggleAutoDetectOptions(){
+		/**
+		 * Hide the save button on the Export tab.
+		 */
+		function hideSaveButtonOnExportTab() {
+			const queryString = window.location.search;
+			const urlParams = new URLSearchParams(queryString);
+			if (urlParams.get('section') === 'export') {
+				$('.submit').hide();
+			}
+		}
+		// hideSaveButtonOnExportTab();
+
+		/**
+		 * Toggle AutoDetect customer location option on Generals Settings page. 
+		 */
+		function toggleAutoDetectOptions() {
 
 			const autoDetectLocation = $('#lpac_auto_detect_location');
 
-			if( ! autoDetectLocation ){
+			if (!autoDetectLocation) {
 				return;
 			}
 
 			const autoDetectLocationChecked = autoDetectLocation.is(":checked");
 			const forceMapUse = $('#lpac_force_map_use');
-	
+
 			// Hide suboptions if feature disabled
-			if( autoDetectLocationChecked ){
+			if (autoDetectLocationChecked) {
 				forceMapUse.closest('tr').hide();
 			}
-	
+
 			autoDetectLocation.on('click', () => {
-	
-				if( autoDetectLocation.is(':checked') ){
+
+				if (autoDetectLocation.is(':checked')) {
 					forceMapUse.closest('tr').hide();
-				}else{
+				} else {
 					forceMapUse.closest('tr').show();
 				}
-		
+
 			});
 
 		}
 
-		function toggleMapLinkOrderEmailOptions(){
+		/**
+		 * Toggle "Add Map Link to Order Emails?" on Generals Settings page. 
+		 */
+		function toggleMapLinkOrderEmailOptions() {
 
 			const addToEmail = $('#lpac_enable_delivery_map_link_in_email');
 
-			if( ! addToEmail ){
+			if (!addToEmail) {
 				return;
 			}
 
 			const addToEmailChecked = addToEmail.is(":checked");
 			const linkType = $('#lpac_email_delivery_map_link_type');
 			const linkLocation = $('#lpac_email_delivery_map_link_location');
 			const selectedEmails = $('#lpac_email_delivery_map_emails');
-	
+
 			// Hide suboptions if feature disabled
-			if( ! addToEmailChecked ){
+			if (!addToEmailChecked) {
 				linkType.closest('tr').hide();
 				linkLocation.closest('tr').hide();
 				selectedEmails.closest('tr').hide();
 			}
-	
+
 			addToEmail.on('click', () => {
-	
-			if( addToEmail.is(':checked') ){
-				linkType.closest('tr').show();
-				linkLocation.closest('tr').show();
-				selectedEmails.closest('tr').show();
-			}else{
-				linkType.closest('tr').hide();
-				linkLocation.closest('tr').hide();
-				selectedEmails.closest('tr').hide();
-			}
-	
+
+				if (addToEmail.is(':checked')) {
+					linkType.closest('tr').show();
+					linkLocation.closest('tr').show();
+					selectedEmails.closest('tr').show();
+				} else {
+					linkType.closest('tr').hide();
+					linkLocation.closest('tr').hide();
+					selectedEmails.closest('tr').hide();
+				}
+
 			});
 
 		}
 
-		function togglePlacesAutoCompleteOptions(){
+		/**
+		 * Toggle "Enable Places Autocomplete Feature" on Generals Settings page. 
+		 */
+		function togglePlacesAutoCompleteOptions() {
 
 			const placesAutoComplete = $('#lpac_enable_places_autocomplete');
 
-			if( ! placesAutoComplete ){
+			if (!placesAutoComplete) {
 				return;
 			}
 
 			const placesAutoCompleteChecked = placesAutoComplete.is(":checked");
 			const placesAllowedFields = $('#lpac_places_autocomplete_fields');
 			const placesAutoCompleteHideMap = $('#lpac_places_autocomplete_hide_map');
 
-			if( ! placesAutoCompleteChecked ){
+			if (!placesAutoCompleteChecked) {
 				placesAllowedFields.closest('tr').hide();
 				placesAutoCompleteHideMap.closest('tr').hide();
 			}
 
 			placesAutoComplete.on('click', () => {
 
-			if( placesAutoComplete.is(':checked') ){
-				placesAllowedFields.closest('tr').show();
-				placesAutoCompleteHideMap.closest('tr').show();
-			}else{
-				placesAllowedFields.closest('tr').hide();
-				placesAutoCompleteHideMap.closest('tr').hide();
-			}
+				if (placesAutoComplete.is(':checked')) {
+					placesAllowedFields.closest('tr').show();
+					placesAutoCompleteHideMap.closest('tr').show();
+				} else {
+					placesAllowedFields.closest('tr').hide();
+					placesAutoCompleteHideMap.closest('tr').hide();
+				}
 
 			});
 

bin/freemius-prep.sh

@@ -15,6 +15,10 @@ mkdir -p artifact
 composer install --no-dev
 composer dumpautoload
 
+# Remove the QR Code library font files from dist. They make the library huge.
+rm "vendor/endroid/qr-code/assets/noto_sans.otf"
+rm "vendor/endroid/qr-code/assets/open_sans.ttf"
+
 # Build our JS files with parcel
 npm run-script build
 
@@ -27,6 +31,9 @@ rsync -acvP --delete --exclude-from=".distignore" ./ "./dist"
 # Delete dist folder
 rm -rf dist
 
+# Delete the QR code library so all its files can be added back when the composer install command runs
+rm -r "vendor/endroid"
+
 # Re-add dev dependencies
 composer install
 composer dumpautoload

class-lpac-uninstall.php

@@ -85,15 +85,17 @@ public static function remove_plugin_settings() {
 			'lpac_enable_places_autocomplete',
 			'lpac_places_autocomplete_fields',
 			'lpac_auto_detect_location',
+			'lpac_export_date_from',
+			'lpac_export_date_to',
 		);
 
 		foreach ( $option_keys as $key ) {
 			delete_option( $key );
 		}
 
-		$lpac_qr_codes_directory = wp_upload_dir()['basedir'] . '/' . 'lpac-qr-codes';
+		$lpac_directory = wp_upload_dir()['basedir'] . '/lpac';
 
-		( new WP_Filesystem_Direct( '' ) )->delete( $lpac_qr_codes_directory, true, 'd' );
+		( new WP_Filesystem_Direct( '' ) )->delete( $lpac_directory, true, 'd' );
 
 	}