Changeset 2298752

Timestamp:

05/05/2020 07:03:53 PM (6 years ago)

Author:

patternsinthecloud

Message:

• Fixed: Updated to include the latest schedule-options.js file for the new Multi-Product page template support.

Location:

autoship-cloud/trunk

Files:

• autoship.php (modified) (2 diffs)
• js/schedule-options.js (modified) (7 diffs)
• readme.txt (modified) (2 diffs)
• src/products.php (modified) (1 diff)

autoship-cloud/trunk/autoship.php

@@ -4 +4 @@
 Plugin URI: https://autoship.cloud
 Description: Autoship Cloud for WooCommerce
-Version: 2.0.5
+Version: 2.0.6
 Author: Patterns In the Cloud LLC
 Author URI: https://qpilot.cloud
@@ -14 +14 @@
 */
 
-define( 'Autoship_Version', '2.0.5' );
+define( 'Autoship_Version', '2.0.6' );
 if ( ! defined( 'Autoship_Plugin_Dir' ) ) {
     define( 'Autoship_Plugin_Dir', __DIR__ );

autoship-cloud/trunk/js/schedule-options.js

@@ -157 +157 @@
        */
 
+      // Toggle Price
+      var togglePriceDisplay = function( $thisProduct, resetPrice ){
+
+        var priceInfo = priceData[ retrieveProductId( $thisProduct ) ];
+
+        if ( priceInfo != undefined )
+        displayCustomPrice( $thisProduct, priceInfo.customized_price_enabled && !resetPrice ? priceInfo.autoship_price : priceInfo.original_price, priceInfo.original_price_selector );
+
+      }
+
       // Displays the Custom Autoship Price HTML
       var displayCustomPrice = function ( $thisProduct, $priceHTML, $containerSelector ){
@@ -170 +180 @@
       var selectDisplay = function( $thisProduct, $autoshipOptions ){
 
-        if ( !selectFrequency( $thisProduct, $autoshipOptions ) )
-        return;
-
+        if ( selectFrequency( $thisProduct, $autoshipOptions ) )
         $autoshipOptions.find(window.autoshipTemplateData.frequencyCls).addClass('active');
-
-        var priceInfo = priceData[ retrieveProductId( $thisProduct ) ];
-
-        if ( priceInfo != undefined && priceInfo.customized_price_enabled )
-        displayCustomPrice( $thisProduct, priceInfo.autoship_price, priceInfo.original_price_selector );
 
       };
@@ -205 +208 @@
         $autoshipOptions.find(window.autoshipTemplateData.frequencyCls).removeClass('active');
 
-        var priceInfo = priceData[ retrieveProductId( $thisProduct ) ];
-
-        if ( priceInfo != undefined && priceInfo.customized_price_enabled )
-        displayCustomPrice( $thisProduct, priceInfo.original_price, priceInfo.original_price_selector );
-
       };
 
@@ -270 +268 @@
 
         var $autoshipOptions = $( variationForm ).find(window.autoshipTemplateData.optionsCls);
-        var $percentDiscount = $autoshipOptions.find(window.autoshipTemplateData.discountPriceCls);
-        var $discountedPrice = $autoshipOptions.find(window.autoshipTemplateData.checkoutPriceCls);
         var autoshipDataValues = autoshipData( variationId, variationForm );
 
         if ( autoshipDataValues ){
+
           initAutoshipData( variationForm, autoshipDataValues );
           setVariationId( variationForm, variationId );
+
+          // Retrigger the click on the yes to refresh html prices etc.
+          var $autoshipYesRadio = $autoshipOptions.find( window.autoshipTemplateData.yesBtn );
+          if ( $autoshipYesRadio.is(':checked') )
+          $autoshipYesRadio.trigger('click');
+
         } else {
           setVariationId( variationForm, 0 );
@@ -326 +329 @@
           var $thisProduct              = findProduct( e.target );
           var $autoshipOptions          = $thisProduct.find(window.autoshipTemplateData.optionsCls);
-          selectDisplay( $thisProduct, $autoshipOptions ); });
+          selectDisplay( $thisProduct, $autoshipOptions );
+          togglePriceDisplay( $thisProduct, false );});
         $autoshipOptions.find(window.autoshipTemplateData.noBtn).on( 'click' , function(e){
           var $thisProduct              = findProduct( e.target );
           var $autoshipOptions          = $thisProduct.find(window.autoshipTemplateData.optionsCls);
-          selectHide( $thisProduct, $autoshipOptions ); });
+          selectHide( $thisProduct, $autoshipOptions );
+          togglePriceDisplay( $thisProduct, true ); });
 
         $('body').on( 'reset_data', window.autoshipTemplateData.variationFormCls, function( e ){
@@ -407 +412 @@
 
         // Toggle the labels
-        toggleAutoshipLabels( $autoshipOptions, autoshipData.percent_discount !== 0 || autoshipData.recurring_percent_discount !== 0 );
+        toggleAutoshipLabels( $autoshipOptions, autoshipData.show_discount_str );
 
         $autoshipOptions.removeClass('hidden').removeClass('loading');
@@ -443 +448 @@
       $autoshipYesRadio.trigger('click');
 
-      $( $thisProduct ).trigger( "autoship_product_initialized", [ $thisProduct, $autoshipOptions, priceData, $autoshipNoRadio, $addToCartBtn ] );
-
     })
 

autoship-cloud/trunk/readme.txt

@@ -8 +8 @@
 WC tested up to: 4.0.1
 Requires PHP: 5.6
-Stable tag: 2.0.5
+Stable tag: 2.0.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -153 +153 @@
 
 == Changelog ==
+
+= 2.0.6 - 2020-05-05 =
+
+* Fixed: Updated to include the latest schedule-options.js file for the new Multi-Product page template support.
 
 = 2.0.5 - 2020-05-05 =

autoship-cloud/trunk/src/products.php

@@ -1010 +1010 @@
     // The Percent Discount for Recurring Orders
     'recurring_percent_discount'      => $recurring_percent_discount,
+
+    // Toggles the Discount String on the Product Pages
+    'show_discount_str'               => $percent_discount || $recurring_percent_discount,
 
     // If Add to Scheduled Order is endabled for the product