Development

.github/workflows/create-build-zip.yml

@@ -2,7 +2,7 @@ name: Build and publish the ZIP build file
 
 on:
   pull_request:
-    types: [ opened, synchronize, ready_for_review ]
+    types: [opened, synchronize, ready_for_review]
     branches-ignore:
       - "update_dependencies"
 concurrency:
@@ -18,7 +18,7 @@ jobs:
       git-sha-8: ${{ steps.retrieve-git-sha-8.outputs.sha8 }}
     steps:
       - name: Check out source files
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
@@ -36,6 +36,12 @@ jobs:
         run: yarn install --frozen-lockfile
       - name: Build files
         run: yarn run build
+      - name: Bump the plugin version
+        run: |
+          CURRENT_VERSION=$(node -p -e "require('./package.json').version")
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          DEV_VERSION="${CURRENT_VERSION}-dev.${COMMIT_HASH}"
+          npm run grunt version::${DEV_VERSION}
       - name: Create zip
         run: yarn run dist
       - name: Retrieve branch name

.github/workflows/test-php.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   phpunit:
     name: Phpunit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     services:
       mysql:
         image: mysql:5.7

assets/ppom-basic-meta.json

@@ -1 +1 @@
-[{"productmeta_style":"","productmeta_categories":"","send_file_attachment":"","show_cart_thumb":"","aviary_api_key":"","productmeta_validation":"","productmeta_id":"183","productmeta_created":"2019-03-12 14:22:27","productmeta_name":"Basic Fields","dynamic_price_display":"all_option","the_meta":"{"1":{"type":"text","title":"Any text input","data_name":"any_text_input","placeholder":"","description":"It\\\\\\\\'s a test field","error_message":"","maxlength":"","minlength":"","default_value":"","class":"","input_mask":"","width":"12","visibility":"everyone","visibility_role":"","conditions":{"visibility":"Show","bound":"All","rules":[{"elements":"any_text_input","operators":"is","element_values":""}]}},"2":{"type":"select","title":"Test Options","data_name":"test_options","description":"","error_message":"","options":[{"option":"Option A","price":"5","weight":"","id":"option_a"},{"option":"Option B","price":"6","weight":"","id":"option_b"},{"option":"Option C","price":"7","weight":"","id":"option_c"}],"selected":"","first_option":"","class":"","width":"12","visibility":"everyone","visibility_role":"","conditions":{"visibility":"Show","bound":"All","rules":[{"elements":"any_text_input","operators":"is","element_values":""}]}},"3":{"type":"checkbox","title":"Conditional Field","data_name":"conditional_field","description":"Shown when Option B is selected","error_message":"","options":[{"option":"Test Checkbox","price":"","weight":"","id":"test_checkbox"}],"class":"","width":"12","checked":"","min_checked":"","max_checked":"","visibility":"everyone","visibility_role":"","logic":"on","conditions":{"visibility":"Show","bound":"All","rules":[{"elements":"test_options","operators":"is","element_values":"Option B"}]}}}"}]
+[{"productmeta_style":"","productmeta_categories":"","send_file_attachment":"","show_cart_thumb":"","aviary_api_key":"","productmeta_validation":"","productmeta_id":"183","productmeta_created":"2019-03-12 14:22:27","productmeta_name":"Basic Fields","dynamic_price_display":"all_option","the_meta":"{"1":{"type":"text","title":"Any text input","data_name":"any_text_input","placeholder":"","description":"It\\\\\\\\'s a test field","error_message":"","maxlength":"","minlength":"","default_value":"","class":"","input_mask":"","width":"12","visibility":"everyone","visibility_role":"","conditions":{"visibility":"Show","bound":"All","rules":[{"elements":"any_text_input","operators":"is","element_values":""}]},"ppom_id":"1"},"2":{"type":"select","title":"Test Options","data_name":"test_options","description":"","error_message":"","options":[{"option":"Option A","price":"5","weight":"","id":"option_a"},{"option":"Option B","price":"6","weight":"","id":"option_b"},{"option":"Option C","price":"7","weight":"","id":"option_c"}],"selected":"","first_option":"","class":"","width":"12","visibility":"everyone","visibility_role":"","conditions":{"visibility":"Show","bound":"All","rules":[{"elements":"any_text_input","operators":"is","element_values":""}]},"ppom_id":"1"},"3":{"type":"checkbox","title":"Conditional Field","data_name":"conditional_field","description":"Shown when Option B is selected","error_message":"","options":[{"option":"Test Checkbox","price":"","weight":"","id":"test_checkbox"}],"class":"","width":"12","checked":"","min_checked":"","max_checked":"","visibility":"everyone","visibility_role":"","logic":"on","conditions":{"visibility":"Show","bound":"All","rules":[{"elements":"test_options","operators":"is","element_values":"Option B"}]},"ppom_id":"1"}}"}]

backend/assets/settings.css

@@ -1,6 +1,6 @@
 /*---------------------------------
     * Admin Settings Panel CSS
-    
+
     * It included following css
     -> Inputs CSS
     -> Tooltip CSS
@@ -45,16 +45,6 @@
     transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
 
-.nmsf-wrapper input[type="submit"] {
-    background: #f95700 !important;
-    border-color: #f95700 !important;
-    border-radius: 0 !important;
-}
-
-.nmsf-migrate-back-btn {
-    border-radius: 0 !important;
-}
-
 .nmsf-wrapper textarea {
     min-height: 105px;
     max-height: 105px;
@@ -289,15 +279,6 @@
 
 /*Admin Settings Panel*/
 
-.nmsf-wrapper {
-    position: relative;
-    border: 1px solid #f957002b;
-    margin-right: 15px;
-    margin-top: 22px;
-    background-color: #eaeaea;
-    padding: 10px;
-    box-shadow: 0 1px 3px rgb(0 0 0 / 12%), 0 1px 2px rgb(0 0 0 / 24%);
-}
 
 .nmsf-wrapper .nmsf-tabs-content div {
     padding: 15px 20px 15px 40px;
@@ -355,6 +336,7 @@ div.nmsf-panels-area {
     margin: 0;
     padding: 0;
     transition: 0.5s all cubic-bezier(0.075, 0.82, 0.165, 1);
+    margin-left: 30px;
 }
 
 div.nmsf-panels-area .nmsf-panels-content {
@@ -410,29 +392,28 @@ div.nmsf-panels-area .nmsf-panels-content p {
     padding: 8px 10px;
     margin-right: 2px;
     cursor: pointer;
-    background: #3985b7;
     font-weight: bold;
     transition: background ease 0.2s;
-    color: #fff;
+    border: 1px solid #c3c4c7;
+    background: #dcdcde;
 }
 
 .nmsf-panels-content-inner .nmsf-panel-settings-area {
     order: 99;
     flex-grow: 1;
     width: 100%;
     display: none;
-    padding: 1rem;
-    background: #fff;
 }
 
 .nmsf-panels-content-inner input[type=radio] {
     display: none;
 }
 
 .nmsf-panels-content-inner input[type=radio]:checked+label {
-    background: #fff;
-    border-top: 2px solid #f95700;
-    color: #030303;
+
+    border-bottom: 1px solid #f0f0f1;
+    background: #f0f0f1;
+    color: #000;
 }
 
 .nmsf-panels-content-inner input[type=radio]:checked+label+.nmsf-panel-settings-area {
@@ -453,15 +434,10 @@ div.nmsf-panels-area .nmsf-panels-content p {
     background-color: transparent;
 }
 
-.nmsf-panel-table tr {
-    border-top: 1px solid #f9570094;
-    border-bottom: 1px solid #f9570094;
-}
-
 .nmsf-panel-table td,
 .nmsf-panel-table th {
-    padding: .75rem;
-    vertical-align: top;
+    vertical-align: middle;
+    padding-left: 0px;
 }
 
 .nmsf-panel-table th {
@@ -605,13 +581,9 @@ div.nmsf-panels-area .nmsf-panels-content p {
 }
 
 .nmsf-section-type h3 {
-    background-color: #F6F6F6;
-    margin: 0;
-    font-weight: 600;
-    font-family: 'Titillium Web', sans-serif;
-    font-size: 18px;
-    padding: 10px;
-    color: #0473AA;
+    color: #1d2327;
+    font-size: 1.3em;
+    margin: 1em 0;
 }
 
 .nmsf-hint-area {
@@ -653,3 +625,25 @@ div.nmsf-panels-area .nmsf-panels-content p {
     color: #fff;
     background-color: #343a40;
 }
+.ppom-is-locked-section{
+    opacity: 0.7;
+}
+.ppom-is-locked-field .ppom-notice-upsell{
+    font-style: italic;
+    font-weight: 500;
+}
+.ppom-is-locked-panel .ppom-notice-upsell, .ppom-is-locked-field .ppom-notice-upsell {
+    background: #fff;
+    border: 1px solid #c3c4c7;
+    border-left-width: 4px;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, .04);
+    border-left-color: #72aee6;
+    padding: 12px;
+    margin-top: 15px;
+}
+.ppom-is-locked-panel .nmsf-panel-desc, .ppom-is-locked-panel .nmsf-panel-table, .ppom-is-locked-field > * > *:not(.ppom-notice-upsell){ opacity: 0.6; cursor: not-allowed; pointer-events: none; }
+.ppom-is-locked-panel input,
+.ppom-is-locked-field input,
+.ppom-is-locked-field select,
+.ppom-is-locked-panel select{   cursor: not-allowed;
+    pointer-events: none; }

backend/assets/settings.js

@@ -74,23 +74,6 @@ jQuery(function($) {
         }
     });
 
-
-    /**
-        Migration Event
-    **/
-    $(document).on("click", ".nmsf-migrate-back-btn", function(e) {
-
-        if (!confirm(nmsf_vars.migrate_back_msg)) {
-
-            e.preventDefault();
-            return false;
-        }
-        else {
-            return true;
-        }
-    });
-
-
     /**
         Add Conditional Settings Fields
     **/
@@ -138,6 +121,17 @@ jQuery(function($) {
     **/
     $('.nmsf-multiselect-js').select2();
 
+    /**
+     * Disabled submit button.
+     */
+    $(document).on('click', '.nmsf-panels-content-inner .nmsf-label', function(){
+        var isLocked = $(this).hasClass('ppom-is-locked-section');
+        $(this)
+        .parents('.nmsf-panels-area')
+        .find('.woocommerce-save-button')
+        .attr('disabled', isLocked);
+    });
+
     const permissionField = $('#ppom_permission_mfields');
 
     $(document).ready(function(){

backend/changelog_handler.php

@@ -52,7 +52,7 @@ private function parse_changelog( $changelog_path ) {
 			if ( strpos( $changelog_line, '**Changes:**' ) !== false || empty( $changelog_line ) ) {
 				continue;
 			}
-			if ( substr( ltrim( $changelog_line ), 0, 3 ) === '###' ) {
+			if ( substr( ltrim( $changelog_line ), 0, 4 ) === '####' ) {
 				$release_count ++;
 
 				preg_match( '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/', $changelog_line, $found_v );
@@ -63,7 +63,10 @@ private function parse_changelog( $changelog_path ) {
 				);
 				continue;
 			}
-			if ( preg_match( '/[*|-]?\s?(\[fix]|\[Fix]|fix|Fix)[:]?\s?(\b|(?=\[))/', $changelog_line ) ) {
+			if ( substr( ltrim( $changelog_line ), 0, 3 ) === '###' ) {
+				continue;
+			}
+			if ( preg_match( '/[*|-]?\s?(\[fix]|\[Fix]|fix|Fix|Fixed)[:]?\s?(\b|(?=\[))/', $changelog_line ) ) {
 				$changelog_line                        = preg_replace( '/[*|-]?\s?(\[fix]|\[Fix]|fix|Fix)[:]?\s?(\b|(?=\[))/', '', $changelog_line );
 				$releases[ $release_count ]['fixes'][] = $this->parse_md_and_clean( $changelog_line );
 				continue;