Changeset 3481811

Timestamp:

03/13/2026 09:42:18 AM (2 weeks ago)

Author:

yaycommerce

Message:

Version 2.0.0

Location:

yayextra/trunk

Files:

• assets/css/yayextra.css (modified) (3 diffs)
• assets/dist/css/main.css (deleted)
• assets/dist/js/main.bundle.js (deleted)
• assets/dist/js/main.js (added)
• assets/dist/style.css (added)
• assets/images (added)
• assets/images/avatar.png (added)
• assets/images/bg-pro.png (added)
• assets/images/employee-avatars.png (added)
• assets/images/favicon.svg (added)
• assets/images/logos-payment.svg (added)
• assets/images/money-back.svg (added)
• assets/images/preview.jpg (added)
• assets/js/yayextra.js (modified) (96 diffs)
• includes/Classes/ProductPage.php (modified) (17 diffs)
• includes/Helper/Database.php (modified) (3 diffs)
• includes/Helper/Utils.php (modified) (5 diffs)
• includes/Init/Ajax.php (modified) (6 diffs)
• includes/Init/CustomPostType.php (modified) (5 diffs)
• includes/Init/Settings.php (modified) (16 diffs)
• includes/Integrations (added)
• includes/Integrations.php (added)
• includes/Integrations/YayCurrency.php (added)
• includes/Register (added)
• includes/Register/RegisterDev.php (added)
• includes/Register/RegisterFacade.php (added)
• includes/Register/RegisterProd.php (added)
• includes/Register/ScriptName.php (added)
• includes/Templates/button_field.php (modified) (2 diffs)
• includes/Templates/checkbox_field.php (modified) (3 diffs)
• includes/Templates/dropdown_field.php (modified) (3 diffs)
• includes/Templates/radio_field.php (modified) (3 diffs)
• includes/Templates/swatches_field.php (modified) (2 diffs)
• includes/Utils (added)
• includes/Utils/SingletonTrait.php (added)
• includes/YayCommerceMenu/OtherPluginsMenu.php (modified) (2 diffs)
• includes/YayCommerceMenu/RegisterMenu.php (modified) (2 diffs)
• includes/YayCommerceMenu/views/other-plugins-content.php (modified) (4 diffs)
• readme.txt (modified) (4 diffs)
• yayextra.php (modified) (5 diffs)

yayextra/trunk/assets/css/yayextra.css

@@ -96 +96 @@
   color: #fff;
   text-align: center;
-  padding: 8px 21px;
-  border-radius: 3px;
+  padding: 6px 10px;
+  border-radius: 4px;
   z-index: 10;
   opacity: 0;
@@ -103 +103 @@
   max-width: 250px;
   box-sizing: border-box;
-  font-size: 15px;
-  line-height: 20px;
+  font-size: 14px;
+  line-height: 1.4;
 }
 
@@ -119 +119 @@
   transform: translateX(-50%);
   margin-bottom: 11px;
+}
+
+.yayextra-opt-button .yayextra-tooltip-top {
+  margin-bottom: 15px;
+}
+.yayextra-opt-button .yayextra-tooltip-bottom {
+  margin-bottom: 15px;
 }
 

yayextra/trunk/assets/js/yayextra.js

