Changeset 2414647

Timestamp:

11/08/2020 06:12:32 AM (5 years ago)

Author:

jyotsnasingh520

Message:

tested for latest WP and new feature detail updated

Location:

advanced-free-flat-shipping-woocommerce/trunk

Files:

• README.txt (modified) (3 diffs)
• admin/class-extended-flat-rate-shipping-woocommerce-menu.php (modified) (1 diff)
• admin/selection_rules/rules/pro_rules.php (modified) (3 diffs)
• extended-flat-rate-shipping-woocommerce.php (modified) (4 diffs)

advanced-free-flat-shipping-woocommerce/trunk/README.txt

@@ -4 +4 @@
 Tags: conditional shipping, flexible shipping,  table rate, WooCommerce shipping, Shipping method, shipping,  Free shipping WooCommerce, Flat rate shipping, Advanced free shipping, Advanced flat shipping
 Requires at least: 3.0.1
-Tested up to: 5.5.1
+Tested up to: 5.5.3
 sLicense: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -33 +33 @@
     <li><strong>State-based shipping method</strong>: Assign different shipping method as per the State/County of your customer</li>
     <li><strong>Postcode/Zipcode based shipping method</strong>: If the user comes from a specific postcode, you can even assign rage of postcode like 9011...9090, this will assign the shipping method to all the customer whose postcode falls in 9011 to 9090</li>
+    <li><strong>City/town</strong>: offer a shipping method based on the city/town selected by the customer. this does a string comparison to do the matching as city is a text field in the WooCommerce checkout process</li>
     <li><strong>Zone-based shipping method</strong>: Assign different shipping method as per the Shipping zone of your customer</li>
-    <li><strong>Cart Sub Total (after discount) based shipping method</strong>: Some time the user add discount coupon so their subtotal reduces and if you want to consider those reduced total while deciding the shipping method you can do that using this rule</li>
+    <li><strong>Cart Sub Total (after discount) based shipping method</strong>: Some time the user add discount coupon so their subtotal reduces and if you want to consider those reduced total while deciding the shipping method you can do that using this rule (you have option to exclude virtual product from this total)</li>
     <li><strong>Weight-based shipping method</strong>: If your want to offer different shipping method based on the total weight of the product in the order or cart then you can do this using this rule, it calculates the total weight of the product in the cart and then based on the set value in the rule it assigns a shipping method</li>
     <li><strong>Product Width based shipping method</strong>: It finds the maximum width of the product in the cart and uses that as the width of the cart and compares with width value set by you in the rule and as per the logic set in the rule it assign a shipping method</li>
@@ -43 +44 @@
     <li><strong>Payment method based shipping method</strong>: Show a specific shipping method, if the user buys select a specific payment gateway, E.g: If you have a shipping method that also collects a payment, then you can show that shipping method when user select cash on the delivery payment method</li>
     <li><strong>User role-based shipping method</strong>: Using this you can assign a different shipping method as per the user role. E.g: you can offer a different shipping method to a registered customer and different shipping method to those who are doing a Guest checkout</li>
-    <li><strong>User city based method</strong>: You can offer method based on user city, it is string comparison</li>
+    <li><strong>User city based method</strong>: You can offer method based on user city, it is string comparison or city name</li>
+    <li><strong>Shipping class total</strong> this rule applies when customer has purchased an x amount of product from specific shipping class</li> 
+    <li><strong>Shipping class total quantity of product in cart</strong> this rule applies when customer has added x unit of product from a specific shipping class in his cart</li> 
 </ul>
 

advanced-free-flat-shipping-woocommerce/trunk/admin/class-extended-flat-rate-shipping-woocommerce-menu.php

@@ -105 +105 @@
                         <li class="border-top py-1 font-weight-light h6"><strong class="text-primary">Remove all other methods of this plugin</strong>, when a particular method is activated</li>
                         <li class="border-top py-1 font-weight-light h6"><strong class="text-primary">Remove all other methods of low priority of this plugin</strong>, when a particular method is activated</li>