@@ -1 +1 @@
 (function ($) {
-  'use strict';
+  "use strict";
   const optionSetList = YAYE_CLIENT_DATA.OPTION_SET_LIST;
   const yayeSettings = YAYE_CLIENT_DATA.settings;
   $(document).ready(function ($) {
-
     // Add to cart by ajax
-    $( 'form button.add_to_cart_button.ajax_add_to_cart' ).on( 'click', function() {
-      if($('.yayextra-option-field-wrap').length > 0) {
-        $( 'form.cart' ).trigger('submit');
+    $("form button.add_to_cart_button.ajax_add_to_cart").on(
+      "click",
+      function () {
+        if ($(".yayextra-option-field-wrap").length > 0) {
+          $("form.cart").trigger("submit");
+        }
       }
-        } );
+    );
 
     $.each(optionSetList, function (_, optionSet) {
-      if( 1 === parseInt(optionSet.status) ) {
+      if (1 === parseInt(optionSet.status)) {
         const optionSetId = optionSet.id;
         let referenceObject = {};
         $.each(optionSet.options, function (_, option) {
           $.each(option.logics, function (_, logic) {
-            if(logic.option && logic.option.id) {
+            if (logic.option && logic.option.id) {
               if (logic.option.id in referenceObject) {
                 referenceObject[logic.option.id].push(option);
@@ -32 +34 @@
             return;
           }
-  
+
           if (checkLogic(optionSetId, option)) {
             showOption(option);
@@ -39 +41 @@
             hideReferenceOption(optionSetId, option, referenceObject);
           }
-  
+
           $.each(option.logics, function (_, logic) {
             createEvent(optionSetId, option, logic, referenceObject);
@@ -48 +50 @@
 
     // Show/hide adition description of Select option field.
-    const selectOptionFields = $('.yayextra-option-field-wrap select');
+    const selectOptionFields = $(".yayextra-option-field-wrap select");
     if (selectOptionFields.length > 0) {
       $.each(selectOptionFields, function (idx, el) {
         showHideAdditionDescSelectOpt(el);
 
-        $(el).on('change', function () {
+        $(el).on("change", function () {
           showHideAdditionDescSelectOpt(this);
           getTotalCost();
@@ -61 +63 @@
 
     // Catch option swatched Event
-    const swatchOptionFields = $('.yayextra-option-field-swatches-label');
+    const swatchOptionFields = $(".yayextra-option-field-swatches-label");
     if (swatchOptionFields.length > 0) {
       $.each(swatchOptionFields, function (idx, el) {
-        const inputEl = $(el).siblings('input');
-        const optId = $(inputEl).attr('data-opt-id');
-        const optImg = $(inputEl).attr('data-opt-img');
-        const prodImg = $(inputEl).attr('data-product-img');
-        const optSetId = $(inputEl).attr('data-optset-id');
+        const inputEl = $(el).siblings("input");
+        const optId = $(inputEl).attr("data-opt-id");
+        const optImg = $(inputEl).attr("data-opt-img");
+        const prodImg = $(inputEl).attr("data-product-img");
+        const optSetId = $(inputEl).attr("data-optset-id");
 
         let isMultiSelectable = false;
-        const optionFieldWraps = $(el).parents('.yayextra-option-field-wrap');
+        const optionFieldWraps = $(el).parents(".yayextra-option-field-wrap");
         if (optionFieldWraps.length > 0) {
           const optFieldWrap = optionFieldWraps[0];
           isMultiSelectable =
-            $(optFieldWrap).attr('data-multi-selectable') == 1 ? true : false;
+            $(optFieldWrap).attr("data-multi-selectable") == 1 ? true : false;
         }
 
         // Check input is checked init ?
-        if ($(inputEl).is(':checked')) {
-          $(el).addClass('checked');
+        if ($(inputEl).is(":checked")) {
+          $(el).addClass("checked");
 
           showHideAdditionDescSwatchesButtonOpt(inputEl);
@@ -91 +93 @@
             $.each(optionValues, function (idx, optVal) {
               if (
-                'image' === optVal.swatchesType &&
+                "image" === optVal.swatchesType &&
                 optionValChecked === optVal.value &&
                 optId === optionData.id
@@ -103 +105 @@
 
         // Event click;
-        $(el).on('click', function () {
-          if (!$(inputEl).is(':checked')) {
-            $(el).addClass('checked');
-            $(inputEl).prop('checked', true);
+        $(el).on("click", function () {
+          if (!$(inputEl).is(":checked")) {
+            $(el).addClass("checked");
+            $(inputEl).prop("checked", true);
 
             showHideAdditionDescSwatchesButtonOpt(inputEl);
@@ -117 +119 @@
               $.each(optionValues, function (idx, optVal) {
                 if (
-                  'image' === optVal.swatchesType &&
+                  "image" === optVal.swatchesType &&
                   optionValChecked === optVal.value &&
                   optId === optionData.id
@@ -129 +131 @@
             }
           } else {
-            $(el).removeClass('checked');
-            $(inputEl).prop('checked', false);
+            $(el).removeClass("checked");
+            $(inputEl).prop("checked", false);
+            showHideAdditionDescSwatchesButtonOpt(inputEl);
           }
 
@@ -136 +139 @@
           if (!isMultiSelectable) {
             const optSwatchesSiblings = $(el)
-              .closest('.yayextra-opt-swatches')
+              .closest(".yayextra-opt-swatches")
               .siblings();
             if (optSwatchesSiblings.length > 0) {
               $.each(optSwatchesSiblings, function (idx, el1) {
                 $(el1)
-                  .find('.yayextra-option-field-swatches-label')
-                  .removeClass('checked');
-                if (
-                  $(el1)
-                    .find('input')
-                    .is(':checked')
-                ) {
-                  $(el1)
-                    .find('input')
-                    .prop('checked', false);
+                  .find(".yayextra-option-field-swatches-label")
+                  .removeClass("checked");
+                if ($(el1).find("input").is(":checked")) {
+                  $(el1).find("input").prop("checked", false);
                 }
               });
@@ -156 +153 @@
           }
 
-          inputEl.trigger('change');
+          inputEl.trigger("change");
         });
       });
@@ -162 +159 @@
 
     // Catch option button type Event
-    const buttonOptions = $('.yayextra-option-button-label');
+    const buttonOptions = $(".yayextra-option-button-label");
     if (buttonOptions.length > 0) {
       $.each(buttonOptions, function (idx, el) {
         // const labelEl = $(el).siblings('.yayextra-option-button-label');
-        const inputEl = $(el).siblings('input');
+        const inputEl = $(el).siblings("input");
 
         let isMultiSelectable = false;
-        const optionFieldWraps = $(el).parents('.yayextra-option-field-wrap');
+        const optionFieldWraps = $(el).parents(".yayextra-option-field-wrap");
         if (optionFieldWraps.length > 0) {
           const optFieldWrap = optionFieldWraps[0];
           isMultiSelectable =
-            $(optFieldWrap).attr('data-multi-selectable') == 1 ? true : false;
+            $(optFieldWrap).attr("data-multi-selectable") == 1 ? true : false;
         }
 
         // Check input is checked init ?
-        if ($(inputEl).is(':checked')) {
-          $(el).addClass('checked');
+        if ($(inputEl).is(":checked")) {
+          $(el).addClass("checked");
 
           showHideAdditionDescSwatchesButtonOpt(inputEl);
@@ -184 +181 @@
 
         // Event click;
-        $(el).on('click', function () {
-          if (!$(inputEl).is(':checked')) {
-            $(el).addClass('checked');
-            $(inputEl).prop('checked', true);
+        $(el).on("click", function () {
+          if (!$(inputEl).is(":checked")) {
+            $(el).addClass("checked");
+            $(inputEl).prop("checked", true);
 
             showHideAdditionDescSwatchesButtonOpt(inputEl);
           } else {
-            $(el).removeClass('checked');
-            $(inputEl).prop('checked', false);
+            $(el).removeClass("checked");
+            $(inputEl).prop("checked", false);
+            showHideAdditionDescSwatchesButtonOpt(inputEl);
           }
 
@@ -198 +196 @@
           if (!isMultiSelectable) {
             const optButtonSiblings = $(el)
-              .closest('.yayextra-opt-button')
+              .closest(".yayextra-opt-button")
               .siblings();
             if (optButtonSiblings.length > 0) {
               $.each(optButtonSiblings, function (idx, el1) {
                 $(el1)
-                  .find('.yayextra-option-button-label')
-                  .removeClass('checked');
-                if (
-                  $(el1)
-                    .find('input')
-                    .is(':checked')
-                ) {
-                  $(el1)
-                    .find('input')
-                    .prop('checked', false);
+                  .find(".yayextra-option-button-label")
+                  .removeClass("checked");
+                if ($(el1).find("input").is(":checked")) {
+                  $(el1).find("input").prop("checked", false);
                 }
               });
@@ -218 +210 @@
           }
 
-          inputEl.trigger('change');
+          inputEl.trigger("change");
         });
       });
     }
 
-    const datePickerFields = $('.yayextra-date-picker');
+    const datePickerFields = $(".yayextra-date-picker");
     if (datePickerFields.length > 0) {
       $.each(datePickerFields, function (idx, el) {
-        const datePickerFieldId = $(el).attr('id');
-        $('#' + datePickerFieldId).datepicker();
-      });
-    }
-
-    const timePickerInputFields = $('.yayextra-time-picker-input');
+        const datePickerFieldId = $(el).attr("id");
+        $("#" + datePickerFieldId).datepicker();
+      });
+    }
+
+    const timePickerInputFields = $(".yayextra-time-picker-input");
     if (timePickerInputFields.length > 0) {
       $.each(timePickerInputFields, function (idx, el) {
-        $(el).on('click', function () {
-          const timePickerFieldInputId = $(this).attr('id');
-          const timePickerDivClass = '.' + timePickerFieldInputId;
+        $(el).on("click", function () {
+          const timePickerFieldInputId = $(this).attr("id");
+          const timePickerDivClass = "." + timePickerFieldInputId;
           $(timePickerDivClass).show();
           $(timePickerDivClass).datetimepicker({
-            baseCls: 'yayextra-datetimepicker',
+            baseCls: "yayextra-datetimepicker",
             date: new Date(),
-            viewMode: 'HM',
+            viewMode: "HM",
             onDateChange: function () {
               const datetime = new Date(this.getValue()).toLocaleTimeString(
                 [],
                 {
-                  hour: '2-digit',
-                  minute: '2-digit',
+                  hour: "2-digit",
+                  minute: "2-digit",
                 }
               );
-              $('#' + timePickerFieldInputId).val(datetime);
-              $('#' + timePickerFieldInputId).trigger('change');
+              $("#" + timePickerFieldInputId).val(datetime);
+              $("#" + timePickerFieldInputId).trigger("change");
             },
             onOk: function () {
@@ -259 +251 @@
 
           // Hide timepicker icon plus, minus
-          const timePickerIconI = $('.yayextra-option-field-wrap').find(
-            '.yayextra-datetimepicker i'
+          const timePickerIconI = $(".yayextra-option-field-wrap").find(
+            ".yayextra-datetimepicker i"
           );
           if (timePickerIconI.length > 0) {
             $.each(timePickerIconI, function (idx, el) {
-              $(el)
-                .parent('td')
-                .hide();
+              $(el).parent("td").hide();
             });
           }
@@ -274 +264 @@
 
     $(document).mousedown(function (e) {
-      if ($(e.target).closest('.yayextra-datetimepicker').length === 0) {
-        $('.yayextra-time-picker').hide();
+      if ($(e.target).closest(".yayextra-datetimepicker").length === 0) {
+        $(".yayextra-time-picker").hide();
       }
     });
@@ -406 +396 @@
 
     // Validate value of Text field - start
-    const optionTextFields = $('.yayextra-option-field-wrap input.yayextra-text');
+    const optionTextFields = $(
+      ".yayextra-option-field-wrap input.yayextra-text"
+    );
     if (optionTextFields.length > 0) {
       $.each(optionTextFields, function (_, el) {
-        $(el).on('keyup', function () {
-          let elMessage = $(this).siblings('.error-message-text');
+        $(el).on("keyup", function () {
+          let elMessage = $(this).siblings(".error-message-text");
           if ($(this).val().length > 0) {
-            elMessage.html('').hide();
-            const textFormat = $(this).attr('data-text-format');
-            if ('url' === textFormat) {
+            elMessage.html("").hide();
+            const textFormat = $(this).attr("data-text-format");
+            if ("url" === textFormat) {
               validateUrl($(this).val(), elMessage);
-            } else if ('email' === textFormat) {
+            } else if ("email" === textFormat) {
               validateEmail($(this).val(), elMessage);
             }
@@ -432 +424 @@
     if (optionCheckboxRadioFields.length > 0) {
       $.each(optionCheckboxRadioFields, function (_, el) {
-        $(el).on('click', function () {
+        $(el).on("click", function () {
           getTotalCost();
         });
@@ -440 +432 @@
     // Event swatches change
     const optionSwatchesButtonFields = $(
-      '.yayextra-option-field-wrap .yayextra-opt-swatches input,.yayextra-option-field-wrap .yayextra-opt-button input'
+      ".yayextra-option-field-wrap .yayextra-opt-swatches input,.yayextra-option-field-wrap .yayextra-opt-button input"
     );
     if (optionSwatchesButtonFields.length > 0) {
       $.each(optionSwatchesButtonFields, function (_, el) {
-        $(el).on('change', function () {
+        $(el).on("change", function () {
           getTotalCost();
         });
@@ -451 +443 @@
 
     // Event Textarea click
-    const optionTextareaFields = $('.yayextra-option-field-wrap textarea');
+    const optionTextareaFields = $(".yayextra-option-field-wrap textarea");
     if (optionTextareaFields.length > 0) {
       $.each(optionTextareaFields, function (_, el) {
-        $(el).on('keyup', function () {
+        $(el).on("keyup", function () {
           getTotalCost();
         });
@@ -461 +453 @@
 
     // Event input click
-    const optionNumberFields = $('.yayextra-option-field-wrap input[type="number"]');
+    const optionNumberFields = $(
+      '.yayextra-option-field-wrap input[type="number"]'
+    );
     if (optionNumberFields.length > 0) {
       $.each(optionNumberFields, function (_, el) {
-        $(el).on('input change', function () {
+        $(el).on("input change", function () {
           getTotalCost();
         });
@@ -472 +466 @@
     // Event input yayextra-date-picker/yayextra-time-picker-input change
     const optionDateTimeFields = $(
-      '.yayextra-option-field-wrap input.yayextra-date-picker, .yayextra-option-field-wrap input.yayextra-time-picker-input'
+      ".yayextra-option-field-wrap input.yayextra-date-picker, .yayextra-option-field-wrap input.yayextra-time-picker-input"
     );
     if (optionDateTimeFields.length > 0) {
       $.each(optionDateTimeFields, function (_, el) {
-        $(el).on('change', function () {
+        $(el).on("change", function () {
           getTotalCost();
         });
@@ -483 +477 @@
 
     // Event product quantity input
-    $('.quantity input.qty').on('change', function () {
+    $(".quantity input.qty").on("change", function () {
       getTotalCost();
     });
@@ -490 +484 @@
     getTotalCost();
 
-     // Events of variations product
-    if($('.product form.variations_form').length > 0){
-      let productVariationForm = $('.product form.variations_form');
+    // Events of variations product
+    if ($(".product form.variations_form").length > 0) {
+      $(".yaye-product-price-original").attr("data-product-price-original", 0);
+
+      let productVariationForm = $(".product form.variations_form");
       let variationProductsMeta = getVariationProductsMeta();
       // if ($('.yayextra-total-price').length > 0 || $('.yayextra-extra-subtotal-price').length > 0) {
-        let prodVariationData = {};
-        productVariationForm.find('.variations select').each(function() {
-          let attrName = $(this).data('attribute_name') || $(this).attr('name');
-          let value = $(this).val() || '';
-          prodVariationData[ attrName ] = value;
-
-          // Event select;
-          $(this).on('change', function () {
-            let valueE = $(this).val() || '';
-            if( valueE ){
-              prodVariationData[ attrName ] = valueE;
-
-              const variationProductPrice = updateTotalPriceByVariationProduct(variationProductsMeta, prodVariationData);
-
-              // Change option addition price for percetage type
-              if ( variationProductPrice ) {
-                changeAdditionCostByVariationProduct(variationProductPrice)
-              } else {
-                changeAdditionCostByVariationProduct(0)
-              }
+      let prodVariationData = {};
+      productVariationForm.find(".variations select").each(function () {
+        let attrName = $(this).data("attribute_name") || $(this).attr("name");
+        let value = $(this).val() || "";
+        prodVariationData[attrName] = value;
+
+        // Event select;
+        $(this).on("change", function () {
+          let valueE = $(this).val() || "";
+          if (valueE) {
+            prodVariationData[attrName] = valueE;
+
+            const variationProductPrice = updateTotalPriceByVariationProduct(
+              variationProductsMeta,
+              prodVariationData
+            );
+
+            // Change option addition price for percetage type
+            if (variationProductPrice) {
+              changeAdditionCostByVariationProduct(variationProductPrice);
             } else {
-              changeAdditionCostByVariationProduct(0)
-              $('.yayextra-total-price .total-price').attr('data-total-price', 0);
+              changeAdditionCostByVariationProduct(0);
             }
-
-            getTotalCost();
-          })
+          } else {
+            changeAdditionCostByVariationProduct(0);
+            $(".yayextra-total-price .total-price").attr("data-total-price", 0);
+            $(".yaye-product-price-original").attr(
+              "data-product-price-original",
+              0
+            );
+          }
+
+          getTotalCost();
         });
-
-        if( Object.keys(prodVariationData).length === 0 ) {
-          $('.yayextra-total-price .total-price').attr('data-total-price', 0);
-          // getTotalCost();
-        } else {
-          for (const attr in prodVariationData) {
-            if( '' === prodVariationData[attr] ){
-              $('.yayextra-total-price .total-price').attr('data-total-price', 0);
-              // getTotalCost();
-              break;
-            }
+      });
+
+      if (Object.keys(prodVariationData).length === 0) {
+        $(".yayextra-total-price .total-price").attr("data-total-price", 0);
+        $(".yaye-product-price-original").attr(
+          "data-product-price-original",
+          0
+        );
+        // getTotalCost();
+      } else {
+        for (const attr in prodVariationData) {
+          if ("" === prodVariationData[attr]) {
+            $(".yayextra-total-price .total-price").attr("data-total-price", 0);
+            $(".yaye-product-price-original").attr(
+              "data-product-price-original",
+              0
+            );
+            // getTotalCost();
+            break;
           }
         }
-
-        const variationProductPriceInit = updateTotalPriceByVariationProduct(variationProductsMeta, prodVariationData);
-
-        // Change option addition price for percetage type
-        if ( variationProductPriceInit ) {
-          changeAdditionCostByVariationProduct(variationProductPriceInit)
-        } else {
-          changeAdditionCostByVariationProduct(0)
-        }
-
-        getTotalCost();
+      }
+
+      const variationProductPriceInit = updateTotalPriceByVariationProduct(
+        variationProductsMeta,
+        prodVariationData
+      );
+
+      // Change option addition price for percetage type
+      if (variationProductPriceInit) {
+        changeAdditionCostByVariationProduct(variationProductPriceInit);
+      } else {
+        changeAdditionCostByVariationProduct(0);
+      }
+
+      getTotalCost();
       // }
     }
@@ -552 +566 @@
     // Init set Visibility option id into hidden field
     getVisibilityOption();
-
   });
 
@@ -559 +572 @@
       const optionWrapper = $("[data-option-field-id='" + option.id + "']");
 
-      let fieldDataObjs = optionWrapper.find('input');
-      if ('dropdown' == option.type.value) {
-        fieldDataObjs = optionWrapper.find('select');
-      } else if ('textarea' == option.type.value) {
-        fieldDataObjs = optionWrapper.find('textarea');
+      let fieldDataObjs = optionWrapper.find("input");
+      if ("dropdown" == option.type.value) {
+        fieldDataObjs = optionWrapper.find("select");
+      } else if ("textarea" == option.type.value) {
+        fieldDataObjs = optionWrapper.find("textarea");
       }
-  
+
       if (optionWrapper.length) {
         optionWrapper.show();
         for (const fieldDataObj of fieldDataObjs) {
-          $(fieldDataObj).prop('disabled', false);
+          $(fieldDataObj).prop("disabled", false);
         }
       }
-  
+
       getTotalCost();
       getVisibilityOption();
@@ -587 +600 @@
 
   function hideOption(option) {
-    if( option && option.id ) {
+    if (option && option.id) {
       const optionWrapper = $("[data-option-field-id='" + option.id + "']");
 
-      let fieldDataObjs = optionWrapper.find('input');
-      if ('dropdown' == option.type.value) {
-        fieldDataObjs = optionWrapper.find('select');
-      } else if ('textarea' == option.type.value) {
-        fieldDataObjs = optionWrapper.find('textarea');
+      let fieldDataObjs = optionWrapper.find("input");
+      if ("dropdown" == option.type.value) {
+        fieldDataObjs = optionWrapper.find("select");
+      } else if ("textarea" == option.type.value) {
+        fieldDataObjs = optionWrapper.find("textarea");
       }
-  
+
       if (optionWrapper.length) {
         optionWrapper.hide();
         for (const fieldDataObj of fieldDataObjs) {
-          $(fieldDataObj).prop('disabled', true);
+          $(fieldDataObj).prop("disabled", true);
         }
       }
       resetElement(option);
-  
+
       getTotalCost();
       getVisibilityOption();
@@ -619 +632 @@
   function resetElement(option) {
     const currentField = $("[data-option-field-id='" + option.id + "']");
-    const currentFieldType = currentField.attr('data-option-field-type');
+    const currentFieldType = currentField.attr("data-option-field-type");
     if (
-      'text' === currentFieldType ||
-      'number' === currentFieldType ||
-      'date_picker' === currentFieldType ||
-      'time_picker' === currentFieldType
+      "text" === currentFieldType ||
+      "number" === currentFieldType ||
+      "date_picker" === currentFieldType ||
+      "time_picker" === currentFieldType
     ) {
-      const element = currentField.find('input');
-      element.val('');
-    } else if ( 'textarea' === currentFieldType ) {
-      const element = currentField.find('textarea');
-      element.val('');
-    } else if (['radio', 'checkbox', 'button', 'swatches', 'button_multi', 'swatches_multi'].includes(currentFieldType)) {
-      const elements = currentField.find('input');
+      const element = currentField.find("input");
+      element.val("");
+    } else if ("textarea" === currentFieldType) {
+      const element = currentField.find("textarea");
+      element.val("");
+    } else if (
+      [
+        "radio",
+        "checkbox",
+        "button",
+        "swatches",
+        "button_multi",
+        "swatches_multi",
+      ].includes(currentFieldType)
+    ) {
+      const elements = currentField.find("input");
       $.each(elements, function (index, element) {
-        if(option.optionValues[index] && option.optionValues[index].isDefault) {
+        if (
+          option.optionValues[index] &&
+          option.optionValues[index].isDefault
+        ) {
           element.checked = option.optionValues[index].isDefault;
         }
       });
-    } else if ('dropdown' === currentFieldType) {
-      const element = currentField.find('select');
+    } else if ("dropdown" === currentFieldType) {
+      const element = currentField.find("select");
       const findingDefault = option.optionValues.find(
         (option) => option.isDefault
@@ -648 +673 @@
   function checkTextLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
 
     let logicVal = logic.value;
-    if( undefined === logicVal|| ( Array.isArray(logicVal) && null === logicVal[0])) {
+    if (
+      undefined === logicVal ||
+      (Array.isArray(logicVal) && null === logicVal[0])
+    ) {
       logicVal = "";
     }
 
     const fieldLogic = $(
-      "input[name='option_field_data[" + optionSetId + '][' + optionId + "]']"
-    );
-
-    if (fieldLogic.prop('disabled')) return false;
+      "input[name='option_field_data[" + optionSetId + "][" + optionId + "]']"
+    );
+
+    if (fieldLogic.prop("disabled")) return false;
 
     const fieldLogicVal = fieldLogic.val();
 
-    if ('match' === logic.comparation.value) {
+    if ("match" === logic.comparation.value) {
       if (fieldLogicVal === logicVal) return true;
     }
-    if ('not_match' === logic.comparation.value) {
+    if ("not_match" === logic.comparation.value) {
       if (fieldLogicVal !== logicVal) return true;
     }
-    if ('contains' === logic.comparation.value && fieldLogicVal) {
+    if ("contains" === logic.comparation.value && fieldLogicVal) {
       if (fieldLogicVal.includes(logicVal)) return true;
     }
@@ -678 +706 @@
   function checkTextareaLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
 
     let logicVal = logic.value;
-    if( undefined === logicVal || ( Array.isArray(logicVal) && null === logicVal[0])) {
+    if (
+      undefined === logicVal ||
+      (Array.isArray(logicVal) && null === logicVal[0])
+    ) {
       logicVal = "";
     }
 
     const fieldLogic = $(
-      "textarea[name='option_field_data[" + optionSetId + '][' + optionId + "]']"
-    );
-
-    if (fieldLogic.prop('disabled')) return false;
+      "textarea[name='option_field_data[" +
+        optionSetId +
+        "][" +
+        optionId +
+        "]']"
+    );
+
+    if (fieldLogic.prop("disabled")) return false;
 
     const fieldLogicVal = fieldLogic.val();
 
-    if ('match' === logic.comparation.value) {
+    if ("match" === logic.comparation.value) {
       if (fieldLogicVal === logicVal) return true;
     }
-    if ('not_match' === logic.comparation.value) {
+    if ("not_match" === logic.comparation.value) {
       if (fieldLogicVal !== logicVal) return true;
     }
-    if ('contains' === logic.comparation.value && fieldLogicVal) {
+    if ("contains" === logic.comparation.value && fieldLogicVal) {
       if (fieldLogicVal.includes(logicVal)) return true;
     }
@@ -708 +743 @@
   function checkNumberLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
 
     const fieldLogic = $(
-      "input[name='option_field_data[" + optionSetId + '][' + optionId + "]']"
-    );
-
-    if (fieldLogic.prop('disabled')) return false;
+      "input[name='option_field_data[" + optionSetId + "][" + optionId + "]']"
+    );
+
+    if (fieldLogic.prop("disabled")) return false;
 
     const fieldLogicVal = parseFloat(fieldLogic.val());
 
-    if ('NaN' == fieldLogicVal) return false;
-
-    if ('equal' === logic.comparation.value) {
+    if ("NaN" == fieldLogicVal) return false;
+
+    if ("equal" === logic.comparation.value) {
       if (fieldLogicVal == parseFloat(logic.value)) return true;
-    } else if ('less_than' === logic.comparation.value) {
+    } else if ("less_than" === logic.comparation.value) {
       if (fieldLogicVal < parseFloat(logic.value)) return true;
-    } else if ('greater_than' === logic.comparation.value) {
+    } else if ("greater_than" === logic.comparation.value) {
       if (fieldLogicVal > parseFloat(logic.value)) return true;
-    } else if ('less_than_or_equal' === logic.comparation.value) {
+    } else if ("less_than_or_equal" === logic.comparation.value) {
       if (fieldLogicVal <= parseFloat(logic.value)) return true;
-    } else if ('greater_than_or_equal' === logic.comparation.value) {
+    } else if ("greater_than_or_equal" === logic.comparation.value) {
       if (fieldLogicVal >= parseFloat(logic.value)) return true;
     }
@@ -737 +772 @@
   function checkCheckboxLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
@@ -743 +778 @@
     const checkboxes = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      optionId +
-      "][]']:checked"
-    );
-    if (checkboxes.prop('disabled')) return false;
+        optionSetId +
+        "][" +
+        optionId +
+        "][]']:checked"
+    );
+    if (checkboxes.prop("disabled")) return false;
 
     let values = [];
     if (Array.isArray(logic.value)) {
       values = logic.value.map((v) => v.value);
-    } else if ( logic.value ) {
+    } else if (logic.value) {
       values.push(logic.value.value);
     }
@@ -759 +794 @@
       values.includes($(checkbox).val())
     );
-    if (logic.comparation.value === 'is_one_of') {
+    if (logic.comparation.value === "is_one_of") {
       if (findingResult === undefined) return false;
       return true;
@@ -769 +804 @@
   function checkRadioLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
@@ -775 +810 @@
     const radio = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      optionId +
-      "]']:checked"
-    );
-    if (radio.prop('disabled')) return false;
-
-    const logicValue = Array.isArray(logic.value) ? logic.value[0].value : logic.value.value;
-    if (logic.comparation.value === 'is') {
+        optionSetId +
+        "][" +
+        optionId +
+        "]']:checked"
+    );
+    if (radio.prop("disabled")) return false;
+
+    const logicValue = Array.isArray(logic.value)
+      ? logic.value[0].value
+      : logic.value.value;
+    if (logic.comparation.value === "is") {
       return logicValue === radio.val();
     }
@@ -790 +827 @@
   function checkButtonLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
@@ -796 +833 @@
     const buttons = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      optionId +
-      "][]']:checked"
+        optionSetId +
+        "][" +
+        optionId +
+        "][]']:checked"
     );
 
@@ -807 +844 @@
     });
 
-    if (buttons.prop('disabled')) return false;
-
-    const logicValue = Array.isArray(logic.value) ? logic.value[0].value : logic.value.value;
+    if (buttons.prop("disabled")) return false;
+
+    const logicValue = Array.isArray(logic.value)
+      ? logic.value[0].value
+      : logic.value.value;
     const findingResult = buttonVals.includes(logicValue);
 
-    if (logic.comparation.value === 'is') {
+    if (logic.comparation.value === "is") {
       if (findingResult) return true;
       return false;
@@ -821 +860 @@
   function checkButtonMultiLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
@@ -827 +866 @@
     const buttones = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      optionId +
-      "][]']:checked"
-    );
-    if (buttones.prop('disabled')) return false;
+        optionSetId +
+        "][" +
+        optionId +
+        "][]']:checked"
+    );
+    if (buttones.prop("disabled")) return false;
 
     let values = [];
     if (Array.isArray(logic.value)) {
       values = logic.value.map((v) => v.value);
-    } else if ( logic.value ) {
+    } else if (logic.value) {
       values.push(logic.value.value);
     }
@@ -843 +882 @@
       values.includes($(button).val())
     );
-    if (logic.comparation.value === 'is_one_of') {
+    if (logic.comparation.value === "is_one_of") {
       if (findingResult === undefined) return false;
       return true;
@@ -853 +892 @@
   function checkSelectLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
 
     const fieldLogic = $(
-      "select[name='option_field_data[" + optionSetId + '][' + optionId + "]']"
-    );
-
-    if (fieldLogic.prop('disabled')) return false;
+      "select[name='option_field_data[" + optionSetId + "][" + optionId + "]']"
+    );
+
+    if (fieldLogic.prop("disabled")) return false;
 
     const fieldLogicVal = String(fieldLogic.val());
-    const logicValue = Array.isArray(logic.value) ? logic.value[0].value : logic.value.value;
-    if ('is' === logic.comparation.value) {
+    const logicValue = Array.isArray(logic.value)
+      ? logic.value[0].value
+      : logic.value.value;
+    if ("is" === logic.comparation.value) {
       if (fieldLogicVal == String(logicValue)) return true;
-    } else if ('is_not' === logic.comparation.value) {
+    } else if ("is_not" === logic.comparation.value) {
       if (fieldLogicVal != String(logicValue)) return true;
     }
@@ -874 +915 @@
   function checkSwatchesLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
@@ -880 +921 @@
     const swatches = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      optionId +
-      "][]']:checked"
+        optionSetId +
+        "][" +
+        optionId +
+        "][]']:checked"
     );
 
@@ -891 +932 @@
     });
 
-    if (swatches.prop('disabled')) return false;
-
-    const logicValue = Array.isArray(logic.value) ? logic.value[0].value : logic.value.value;
+    if (swatches.prop("disabled")) return false;
+
+    const logicValue = Array.isArray(logic.value)
+      ? logic.value[0].value
+      : logic.value.value;
     const findingResult = swatchesVals.includes(logicValue);
 
-    if (logic.comparation.value === 'is') {
+    if (logic.comparation.value === "is") {
       if (findingResult) return true;
       return false;
@@ -905 +948 @@
   function checkSwatchesMultiLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
@@ -911 +954 @@
     const swatches = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      optionId +
-      "][]']:checked"
-    );
-    if (swatches.prop('disabled')) return false;
+        optionSetId +
+        "][" +
+        optionId +
+        "][]']:checked"
+    );
+    if (swatches.prop("disabled")) return false;
 
     let values = [];
     if (Array.isArray(logic.value)) {
       values = logic.value.map((v) => v.value);
-    } else if ( logic.value ) {
+    } else if (logic.value) {
       values.push(logic.value.value);
     }
@@ -927 +970 @@
       values.includes($(swatch).val())
     );
-    if (logic.comparation.value === 'is_one_of') {
+    if (logic.comparation.value === "is_one_of") {
       if (findingResult === undefined) return false;
       return true;
@@ -937 +980 @@
   function checkDatePickerLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
 
     const fieldLogic = $(
-      "input[name='option_field_data[" + optionSetId + '][' + optionId + "]']"
-    );
-
-    if (fieldLogic.prop('disabled')) return false;
+      "input[name='option_field_data[" + optionSetId + "][" + optionId + "]']"
+    );
+
+    if (fieldLogic.prop("disabled")) return false;
 
     const fieldLogicVal = fieldLogic.val();
@@ -953 +996 @@
     const currentDate = new Date(fieldLogicVal).toLocaleDateString();
 
-    if ('between' === logic.comparation.value) {
+    if ("between" === logic.comparation.value) {
       if (startDate <= currentDate && currentDate <= endDate) return true;
     }
-    if ('not_between' === logic.comparation.value) {
+    if ("not_between" === logic.comparation.value) {
       if (startDate > currentDate || currentDate > endDate) return true;
     }
@@ -963 +1006 @@
   function checkTimePickerLogic(optionSetId, logic) {
     const optionId =
-      typeof logic.option !== 'undefined'
+      typeof logic.option !== "undefined"
         ? logic.option.value
         : logic.optionId.value;
 
     const fieldLogic = $(
-      "input[name='option_field_data[" + optionSetId + '][' + optionId + "]']"
-    );
-
-    if (fieldLogic.prop('disabled')) return false;
+      "input[name='option_field_data[" + optionSetId + "][" + optionId + "]']"
+    );
+
+    if (fieldLogic.prop("disabled")) return false;
 
     const startTime = convertTimeAMPM(
       new Date(logic.value.from_time).toLocaleTimeString([], {
-        hour: '2-digit',
-        minute: '2-digit',
+        hour: "2-digit",
+        minute: "2-digit",
       })
     );
     const endTime = convertTimeAMPM(
       new Date(logic.value.to_time).toLocaleTimeString([], {
-        hour: '2-digit',
-        minute: '2-digit',
+        hour: "2-digit",
+        minute: "2-digit",
       })
     );
@@ -989 +1032 @@
     if (null === currentTime) return false;
 
-    if ('between' === logic.comparation.value) {
+    if ("between" === logic.comparation.value) {
       if (startTime <= currentTime && currentTime <= endTime) return true;
     }
-    if ('not_between' === logic.comparation.value) {
+    if ("not_between" === logic.comparation.value) {
       if (startTime > currentTime || currentTime > endTime) return true;
     }
@@ -999 +1042 @@
 
   function getLogicResult(optionSetId, logic) {
-    if( !logic.option || ! logic.option.type || !logic.option.type.value ) return false;
-
-    if (logic.option.type.value === 'text')
+    if (!logic.option || !logic.option.type || !logic.option.type.value)
+      return false;
+
+    if (logic.option.type.value === "text")
       return checkTextLogic(optionSetId, logic);
-    if (logic.option.type.value === 'textarea')
+    if (logic.option.type.value === "textarea")
       return checkTextareaLogic(optionSetId, logic);
-    if (logic.option.type.value === 'number')
+    if (logic.option.type.value === "number")
       return checkNumberLogic(optionSetId, logic);
-    if (logic.option.type.value === 'checkbox')
+    if (logic.option.type.value === "checkbox")
       return checkCheckboxLogic(optionSetId, logic);
-    if (logic.option.type.value === 'radio')
+    if (logic.option.type.value === "radio")
       return checkRadioLogic(optionSetId, logic);
-    if (logic.option.type.value === 'button')
+    if (logic.option.type.value === "button")
       return checkButtonLogic(optionSetId, logic);
-    if (logic.option.type.value === 'button_multi')
+    if (logic.option.type.value === "button_multi")
       return checkButtonMultiLogic(optionSetId, logic);
-    if (logic.option.type.value === 'dropdown')
+    if (logic.option.type.value === "dropdown")
       return checkSelectLogic(optionSetId, logic);
-    if (logic.option.type.value === 'swatches')
+    if (logic.option.type.value === "swatches")
       return checkSwatchesLogic(optionSetId, logic);
-    if (logic.option.type.value === 'swatches_multi')
+    if (logic.option.type.value === "swatches_multi")
       return checkSwatchesMultiLogic(optionSetId, logic);
-    if (logic.option.type.value === 'date_picker')
+    if (logic.option.type.value === "date_picker")
       return checkDatePickerLogic(optionSetId, logic);
-    if (logic.option.type.value === 'time_picker')
+    if (logic.option.type.value === "time_picker")
       return checkTimePickerLogic(optionSetId, logic);
   }
@@ -1029 +1073 @@
     const { matchType, displayType } = option;
     let result = false;
-    if (matchType.value === 'any') {
+    if (matchType.value === "any") {
       const check = option.logics.find((logic) => {
         return getLogicResult(optionSetId, logic);
@@ -1040 +1084 @@
       if (check === undefined) result = true;
     }
-    if (displayType.value === 'display') return result;
+    if (displayType.value === "display") return result;
 
     return !result;
@@ -1047 +1091 @@
     const checkboxes = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "][]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "][]']"
     );
 
     $.each(checkboxes, function (_, checkbox) {
-      $(checkbox).on('change', function () {
+      $(checkbox).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1068 +1112 @@
     const radios = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "]']"
     );
     $.each(radios, function (_, radio) {
-      $(radio).on('change', function () {
+      $(radio).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1088 +1132 @@
     const radios = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "][]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "][]']"
     );
     $.each(radios, function (_, radio) {
-      $(radio).on('change', function () {
+      $(radio).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1108 +1152 @@
     const texts = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "]']"
     );
 
     $.each(texts, function (_, text) {
-      $(text).on('change', function () {
+      $(text).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1129 +1173 @@
     const textareas = $(
       "textarea[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "]']"
     );
 
     $.each(textareas, function (_, textarea) {
-      $(textarea).on('change', function () {
+      $(textarea).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1150 +1194 @@
     const numbers = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "]']"
     );
 
     $.each(numbers, function (_, number) {
-      $(number).on('change', function () {
+      $(number).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1171 +1215 @@
     const selects = $(
       "select[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "]']"
     );
 
     $.each(selects, function (_, select) {
-      $(select).on('change', function () {
+      $(select).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1192 +1236 @@
     const swatches = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "][]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "][]']"
     );
     $.each(swatches, function (_, swatch) {
-      $(swatch).on('change', function () {
+      $(swatch).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1212 +1256 @@
     const datepickers = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "]']"
     );
 
     $.each(datepickers, function (_, text) {
-      $(text).on('change', function () {
+      $(text).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1233 +1277 @@
     const timepickers = $(
       "input[name='option_field_data[" +
-      optionSetId +
-      '][' +
-      logic.option.value +
-      "]']"
+        optionSetId +
+        "][" +
+        logic.option.value +
+        "]']"
     );
 
     $.each(timepickers, function (_, text) {
-      $(text).on('change', function () {
+      $(text).on("change", function () {
         if (checkLogic(optionSetId, option)) {
           showOption(option);
@@ -1253 +1297 @@
   function createEvent(optionSetId, option, logic, referenceObject) {
     const optionType = logic?.option?.type?.value;
-    if (optionType === 'checkbox')
+    if (optionType === "checkbox")
       createCheckboxEvent(optionSetId, option, logic, referenceObject);
-    if (optionType === 'radio')
+    if (optionType === "radio")
       createRadioEvent(optionSetId, option, logic, referenceObject);
-    if (optionType === 'button' || optionType === 'button_multi')
+    if (optionType === "button" || optionType === "button_multi")
       createButtonEvent(optionSetId, option, logic, referenceObject);
-    if (optionType === 'text')
+    if (optionType === "text")
       createTextEvent(optionSetId, option, logic, referenceObject);
-    if (optionType === 'textarea')
+    if (optionType === "textarea")
       createTextareaEvent(optionSetId, option, logic, referenceObject);
-    if (optionType === 'number')
+    if (optionType === "number")
       createNumberEvent(optionSetId, option, logic, referenceObject);
-    if (optionType === 'dropdown')
+    if (optionType === "dropdown")
       createSelectEvent(optionSetId, option, logic, referenceObject);
-    if (optionType === 'swatches' || optionType === 'swatches_multi')
+    if (optionType === "swatches" || optionType === "swatches_multi")
       createSwatchesEvent(optionSetId, option, logic, referenceObject);
-    if (optionType === 'date_picker')
+    if (optionType === "date_picker")
       createDatePickerEvent(optionSetId, option, logic, referenceObject);
-    if (optionType === 'time_picker')
+    if (optionType === "time_picker")
       createTimePickerEvent(optionSetId, option, logic, referenceObject);
   }
   function showHideAdditionDescSelectOpt(el) {
-    const optionId = $(el).attr('id');
+    const optionId = $(el).attr("id");
     const value = el.value.replaceAll('"', '\\"');
     const optionDes = $("[data-option-field-id='" + optionId + "']").find(
       '.yayextra-addition-des-dropdown[data-opt-id="' +
-      optionId +
-      '"][data-opt-val="' +
-      value +
-      '"]'
+        optionId +
+        '"][data-opt-val="' +
+        value +
+        '"]'
     );
 
     if (optionDes.length > 0) {
       optionDes.show();
-      optionDes.siblings('p.yayextra-addition-des-dropdown').hide();
+      optionDes.siblings("p.yayextra-addition-des-dropdown").hide();
     } else {
       $("[data-option-field-id='" + optionId + "']")
-        .find('.yayextra-addition-des-dropdown')
+        .find(".yayextra-addition-des-dropdown")
         .hide();
     }
@@ -1296 +1340 @@
 
   function showHideAdditionDescSwatchesButtonOpt(el) {
-    const optionId = $(el).attr('data-opt-id');
+    const optionId = $(el).attr("data-opt-id");
     const value = $(el).val().replaceAll('"', '\\"');
 
     const optionDes = $("[data-option-field-id='" + optionId + "']").find(
       '.yayextra-addition-des-swatches-button[data-opt-id="' +
-      optionId +
-      '"][data-opt-val="' +
-      value +
-      '"]'
+        optionId +
+        '"][data-opt-val="' +
+        value +
+        '"]'
     );
 
     if (optionDes.length > 0) {
-      optionDes.show();
-      optionDes.siblings('p.yayextra-addition-des-swatches-button').hide();
+      if ($(el).is(":checked")) {
+        optionDes.show();
+      } else {
+        optionDes.hide();
+      }
+      optionDes.siblings("p.yayextra-addition-des-swatches-button").hide();
     } else {
       $("[data-option-field-id='" + optionId + "']")
-        .find('.yayextra-addition-des-swatches-button')
+        .find(".yayextra-addition-des-swatches-button")
         .hide();
     }
@@ -1322 +1370 @@
       var minutes = Number(time.match(/:(\d+)/)[1]);
       var AMPM = time.match(/\s(.*)$/)[1];
-      if ((AMPM == 'PM' || AMPM == 'pm') && hours < 12) hours = hours + 12;
-      if ((AMPM == 'AM' || AMPM == 'am') && hours == 12) hours = hours - 12;
+      if ((AMPM == "PM" || AMPM == "pm") && hours < 12) hours = hours + 12;
+      if ((AMPM == "AM" || AMPM == "am") && hours == 12) hours = hours - 12;
       var sHours = hours.toString();
       var sMinutes = minutes.toString();
-      if (hours < 10) sHours = '0' + sHours;
-      if (minutes < 10) sMinutes = '0' + sMinutes;
-      return sHours + ':' + sMinutes;
+      if (hours < 10) sHours = "0" + sHours;
+      if (minutes < 10) sMinutes = "0" + sMinutes;
+      return sHours + ":" + sMinutes;
     }
     return null;
@@ -1337 +1385 @@
       '<div class="yayextra-notification"><div class="yayextra-notification-content">' +
       messages +
-      '</div></div>';
-
-    $('.' + containerClass).after(notifyHtml);
+      "</div></div>";
+
+    $("." + containerClass).after(notifyHtml);
     setTimeout(function () {
-      $('.yayextra-notification').addClass('NslideDown');
-      $('.yayextra-notification').remove();
+      $(".yayextra-notification").addClass("NslideDown");
+      $(".yayextra-notification").remove();
     }, 1500);
   }
@@ -1352 +1400 @@
     spinnerHtml +=
       '<circle class="woocommerce-spinner__circle" fill="none" stroke-width="5" stroke-linecap="round" cx="50" cy="50" r="30"></circle>';
-    spinnerHtml += '/<svg>';
-    spinnerHtml += '</div>';
+    spinnerHtml += "/<svg>";
+    spinnerHtml += "</div>";
     if (isShow) {
-      if (typeof containerClass === 'string') {
-        $('.' + containerClass).append(spinnerHtml);
+      if (typeof containerClass === "string") {
+        $("." + containerClass).append(spinnerHtml);
       } else {
         $(containerClass).append(spinnerHtml);
       }
     } else {
-      $('.yayextra-spinner').remove();
+      $(".yayextra-spinner").remove();
     }
   }
@@ -1369 +1417 @@
     if (optionSetList.length > 0) {
       $.each(optionSetList, function (_, optionSet) {
-        if( optSetId == optionSet.id ) {
+        if (optSetId == optionSet.id) {
           const optionList = optionSet.options;
           if (optionList.length > 0) {
@@ -1378 +1426 @@
               }
             });
-            if ( result ) return false;
+            if (result) return false;
           }
-        } 
+        }
       });
     }
@@ -1386 +1434 @@
   }
 
-  function replaceProductImage(imageUrl, setTimeOut) {
-    let productGalleryImgList = $('.woocommerce-product-gallery').find(
-      '.woocommerce-product-gallery__image'
+  function replaceProductImage(imageUrlOriginal, setTimeOut) {
+    let imageUrl =
+      window.location.protocol !== "https:"
+        ? imageUrlOriginal
+        : imageUrlOriginal.replaceAll("http://", "https://");
+
+    let productGalleryImgList = $(".woocommerce-product-gallery").find(
+      ".woocommerce-product-gallery__image"
     );
 
     if (productGalleryImgList.length > 0) {
       let productGalleryImgFirst = productGalleryImgList[0];
-      $(productGalleryImgFirst).attr('data-thumb', imageUrl);
-      $(productGalleryImgFirst)
-        .find('a')
-        .attr('href', imageUrl);
+      $(productGalleryImgFirst).attr("data-thumb", imageUrl);
+      $(productGalleryImgFirst).find("a").attr("href", imageUrl);
 
       let productGalleryImgEl = $(productGalleryImgFirst).find(
-        'img.wp-post-image'
+        "img.wp-post-image"
       );
-      $(productGalleryImgEl).attr('src', imageUrl);
-      $(productGalleryImgEl).attr('data-src', imageUrl);
-      $(productGalleryImgEl).attr('data-large_image', imageUrl);
-      $(productGalleryImgEl).attr('srcset', imageUrl);
+      $(productGalleryImgEl).attr("src", imageUrl);
+      $(productGalleryImgEl).attr("data-src", imageUrl);
+      $(productGalleryImgEl).attr("data-large_image", imageUrl);
+      $(productGalleryImgEl).attr("srcset", imageUrl);
 
       if (true === setTimeOut) {
         setTimeout(function () {
           let productGalleryImgZoomEl = $(productGalleryImgFirst).find(
-            'img.zoomImg'
+            "img.zoomImg"
           );
           if (productGalleryImgZoomEl.length > 0) {
-            $(productGalleryImgZoomEl).attr('src', imageUrl);
+            $(productGalleryImgZoomEl).attr("src", imageUrl);
           }
         }, 1000);
       } else {
         let productGalleryImgZoomEl = $(productGalleryImgFirst).find(
-          'img.zoomImg'
+          "img.zoomImg"
         );
         if (productGalleryImgZoomEl.length > 0) {
-          $(productGalleryImgZoomEl).attr('src', imageUrl);
+          $(productGalleryImgZoomEl).attr("src", imageUrl);
         }
       }
     }
 
-    let productGalleryThumbList = $('.woocommerce-product-gallery').find(
-      '.flex-control-thumbs li'
+    let productGalleryThumbList = $(".woocommerce-product-gallery").find(
+      ".flex-control-thumbs li"
     );
 
     if (productGalleryThumbList.length > 0) {
       let productGalleryThumbFirst = productGalleryThumbList[0];
-      $(productGalleryThumbFirst)
-        .find('img')
-        .attr('src', imageUrl);
+      $(productGalleryThumbFirst).find("img").attr("src", imageUrl);
     }
   }
@@ -1443 +1492 @@
       )
     ) {
-      elMessage.html('').hide();
+      elMessage.html("").hide();
       return true;
     }
-    elMessage.html('You have entered an invalid email address!').show();
+    elMessage.html("You have entered an invalid email address!").show();
     return false;
   }
@@ -1452 +1501 @@
   function validateUrl(url, elMessage) {
     let pattern = new RegExp(
-      '^(https?:\\/\\/)?' + // protocol
-      '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
-      '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-      '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-      '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-      '(\\#[-a-z\\d_]*)?$',
-      'i'
+      "^(https?:\\/\\/)?" + // protocol
+        "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // domain name
+        "((\\d{1,3}\\.){3}\\d{1,3}))" + // OR ip (v4) address
+        "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" + // port and path
+        "(\\?[;&a-z\\d%_.~+=-]*)?" + // query string
+        "(\\#[-a-z\\d_]*)?$",
+      "i"
     ); // fragment locator
     if (pattern.test(url)) {
-      elMessage.html('').hide();
+      elMessage.html("").hide();
       return true;
     }
-    elMessage.html('You have entered an invalid URL!').show();
+    elMessage.html("You have entered an invalid URL!").show();
     return false;
   }
 
   function checkLogicAction(optionSetId, action) {
-    if( !action || !action.conditions || !action.matchType.value ) return false;
+    if (!action || !action.conditions || !action.matchType.value) return false;
 
     let conditions = action.conditions;
@@ -1478 +1527 @@
     }
 
-    if ('any' === matchType) {
+    if ("any" === matchType) {
       let result = false;
       $.each(conditions, function (_, condition) {
@@ -1504 +1553 @@
 
   function getLogicActionResult(optionSetId, condition) {
-    if( !condition || !condition.type || !condition.type.value ) return false;
-
-    if ( ! $(".yayextra-option-field-wrap[data-option-field-id=" + condition.optionId.id + "]" ).is(':visible')) return false;
-    
+    if (!condition || !condition.type || !condition.type.value) return false;
+
+    if (
+      !$(
+        ".yayextra-option-field-wrap[data-option-field-id=" +
+          condition.optionId.id +
+          "]"
+      ).is(":visible")
+    )
+      return false;
+
     const optionType = condition.type.value;
 
-    if (optionType === 'text') {
+    if (optionType === "text") {
       return checkTextLogic(optionSetId, condition);
     }
-    if (optionType === 'textarea') {
+    if (optionType === "textarea") {
       return checkTextareaLogic(optionSetId, condition);
     }
-    if (optionType === 'number') {
+    if (optionType === "number") {
       return checkNumberLogic(optionSetId, condition);
     }
-    if (optionType === 'checkbox') {
+    if (optionType === "checkbox") {
       return checkCheckboxLogic(optionSetId, condition);
     }
-    if (optionType === 'radio') {
+    if (optionType === "radio") {
       return checkRadioLogic(optionSetId, condition);
     }
-    if (optionType === 'button') {
+    if (optionType === "button") {
       return checkButtonLogic(optionSetId, condition);
     }
-    if (optionType === 'button_multi') {
+    if (optionType === "button_multi") {
       return checkButtonMultiLogic(optionSetId, condition);
     }
-    if (optionType === 'dropdown') {
+    if (optionType === "dropdown") {
       return checkSelectLogic(optionSetId, condition);
     }
-    if (optionType === 'swatches') {
+    if (optionType === "swatches") {
       return checkSwatchesLogic(optionSetId, condition);
     }
-    if (optionType === 'swatches_multi') {
+    if (optionType === "swatches_multi") {
       return checkSwatchesMultiLogic(optionSetId, condition);
     }
-    if (optionType === 'date_picker') {
+    if (optionType === "date_picker") {
       return checkDatePickerLogic(optionSetId, condition);
     }
-    if (optionType === 'time_picker') {
+    if (optionType === "time_picker") {
       return checkTimePickerLogic(optionSetId, condition);
     }
   }
 
-  function getFeeDiscountFromAction(optionSets) {
+  function getFeeDiscountFromAction(optionSets, isOriginal) {
     let feeDiscountArray = [];
     $.each(optionSets, function (_, optionSet) {
-      if( 1 == parseInt(optionSet.status) ){
+      if (1 == parseInt(optionSet.status)) {
         const optionSetId = optionSet.id;
         $.each(optionSet.actions, function (_, action) {
           if (checkLogicAction(optionSetId, action)) {
             const subActions = action.subActions;
-  
+
             if (subActions.length > 0) {
               $.each(subActions, function (_, subAction) {
-                const actionVal = ( undefined !== subAction.subActionValueYayCurrency ) ? subAction.subActionValueYayCurrency : 0;
+                let actionVal = 0;
+                if (isOriginal) {
+                  actionVal =
+                    undefined !== subAction.subActionValue
+                      ? subAction.subActionValue
+                      : 0;
+                } else {
+                  actionVal =
+                    undefined !== subAction.subActionValueYayCurrency
+                      ? subAction.subActionValueYayCurrency
+                      : 0;
+                }
+
                 feeDiscountArray.push({
                   type: subAction.subActionType.value,
                   name: subAction.subActionName,
-                  value: actionVal
+                  value: actionVal,
                 });
               });
@@ -1576 +1644 @@
     $.each(feeDiscountArray, function (_, feeDiscount) {
       let price =
-        'add_fee' === feeDiscount.type
+        "add_fee" === feeDiscount.type
           ? parseFloat(feeDiscount.value)
           : parseFloat(-feeDiscount.value);
@@ -1587 +1655 @@
 
   function yayeNumberFormat(number, decimals, decPoint, thousandsSep) {
-    number = (number + '').replace(/[^0-9+\-Ee.]/g, '');
+    number = (number + "").replace(/[^0-9+\-Ee.]/g, "");
     var n = !isFinite(+number) ? 0 : +number;
     var prec = !isFinite(+decimals) ? 0 : Math.abs(decimals);
-    var sep = typeof thousandsSep === 'undefined' ? ',' : thousandsSep;
-    var dec = typeof decPoint === 'undefined' ? '.' : decPoint;
-    var s = '';
+    var sep = typeof thousandsSep === "undefined" ? "," : thousandsSep;
+    var dec = typeof decPoint === "undefined" ? "." : decPoint;
+    var s = "";
 
     var toFixedFix = function toFixedFix(n, prec) {
-      if (('' + n).indexOf('e') === -1) {
-        return +(Math.round(n + 'e+' + prec) + 'e-' + prec);
+      if (("" + n).indexOf("e") === -1) {
+        return +(Math.round(n + "e+" + prec) + "e-" + prec);
       } else {
-        var arr = ('' + n).split('e');
-        var sig = '';
+        var arr = ("" + n).split("e");
+        var sig = "";
         if (+arr[1] + prec > 0) {
-          sig = '+';
+          sig = "+";
         }
         return (+(
-          Math.round(+arr[0] + 'e' + sig + (+arr[1] + prec)) +
-          'e-' +
+          Math.round(+arr[0] + "e" + sig + (+arr[1] + prec)) +
+          "e-" +
           prec
         )).toFixed(prec);
@@ -1612 +1680 @@
 
     // @todo: for IE parseFloat(0.55).toFixed(0) = 0;
-    s = (prec ? toFixedFix(n, prec).toString() : '' + Math.round(n)).split('.');
+    s = (prec ? toFixedFix(n, prec).toString() : "" + Math.round(n)).split(".");
     if (s[0].length > 3) {
       s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep);
     }
-    if ((s[1] || '').length < prec) {
-      s[1] = s[1] || '';
-      s[1] += new Array(prec - s[1].length + 1).join('0');
+    if ((s[1] || "").length < prec) {
+      s[1] = s[1] || "";
+      s[1] += new Array(prec - s[1].length + 1).join("0");
     }
 
@@ -1626 +1694 @@
   function getTotalCost() {
     let additionCostSum = 0;
+    let additionCostSumOriginal = 0;
     let feeDiscounts = 0;
+    let feeDiscountsOriginal = 0;
 
     let quantityProduct = 0;
-    if ( $('.quantity input.qty').length > 0 ) {
-      quantityProduct = $('.quantity input.qty').val();
-    } else if ( $('.quantity select.qty').length > 0 ) {
-      quantityProduct = $('.quantity select.qty').val();
+    if ($(".quantity input.qty").length > 0) {
+      quantityProduct = $(".quantity input.qty").val();
+    } else if ($(".quantity select.qty").length > 0) {
+      quantityProduct = $(".quantity select.qty").val();
     }
 
     if (
-      $('.yayextra-total-price').length > 0 ||
-      $('.yayextra-extra-subtotal-price').length > 0
+      $(".yayextra-total-price").length > 0 ||
+      $(".yayextra-extra-subtotal-price").length > 0
     ) {
-      const optionFields = $('body').find('.yayextra-option-field-wrap');
+      const optionFields = $("body").find(".yayextra-option-field-wrap");
       const optHasVals = [
-        'radio',
-        'dropdown',
-        'checkbox',
-        'button',
-        'button_multi',
-        'swatches',
-        'swatches_multi',
+        "radio",
+        "dropdown",
+        "checkbox",
+        "button",
+        "button_multi",
+        "swatches",
+        "swatches_multi",
       ];
 
       if (optionFields.length > 0) {
         $.each(optionFields, function (idx, el) {
-          if ($(el).is(':visible')) {
+          if ($(el).is(":visible")) {
             // Sum value of value option field
-            const optType = $(el).attr('data-option-field-type');
+            const optType = $(el).attr("data-option-field-type");
             if (optHasVals.includes(optType)) {
-              if ('dropdown' === optType) {
-                let valEls = $(el).find('select');
+              if ("dropdown" === optType) {
+                let valEls = $(el).find("select");
                 if (valEls.length > 0) {
                   $.each(valEls, function (_, valEl) {
-                    let selectedOption = $(valEl).find('option:selected');
+                    let selectedOption = $(valEl).find("option:selected");
                     if (selectedOption.length > 0) {
                       additionCostSum += parseFloat(
-                        selectedOption.attr('data-addition-cost')
+                        selectedOption.attr("data-addition-cost")
+                      );
+                      additionCostSumOriginal += parseFloat(
+                        selectedOption.attr("data-option-org-cost")
                       );
                     }
@@ -1669 +1742 @@
                 }
               } else {
-                let valEls = $(el).find('input');
+                let valEls = $(el).find("input");
                 if (valEls.length > 0) {
                   $.each(valEls, function (_, valEl) {
-                    if ($(valEl).is(':checked')) {
+                    if ($(valEl).is(":checked")) {
                       additionCostSum += parseFloat(
-                        $(valEl).attr('data-addition-cost')
+                        $(valEl).attr("data-addition-cost")
+                      );
+                      additionCostSumOriginal += parseFloat(
+                        $(valEl).attr("data-option-org-cost")
                       );
                     }
@@ -1685 +1761 @@
       }
 
-      feeDiscounts = getFeeDiscountFromAction(optionSetList);
+      feeDiscounts = getFeeDiscountFromAction(optionSetList, false);
+      feeDiscountsOriginal = getFeeDiscountFromAction(optionSetList, true);
+
+      // Update data into hidden input
+      $("input.yaye-total-options-original").attr(
+        "data-total-options-price-original",
+        additionCostSumOriginal
+      );
+      $("input.yaye-total-fee-original").attr(
+        "data-total-fee-original",
+        feeDiscountsOriginal.feeDiscountTotal
+      );
     }
 
     // Total price - start
-    if ($('.yayextra-total-price').length > 0) {
+    if ($(".yayextra-total-price").length > 0) {
       totalPriceHtml(
-        'yayextra-total-price',
+        "yayextra-total-price",
         additionCostSum,
         feeDiscounts,
@@ -1700 +1787 @@
 
     // Extra subtotal price - start
-    if ($('.yayextra-extra-subtotal-price').length > 0) {
+    if ($(".yayextra-extra-subtotal-price").length > 0) {
       totalPriceHtml(
-        'yayextra-extra-subtotal-price',
+        "yayextra-extra-subtotal-price",
         additionCostSum,
         feeDiscounts,
@@ -1717 +1804 @@
     quantityProduct
   ) {
-    let dataTokenReplace = $('.' + elementWrap + ' .total-price').attr(
-      'data-token-replace'
-    );
-
-    let currentPrice = $('.' + elementWrap + ' .total-price').attr(
-      'data-total-price'
-    );
-
+    let dataTokenReplace = $("." + elementWrap + " .total-price").attr(
+      "data-token-replace"
+    );
+
+    let currentPrice = $("." + elementWrap + " .total-price").attr(
+      "data-total-price"
+    );
+
+    // Remove fee/discount total
+    //let totalPrice = (additionCostSum + parseFloat(currentPrice)) * parseInt(quantityProduct) + parseFloat(feeDiscounts.feeDiscountTotal);
     let totalPrice =
-      (additionCostSum + parseFloat(currentPrice)) * parseInt(quantityProduct) + parseFloat(feeDiscounts.feeDiscountTotal);
+      (additionCostSum + parseFloat(currentPrice)) * parseInt(quantityProduct);
 
     let totalPriceFormat = yayeNumberFormat(
@@ -1735 +1824 @@
     );
 
-    let priceString = $('.' + elementWrap + ' .total-price').html();
+    let priceString = $("." + elementWrap + " .total-price").html();
     let stringReplace = yayeNumberFormat(
       parseFloat(dataTokenReplace),
@@ -1744 +1833 @@
 
     // Update data-token-replace for later
-    $('.' + elementWrap + ' .total-price').attr(
-      'data-token-replace',
+    $("." + elementWrap + " .total-price").attr(
+      "data-token-replace",
       totalPrice
     );
@@ -1751 +1840 @@
     let priceStringFinal = priceString.replace(stringReplace, totalPriceFormat);
 
-    if ( 'yayextra-total-price' === elementWrap ) {
+    if ("yayextra-total-price" === elementWrap) {
       let productId = 0;
-      if ( $('button[name="add-to-cart"').length && '' != $('button[name="add-to-cart"').val() ) { // regular product
-        productId = parseInt( $('button[name="add-to-cart"').val() );
-      } else if ( $('input[name="variation_id"').length  && '' != $('input[name="variation_id"').val() ) { // variation product
-        productId = parseInt( $('input[name="variation_id"').val() );
+      if (
+        $('button[name="add-to-cart"').length &&
+        "" != $('button[name="add-to-cart"').val()
+      ) {
+        // regular product
+        productId = parseInt($('button[name="add-to-cart"').val());
+      } else if (
+        $('input[name="variation_id"').length &&
+        "" != $('input[name="variation_id"').val()
+      ) {
+        // variation product
+        productId = parseInt($('input[name="variation_id"').val());
       }
       // yaye_total_price_hook
-      $('.' + elementWrap + ' .total-price').html( wp.hooks.applyFilters( 'yaye_total_price_hook', priceStringFinal, totalPrice, productId ) );
+      const totalPriceOriginalData = getTotalPriceOriginalData();
+      priceStringFinal = wp.hooks.applyFilters(
+        "yaye_total_price_hook",
+        priceStringFinal,
+        quantityProduct,
+        totalPriceOriginalData
+      );
+      $("." + elementWrap + " .total-price").html(priceStringFinal);
     } else {
-      $('.' + elementWrap + ' .total-price').html(priceStringFinal);
-    } 
-  }
-
-  function getVariationProductsMeta(){
-    if($('.product form.variations_form').length > 0){
-      let variationsMeta = $('.product form.variations_form').attr('data-product_variations');
+      $("." + elementWrap + " .total-price").html(priceStringFinal);
+    }
+  }
+
+  function getVariationProductsMeta() {
+    if ($(".product form.variations_form").length > 0) {
+      let variationsMeta = $(".product form.variations_form").attr(
+        "data-product_variations"
+      );
       return JSON.parse(variationsMeta);
     }
@@ -1774 +1880 @@
 
   // Return price of variable product or null
-  function updateTotalPriceByVariationProduct(variationProductsMeta, prodVariationData){
-    if(variationProductsMeta !== null && variationProductsMeta.length > 0) {
-      for(let variationProduct of variationProductsMeta){
-        const findVariationProd = findVariationProduct(variationProduct, prodVariationData);
-        if(findVariationProd){
-          $('.yayextra-total-price .total-price').attr('data-total-price', parseFloat(variationProduct.display_price));
+  function updateTotalPriceByVariationProduct(
+    variationProductsMeta,
+    prodVariationData
+  ) {
+    if (variationProductsMeta !== null && variationProductsMeta.length > 0) {
+      for (let variationProduct of variationProductsMeta) {
+        const findVariationProd = findVariationProduct(
+          variationProduct,
+          prodVariationData
+        );
+        if (findVariationProd) {
+          const productPrice = parseFloat(variationProduct.display_price);
+
+          $(".yayextra-total-price .total-price").attr(
+            "data-total-price",
+            productPrice
+          );
+
+          let productPriceOriginal = productPrice;
+          if ("undefined" !== typeof YayCurrency_Callback) {
+            productPriceOriginal =
+              YayCurrency_Callback.Helper.handelRevertPrice(productPrice);
+          }
+          $(".yaye-product-price-original").attr(
+            "data-product-price-original",
+            productPriceOriginal
+          );
+
           // getTotalCost();
-          return parseFloat(variationProduct.display_price);
-        }
-      };
+          return productPrice;
+        } else {
+          $(".yaye-product-price-original").attr(
+            "data-product-price-original",
+            0
+          );
+        }
+      }
     }
     return null;
   }
 
-  // Find variation product 
+  // Find variation product
   function findVariationProduct(variationProduct, prodVariationData) {
     let result = true;
     let attrs = variationProduct.attributes;
     for (const attr in attrs) {
-      if( ! prodVariationData[attr] ) {
-        result = false
+      if (!prodVariationData[attr]) {
+        result = false;
         break;
       } else {
-        if( attrs[attr] && attrs[attr] !== prodVariationData[attr] ) {
-          result = false
+        if (attrs[attr] && attrs[attr] !== prodVariationData[attr]) {
+          result = false;
           break;
         }
@@ -1806 +1939 @@
     return result;
   }
-  
-  function changeAdditionCostByVariationProduct( variationProductPrice ) {
-    let optionAdditionPercentageCostEls = $('.option-addition-percentage-cost')
-    if(optionAdditionPercentageCostEls.length > 0){
+
+  function changeAdditionCostByVariationProduct(variationProductPrice) {
+    let optionAdditionPercentageCostEls = $(".option-addition-percentage-cost");
+    if (optionAdditionPercentageCostEls.length > 0) {
       for (const valOptLabel of optionAdditionPercentageCostEls) {
-        const optionValId   = $(valOptLabel).attr('data-opt-val-id')
-        const optionCostOrg = $(valOptLabel).attr('data-option-org-cost')
-        const additionCost  = parseFloat( optionCostOrg ) * variationProductPrice / 100;
-      
+        const optionValId = $(valOptLabel).attr("data-opt-val-id");
+        const optionCostOrg = $(valOptLabel).attr("data-option-org-val");
+        const additionCost =
+          (parseFloat(optionCostOrg) * variationProductPrice) / 100;
+
         // update data-addition-cost for input element
-        const inputEl = $('[id="' + optionValId + '"]')
-        if(inputEl.length > 0){
-          $(inputEl[0]).attr('data-addition-cost', additionCost)
-        } else { // Case for Dropdown option
-          const selectEl = $('option[data-opt-val-id="' + optionValId + '"]')
-          if(selectEl.length > 0){
-            $(selectEl[0]).attr('data-addition-cost', additionCost)
+        const inputEl = $('[id="' + optionValId + '"]');
+        if (inputEl.length > 0) {
+          $(inputEl[0]).attr("data-addition-cost", additionCost);
+        } else {
+          // Case for Dropdown option
+          const selectEl = $('option[data-opt-val-id="' + optionValId + '"]');
+          if (selectEl.length > 0) {
+            $(selectEl[0]).attr("data-addition-cost", additionCost);
           }
         }
@@ -1835 +1970 @@
 
         let dataTokenReplace = $(valOptLabel).attr(
-          'data-option-org-cost-token-replace'
+          "data-option-org-cost-token-replace"
         );
 
@@ -1847 +1982 @@
 
         // Update data-token-replace for later
-        $(valOptLabel).attr(
-          'data-option-org-cost-token-replace',
-          additionCost
+        $(valOptLabel).attr("data-option-org-cost-token-replace", additionCost);
+
+        let priceStringFinal = priceString.replace(
+          stringReplace,
+          additionCostFormat
         );
 
-        let priceStringFinal = priceString.replace(stringReplace, additionCostFormat);
-
         $(valOptLabel).html(priceStringFinal);
-
       }
     }
@@ -1861 +1995 @@
 
   function getVisibilityOption() {
-    let optionFieldList = $('form').find('.yayextra-option-field-wrap:visible'); 
+    let optionFieldList = $("form").find(".yayextra-option-field-wrap:visible");
     let optionIdList = [];
     $.each(optionFieldList, function (_, optField) {
-      const optId = $(optField).attr('data-option-field-id');
+      const optId = $(optField).attr("data-option-field-id");
       optionIdList.push(optId);
-    })
+    });
 
     // Set option id to hidden field to php handle
@@ -1872 +2006 @@
   }
 
+  function getTotalPriceOriginalData() {
+    const totalOptionsOriginal = $(".yaye-total-options-original").attr(
+      "data-total-options-price-original"
+    );
+    const totalFeeOriginal = $(".yaye-total-fee-original").attr(
+      "data-total-fee-original"
+    );
+    const productPriceOriginal = $(".yaye-product-price-original").attr(
+      "data-product-price-original"
+    );
+
+    return {
+      total_options_original: totalOptionsOriginal,
+      total_fee_original: totalFeeOriginal,
+      product_price_original: productPriceOriginal,
+    };
+  }
 })(jQuery);

yayextra/trunk/includes/Classes/ProductPage.php

@@ -121 +121 @@
                                 $opt_field['type']['value'] . '_field',
                                 array(
-                                    'opt_set_id'          => $opt_set_data['id'],
-                                    'data'                => $opt_field,
-                                    'product_price'       => $product_price,
-                                    'is_edit_option_mode' => $this->is_edit_option_mode(),
-                                    'settings'            => $settings,
+                                    'opt_set_id'             => $opt_set_data['id'],
+                                    'data'                   => $opt_field,
+                                    'product_price'          => $product_price,
+                                    'product_price_original' => $product->get_price( 'original' ),
+                                    'is_edit_option_mode'    => $this->is_edit_option_mode(),
+                                    'settings'               => $settings,
                                 )
                             );
@@ -137 +138 @@
 
             if ( isset( $settings['general'] ) && true === $settings['general']['show_extra_subtotal'] ) {
+                $subtotal_text = apply_filters( 'yaye_subtotal_text', esc_html__( 'Extra subtotal:', 'yayextra' ) );
                 echo '<div class="yayextra-extra-subtotal-price">';
-                echo '<span class="total-price-title">' . esc_html__( 'Extra subtotal:', 'yayextra' ) . '</span>';
+                echo '<span class="total-price-title">' . esc_html( $subtotal_text ) . '</span>';
                 echo '<span class="total-price" data-token-replace="0" data-total-price="0">' . wp_kses_post( Utils::get_formatted_price_from_yaycurrency( 0 ) ) . '</span>';
                 echo '</div>';
@@ -144 +146 @@
 
             if ( isset( $settings['general'] ) && true === $settings['general']['show_total_price'] ) {
+                $total_price_text = apply_filters( 'yaye_total_price_text', esc_html__( 'Total price:', 'yayextra' ) );
                 echo '<div class="yayextra-total-price">';
-                echo '<span class="total-price-title">' . esc_html__( 'Total price:', 'yayextra' ) . '</span>';
+                echo '<span class="total-price-title">' . esc_html( $total_price_text ) . '</span>';
                 echo '<span class="total-price" data-token-replace="' . esc_attr( $product_price ) . '" data-total-price="' . esc_attr( $product_price ) . '">' . wp_kses_post( Utils::get_formatted_price_from_yaycurrency( $product_price ) ) . '</span>';
                 echo '</div>';
@@ -162 +165 @@
             // For YayExtra pro version.
         }
+
+        // Store original total options price, fee, linked product price for later 3rd plugin
+        echo '<input type="hidden" class="yaye-total-options-original" data-total-options-price-original="0" />';
+        echo '<input type="hidden" class="yaye-total-fee-original" data-total-fee-original="0" />';
+        echo '<input type="hidden" class="yaye-product-price-original" data-product-price-original="' . esc_attr( $product->get_price( 'original' ) ) . '" data-product-regular-price-original="' . esc_attr( $product->get_regular_price( 'original' ) ) . '"/>';
     }
 
@@ -634 +642 @@
         foreach ( $cart_object->cart_contents as $cart_value ) {
             if( !empty($cart_value['data']) ) {
-                $cost_total         = Utils::get_price_fixed_from_currency_plugin( $cart_value['product_id'], floatval( $cart_value['data']->get_price( 'original' ) ), true);
-                $cost_regular_total = Utils::get_price_fixed_from_currency_plugin( $cart_value['product_id'], floatval( $cart_value['data']->get_regular_price( 'original' ) ), true); 
+                $product = wc_get_product( $cart_value['data']->get_id() );
+                $cost_total         = Utils::get_price_fixed_from_currency_plugin( $cart_value['product_id'], floatval( $product->get_price( 'original' ) ), true);
+                $cost_regular_total = Utils::get_price_fixed_from_currency_plugin( $cart_value['product_id'], floatval( $product->get_regular_price( 'original' ) ), true); 
                 
                 if ( ! empty( $cart_value['yaye_custom_option'] ) ) {
@@ -660 +669 @@
                 );
     
-                $cost_total         = apply_filters('yaye_cart_line_total', Utils::get_price_from_currency_plugin( $cost_total ), $cart_value);
-                $cost_regular_total = apply_filters('yaye_cart_line_regular_total', Utils::get_price_from_currency_plugin( $cost_regular_total ), $cart_value);
+                
+                if ( function_exists( 'Yay_Currency\\plugin_init' )) {
+                    $cost_total         = apply_filters('yaye_cart_line_total', $cost_total, $cart_value);
+                    $cost_regular_total = apply_filters('yaye_cart_line_regular_total', $cost_regular_total, $cart_value);
+                } else {
+                    $cost_total         = apply_filters('yaye_cart_line_total', Utils::get_price_from_currency_plugin( $cost_total ), $cart_value);
+                    $cost_regular_total = apply_filters('yaye_cart_line_regular_total', Utils::get_price_from_currency_plugin( $cost_regular_total ), $cart_value);
+                }
 
                 $cart_value['data']->set_price( $cost_total );
@@ -744 +759 @@
 
         // Add edit option field link with product has applied opiton field.
-        if ( is_cart() && ! empty( $product_permalink ) ) {
+        if ( is_cart() && ! empty( $product_permalink ) && ! wp_is_block_theme() ) {
             $current_prod_id = $_product->get_parent_id();
             if ( empty( $current_prod_id ) ) {
@@ -760 +775 @@
                 );
 
+                $edit_option_text = apply_filters( 'yaye_edit_option_text', esc_html__( 'Edit option field', 'yayextra' ) );
                 $cart_data[] = array(
-                    'name'  => '<a href="' . $edit_link . '" class="yayextra-option-edit-link">' . esc_html__( 'Edit option field', 'yayextra' ) . '</a>',
+                    'name'  => '<a href="' . $edit_link . '" class="yayextra-option-edit-link">' . $edit_option_text . '</a>',
                     'value' => '',
                 );
@@ -1147 +1163 @@
                 $opt_val_temp = array();
                 foreach ( $option_value as $opt_val ) {
-                    array_push( $opt_val_temp, $opt_val['value'] );
+                    array_push( $opt_val_temp, trim($opt_val['value']) );
                 }
                 $option_value = $opt_val_temp;
             } elseif ( 'radio' === $option_type || 'button' === $option_type || 'dropdown' === $option_type || 'swatches' === $option_type ) {
-                $opt_val_temp = ! empty( $option_value['value'] ) ? $option_value['value'] : $option_value[0]['value'];
+                $opt_val_temp = ! empty( $option_value['value'] ) ? trim($option_value['value']) : trim($option_value[0]['value']);
                 $option_value = $opt_val_temp;
             }
@@ -1218 +1234 @@
                         if ( 'is_one_of' === $comparation ) {
                             foreach ( $option['option_value'] as $opt_cart_val ) {
-                                if ( in_array( $opt_cart_val['option_val'], $option_value, true ) ) {
+                                if ( in_array( trim($opt_cart_val['option_val']), $option_value, true ) ) {
                                     return true;
                                 };
@@ -1225 +1241 @@
                         } elseif ( 'is_not_one_of' === $comparation ) {
                             foreach ( $option['option_value'] as $opt_cart_val ) {
-                                if ( in_array( $opt_cart_val['option_val'], $option_value, true ) ) {
+                                if ( in_array( trim($opt_cart_val['option_val']), $option_value, true ) ) {
                                     return false;
                                 };
@@ -1361 +1377 @@
      */
     public function add_link_edit_option_field_in_minicart( $cart_item_quantity_product_price_span, $cart_item, $cart_item_key ) {
-        if ( is_cart() ) return $cart_item_quantity_product_price_span;
+        if ( is_cart() && ! wp_is_block_theme() ) return $cart_item_quantity_product_price_span;
         
         $_product          = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
@@ -1384 +1400 @@
                     $product_permalink
                 );
-                echo '<p><a href="' . esc_attr( $edit_link ) . '" class="yayextra-option-edit-link-minicart">' . esc_html__( 'Edit option field', 'yayextra' ) . '</a></p>';
+
+                $edit_option_text = apply_filters( 'yaye_edit_option_text', esc_html__( 'Edit option field', 'yayextra' ) );
+                echo '<p><a href="' . esc_attr( $edit_link ) . '" class="yayextra-option-edit-link-minicart">' . esc_html( $edit_option_text ) . '</a></p>';
             }
         }
@@ -1587 +1605 @@
                 $css .= '}';
 
-                $css .= '.yayextra-total-price .total-price, .yayextra-extra-subtotal-price .total-price {';
+                $css .= '.yayextra-total-price .total-price {';
                 if ( ! empty( $general_setts['total_price_font_size'] ) && '0px' !== $general_setts['total_price_font_size'] ) {
                     $css .= 'font-size: ' . $general_setts['total_price_font_size'] . 'px !important;';
@@ -1593 +1611 @@
                 if ( ! empty( $general_setts['total_price_font_weight'] ) ) {
                     $css .= 'font-weight: ' . $general_setts['total_price_font_weight']['value'] . ' !important;';
+                }
+
+                $css .= '}';
+
+                $css .= '.yayextra-extra-subtotal-price .total-price {';
+                if ( ! empty( $general_setts['subtotal_price_font_size'] ) && '0px' !== $general_setts['subtotal_price_font_size'] ) {
+                    $css .= 'font-size: ' . $general_setts['subtotal_price_font_size'] . 'px !important;';
+                }
+                if ( ! empty( $general_setts['subtotal_price_font_weight'] ) ) {
+                    $css .= 'font-weight: ' . $general_setts['subtotal_price_font_weight']['value'] . ' !important;';
                 }
 
@@ -1706 +1734 @@
                 }
             }
+        } elseif ( 3 === $prod_filter_type ) { // Choose all products.
+            $prod_apply_list = 'all';
         }
 
@@ -2035 +2065 @@
 
                     if ( ! empty( $prod_apply_list ) ) {
-                        if ( in_array( $current_prod_id, $prod_apply_list, true ) ) {
+                        if ( is_array( $prod_apply_list ) && in_array( $current_prod_id, $prod_apply_list, true ) ) {
+                            if ( isset( $settings['general'] ) && 'first_applicable' === $settings['general']['applied_option_sets']['value'] ) {
+                                return array( $opt_set_data );
+                            } else {
+                                array_push( $result, $opt_set_data );
+                            }
+                        } else if ( 'all' === $prod_apply_list ) { // Choose all products.
                             if ( isset( $settings['general'] ) && 'first_applicable' === $settings['general']['applied_option_sets']['value'] ) {
                                 return array( $opt_set_data );

yayextra/trunk/includes/Helper/Database.php

@@ -1 +1 @@
 <?php
 namespace YayExtra\Helper;
+
+defined( 'ABSPATH' ) || exit;
 
 /**
@@ -402 +404 @@
         global $wpdb;
 
+        $filters = $this->expand_category_conditions( $filters );
+
         $this->filters = $filters;
         $this->apply   = $apply;
@@ -412 +416 @@
         return $result_query_all;
     }
+
+    /**
+     * Expand product_category conditions to include children categories automatically.
+     *
+     * @param array $filters
+     * @return array
+     */
+    public function expand_category_conditions( $filters ) {
+        if ( empty( $filters ) || ! is_array( $filters ) ) {
+            return $filters;
+        }
+
+        foreach ( $filters as &$cond ) {
+
+            if (
+                isset( $cond['type']['value'] ) &&
+                $cond['type']['value'] === 'prod_category' &&
+                ! empty( $cond['value'] )
+            ) {
+                $selected_ids = array_map(
+                    'intval',
+                    wp_list_pluck( $cond['value'], 'value' )
+                );
+
+                $all_cat_ids = [];
+
+                foreach ( $selected_ids as $cid ) {
+
+                    $children = get_term_children( $cid, 'product_cat' );
+
+                    if ( is_array( $children ) ) {
+                        $all_cat_ids = array_merge( $all_cat_ids, $children );
+                    }
+
+                    $all_cat_ids[] = $cid;
+                }
+
+                $all_cat_ids = array_unique( array_map( 'intval', $all_cat_ids ) );
+
+                $cond['value'] = array_map( function ( $id ) {
+                    $term = get_term( $id );
+                    return [
+                        'value' => $id,
+                        'label' => $term && ! is_wp_error( $term ) ? $term->name : '',
+                    ];
+                }, $all_cat_ids );
+            }
+        }
+
+        return $filters;
+    }
 }

yayextra/trunk/includes/Helper/Utils.php

@@ -433 +433 @@
             return x_currency_exchange( $price );
         }
-
-        return $price;
-    }
-
-    /**
-     * Convert price by YayCurrency cookie.
-     *
-     * @param float $price Price value.
-     *
-     * @return array
-     */
-    public static function get_price_from_yaycurrency_cookie( $price ) {
-        if ( function_exists( 'Yay_Currency\\plugin_init' ) ) {
-            if (class_exists('Yay_Currency\Helpers\YayCurrencyHelper')) {
-                if ( method_exists( 'Yay_Currency\Helpers\YayCurrencyHelper', 'calculate_price_by_currency_cookie' ) ) {
-                    return YayCurrencyHelper::calculate_price_by_currency_cookie( $price, false );
-                }
-            }
-        }
+        // PBOC multicurrency 
+        elseif ( function_exists('wcpbc_the_zone') && wcpbc_the_zone()) { 
+            return wcpbc_the_zone()->get_exchange_rate_price( $price );
+        }
+
         return $price;
     }
@@ -504 +490 @@
              method_exists( 'Yay_Currency\Helpers\YayCurrencyHelper', 'detect_current_currency' ) 
         ) {
+            $original_price = $product_price;
             $apply_currency = YayCurrencyHelper::detect_current_currency();
             if ( ! empty( $apply_currency ) ) {
@@ -517 +504 @@
                          YayCurrencyHelper::disable_fallback_option_in_checkout_page( $apply_currency ) ) 
                     {
-                        return wc_get_product( $product_id )->get_price( 'original' );
+                        // return wc_get_product( $product_id )->get_price( 'original' );
+                        return $original_price;
                     }
                     return self::get_reverse_price_from_yaycurrency( $product_price );
@@ -531 +519 @@
             }
             return x_currency_exchange( $product_price );
+        }
+        // PBOC multicurrency 
+        elseif ( function_exists('wcpbc_the_zone') && wcpbc_the_zone()) { 
+            if ( $force_original ) {
+                return $product_price;
+            }
+            return wcpbc_the_zone()->get_exchange_rate_price( $product_price );
         }
 
@@ -742 +737 @@
     public static function gen_uuid() {
         return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-            mt_rand( 0, 0xffff ),
-            mt_rand( 0, 0x0fff ) | 0x4000,
-            mt_rand( 0, 0x3fff ) | 0x8000,
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
+            wp_rand( 0, 0xffff ), wp_rand( 0, 0xffff ),
+            wp_rand( 0, 0xffff ),
+            wp_rand( 0, 0x0fff ) | 0x4000,
+            wp_rand( 0, 0x3fff ) | 0x8000,
+            wp_rand( 0, 0xffff ), wp_rand( 0, 0xffff ), wp_rand( 0, 0xffff )
         );
     }

yayextra/trunk/includes/Init/Ajax.php

@@ -5 +5 @@
 use YayExtra\Init\CustomPostType;
 use YayExtra\Classes\ProductPage;
+defined( 'ABSPATH' ) || exit;
 /**
  * Ajax class
@@ -55 +56 @@
             'get_settings',
             'update_option_set_products_one_by_one',
+            'update_reviewed_flag',
         );
     }
@@ -116 +118 @@
 
     /**
+     * Add missing UUIDs to optionValues inside Option Set.
+     */
+    private function migrate_option_value_id($option_set) {
+
+        $has_changed = false;
+
+        if (empty($option_set['options']) || !is_array($option_set['options'])) {
+            return array(
+                'data'        => $option_set,
+                'has_changed' => false,
+            );
+        }
+
+        foreach ($option_set['options'] as &$option) {
+
+            if (empty($option['optionValues']) || !is_array($option['optionValues'])) {
+                continue;
+            }
+
+            $first = $option['optionValues'][0] ?? null;
+
+            // if id is not empty -> skip
+            if (!empty($first['id'])) {
+                continue;
+            }
+
+            // if id is empty -> migrate for all items
+            foreach ($option['optionValues'] as &$valueItem) {
+                if (empty($valueItem['id'])) {
+                    $valueItem['id'] = wp_generate_uuid4();
+                    $has_changed = true;
+                }
+            }
+        }
+
+        return array(
+            'data'        => $option_set,
+            'has_changed' => $has_changed,
+        );
+    }
+
+/**
+ * Migrate old logic value data to include id (id in optionValue).
+ */
+private function migrate_option_set_logic_value( $option_set ) {
+    $has_changed = false;
+
+    if ( empty( $option_set['options'] ) || ! is_array( $option_set['options'] ) ) {
+        return array( 'data' => $option_set, 'has_changed' => false );
+    }
+
+    /**
+     * Helper: always return array of items
+     */
+    $normalize_value = function( $value ) {
+        if ( empty( $value ) ) {
+            return array();
+        }
+        // If already array of objects → return
+        if ( is_array( $value ) && isset( $value[0] ) && is_array( $value[0] ) ) {
+            return $value;
+        }
+        // Convert single object → array
+        return array( $value );
+    };
+
+    /**
+     * MIGRATE LOGICS
+     */
+    $force_array_types = array( 'checkbox', 'button_multi', 'swatches_multi' );
+    foreach ( $option_set['options'] as &$option ) {
+
+        if ( empty( $option['logics'] ) ) {
+            continue;
+        }
+
+        foreach ( $option['logics'] as &$logic ) {
+
+            // If already has ID → skip
+            if ( isset( $logic['value']['id'] ) && $logic['value']['id'] !== '' ) {
+                continue;
+            }
+
+            if ( empty( $logic['option']['id'] ) ) {
+                continue;
+            }
+
+            $target_option_id = $logic['option']['id'];
+
+            // Find corresponding option
+            $target_option = null;
+            foreach ( $option_set['options'] as $opt ) {
+                if ( $opt['id'] === $target_option_id ) {
+                    $target_option = $opt;
+                    break;
+                }
+            }
+            if ( ! $target_option || empty( $target_option['optionValues'] ) ) {
+                continue;
+            }
+
+            // Normalize value to array
+            $original_value = $logic['value'];
+            $value_list     = $normalize_value( $original_value );
+
+            $mapped_list = array();
+
+            foreach ( $value_list as $item ) {
+                $current_value = $item['value'] ?? null;
+                if ( ! $current_value ) {
+                    $mapped_list[] = $item;
+                    continue;
+                }
+
+                // Match in optionValues
+                $found = false;
+                foreach ( $target_option['optionValues'] as $ov ) {
+                    if ( $ov['value'] === $current_value ) {
+                        $mapped_list[] = array(
+                            'id'    => $ov['id'],
+                            'value' => $ov['value'],
+                            'label' => $item['label'] ?? $ov['value'],
+                        );
+                        $has_changed = true;
+                        $found       = true;
+                        break;
+                    }
+                }
+
+                if ( ! $found ) {
+                    // fallback
+                    $mapped_list[] = $item;
+                }
+            }
+
+            // Restore single or array
+            $option_type = $logic['option']['type']['value'] ?? null;
+            if ( in_array( $option_type, $force_array_types, true ) ) {
+                $logic['value'] = $mapped_list;
+            } else {
+                $logic['value'] = ( count( $mapped_list ) === 1 ) ? $mapped_list[0] : $mapped_list;
+            }
+        }
+    }
+
+    /**
+     * MIGRATE ACTION CONDITIONS
+     */
+    if ( ! empty( $option_set['actions'] ) ) {
+        foreach ( $option_set['actions'] as &$action ) {
+
+            if ( empty( $action['conditions'] ) ) {
+                continue;
+            }
+
+            foreach ( $action['conditions'] as &$condition ) {
+
+                if ( isset( $condition['value']['id'] ) && $condition['value']['id'] !== '' ) {
+                    continue;
+                }
+
+                $target_option_id = $condition['optionId']['id'] ?? null;
+                if ( ! $target_option_id ) {
+                    continue;
+                }
+
+                // Find corresponding option
+                $target_option = null;
+                foreach ( $option_set['options'] as $opt ) {
+                    if ( $opt['id'] === $target_option_id ) {
+                        $target_option = $opt;
+                        break;
+                    }
+                }
+                if ( ! $target_option ) {
+                    continue;
+                }
+
+                $original_value = $condition['value'];
+                $value_list     = $normalize_value( $original_value );
+
+                $mapped_list = array();
+
+                foreach ( $value_list as $item ) {
+                    $current_value = $item['value'] ?? null;
+
+                    if ( ! $current_value ) {
+                        $mapped_list[] = $item;
+                        continue;
+                    }
+
+                    $found = false;
+                    foreach ( $target_option['optionValues'] as $ov ) {
+                        if ( $ov['value'] === $current_value ) {
+                            $mapped_list[] = array(
+                                'id'    => $ov['id'],
+                                'value' => $ov['value'],
+                                'label' => $item['label'] ?? $ov['value'],
+                            );
+                            $has_changed = true;
+                            $found       = true;
+                            break;
+                        }
+                    }
+
+                    if ( ! $found ) {
+                        $mapped_list[] = $item;
+                    }
+                }
+
+                $cond_type = $condition['type']['value'] ?? null;
+                if ( in_array( $cond_type, $force_array_types, true ) ) {
+                    $condition['value'] = $mapped_list;
+                } else {
+                    $condition['value'] = ( count( $mapped_list ) === 1 ) ? $mapped_list[0] : $mapped_list;
+                }
+            }
+        }
+    }
+
+    return array(
+        'data'        => $option_set,
+        'has_changed' => $has_changed,
+    );
+}
+
+    /**
      * Ajax get option set by id.
      *
@@ -130 +359 @@
             $id         = sanitize_text_field( wp_unslash( isset( $_POST['id'] ) ? $_POST['id'] : null ) );
             $option_set = CustomPostType::get_option_set( $id );
-
+            //migrate option set data
+            $migrated_option_value_id = $this->migrate_option_value_id( $option_set );
+            $option_set = $migrated_option_value_id['data'];
+
+            if ( $migrated_option_value_id['has_changed'] ) {
+                update_post_meta( $id, '_yaye_options', $option_set['options'] );
+            }
+
+            $migrated_logics_actions = $this->migrate_option_set_logic_value( $option_set );
+            $option_set = $migrated_logics_actions['data'];
+
+            if ( $migrated_logics_actions['has_changed'] ) {
+                update_post_meta( $id, '_yaye_options', $option_set['options'] );
+                update_post_meta( $id, '_yaye_actions', $option_set['actions'] );
+            }
+            
+            
+            //get products
             $filters = get_post_meta( $id, '_yaye_products', true );
 
@@ -271 +517 @@
                 }
 
+                $data = array_reverse( $data );
                 foreach ( $data as $option_set ) {
                     /**
@@ -591 +838 @@
         }
     }
+
+    public function update_reviewed_flag() {
+        try {
+            Utils::check_nonce();
+            update_option( 'yaye_reviewed_flag', true );
+            wp_send_json_success( 'success', 200 );
+        } catch ( \Exception $ex ) {
+            wp_send_json_error( array( 'msg' => $ex->getMessage() ) );
+        } catch ( \Error $err ) {
+            wp_send_json_error( array( 'msg' => $err->getMessage() ) );
+        }
+    }
 }

yayextra/trunk/includes/Init/CustomPostType.php

@@ -55 +55 @@
 
     /**
-     * Get list option set with params or get all without params.
+     * Get all option sets.
+     *
+     * @param int $option_set_id Option set id.
+     * @param string $search Search keyword.
+     *
+     * @return array
+     */
+    protected static function get_all_option_sets( $option_set_id = 0, $search = '' ) {
+        $args = array(
+            'posts_per_page' => -1,
+            'post_type'      => 'yaye_option_set',
+            'post_status'    => 'publish',
+            'order'          => 'DESC',
+            'orderby'        => array(
+                'date' => 'DESC',
+                'ID'   => 'DESC',
+            ),
+        );
+
+        if ( ! empty( $option_set_id ) ) {
+            $args['p'] = $option_set_id;
+        } else {
+            $args['meta_query'] = array(
+                array(
+                    'key'     => '_yaye_name',
+                    'value'   => $search,
+                    'compare' => 'LIKE',
+                ),
+            );
+        }
+
+        $option_sets = get_posts( $args );
+        return $option_sets;
+    }
+
+    /**
+     * Get paginated option sets.
+     *
+     * @param int $limit Limit of option sets.
+     * @param int $page Page number.
+     * @param int $option_set_id Option set id.
+     * @param string $search Search keyword.
+     *
+     * @return array
+     */
+    protected static function get_paginated_option_sets( $limit = 10, $page = 1, $option_set_id = 0, $search = '' ) {
+        $args = array(
+            'posts_per_page' => $limit,
+            'paged'          => $page,
+            'post_type'      => 'yaye_option_set',
+            'post_status'    => 'publish',
+            'order'          => 'DESC',
+            'orderby'        => array(
+                'date' => 'DESC',
+                'ID'   => 'DESC',
+            ),
+        );
+
+        if ( ! empty( $option_set_id ) ) {
+            $args['p'] = $option_set_id;
+        } else {
+            $args['meta_query'] = array(
+                array(
+                    'key'     => '_yaye_name',
+                    'value'   => $search,
+                    'compare' => 'LIKE',
+                ),
+            );
+        }
+
+        $option_sets = get_posts( $args );
+        return $option_sets;
+    }
+
+
+    /**
+     * Get list option set with pagination or get all without pagination.
      *
      * @param array   $params filter information.
-     * @param boolean $force_all  Allow get all option sets.
+     * @param boolean $force_all Allow get all option sets.
      *
      * @return array
      */
     public static function get_list_option_set( $params = array(), $force_all = false ) {
-        global $wpdb;
-
-        $search = ! empty( $params['search'] ) ? $params['search'] : ''; // Option set name
-        $option_set_id = ! empty( $params['option_set_id'] ) && is_numeric( $params['option_set_id'] ) ? (int) $params['option_set_id'] : 0; // Option set ID
-        $limit = ! empty( $params['page_size'] ) && is_numeric( $params['page_size'] ) ? (int) $params['page_size'] : 10;
-        $page = ! empty( $params['current'] ) && is_numeric( $params['current'] ) ? (int) $params['current'] : 1;
-
-        // Build query components
-        $base_where = "p.post_type = 'yaye_option_set' AND p.post_status = 'publish'";
-        
-        // Handle search by ID
-        if ( ! empty( $option_set_id ) ) {
-            $join_clause = '';
-            $search_where = " AND p.ID = %d";
-            $search_params = array( $option_set_id );
-        } else {
-            // Handle search by name (existing functionality)
-            $join_clause = ! empty( $search ) ? " INNER JOIN {$wpdb->prefix}postmeta pm ON p.ID = pm.post_id" : '';
-            $search_where = ! empty( $search ) ? " AND pm.meta_key = '_yaye_name' AND pm.meta_value LIKE %s" : '';
-            $search_params = ! empty( $search ) ? array( '%' . $wpdb->esc_like( $search ) . '%' ) : array();
-        }
+        $search        = ! empty( $params['search'] ) ? $params['search'] : '';
+        $option_set_id = ! empty( $params['option_set_id'] ) && is_numeric( $params['option_set_id'] ) ? (int) $params['option_set_id'] : 0;
+        $limit         = ! empty( $params['page_size'] ) && is_numeric( $params['page_size'] ) ? (int) $params['page_size'] : 10;
+        $page          = ! empty( $params['current'] ) && is_numeric( $params['current'] ) ? (int) $params['current'] : 1;
 
         // Get total count
-        $count_query = "SELECT COUNT(DISTINCT p.ID) FROM {$wpdb->prefix}posts p{$join_clause} WHERE {$base_where}{$search_where}";
-        $total_items = ! empty( $search_params ) ? $wpdb->get_var( $wpdb->prepare( $count_query, $search_params ) ) : $wpdb->get_var( $count_query );
-
-        // Handle force_all case
+        $option_sets = self::get_all_option_sets();
+        $total_items = count( $option_sets );
+
         if ( $force_all ) {
-            $all_query = "SELECT DISTINCT p.* FROM {$wpdb->prefix}posts p{$join_clause} WHERE {$base_where}{$search_where} ORDER BY p.post_date DESC";
-            return ! empty( $search_params ) ? $wpdb->get_results( $wpdb->prepare( $all_query, $search_params ) ) : $wpdb->get_results( $all_query );
-        }
-
-        // Get paginated results
-        $offset = ( $page - 1 ) * $limit;
-        $query = "SELECT DISTINCT p.* FROM {$wpdb->prefix}posts p{$join_clause} WHERE {$base_where}{$search_where} ORDER BY p.post_date DESC LIMIT %d OFFSET %d";
-        $final_params = array_merge( $search_params, array( $limit, $offset ) );
-        $query_result = $wpdb->get_results( $wpdb->prepare( $query, $final_params ) );
-        // Build option set list
+            return $option_sets;
+        }
+
+        // Get paginated data
+        $option_sets_paginated = self::get_paginated_option_sets( $limit, $page, $option_set_id, $search );
+
         $option_set_list = array();
-        if ( ! empty( $query_result ) ) {
-            foreach ( $query_result as $post ) {
+        if ( ! empty( $option_sets_paginated ) ) {
+            foreach ( $option_sets_paginated as $post ) {
                 $option_set_list[] = self::build_option_set_data( $post->ID );
             }
@@ -151 +205 @@
      */
     public static function get_option_set( $option_set_id ) {
+
         return self::build_option_set_data( $option_set_id, true );
+        
     }
 
@@ -233 +289 @@
             update_post_meta( $insert_id, '_yaye_name', 'Sample Option Set' );
             update_post_meta( $insert_id, '_yaye_description', 'Sample description' );
-            update_post_meta( $insert_id, '_yaye_status', 0 );
+            update_post_meta( $insert_id, '_yaye_status', 1 );
             update_post_meta( $insert_id, '_yaye_options', array() );
             update_post_meta( $insert_id, '_yaye_actions', array() );
@@ -240 +296 @@
                 '_yaye_products',
                 array(
-                    'product_filter_type'          => 1, // 1 : one by one (default), 2 : by conditions,
+                    'product_filter_type'          => 3, // 1 : one by one, 2 : by conditions, 3 : all products,
                     'product_filter_one_by_one'    => array(),
                     'product_filter_by_conditions' => array(
@@ -318 +374 @@
             }
 
-            update_post_meta( $insert_id, '_yaye_name', $option_set_org['name'] );
+            $clone_name = $option_set_org['name'] . '_Copy';
+            update_post_meta( $insert_id, '_yaye_name', $clone_name );
             update_post_meta( $insert_id, '_yaye_description', $option_set_org['description'] );
             update_post_meta( $insert_id, '_yaye_status', $option_set_org['status'] );

yayextra/trunk/includes/Init/Settings.php

@@ -7 +7 @@
 use YayExtra\Classes\ProductPage;
 use YayExtra\Helper\Utils;
-
+use YayExtra\Utils\SingletonTrait;
+use YayExtra\Register\ScriptName;
 defined( 'ABSPATH' ) || exit;
 /**
@@ -16 +17 @@
 class Settings {
 
-    /**
-     * Single instance of class
-     *
-     * @var Settings
-     */
-    protected static $_instance = null;
-
-    /**
-     * Function ensure only one instance created
-     *
-     * @return Settings
-     */
-    public static function get_instance() {
-        if ( is_null( self::$_instance ) ) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * Constructor
-     *
-     * @return void
-     */
+    use SingletonTrait;
+
     private function __construct() {
         if ( ! function_exists( 'WC' ) ) {
@@ -48 +27 @@
         add_action(
             'before_woocommerce_init',
-            function() {
+            function () {
                 if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
                     \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', YAYE_PLUGIN_FILE, true );
@@ -54 +33 @@
             }
         );
-
+        add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
         add_action( 'admin_menu', array( $this, 'admin_menu' ), YAYE_MENU_PRIORITY );
         add_filter( 'plugin_action_links_' . YAYE_BASENAME, array( $this, 'plugin_action_links' ) );
@@ -68 +47 @@
     }
 
+    public function admin_body_class( $classes ) {
+        if ( strpos( $classes, 'yay-ui' ) === false ) {
+            $classes .= ' yay-ui';
+        }
+        return $classes;
+    }
     /**
      * Call back for admin_menu action
@@ -115 +100 @@
         $current_screen = get_current_screen();
         if ( 'yaycommerce_page_yayextra' === $current_screen->id ) {
-
-            // Enqueue react bundle.
-            wp_enqueue_script( YAYE_PREFIX, YAYE_URL . 'assets/dist/js/main.bundle.js', array( 'wp-blocks', 'wp-i18n', 'wp-element', 'wp-editor', 'wp-components', 'wc-components' ), YAYE_VERSION, true );
-            wp_enqueue_style( YAYE_PREFIX, YAYE_URL . 'assets/dist/css/main.css', array( 'wp-components', 'wc-components' ), YAYE_VERSION );
-
             // Enqueue script for wp.media .
             wp_enqueue_media();
@@ -139 +119 @@
             $option_set_id_list = $this->get_option_set_id_list();
 
+            wp_enqueue_script( ScriptName::PAGE_SETTINGS );
+            wp_enqueue_style( ScriptName::STYLE_SETTINGS );
+            wp_enqueue_style( 'yayextra-css', YAYE_URL . 'assets/css/yayextra.css', array(), YAYE_VERSION );
+
             // Localize script for react.
             wp_localize_script(
-                YAYE_PREFIX,
+                ScriptName::PAGE_SETTINGS, //YAYE_PREFIX,
                 'yaye_data',
                 array(
@@ -148 +132 @@
                     'ajax_url'          => admin_url( 'admin-ajax.php' ),
                     'nonce'             => wp_create_nonce( 'yaye_nonce' ),
-                    'image_url'         => YAYE_URL . '/assets/dist/images/',
+                    'plugin_url'        => YAYE_URL,
                     'site_url'          => YAYE_SITE_URL,
                     'default_image_url' => \wc_placeholder_img_src(),
@@ -156 +140 @@
                     'mine_types'        => Utils::get_mime_types(),
                     'size_allow'        => size_format( wp_max_upload_size() ),
+                    'rest_url'          => esc_url_raw( rest_url() ),
+                    'rest_nonce'        => wp_create_nonce( 'wp_rest' ),
+                    'rest_base'         => 'yayextra/v1',
+                    'settings'          => get_option( 'yaye_settings' ),
+                    'reviewed'          => get_option( 'yaye_reviewed_flag' ),
+                    'currency'          => html_entity_decode( get_woocommerce_currency_symbol() ),
                 )
             );
+
         }
     }
@@ -264 +255 @@
                         'value' => 400,
                     ),
+                    'subtotal_price_font_size'   => '16',
+                    'subtotal_price_font_weight' => array(
+                        'label' => '400',
+                        'value' => 400,
+                    ),
                     // 'total_price_color'       => '#6d6d6d',
                 ),
@@ -326 +322 @@
                     'width'                    => '38',
                     'height'                   => '38',
-                    'border_width'             => '0',
-                    'border_color'             => '#43454b',
+                    'border_width'             => '2',
+                    'border_color'             => '#f5f5f5',
                     'border_style'             => array(
                         'label' => 'Solid',
@@ -333 +329 @@
                     ),
                     'selected_border_width'    => '2',
-                    'selected_border_color'    => '#43454b',
+                    'selected_border_color'    => '#333333',
                     'selected_border_style'    => array(
                         'label' => 'Solid',
@@ -342 +338 @@
                         'value' => 'bottom',
                     ),
-                    'tooltip_background_color' => '#555',
+                    'tooltip_background_color' => '##333333',
                     'tooltip_text_color'       => '#fff',
+                    'corner_radius'            => '3',
                 ),
                 'button'   => array(
@@ -352 +349 @@
                         'value' => 'solid',
                     ),
-                    'border_color'              => '#bcbcbc',
+                    'border_color'              => '#e4e4e7',
                     'background_color'          => '#fff',
-                    'text_color'                => '#6d6d6d',
+                    'text_color'                => '##333333',
                     // 'hover_styling'             => false,
-                    // 'hover_border_color'        => '#333333',
-                    // 'hover_background_color'    => '#fff',
-                    // 'hover_text_color'          => '#6d6d6d',
+                    'hover_border_color'        => '#333333',
+                    'hover_background_color'    => '#fff',
+                    'hover_text_color'          => '#333333',
                     'selected_border_color'     => '#333333',
                     'selected_background_color' => '#333333',
@@ -366 +363 @@
                         'value' => 'bottom',
                     ),
-                    'tooltip_background_color'  => '#555',
+                    'tooltip_background_color'  => '#333333',
                     'tooltip_text_color'        => '#fff',
                 ),
@@ -397 +394 @@
 
     }
-
 }

yayextra/trunk/includes/Templates/button_field.php

@@ -82 +82 @@
         $id_opt        = $data['id'] . (string) $index;
         $addition_cost = 0;
+        $addition_cost_original = 0;
         if ( ! empty( $opt['additionalCost'] ) && ! empty( $opt['additionalCost']['isEnabled'] ) ) {
             $cost_type = $opt['additionalCost']['costType']['value'];
             if ( 'fixed' === $cost_type ) {
                 $addition_cost = Utils::get_price_from_currency_plugin( floatval( $opt['additionalCost']['value'] ) );
+                $addition_cost_original = floatval( $opt['additionalCost']['value'] );
             } else {
                 if ( isset( $params['product_price'] ) && is_numeric( $params['product_price'] ) ) {
                     $addition_cost = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price'] ) / 100;
+                    $addition_cost_original = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price_original'] ) / 100;
                 }
             }
@@ -95 +98 @@
         if ( ! empty( $general_settings['show_additional_price'] ) && ! empty( $addition_cost ) ) {
             if ( isset($cost_type) && 'percentage' === $cost_type ) {
-                $tooltip = '<strong class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . $addition_cost . '" data-option-org-cost="' . floatval( $opt['additionalCost']['value'] ) . '">' . $opt['value'] . ' ( + ' . wc_price( $addition_cost ) . ' )</strong>';
+                $tooltip = '<strong class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . esc_attr( $addition_cost ) . '" data-option-org-val="' . floatval( esc_attr( $opt['additionalCost']['value'] ) ) . '">' . esc_attr( $opt['value'] ) . ' ( + ' . wc_price( esc_attr( $addition_cost ) ) . ' )</strong>';
             } else {
-                $tooltip = '<strong>' . $opt['value'] . ' ( + ' . wc_price( $addition_cost ) . ' )</strong>';
+                $tooltip = '<strong>' . esc_attr( $opt['value'] ) . ' ( + ' . wc_price( esc_attr( $addition_cost ) ) . ' )</strong>';
             }
         } else {
-            $tooltip = '<strong>' . $opt['value'] . '</strong>';
+            $tooltip = '<strong>' . esc_attr( $opt['value'] ) . '</strong>';
         }
 
         echo '<div class="yayextra-opt-button yayextra-tooltip">';
-        echo '<input id="' . esc_attr( $id_opt ) . '" name="option_field_data[' . esc_attr( $opt_set_id ) . '][' . esc_attr( $data['id'] ) . '][]" type="checkbox" data-opt-id="' . esc_attr( $data['id'] ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( ! empty( $checked_results ) && in_array( $opt['value'], $checked_results, true ) ? 'checked' : '' ) . ' class="yayextra-option-button" style="display:none">';
+        echo '<input id="' . esc_attr( $id_opt ) . '" name="option_field_data[' . esc_attr( $opt_set_id ) . '][' . esc_attr( $data['id'] ) . '][]" type="checkbox" data-opt-id="' . esc_attr( $data['id'] ) . '" data-option-org-cost="' . esc_attr( $addition_cost_original ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( ! empty( $checked_results ) && in_array( $opt['value'], $checked_results, true ) ? 'checked' : '' ) . ' class="yayextra-option-button" style="display:none">';
         echo '<label class="yayextra-option-field-label yayextra-tooltip-wrap yayextra-option-button-label ' . esc_attr( $class_names ) . '">' . wp_kses_post( $opt['value'] ) . '</label>';
         echo '<span class="yayextra-tooltiptext ' . esc_attr( $tooltip_possition_class ) . '">' . wp_kses_post( $tooltip ) . '</span>';

yayextra/trunk/includes/Templates/checkbox_field.php

@@ -82 +82 @@
 
         $addition_cost = 0;
+        $addition_cost_original = 0;
         if ( ! empty( $opt['additionalCost'] ) && ! empty( $opt['additionalCost']['isEnabled'] ) ) {
             $cost_type = $opt['additionalCost']['costType']['value'];
             if ( 'fixed' === $cost_type ) {
                 $addition_cost = Utils::get_price_from_currency_plugin( floatval( $opt['additionalCost']['value'] ) );
+                $addition_cost_original = floatval( $opt['additionalCost']['value'] );
             } else {
                 if ( isset( $params['product_price'] ) && is_numeric( $params['product_price'] ) ) {
                     $addition_cost = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price'] ) / 100;
+                    $addition_cost_original = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price_original'] ) / 100;
                 }
             }
@@ -95 +98 @@
         if ( ! empty( $general_settings['show_additional_price'] ) && ! empty( $addition_cost ) ) {
             if ( isset($cost_type) && 'percentage' === $cost_type ) {
-                $label = '<span class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . $addition_cost . '" data-option-org-cost="' . floatval( $opt['additionalCost']['value'] ) . '">' . $opt['value'] . ' ( + ' . wc_price( $addition_cost ) . ' ) </span>';
+                $label = '<span class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . esc_attr($addition_cost) . '" data-option-org-val="' . floatval( esc_attr( $opt['additionalCost']['value'] ) ) . '">' . esc_attr( $opt['value'] ) . ' ( + ' . wc_price( esc_attr($addition_cost) ) . ' ) </span>';
             } else {
-                $label = $opt['value'] . ' ( + ' . wc_price( $addition_cost ) . ' )';
+                $label = esc_attr( $opt['value'] ) . ' ( + ' . wc_price( esc_attr( $addition_cost ) ) . ' )';
             }
         } else {
-            $label = $opt['value'];
+            $label = esc_attr( $opt['value'] );
         }
 
@@ -109 +112 @@
 
         echo '<div class="">';
-        echo '<span class=""><input id="' . esc_attr( $id_opt ) . '" class="' . esc_attr( $class_names ) . '" type="checkbox" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( ! empty( $checked_results ) && in_array( $opt['value'], $checked_results, true ) ? 'checked' : '' ) . ' name="option_field_data[' . esc_attr( $opt_set_id ) . '][' . esc_attr( $data['id'] ) . '][]"></span>';
+        echo '<span class=""><input id="' . esc_attr( $id_opt ) . '" class="' . esc_attr( $class_names ) . '" type="checkbox" data-option-org-cost="' . esc_attr( $addition_cost_original ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( ! empty( $checked_results ) && in_array( $opt['value'], $checked_results, true ) ? 'checked' : '' ) . ' name="option_field_data[' . esc_attr( $opt_set_id ) . '][' . esc_attr( $data['id'] ) . '][]"></span>';
         echo '<label class="yayextra-option-field-label" for="' . esc_attr( $id_opt ) . '">' . wp_kses_post( $label ) . '</label>';
         if ( ! empty( $addition_description ) ) {

yayextra/trunk/includes/Templates/dropdown_field.php

@@ -37 +37 @@
 
     if ( '' !== $placeholder_value ) {
-        echo '<option data-addition-cost="0" value="" >' . wp_kses_post( $placeholder_value ) . '</option>';
+        echo '<option data-addition-cost="0" data-option-org-cost="0" value="" >' . wp_kses_post( $placeholder_value ) . '</option>';
     } else {
-        echo '<option data-addition-cost="0" value="" >' . esc_html__( 'Select your option', 'yayextra' ) . '</option>';
+        echo '<option data-addition-cost="0" data-option-org-cost="0" value="" >' . esc_html__( 'Select your option', 'yayextra' ) . '</option>';
     }
 
@@ -79 +79 @@
 
         $addition_cost = 0;
+        $addition_cost_original = 0;
         if ( ! empty( $opt['additionalCost'] ) && ! empty( $opt['additionalCost']['isEnabled'] ) ) {
             $cost_type = $opt['additionalCost']['costType']['value'];
             if ( 'fixed' === $cost_type ) {
                 $addition_cost = Utils::get_price_from_currency_plugin( floatval( $opt['additionalCost']['value'] ) );
+                $addition_cost_original = floatval( $opt['additionalCost']['value'] );
             } else {
                 if ( isset( $params['product_price'] ) && is_numeric( $params['product_price'] ) ) {
                     $addition_cost = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price'] ) / 100;
+                    $addition_cost_original = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price_original'] ) / 100;
                 }
             }
@@ -91 +94 @@
 
         if ( ! empty( $general_settings['show_additional_price'] ) && ! empty( $addition_cost ) ) {
-            $label = $opt['value'] . ' ( + ' . wc_price( $addition_cost ) . ' )';
+            $label = $opt['value'] . ' ( + ' . wc_price( esc_attr( $addition_cost ) ) . ' )';
 
             if ( isset($cost_type) && 'percentage' === $cost_type ) {
-                echo '<option class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . esc_attr( $addition_cost ) . '" data-option-org-cost="' . floatval( $opt['additionalCost']['value'] ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( $is_selected ? 'selected' : '' ) . '>' . wp_kses_post( $label ) . '</option>';
+                echo '<option class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . esc_attr( $addition_cost ) . '" data-option-org-val="' . floatval( esc_attr( $opt['additionalCost']['value'] ) ) . '" data-option-org-cost="' . floatval( esc_attr( $addition_cost_original ) ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( $is_selected ? 'selected' : '' ) . '>' . wp_kses_post( $label ) . '</option>';
             } else {
-                echo '<option data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( $is_selected ? 'selected' : '' ) . '>' . wp_kses_post( $label ) . '</option>';
+                echo '<option data-option-org-cost="' . floatval( esc_attr( $addition_cost_original ) ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( $is_selected ? 'selected' : '' ) . '>' . wp_kses_post( $label ) . '</option>';
             }
             
         } else {
             $label = $opt['value'];
-            echo '<option data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( $is_selected ? 'selected' : '' ) . '>' . wp_kses_post( $label ) . '</option>';
+            echo '<option data-option-org-cost="' . floatval( esc_attr( $addition_cost_original ) ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( $is_selected ? 'selected' : '' ) . '>' . wp_kses_post( $label ) . '</option>';
         }
     }

yayextra/trunk/includes/Templates/radio_field.php

@@ -40 +40 @@
 
         $addition_cost = 0;
+        $addition_cost_original = 0;
         if ( ! empty( $opt['additionalCost'] ) && ! empty( $opt['additionalCost']['isEnabled'] ) ) {
             $cost_type = $opt['additionalCost']['costType']['value'];
             if ( 'fixed' === $cost_type ) {
                 $addition_cost = Utils::get_price_from_currency_plugin( floatval( $opt['additionalCost']['value'] ) );
+                $addition_cost_original = floatval( $opt['additionalCost']['value'] );
             } else {
                 if ( isset( $params['product_price'] ) && is_numeric( $params['product_price'] ) ) {
                     $addition_cost = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price'] ) / 100;
+                    $addition_cost_original = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price_original'] ) / 100;
                 }
             }
@@ -53 +56 @@
         if ( ! empty( $general_settings['show_additional_price'] ) && ! empty( $addition_cost ) ) {
             if ( isset($cost_type) && 'percentage' === $cost_type ) {
-                $label = '<span class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . $addition_cost . '" data-option-org-cost="' . floatval( $opt['additionalCost']['value'] ) . '">' . $opt['value'] . ' ( + ' . wc_price( $addition_cost ) . ' ) </span>';
+                $label = '<span class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . esc_attr($addition_cost) . '" data-option-org-val="' . floatval( esc_attr( $opt['additionalCost']['value'] ) ) . '">' . esc_attr( $opt['value'] ) . ' ( + ' . wc_price( esc_attr($addition_cost) ) . ' ) </span>';
             } else {
-                $label = $opt['value'] . ' ( + ' . wc_price( $addition_cost ) . ' )';
+                $label = esc_attr( $opt['value'] ) . ' ( + ' . wc_price( esc_attr( $addition_cost ) ) . ' )';
             }
         } else {
-            $label = $opt['value'];
+            $label = esc_attr( $opt['value'] );
         }
 
@@ -97 +100 @@
 
         echo '<div class="">';
-        echo '<span class=""><input id="' . esc_attr( $id_opt ) . '" name="option_field_data[' . esc_attr( $opt_set_id ) . '][' . esc_attr( $data['id'] ) . ']" class="' . esc_attr( $class_names ) . '" type="radio" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( $is_checked ? 'checked' : '' ) . esc_attr( $is_required ? ' required ' : '' ) . '></span>';
+        echo '<span class=""><input id="' . esc_attr( $id_opt ) . '" name="option_field_data[' . esc_attr( $opt_set_id ) . '][' . esc_attr( $data['id'] ) . ']" class="' . esc_attr( $class_names ) . '" type="radio" data-option-org-cost="' . esc_attr( $addition_cost_original ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( $is_checked ? 'checked' : '' ) . esc_attr( $is_required ? ' required ' : '' ) . '></span>';
         echo '<label class="yayextra-option-field-label" for="' . esc_attr( $id_opt ) . '">' . wp_kses_post( $label ) . '</label>';
         if ( ! empty( $addition_description ) ) {

yayextra/trunk/includes/Templates/swatches_field.php

@@ -102 +102 @@
         $id_opt        = $data['id'] . (string) $index;
         $addition_cost = 0;
+        $addition_cost_original = 0;
         if ( ! empty( $opt['additionalCost'] ) && ! empty( $opt['additionalCost']['isEnabled'] ) ) {
             $cost_type = $opt['additionalCost']['costType']['value'];
             if ( 'fixed' === $cost_type ) {
                 $addition_cost = Utils::get_price_from_currency_plugin( floatval( $opt['additionalCost']['value'] ) );
+                $addition_cost_original = floatval( $opt['additionalCost']['value'] );
             } else {
                 if ( isset( $params['product_price'] ) && is_numeric( $params['product_price'] ) ) {
                     $addition_cost = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price'] ) / 100;
+                    $addition_cost_original = floatval( $opt['additionalCost']['value'] ) * floatval( $params['product_price_original'] ) / 100;
                 }
             }
@@ -115 +118 @@
         if ( ! empty( $general_settings['show_additional_price'] ) && ! empty( $addition_cost ) ) {
             if ( isset($cost_type) && 'percentage' === $cost_type ) {
-                $tooltip = '<strong class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . $addition_cost . '" data-option-org-cost="' . floatval( $opt['additionalCost']['value'] ) . '">' . $opt['value'] . ' ( + ' . wc_price( $addition_cost ) . ' )</strong>';
+                $tooltip = '<strong class="option-addition-percentage-cost" data-opt-val-id="' . esc_attr( $id_opt ) . '" data-option-org-cost-token-replace="' . esc_attr( $addition_cost ) . '" data-option-org-val="' . floatval( esc_attr( $opt['additionalCost']['value'] ) ) . '">' . esc_attr( $opt['value'] ) . ' ( + ' . wc_price( esc_attr( $addition_cost ) ) . ' )</strong>';
             } else {
-                $tooltip = '<strong>' . $opt['value'] . ' ( + ' . wc_price( $addition_cost ) . ' )</strong>';
+                $tooltip = '<strong>' . esc_attr( $opt['value'] ) . ' ( + ' . wc_price( esc_attr( $addition_cost ) ) . ' )</strong>';
             }
         } else {
-            $tooltip = '<strong>' . $opt['value'] . '</strong>';
+            $tooltip = '<strong>' . esc_attr( $opt['value'] ) . '</strong>';
         }
 
         echo '<div class="yayextra-opt-swatches yayextra-tooltip">';
-          echo '<input id="' . esc_attr( $id_opt ) . '" name="option_field_data[' . esc_attr( $opt_set_id ) . '][' . esc_attr( $data['id'] ) . '][]" type="checkbox" data-optset-id="' . esc_attr( $opt_set_id ) . '" data-opt-id="' . esc_attr( $data['id'] ) . '" data-opt-img="' . esc_attr( $opt['imageUrl'] ) . '" data-product-img="' . esc_attr( $product_image[0] ) . '" data-product-id="' . esc_attr( $product_id ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( ! empty( $checked_results ) && in_array( $opt['value'], $checked_results, true ) ? 'checked' : '' ) . ' style="display:none">';
+          echo '<input id="' . esc_attr( $id_opt ) . '" name="option_field_data[' . esc_attr( $opt_set_id ) . '][' . esc_attr( $data['id'] ) . '][]" type="checkbox" data-optset-id="' . esc_attr( $opt_set_id ) . '" data-opt-id="' . esc_attr( $data['id'] ) . '" data-opt-img="' . esc_attr( $opt['imageUrl'] ) . '" data-product-img="' . esc_attr( $product_image[0] ) . '" data-product-id="' . esc_attr( $product_id ) . '" data-option-org-cost="' . esc_attr( $addition_cost_original ) . '" data-addition-cost="' . esc_attr( $addition_cost ) . '" value="' . esc_attr( $opt['value'] ) . '"' . ( ! empty( $checked_results ) && in_array( $opt['value'], $checked_results, true ) ? 'checked' : '' ) . ' style="display:none">';
         if ( 'image' === $opt['swatchesType'] && ! empty( $opt['imageUrl'] ) ) {
             echo '<div class="yayextra-option-field-swatches-label yayextra-tooltip-wrap yayextra-option-field-swatches-label-image ' . esc_attr( $class_swatches_shape ) . ' ' . esc_attr( $class_names ) . '" style="background-image: url(' . esc_attr( $opt['imageUrl'] ) . ')"></div>';

yayextra/trunk/includes/YayCommerceMenu/OtherPluginsMenu.php

@@ -164 +164 @@
 
     public static function get_other_plugins() {
-        return array(
-            'filebird'          => array(
-                'slug'              => 'filebird',
-                'name'              => 'FileBird - WordPress Media Library Folders & File Manager',
-                'short_description' => 'Organize thousands of WordPress media files in folders / categories at ease.',
-                'icon'              => 'https://ps.w.org/filebird/assets/icon-128x128.gif?rev=2299145',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/filebird.zip',
-                'type'              => array( 'featured' ),
-                'version'           => 0,
-            ),
-            'yaymail'           => array(
-                'slug'              => 'yaymail',
-                'name'              => 'YayMail - WooCommerce Email Customizer',
-                'short_description' => 'Customize WooCommerce email templates with live preview & drag and drop email builder.',
-                'icon'              => 'https://ps.w.org/yaymail/assets/icon-256x256.gif?rev=2599198',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/yaymail.zip',
-                'type'              => array( 'featured', 'woocommerce' ),
-                'version'           => 0,
-            ),
-            'yaycurrency'       => array(
-                'slug'              => 'yaycurrency',
-                'name'              => 'YayCurrency - WooCommerce Multi-Currency Switcher',
-                'short_description' => 'WooCommerce Multi-Currency made easy, powerful, and flexible.',
-                'icon'              => 'https://ps.w.org/yaycurrency/assets/icon-256x256.png?rev=2550570',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/yaycurrency.zip',
-                'type'              => array( 'featured', 'woocommerce' ),
-                'version'           => 0,
-            ),
-            'yayswatches'       => array(
-                'slug'              => 'yayswatches',
-                'name'              => 'YaySwatches - Variation Swatches for WooCommerce',
-                'short_description' => 'Optimize your variable product showcase with color swatches, image swatches, custom images, buttons, and more!',
-                'icon'              => 'https://ps.w.org/yayswatches/assets/icon-256x256.png?rev=2757155',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/yayswatches.zip',
-                'type'              => array( 'woocommerce' ),
-                'version'           => 0,
-            ),
-            'yayextra'          => array(
-                'slug'              => 'yayextra',
-                'name'              => 'YayExtra - WooCommerce Extra Product Options',
-                'short_description' => 'Add WooCommerce product options like personal engraving, print-on-demand items, gifts, custom canvas prints, and personalized products.',
-                'icon'              => 'https://ps.w.org/yayextra/assets/icon-256x256.png?rev=2776349',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/yayextra.zip',
-                'type'              => array( 'woocommerce' ),
-                'version'           => 0,
-            ),
-            'yaypricing'        => array(
-                'slug'              => 'yaypricing',
-                'name'              => 'YayPricing - WooCommerce Dynamic Pricing & Discounts',
-                'short_description' => 'Offer automatic pricing and discounts to design a powerful marketing strategy for your WooCommerce store.',
-                'icon'              => 'https://yaycommerce.com/wp-content/uploads/2022/11/yaypricing-256x256-1.png',
-                'download_link'     => 'https://yaycommerce.com/yaypricing-woocommerce-dynamic-pricing-and-discounts/',
-                'type'              => array( 'woocommerce' ),
-                'version'           => 0,
-            ),
-            'yaysmtp'           => array(
-                'slug'              => 'yaysmtp',
-                'name'              => 'YaySMTP - Simple WP SMTP Mail',
-                'short_description' => 'Send WordPress emails successfully with WP Mail SMTP via your favorite Mailer.',
-                'icon'              => 'https://ps.w.org/yaysmtp/assets/icon-256x256.png?rev=2437984',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/yaysmtp.zip',
-                'type'              => array( 'featured', 'marketing' ),
-                'version'           => 0,
-            ),
-            'wp-whatsapp'       => array(
-                'slug'              => 'wp-whatsapp',
-                'name'              => 'WP Chat App',
-                'short_description' => 'Integrate WhatsApp experience directly into your WordPress website.',
-                'icon'              => 'https://ps.w.org/wp-whatsapp/assets/icon-256x256.png?rev=2725670',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/wp-whatsapp.zip',
-                'type'              => array( 'featured' ),
-                'version'           => 0,
-            ),
-            'filester'          => array(
-                'slug'              => 'filester',
-                'name'              => 'Filester - File Manager Pro',
-                'short_description' => 'Best WordPress file manager without FTP access. Clean design. No need to upgrade because this…',
-                'icon'              => 'https://ps.w.org/filester/assets/icon-256x256.gif?rev=2305540',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/filester.zip',
-                'type'              => array( 'management' ),
-                'version'           => 0,
-            ),
-            'cf7-multi-step'    => array(
-                'slug'              => 'cf7-multi-step',
-                'name'              => 'Multi Step for Contact Form 7',
-                'short_description' => 'Break your looooooong form into user-friendly steps.',
-                'icon'              => 'https://ps.w.org/cf7-multi-step/assets/icon-256x256.png?rev=1994366',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/cf7-multi-step.zip',
-                'type'              => array( 'management' ),
-                'version'           => 0,
-            ),
-            'cf7-database'      => array(
-                'slug'              => 'cf7-database',
-                'name'              => 'Database for Contact Form 7',
-                'short_description' => 'Automatically save all data submitted via Contact Form 7 to your database.',
-                'icon'              => 'https://ps.w.org/cf7-database/assets/icon-128x128.png?rev=1614091',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/cf7-database.zip',
-                'type'              => array( 'management' ),
-                'version'           => 0,
-            ),
-            'wp-duplicate-page' => array(
-                'slug'              => 'wp-duplicate-page',
-                'name'              => 'WP Duplicate Page',
-                'short_description' => 'Clone WordPress page, post, custom post types.',
-                'icon'              => 'https://ps.w.org/wp-duplicate-page/assets/icon-256x256.gif?rev=2432962',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/wp-duplicate-page.zip',
-                'type'              => array( 'management' ),
-                'version'           => 0,
-            ),
-            'notibar'           => array(
-                'slug'              => 'notibar',
-                'name'              => 'Notibar - Notification Bar for WordPress',
-                'short_description' => 'Customizer for sticky header, notification bar, alert, promo code, marketing campaign, top banner.',
-                'icon'              => 'https://ps.w.org/notibar/assets/icon-256x256.png?rev=2387855',
-                'download_link'     => 'https://downloads.wordpress.org/plugin/notibar.zip',
-                'type'              => array( 'marketing' ),
-                'version'           => 0,
-            ),
-            'yayreviews'        => [
+        return [
+            'filebird'                  => [
+                'slug'              => 'filebird',
+                'name'              => 'FileBird - WordPress Media Library Folders & File Manager',
+                'short_description' => 'Organize thousands of WordPress media files in folders / categories at ease.',
+                'icon'              => 'https://ps.w.org/filebird/assets/icon-128x128.gif',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/filebird.zip',
+                'type'              => [ 'featured' ],
+                'version'           => 0,
+            ],
+            'yaymail'                   => [
+                'slug'              => 'yaymail',
+                'name'              => 'YayMail - WooCommerce Email Customizer',
+                'short_description' => 'Customize WooCommerce email templates with live preview & drag and drop email builder.',
+                'icon'              => 'https://ps.w.org/yaymail/assets/icon-256x256.gif',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/yaymail.zip',
+                'type'              => [ 'featured', 'woocommerce' ],
+                'version'           => 0,
+            ],
+            'yaycurrency'               => [
+                'slug'              => 'yaycurrency',
+                'name'              => 'YayCurrency - WooCommerce Multi-Currency Switcher',
+                'short_description' => 'WooCommerce Multi-Currency made easy, powerful, and flexible.',
+                'icon'              => 'https://ps.w.org/yaycurrency/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/yaycurrency.zip',
+                'type'              => [ 'featured', 'woocommerce' ],
+                'version'           => 0,
+            ],
+            'yayswatches'               => [
+                'slug'              => 'yayswatches',
+                'name'              => 'YaySwatches - Variation Swatches for WooCommerce',
+                'short_description' => 'Optimize your variable product showcase with color swatches, image swatches, custom images, buttons, and more!',
+                'icon'              => 'https://ps.w.org/yayswatches/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/yayswatches.zip',
+                'type'              => [ 'woocommerce' ],
+                'version'           => 0,
+            ],
+            'yayextra'                  => [
+                'slug'              => 'yayextra',
+                'name'              => 'YayExtra - WooCommerce Extra Product Options',
+                'short_description' => 'Add WooCommerce product options like personal engraving, print-on-demand items, gifts, custom canvas prints, and personalized products.',
+                'icon'              => 'https://ps.w.org/yayextra/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/yayextra.zip',
+                'type'              => [ 'woocommerce' ],
+                'version'           => 0,
+            ],
+            'yaypricing'                => [
+                'slug'              => 'yaypricing',
+                'name'              => 'YayPricing - WooCommerce Dynamic Pricing & Discounts',
+                'short_description' => 'Offer automatic pricing and discounts to design a powerful marketing strategy for your WooCommerce store.',
+                'icon'              => 'https://ps.w.org/yaypricing/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/yaypricing.zip',
+                'type'              => [ 'woocommerce' ],
+                'version'           => 0,
+            ],
+            'yaysmtp'                   => [
+                'slug'              => 'yaysmtp',
+                'name'              => 'YaySMTP - Simple WP SMTP Mail',
+                'short_description' => 'Send WordPress emails successfully with WP Mail SMTP via your favorite Mailer.',
+                'icon'              => 'https://ps.w.org/yaysmtp/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/yaysmtp.zip',
+                'type'              => [ 'featured', 'marketing' ],
+                'version'           => 0,
+            ],
+            'yayreviews'                => [
                 'slug'              => 'yay-customer-reviews-woocommerce',
                 'name'              => 'YayReviews – Advanced Customer Reviews for WooCommerce',
-                'short_description' => 'Collect more customer reviews through automated reminders and rewards.',
-                'icon'              => 'https://ps.w.org/yay-customer-reviews-woocommerce/assets/icon-256x256.png?rev=3340109',
+                'short_description' => 'YayReviews helps online stores collect, manage, and display authentic customer feedback.',
+                'icon'              => 'https://ps.w.org/yay-customer-reviews-woocommerce/assets/icon-256x256.png',
                 'download_link'     => 'https://downloads.wordpress.org/plugin/yay-customer-reviews-woocommerce.zip',
-                'type'              => [ 'woocommerce' ],
-                'version'           => 0,
-            ],
-        );
-    }
+                'type'              => [ 'featured', 'woocommerce' ],
+                'version'           => 0,
+            ],
+            'yay-wholesale-b2b'         => [
+                'slug'              => 'yay-wholesale-b2b',
+                'name'              => 'Yay Wholesale B2B for WooCommerce',
+                'short_description' => 'Yay Wholesale & B2B for WooCommerce is a powerful plugin that allows you to sell your products to wholesale customers and businesses.',
+                'icon'              => 'https://ps.w.org/yay-wholesale-b2b/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/yay-wholesale-b2b.zip',
+                'type'              => [ 'featured', 'woocommerce' ],
+                'version'           => 0,
+            ],
+            'yayboost-sales-booster-for-woocommerce' => [
+                'slug'              => 'yayboost-sales-booster-for-woocommerce',
+                'name'              => 'YayBoost – Sales Booster for WooCommerce',
+                'short_description' => 'Boost conversions with smart sales triggers',
+                'icon'              => 'https://ps.w.org/yayboost-sales-booster-for-woocommerce/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/yayboost-sales-booster-for-woocommerce.zip',
+                'type'              => [ 'featured', 'woocommerce' ],
+                'version'           => 0,
+            ],
+            'wp-whatsapp'               => [
+                'slug'              => 'wp-whatsapp',
+                'name'              => 'WP Chat App',
+                'short_description' => 'Integrate WhatsApp experience directly into your WordPress website.',
+                'icon'              => 'https://ps.w.org/wp-whatsapp/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/wp-whatsapp.zip',
+                'type'              => [ 'featured' ],
+                'version'           => 0,
+            ],
+            'filebird-document-library' => [
+                'slug'              => 'filebird-document-library',
+                'name'              => 'FileBird Document Library',
+                'short_description' => 'Create and publish document galleries using Gutenberg and FileBird folders.',
+                'icon'              => 'https://ps.w.org/filebird-document-library/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/filebird-document-library.zip',
+                'url'               => 'https://wordpress.org/plugins/filebird-document-library/',
+                'type'              => [ 'management' ],
+                'version'           => 0,
+            ],
+            'filester'                  => [
+                'slug'              => 'filester',
+                'name'              => 'Filester - File Manager Pro',
+                'short_description' => 'Best WordPress file manager without FTP access. Clean design. No need to upgrade because this…',
+                'icon'              => 'https://ps.w.org/filester/assets/icon-256x256.gif',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/filester.zip',
+                'type'              => [ 'management' ],
+                'version'           => 0,
+            ],
+            'cf7-multi-step'            => [
+                'slug'              => 'cf7-multi-step',
+                'name'              => 'Multi Step for Contact Form 7',
+                'short_description' => 'Break your looooooong form into user-friendly steps.',
+                'icon'              => 'https://ps.w.org/cf7-multi-step/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/cf7-multi-step.zip',
+                'type'              => [ 'management' ],
+                'version'           => 0,
+            ],
+            'cf7-database'              => [
+                'slug'              => 'cf7-database',
+                'name'              => 'Database for Contact Form 7',
+                'short_description' => 'Automatically save all data submitted via Contact Form 7 to your database.',
+                'icon'              => 'https://ps.w.org/cf7-database/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/cf7-database.zip',
+                'type'              => [ 'management' ],
+                'version'           => 0,
+            ],
+            'wp-duplicate-page'         => [
+                'slug'              => 'wp-duplicate-page',
+                'name'              => 'WP Duplicate Page',
+                'short_description' => 'Clone WordPress page, post, custom post types.',
+                'icon'              => 'https://ps.w.org/wp-duplicate-page/assets/icon-256x256.gif',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/wp-duplicate-page.zip',
+                'type'              => [ 'management' ],
+                'version'           => 0,
+            ],
+            'notibar'                   => [
+                'slug'              => 'notibar',
+                'name'              => 'Notibar - Notification Bar for WordPress',
+                'short_description' => 'Customizer for sticky header, notification bar, alert, promo code, marketing campaign, top banner.',
+                'icon'              => 'https://ps.w.org/notibar/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/notibar.zip',
+                'type'              => [ 'marketing' ],
+                'version'           => 0,
+            ],
+            'fastdup'                   => [
+                'slug'              => 'fastdup',
+                'name'              => 'FastDup – Fastest WordPress Migration & Duplicator',
+                'short_description' => 'Backup and migrate your WordPress sites.',
+                'icon'              => 'https://ps.w.org/fastdup/assets/icon-256x256.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/fastdup.zip',
+                'url'               => 'https://wordpress.org/plugins/fastdup/',
+                'version'           => 0,
+                'type'              => [ 'management' ],
+            ],
+            'ninja-gdpr-compliance'     => [
+                'slug'              => 'ninja-gdpr-compliance',
+                'name'              => 'GDPR CCPA Compliance & Cookie Consent Banner',
+                'short_description' => 'Protect personal user data and privacy of EU citizens.',
+                'icon'              => 'https://ps.w.org/ninja-gdpr-compliance/assets/icon-128x128.png',
+                'download_link'     => 'https://downloads.wordpress.org/plugin/ninja-gdpr-compliance.zip',
+                'url'               => 'https://wordpress.org/plugins/ninja-gdpr-compliance/',
+                'type'              => [ 'management' ],
+                'version'           => 0,
+            ],
+        ];
+    }
 
     public function yay_recommended_get_plugin_data() {
@@ -499 +547 @@
     public function check_pro_version_exists( $pluginDetail ) {
         $existProVer = false;
-        $allPlugin   = get_plugins();
+        $allPlugins   = get_plugins();
         if ( 'filebird' === $pluginDetail['slug'] ) {
-            $existProVer = array_key_exists( 'filebird-pro/filebird.php', $allPlugin ) === true ? 'filebird-pro/filebird.php' : false;
+            $existProVer = array_key_exists( 'filebird-pro/filebird.php', $allPlugins ) === true ? 'filebird-pro/filebird.php' : false;
         }
         if ( 'yaymail' === $pluginDetail['slug'] ) {
-            if ( array_key_exists( 'yaymail-pro/yaymail.php', $allPlugin ) ) {
+            if ( array_key_exists( 'yaymail-pro/yaymail.php', $allPlugins ) ) {
                 $existProVer = 'yaymail-pro/yaymail.php';
-            } elseif ( array_key_exists( 'email-customizer-for-woocommerce/yaymail.php', $allPlugin ) ) {
+            } elseif ( array_key_exists( 'email-customizer-for-woocommerce/yaymail.php', $allPlugins ) ) {
                 $existProVer = 'email-customizer-for-woocommerce/yaymail.php';
             }
         }
         if ( 'yaycurrency' === $pluginDetail['slug'] ) {
-            if ( array_key_exists( 'yaycurrency-pro/yay-currency.php', $allPlugin ) ) {
+            if ( array_key_exists( 'yaycurrency-pro/yay-currency.php', $allPlugins ) ) {
                 $existProVer = 'yaycurrency-pro/yay-currency.php';
-            } elseif ( array_key_exists( 'multi-currency-switcher/yay-currency.php', $allPlugin ) ) {
+            } elseif ( array_key_exists( 'multi-currency-switcher/yay-currency.php', $allPlugins ) ) {
                 $existProVer = 'multi-currency-switcher/yay-currency.php';
             }
         }
         if ( 'yaysmtp' === $pluginDetail['slug'] ) {
-            $existProVer = array_key_exists( 'yaysmtp-pro/yay-smtp.php', $allPlugin ) === true ? 'yaysmtp-pro/yay-smtp.php' : false;
+            $existProVer = array_key_exists( 'yaysmtp-pro/yay-smtp.php', $allPlugins ) === true ? 'yaysmtp-pro/yay-smtp.php' : false;
         }
         if ( 'yayswatches' === $pluginDetail['slug'] ) {
-            $existProVer = array_key_exists( 'yayswatches-pro/yay-swatches.php', $allPlugin ) === true ? 'yayswatches-pro/yay-swatches.php' : false;
+            $existProVer = array_key_exists( 'yayswatches-pro/yay-swatches.php', $allPlugins ) === true ? 'yayswatches-pro/yay-swatches.php' : false;
         }
         if ( 'yayextra' === $pluginDetail['slug'] ) {
-            $existProVer = array_key_exists( 'yayextra-pro/yayextra.php', $allPlugin ) === true ? 'yayextra-pro/yayextra.php' : false;
+            $existProVer = array_key_exists( 'yayextra-pro/yayextra.php', $allPlugins ) === true ? 'yayextra-pro/yayextra.php' : false;
         }
         if ( 'yaypricing' === $pluginDetail['slug'] ) {
-            $existProVer = array_key_exists( 'yaypricing-pro/yaypricing.php', $allPlugin ) === true ? 'yaypricing-pro/yaypricing.php' : false;
+            if ( array_key_exists( 'yaypricing-pro/yaypricing.php', $allPlugins ) ) {
+                $existProVer = 'yaypricing-pro/yaypricing.php';
+            } elseif ( array_key_exists( 'dynamic-pricing-discounts/yaypricing.php', $allPlugins ) ) {
+                $existProVer = 'dynamic-pricing-discounts/yaypricing.php';
+            }
+        }
+        if ( 'yay-customer-reviews-woocommerce' === $pluginDetail['slug'] ) {
+            if ( array_key_exists( 'yayreviews-pro/yay-customer-reviews-woocommerce.php', $allPlugins ) ) {
+                $existProVer = 'yayreviews-pro/yay-customer-reviews-woocommerce.php';
+            }
+        }
+        if ( 'yay-wholesale-b2b' === $pluginDetail['slug'] ) {
+            if ( array_key_exists( 'yay-wholesale-b2b-pro/yay-wholesale-b2b.php', $allPlugins ) ) {
+                $existProVer = 'yay-wholesale-b2b-pro/yay-wholesale-b2b.php';
+            }
         }
         if ( 'cf7-multi-step' === $pluginDetail['slug'] ) {
-            $existProVer = array_key_exists( 'contact-form-7-multi-step-pro/contact-form-7-multi-step.php', $allPlugin ) === true ? 'contact-form-7-multi-step-pro/contact-form-7-multi-step.php' : false;
+            $existProVer = array_key_exists( 'contact-form-7-multi-step-pro/contact-form-7-multi-step.php', $allPlugins ) === true ? 'contact-form-7-multi-step-pro/contact-form-7-multi-step.php' : false;
         }
         if ( 'cf7-database' === $pluginDetail['slug'] ) {
-            $existProVer = array_key_exists( 'contact-form-7-database-pro/cf7-database.php', $allPlugin ) === true ? 'contact-form-7-database-pro/cf7-database.php' : false;
+            $existProVer = array_key_exists( 'contact-form-7-database-pro/cf7-database.php', $allPlugins ) === true ? 'contact-form-7-database-pro/cf7-database.php' : false;
         }
         if ( 'wp-whatsapp' === $pluginDetail['slug'] ) {
-            $existProVer = array_key_exists( 'whatsapp-for-wordpress/whatsapp.php', $allPlugin ) === true ? 'whatsapp-for-wordpress/whatsapp.php' : false;
-        }
-        if ( 'yay-customer-reviews-woocommerce' === $pluginDetail['slug'] ) {
-            if ( array_key_exists( 'yayreviews-pro/yay-customer-reviews-woocommerce.php', $allPlugin ) ) {
-                $existProVer = 'yayreviews-pro/yay-customer-reviews-woocommerce.php';
-            } elseif ( array_key_exists( 'yay-customer-reviews-woocommerce/yay-customer-reviews-woocommerce.php', $allPlugin ) ) {
-                $existProVer = 'yay-customer-reviews-woocommerce/yay-customer-reviews-woocommerce.php';
-            } elseif ( array_key_exists( 'yayreviews/yay-customer-reviews-woocommerce.php', $allPlugin ) ) {
-                $existProVer = 'yayreviews/yay-customer-reviews-woocommerce.php';
+            $existProVer = array_key_exists( 'whatsapp-for-wordpress/whatsapp.php', $allPlugins ) === true ? 'whatsapp-for-wordpress/whatsapp.php' : false;
+        }
+        if ( 'yayboost-sales-booster-for-woocommerce' === $pluginDetail['slug'] ) {
+            if ( array_key_exists( 'yayboost-pro/yayboost-sales-booster-for-woocommerce.php', $allPlugins ) ) {
+                $existProVer = 'yayboost-pro/yayboost-sales-booster-for-woocommerce.php';
             }
         }

yayextra/trunk/includes/YayCommerceMenu/RegisterMenu.php

@@ -74 +74 @@
 
     public function get_submenus() {
-        $submenus['yaycommerce-help'] = array(
-            'parent'             => 'yaycommerce',
-            'name'               => __( 'Help', 'yaycommerce' ),
-            'capability'         => 'manage_options',
-            'render_callback'    => false,
-            'load_data_callback' => false,
-        );
-
-        /**
-         * Temporarily until all Yay plugins has the same code
-         */
-        if ( function_exists( 'YAYDP\\load_plugin' ) && class_exists( '\YAYDP\License\License_Handler' ) ) {
-            $licensing_plugins_yay_pricing = \YAYDP\License\License_Handler::get_licensing_plugins();
-        }
-
-        if ( function_exists( 'YayMail\\plugin_init' ) && class_exists( '\YayMail\License\LicenseHandler' ) ) {
-            $licensing_plugins_yay_mail = \YayMail\License\LicenseHandler::get_licensing_plugins();
-        }
-        
-        if ( function_exists( 'Yay_Swatches\\init' ) && class_exists( '\Yay_Swatches\License\LicenseHandler' ) ) {
-            $licensing_plugins_yay_swatches = \Yay_Swatches\License\LicenseHandler::get_licensing_plugins();
-        }
-
-        if ( function_exists( 'YaySMTP\\init' ) && class_exists( '\YaySMTP\License\LicenseHandler' ) ) {
-            $licensing_plugins_yay_smtp = \YaySMTP\License\LicenseHandler::get_licensing_plugins();
-        }
-
-        if ( function_exists( 'Yay_Currency\\plugin_init' ) && class_exists( '\Yay_Currency\License\LicenseHandler' ) ) {
-            $licensing_plugins_yay_currency = \Yay_Currency\License\LicenseHandler::get_licensing_plugins();
-        }
-        /** -------- */
-
-        $yay_licensing_plugins = apply_filters( 'yaycommerce_licensing_plugins', [] );
-
-        if ( ! empty( $licensing_plugins_yay_mail ) || ! empty( $licensing_plugins_yay_pricing ) || ! empty( $licensing_plugins_yay_swatches ) || ! empty( $licensing_plugins_yay_smtp ) || ! empty( $licensing_plugins_yay_currency ) || ! empty( $yay_licensing_plugins ) ) {
-            $submenus['yaycommerce-licenses'] = array(
+        return array(
+            // 'yaycommerce'     => array(
+            //  'parent'             => 'yaycommerce',
+            //  'name'               => __( 'Dashboard', 'yaycommerce' ),
+            //  'capability'         => 'manage_options',
+            //  'render_callback'    => false,
+            //  'load_data_callback' => false,
+            //  'position'           => 0,
+            // ),
+            'yaycommerce-help'          => array(
+                'parent'             => 'yaycommerce',
+                'name'               => __( 'Help', 'yaycommerce' ),
+                'capability'         => 'manage_options',
+                'render_callback'    => false,
+                'load_data_callback' => false,
+            ),
+            'yaycommerce-licenses'      => array(
                 'parent'             => 'yaycommerce',
                 'name'               => __( 'Licenses', 'yaycommerce' ),
@@ -115 +96 @@
                 'render_callback'    => array( '\YayExtra\YayCommerceMenu\LicensesMenu', 'render' ),
                 'load_data_callback' => array( '\YayExtra\YayCommerceMenu\LicensesMenu', 'load_data' ),
-            );
-        }
-
-        $submenus['yaycommerce-other-plugins'] = array(
-            'parent'             => 'yaycommerce',
-            'name'               => __( 'Other plugins', 'yaycommerce' ),
-            'capability'         => 'manage_options',
-            'render_callback'    => array( '\YayExtra\YayCommerceMenu\OtherPluginsMenu', 'render' ),
-            'load_data_callback' => array( '\YayExtra\YayCommerceMenu\OtherPluginsMenu', 'load_data' ),
+            ),
+            'yaycommerce-other-plugins' => array(
+                'parent'             => 'yaycommerce',
+                'name'               => __( 'Other plugins', 'yaycommerce' ),
+                'capability'         => 'manage_options',
+                'render_callback'    => array( '\YayExtra\YayCommerceMenu\OtherPluginsMenu', 'render' ),
+                'load_data_callback' => array( '\YayExtra\YayCommerceMenu\OtherPluginsMenu', 'load_data' ),
+            ),
         );
-
-        return $submenus;
     }
 

yayextra/trunk/includes/YayCommerceMenu/views/other-plugins-content.php

@@ -1 +1 @@
 <?php
+defined( 'ABSPATH' ) || exit;
 
 $pluginsAllowedTags = array(
@@ -45 +46 @@
         $pluginProVer = $this->check_pro_version_exists( $recommendedPlugin );
         if ( false === $pluginProVer ) {
-            if ( 'yaypricing' === $recommendedPlugin['slug'] ) {
-                $installStatus = array(
-                    'status'  => 'install',
-                    'url'     => $recommendedPlugin['download_link'],
-                    'version' => '',
-                    'file'    => $pluginProVer,
-                );
-            } else {
-                $installStatus = \install_plugin_install_status( $recommendedPlugin );
-            }
+            $installStatus = \install_plugin_install_status( $recommendedPlugin );
         } else {
             $installStatus = array(
@@ -68 +60 @@
                 if ( $installStatus['url'] ) {
                     if ( $compatible_php && $compatible_wp ) {
-                        if ( 'yaypricing' === $recommendedPlugin['slug'] ) {
-                            $actionLinks[] = sprintf(
-                                '<a href="%s" target="_bank"><button class="button button-primary" data-install-url="%s" aria-label="%s">%s</button></a>',
-                                esc_attr( $downloadLink ),
-                                esc_attr( $downloadLink ),
-                                /* translators: %s: Plugin name and version. */
-                                esc_attr( sprintf( _x( 'Install %s now', 'plugin', 'ninjateam-whatsapp' ), $name ) ),
-                                __( 'Install Now', 'ninjateam-whatsapp' )
-                            );
-                        } else {
-                            $actionLinks[] = sprintf(
-                                '<button class="install-now button button-primary" data-install-url="%s" aria-label="%s">%s</button>',
-                                esc_attr( $downloadLink ),
-                                /* translators: %s: Plugin name and version. */
-                                esc_attr( sprintf( _x( 'Install %s now', 'plugin', 'ninjateam-whatsapp' ), $name ) ),
-                                __( 'Install Now', 'ninjateam-whatsapp' )
-                            );
-                        }
+                        $actionLinks[] = sprintf(
+                            '<button class="install-now button button-primary" data-install-url="%s" aria-label="%s">%s</button>',
+                            esc_attr( $downloadLink ),
+                            /* translators: %s: Plugin name and version. */
+                            esc_attr( sprintf( _x( 'Install %s now', 'plugin', 'ninjateam-whatsapp' ), $name ) ),
+                            __( 'Install Now', 'ninjateam-whatsapp' )
+                        );
                     } else {
                         $actionLinks[] = sprintf(
@@ -99 +80 @@
                 if ( $installStatus['url'] ) {
                     if ( $compatible_php && $compatible_wp ) {
-                        if ( 'yaypricing' === $recommendedPlugin['slug'] ) {
-                            $actionLinks[] = sprintf(
-                                '<button class="button aria-button-if-js" data-plugin="%s" data-slug="%s" data-update-url="%s" aria-label="%s" data-name="%s">%s</button>',
-                                esc_attr( $installStatus['file'] ),
-                                esc_attr( $recommendedPlugin['slug'] ),
-                                esc_url( $installStatus['url'] ),
-                                /* translators: %s: Plugin name and version. */
-                                esc_attr( sprintf( _x( 'Update %s now', 'plugin', 'ninjateam-whatsapp' ), $name ) ),
-                                esc_attr( $name ),
-                                __( 'Update Now', 'ninjateam-whatsapp' )
-                            );
-                        } else {
-                            $actionLinks[] = sprintf(
-                                '<button class="update-now button aria-button-if-js" data-plugin="%s" data-slug="%s" data-update-url="%s" aria-label="%s" data-name="%s">%s</button>',
-                                esc_attr( $installStatus['file'] ),
-                                esc_attr( $recommendedPlugin['slug'] ),
-                                esc_url( $installStatus['url'] ),
-                                /* translators: %s: Plugin name and version. */
-                                esc_attr( sprintf( _x( 'Update %s now', 'plugin', 'ninjateam-whatsapp' ), $name ) ),
-                                esc_attr( $name ),
-                                __( 'Update Now', 'ninjateam-whatsapp' )
-                            );
-                        }
+                        $actionLinks[] = sprintf(
+                            '<button class="update-now button aria-button-if-js" data-plugin="%s" data-slug="%s" data-update-url="%s" aria-label="%s" data-name="%s">%s</button>',
+                            esc_attr( $installStatus['file'] ),
+                            esc_attr( $recommendedPlugin['slug'] ),
+                            esc_url( $installStatus['url'] ),
+                            /* translators: %s: Plugin name and version. */
+                            esc_attr( sprintf( _x( 'Update %s now', 'plugin', 'ninjateam-whatsapp' ), $name ) ),
+                            esc_attr( $name ),
+                            __( 'Update Now', 'ninjateam-whatsapp' )
+                        );
                     } else {
                         $actionLinks[] = sprintf(

yayextra/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 5.3
 Tested up to: 6.9
-Stable tag: 1.5.6.1
+Stable tag: 2.0.0
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
@@ -25 +25 @@
 - Improve product pages and increase order value
 
-👉 Check it out: [**YayExtra Pro**](https://yaycommerce.com/yayextra-woocommerce-extra-product-options/) 👀
+👉 Check it out: [**YayExtra - Woo Product Options Pro**](https://yaycommerce.com/yayextra-woocommerce-extra-product-options/) 👀
 
 **Works great for selling:**
@@ -38 +38 @@
 Build better product pages. Offer more choices. Sell more with YayExtra.
 
+📌 [Quick Demo](https://demo.yaycommerce.com/yayextra/product/t-shirt/) | [Admin Test Drive](https://demo.yaycommerce.com/try-yayextra)
+
 [youtube https://youtu.be/qytEac2_Yr0]
 
-[Free vs Pro](https://docs.yaycommerce.com/yayextra/why-upgrade) | [Quick Demo](https://demo.yaycommerce.com/yayextra/product/t-shirt/)
+Why Upgrade? Check it here: [Free vs Pro](https://docs.yaycommerce.com/yayextra/why-upgrade)
 
 ###⚡️ FEATURES
@@ -125 +127 @@
 
 == Changelog ==
+
+= Mar 13, 2026 - Version 2.0.0 =
+- Updated: Admin UI/UX
+- Added: Swatch and Button style settings in Customize [Pro version only]
+- Added: Typography settings for Subtotal price in Customize
+- Added: “All products” option for Product selection
+- Added: Limit selections for Button (Multi) & Checkbox types [Pro version only]
+- Added: Mime type selection for File Upload [Pro version only]
+- Added: Description field for types without Option values [Pro version only]
+- Added: hooks for total_price_text and subtotal_text
+- Added: display link and stock status for Linked Product [Pro version only]
+- Improved: WC tested up to 10.6.1
 
 = Oct 24, 2025 - Version 1.5.6.1 =

yayextra/trunk/yayextra.php

@@ -4 +4 @@
  * Plugin URI: https://yaycommerce.com/yayextra-woocommerce-extra-product-options
  * Description: Offer extra options like personal engraving, print-on-demand items, gifts, custom canvas prints, and personalized products.
- * Version: 1.5.6.1
+ * Version: 2.0.0
  * Author: YayCommerce
  * Author URI: https://yaycommerce.com
  * Text Domain: yayextra
  * WC requires at least: 3.0.0
- * WC tested up to: 10.3.0
+ * WC tested up to: 10.6.1
  * Domain Path: /i18n/languages/
  */
@@ -16 +16 @@
 
 use YayExtra\Init\Settings;
+// use YayExtra\Integrations;
+use YayExtra\Register\RegisterFacade;
 
 defined( 'ABSPATH' ) || exit;
@@ -48 +50 @@
 
 if ( ! defined( 'YAYE_VERSION' ) ) {
-    define( 'YAYE_VERSION', '1.5.6.1' );
+    define( 'YAYE_VERSION', '2.0.0' );
 }
 
@@ -54 +56 @@
     define( 'YAYE_SITE_URL', site_url() );
 }
+
 
 require __DIR__ . '/autoloader.php';
@@ -67 +70 @@
         I18n::getInstance();
         Settings::get_instance();
+        // Integrations::get_instance();
+        // Register Facade
+        RegisterFacade::get_instance();
+
         add_action( 'admin_notices', 'YayExtra\\required_woocommerce_notice' );
     }