+                        <li class="border-top py-1 font-weight-light h6"><strong class="text-primary">Shipping class total</strong> this rule applies when customer has purchased an x amount of product from specific shipping class</li> 
+                        <li class="border-top py-1 font-weight-light h6"><strong class="text-primary">Shipping class total quantity of product in cart</strong> this rule applies when customer has added x unit of product from a specific shipping class in his cart</li>
+                        <li class="border-top py-1 font-weight-light h6"><strong class="text-primary">User city based method</strong>: You can offer method based on user city, it is string comparison</li> 
                     </ul>
                         <a class="btn btn-light" href="<?php echo PI_EFRS_BUY_URL; ?>" target="_blank">Click to Buy Now</a>

advanced-free-flat-shipping-woocommerce/trunk/admin/selection_rules/rules/pro_rules.php

@@ -27 +27 @@
             'pro'=>true
         );
+        $rules['city'] = array(
+            'name'=>__('City/Town (Available in PRO Version)'),
+            'group'=>'location_related',
+            'condition'=>'zones',
+            'pro'=>true
+        );
         $rules['variable_product'] = array(
             'name'=>__('Cart has variable product (Available in PRO Version)'),
@@ -39 +45 @@
             'pro'=>true
         );
+        
         $rules['subtotal_after_discount'] = array(
             'name'=>__('Cart Subtotal (After Discount) (Available in PRO Version)'),
+            'group'=>'cart_related',
+            'condition'=>'subtotal_after_discount',
+            'pro'=>true
+        );
+
+        $rules['cart_subtotal_after_discount_exclude_virtual'] = array(
+            'name'=>__('Cart Subtotal (After Discount Excluding virtual product) (Available in PRO Version)'),
             'group'=>'cart_related',
             'condition'=>'subtotal_after_discount',
@@ -88 +102 @@
         );
 
+        $rules['shipping_class_total'] = array(
+            'name'=>__('Shipping class total (Available in PRO Version)'),
+            'group'=>'cart_related',
+            'condition'=>'shipping_class',
+            'pro'=>true
+        );
+
+        $rules['shipping_class_quantity'] = array(
+            'name'=>__('Shipping class total quantity in cart (Available in PRO Version)'),
+            'group'=>'cart_related',
+            'condition'=>'shipping_class',
+            'pro'=>true
+        );
+
         $rules['payment_method'] = array(
             'name'=>__('Payment Method (Available in PRO Version)'),

advanced-free-flat-shipping-woocommerce/trunk/extended-flat-rate-shipping-woocommerce.php

@@ -10 +10 @@
  *
  * @link              piwebsolution.com
- * @since             1.3.9
+ * @since             1.4.0
  * @package           Extended_Flat_Rate_Shipping_Woocommerce
  *
@@ -17 +17 @@
  * Plugin URI:        piwebsolution.com/advanced-free-flat-shipping-woocommerce
  * Description:       WooCommerce conditional shipping & WooCommerce Advanced Flat rate shipping plugin to Create Advanced Flat rate shipping or Free shipping method, with different advanced criteria to apply this shipping method
- * Version:           1.3.9
+ * Version:           1.4.0
  * Author:            PI Websolution
  * Author URI:        piwebsolution.com
@@ -61 +61 @@
 /**
  * Currently plugin version.
- * Start at version 1.3.9 and use SemVer - https://semver.org
+ * Start at version 1.4.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'EXTENDED_FLAT_RATE_SHIPPING_WOOCOMMERCE_VERSION', '1.3.9' );
+define( 'EXTENDED_FLAT_RATE_SHIPPING_WOOCOMMERCE_VERSION', '1.4.0' );
 define('PI_EFRS_BUY_URL', 'https://www.piwebsolution.com/cart/?add-to-cart=2804&variation_id=2810');
 define('PI_EFRS_PRICE', '$16');
@@ -127 +127 @@
  * not affect the page life cycle.
  *
- * @since    1.3.9
+ * @since    1.4.0
  */
 function run_extended_flat_rate_shipping_woocommerce() {