Discount Rules for WooCommerce - Version 2.1.1

Version Description

  • 17/08/20 =
  • Fix - Country and state field doesn't loads when have multiple
  • Fix - Warning while having BOGO rule.
  • Improvement - Versioning the script files.
Download this release

Release Info

Developer flycart
Plugin Icon 128x128 Discount Rules for WooCommerce
Version 2.1.1
Comparing to
See all releases

Code changes from version 2.1.0 to 2.1.1

Files changed (8) hide show
  1. i18n/languages/woo-discount-rules.pot +70 -66
  2. readme.txt +6 -1
  3. v2/App/Controllers/Admin/Settings.php +16 -15
  4. v2/App/Controllers/Admin/Tabs/GeneralSettings.php +1 -0
  5. v2/App/Controllers/ManageDiscount.php +3 -3
  6. v2/App/Helpers/Helper.php +2 -2
  7. v2/Assets/Js/admin_script.js +6 -2
  8. woo-discount-rules.php +2 -2
i18n/languages/woo-discount-rules.pot CHANGED
@@ -152,7 +152,7 @@ msgstr ""
152
  msgid "License key for the %s is not entered. %s, you can get it from %s"
153
  msgstr ""
154
 
155
- #: v1/helper/general-helper.php:48 v2/App/Controllers/Admin/Settings.php:307
156
  msgid "Guest"
157
  msgstr ""
158
 
@@ -273,7 +273,7 @@ msgstr ""
273
  #: v1/includes/advanced/free_shipping_method.php:73
274
  #: v1/includes/discount-base.php:1063 v1/view/cart-rules.php:133
275
  #: v1/view/pricing-rules.php:163 v1/view/settings_promotion.php:65
276
- #: v1/view/settings_promotion.php:100 v2/App/Controllers/Admin/Settings.php:417
277
  #: v2/App/Views/Admin/Tabs/DiscountRule.php:77
278
  msgid "Enable"
279
  msgstr ""
@@ -301,7 +301,7 @@ msgid "Failed to save"
301
  msgstr ""
302
 
303
  #: v1/includes/discount-base.php:203 v1/view/cart-rules.php:162
304
- #: v1/view/pricing-rules.php:192 v2/App/Controllers/Admin/Settings.php:416
305
  msgid "Active"
306
  msgstr ""
307
 
@@ -383,7 +383,7 @@ msgstr ""
383
 
384
  #: v1/includes/discount-base.php:1024 v1/view/view-pricing-rules.php:654
385
  #: v1/view/view-pricing-rules.php:657 v1/view/view-pricing-rules.php:677
386
- #: v2/App/Controllers/Admin/Settings.php:434
387
  msgid "Quantity"
388
  msgstr ""
389
 
@@ -412,7 +412,7 @@ msgid "Adjustment Type"
412
  msgstr ""
413
 
414
  #: v1/includes/discount-base.php:1030 v1/view/view-pricing-rules.php:954
415
- #: v2/App/Controllers/Admin/Settings.php:437
416
  msgid "Discount percentage"
417
  msgstr ""
418
 
@@ -559,7 +559,7 @@ msgid "Are you sure to remove this ?"
559
  msgstr ""
560
 
561
  #: v1/includes/discount-base.php:1064 v1/view/cart-rules.php:130
562
- #: v1/view/pricing-rules.php:160 v2/App/Controllers/Admin/Settings.php:415
563
  #: v2/App/Views/Admin/Tabs/DiscountRule.php:78
564
  msgid "Disable"
565
  msgstr ""
@@ -1430,7 +1430,7 @@ msgstr ""
1430
 
1431
  #: v1/view/includes/cart-menu.php:13 v1/view/includes/sub-menu.php:13
1432
  #: v1/view/template/discount-table.php:42 v1/view/view-cart-rules.php:756
1433
- #: v1/view/view-pricing-rules.php:708 v2/App/Controllers/Admin/Settings.php:442
1434
  #: v2/App/Views/Admin/Rules/Discounts/Bulk.php:59
1435
  #: v2/App/Views/Admin/Rules/Manage.php:192
1436
  msgid "Discount"
@@ -2599,97 +2599,101 @@ msgstr ""
2599
  msgid "Select Values"
2600
  msgstr ""
2601
 
2602
- #: v2/App/Controllers/Admin/Settings.php:418
 
 
 
 
2603
  #: v2/App/Views/Admin/Tabs/DiscountRule.php:294
2604
  msgid " - (Running)"
2605
  msgstr ""
2606
 
2607
- #: v2/App/Controllers/Admin/Settings.php:419
2608
  msgid "Oops!! something went wrong!"
2609
  msgstr ""
2610
 
2611
- #: v2/App/Controllers/Admin/Settings.php:420
2612
  msgid "Rule duplicated successfully!"
2613
  msgstr ""
2614
 
2615
- #: v2/App/Controllers/Admin/Settings.php:421
2616
  msgid "Rule deleted successfully!"
2617
  msgstr ""
2618
 
2619
- #: v2/App/Controllers/Admin/Settings.php:422
2620
  msgid "Are you sure want to delete this rule!"
2621
  msgstr ""
2622
 
2623
- #: v2/App/Controllers/Admin/Settings.php:423
2624
  msgid "Rule disabled successfully!"
2625
  msgstr ""
2626
 
2627
- #: v2/App/Controllers/Admin/Settings.php:424
2628
  msgid "Rule enabled successfully!"
2629
  msgstr ""
2630
 
2631
- #: v2/App/Controllers/Admin/Settings.php:425
2632
  msgid "Rule saved successfully!"
2633
  msgstr ""
2634
 
2635
- #: v2/App/Controllers/Admin/Settings.php:426
2636
  msgid "Settings saved successfully!"
2637
  msgstr ""
2638
 
2639
- #: v2/App/Controllers/Admin/Settings.php:427
2640
  msgid "Rule priority changed successfully!"
2641
  msgstr ""
2642
 
2643
- #: v2/App/Controllers/Admin/Settings.php:428
2644
  msgid "Rule priority not changed !"
2645
  msgstr ""
2646
 
2647
- #: v2/App/Controllers/Admin/Settings.php:429
2648
  msgid "No data for this period"
2649
  msgstr ""
2650
 
2651
- #: v2/App/Controllers/Admin/Settings.php:430
2652
  msgid "Oops! Coupon already exists in Woocommerce"
2653
  msgstr ""
2654
 
2655
- #: v2/App/Controllers/Admin/Settings.php:431
2656
  msgid "Copied!"
2657
  msgstr ""
2658
 
2659
- #: v2/App/Controllers/Admin/Settings.php:432
2660
  #: v2/App/Views/Admin/Tabs/settings.php:496
2661
  msgid "Copy ShortCode"
2662
  msgstr ""
2663
 
2664
- #: v2/App/Controllers/Admin/Settings.php:433
2665
  msgid "If you make this recursive other row(s) will be removed!"
2666
  msgstr ""
2667
 
2668
- #: v2/App/Controllers/Admin/Settings.php:435
2669
  msgid "Minimum Quantity"
2670
  msgstr ""
2671
 
2672
- #: v2/App/Controllers/Admin/Settings.php:436
2673
  msgid "Discount value"
2674
  msgstr ""
2675
 
2676
- #: v2/App/Controllers/Admin/Settings.php:438
2677
  msgid "Filter (Buy)"
2678
  msgstr ""
2679
 
2680
- #: v2/App/Controllers/Admin/Settings.php:439
2681
  #: v2/App/Views/Admin/Rules/Manage.php:146
2682
  msgid "Filter"
2683
  msgstr ""
2684
 
2685
- #: v2/App/Controllers/Admin/Settings.php:440
2686
  msgid ""
2687
  "<p>Choose <b>what gets discount</b> (products/categories/attributes/SKU and "
2688
  "so on )</p>\n"
2689
  "<p>Note : You can also exclude products/categories.</p>"
2690
  msgstr ""
2691
 
2692
- #: v2/App/Controllers/Admin/Settings.php:443
2693
  msgid ""
2694
  "Discount - <a href=\"https://docs.flycart.org/en/articles/3914904-bulk-"
2695
  "discounts-tiered-pricing-discounts-discount-rules-2-0?utm_source=woo-"
@@ -2698,7 +2702,7 @@ msgid ""
2698
  "\"_blank\">Read Docs</a>"
2699
  msgstr ""
2700
 
2701
- #: v2/App/Controllers/Admin/Settings.php:444
2702
  msgid ""
2703
  "Discount - <a href=\"https://docs.flycart.org/en/articles/3809899-bundle-set-"
2704
  "discount-discount-rules-2-0?utm_source=woo-discount-rules-"
@@ -2706,7 +2710,7 @@ msgid ""
2706
  "\"font-size: 12px;\" target=\"_blank\">Read Docs</a>"
2707
  msgstr ""
2708
 
2709
- #: v2/App/Controllers/Admin/Settings.php:445
2710
  msgid ""
2711
  "Discount - <a href=\"https://docs.flycart.org/en/articles/3810570-buy-x-get-"
2712
  "y-discount-rules-2-0?utm_source=woo-discount-rules-"
@@ -2714,7 +2718,7 @@ msgid ""
2714
  "size: 12px;\" target=\"_blank\">Read Docs</a>"
2715
  msgstr ""
2716
 
2717
- #: v2/App/Controllers/Admin/Settings.php:446
2718
  msgid ""
2719
  "Discount - <a href=\"https://docs.flycart.org/en/articles/3810071-buy-one-"
2720
  "get-one-free-buy-x-get-x-discount-rules-2-0?utm_source=woo-discount-rules-"
@@ -2722,12 +2726,12 @@ msgid ""
2722
  "size: 12px;\" target=\"_blank\">Read Docs</a>"
2723
  msgstr ""
2724
 
2725
- #: v2/App/Controllers/Admin/Settings.php:447
2726
  msgid ""
2727
  "<p>Select discount type and its value (percentage/price/fixed price)</p>"
2728
  msgstr ""
2729
 
2730
- #: v2/App/Controllers/Admin/Settings.php:448
2731
  msgid ""
2732
  "<p>Select discount type and its value (percentage/price/fixed price)</p> "
2733
  "<div class=\"awdr-count-by-description\"><b>Filter set above :</b><p> This "
@@ -2742,7 +2746,7 @@ msgid ""
2742
  "p></div>"
2743
  msgstr ""
2744
 
2745
- #: v2/App/Controllers/Admin/Settings.php:454
2746
  msgid ""
2747
  "<p>Select discount type and its value (percentage/price/fixed price)</p> "
2748
  "<div class=\"awdr-count-by-description\"><b>Individual Product :</b><p>This "
@@ -2756,7 +2760,7 @@ msgid ""
2756
  "because WooCommerce considers a variant as a product itself. </p></div>"
2757
  msgstr ""
2758
 
2759
- #: v2/App/Controllers/Admin/Settings.php:460
2760
  msgid ""
2761
  "<p>Select discount type and its value (percentage/price/fixed price)</p><div "
2762
  "class=\"awdr-count-by-description\"><b>All variants in each product "
@@ -2769,28 +2773,28 @@ msgid ""
2769
  "</p></div>"
2770
  msgstr ""
2771
 
2772
- #: v2/App/Controllers/Admin/Settings.php:466
2773
  msgid "Rules (optional)"
2774
  msgstr ""
2775
 
2776
- #: v2/App/Controllers/Admin/Settings.php:468
2777
  msgid ""
2778
  "<p>Choose Buy Products. (products/categories/attributes/tags/sku) Example : "
2779
  "For Buy X get Y scenarios, choose X here.</p>"
2780
  msgstr ""
2781
 
2782
- #: v2/App/Controllers/Admin/Settings.php:469
2783
  msgid ""
2784
  "<p>Choose on which products the discount should be applied (This can be "
2785
  "products/categories/SKU)</p>"
2786
  msgstr ""
2787
 
2788
- #: v2/App/Controllers/Admin/Settings.php:470
2789
- #: v2/App/Controllers/Admin/Settings.php:472
2790
  msgid "Get Discount"
2791
  msgstr ""
2792
 
2793
- #: v2/App/Controllers/Admin/Settings.php:471
2794
  msgid ""
2795
  "<p>Enter the min/max ranges and choose free item quantity.</p><p>Note : "
2796
  "Enable recursive checkbox if the discounts should be applied in sequential "
@@ -2798,7 +2802,7 @@ msgid ""
2798
  "p>"
2799
  msgstr ""
2800
 
2801
- #: v2/App/Controllers/Admin/Settings.php:473
2802
  msgid ""
2803
  "<p>Choose the adjustment type to which the discount should be applied. You "
2804
  "can choose from products/categories/all products.</p><p>Note : Enable "
@@ -2806,14 +2810,14 @@ msgid ""
2806
  "</p>"
2807
  msgstr ""
2808
 
2809
- #: v2/App/Controllers/Admin/Settings.php:474
2810
  msgid ""
2811
  "<p>Discount will be applied <b>only the selected products (based on mode of "
2812
  "apply)</b></p><p>Note : Enable recursive checkbox if the discounts should be "
2813
  "applied in sequential ranges. </p>"
2814
  msgstr ""
2815
 
2816
- #: v2/App/Controllers/Admin/Settings.php:475
2817
  msgid ""
2818
  "<p>Discount will be applied <b>only the selected categories (based on mode "
2819
  "of apply)</b></p><p>Note : Enable recursive checkbox if the discounts should "
@@ -2824,7 +2828,7 @@ msgid ""
2824
  "table>"
2825
  msgstr ""
2826
 
2827
- #: v2/App/Controllers/Admin/Settings.php:476
2828
  msgid ""
2829
  "<p>Discount applies on the cheapest/highest priced <b>product IN CART</b>.</"
2830
  "p><p>Note : Enable recursive checkbox if the discounts should be applied in "
@@ -2834,40 +2838,40 @@ msgid ""
2834
  "tr></tr><tr><td>4</td><td>5</td><td>2</td></tr></tbody></table>"
2835
  msgstr ""
2836
 
2837
- #: v2/App/Controllers/Admin/Settings.php:479
2838
  msgid "<p>Processing migration, please wait...</p>"
2839
  msgstr ""
2840
 
2841
- #: v2/App/Controllers/Admin/Settings.php:480
2842
  msgid "<p>Migration completed.</p>"
2843
  msgstr ""
2844
 
2845
- #: v2/App/Controllers/Admin/Settings.php:481
2846
  msgid "<p>Migration skipped.</p>"
2847
  msgstr ""
2848
 
2849
- #: v2/App/Controllers/Admin/Settings.php:482
2850
  msgid "<p>Skipping migration, please wait...</p>"
2851
  msgstr ""
2852
 
2853
- #: v2/App/Controllers/Admin/Settings.php:483
2854
  msgid ""
2855
  "<span><b>Example:</b> Product A - Small and Product A - Medium will be "
2856
  "counted as 2 quantity</span>"
2857
  msgstr ""
2858
 
2859
- #: v2/App/Controllers/Admin/Settings.php:484
2860
  msgid "<span>Discount applies to all eligible products in the store</span>"
2861
  msgstr ""
2862
 
2863
- #: v2/App/Controllers/Admin/Settings.php:485
2864
  msgid ""
2865
  "<span>Choose products that get the discount using \"In List\". If you want "
2866
  "to exclude a few products, choose \"Not In List\" and select the products "
2867
  "you wanted to exclude from discount. (You can add multiple filters)</span>"
2868
  msgstr ""
2869
 
2870
- #: v2/App/Controllers/Admin/Settings.php:486
2871
  msgid ""
2872
  "<span>Choose categories that get the discount using \"In List\". If you want "
2873
  "to exclude a few categories, choose \"Not In List\" and select the "
@@ -2875,7 +2879,7 @@ msgid ""
2875
  "filters of same type)</span>"
2876
  msgstr ""
2877
 
2878
- #: v2/App/Controllers/Admin/Settings.php:487
2879
  msgid ""
2880
  "<span> Choose attributes that get the discount using \"In List\". If you "
2881
  "want to exclude a few attributes, choose \"Not In List\" and select the "
@@ -2883,58 +2887,58 @@ msgid ""
2883
  "filters of same type)</span>"
2884
  msgstr ""
2885
 
2886
- #: v2/App/Controllers/Admin/Settings.php:488
2887
  msgid ""
2888
  "<span>Choose tags that get the discount using \"In List\". If you want to "
2889
  "exclude a few tags, choose \"Not In List\" and select the tags you wanted to "
2890
  "exclude from discount. (You can add multiple filters of same type)</span>"
2891
  msgstr ""
2892
 
2893
- #: v2/App/Controllers/Admin/Settings.php:489
2894
  msgid ""
2895
  "<span>Choose SKUs that get the discount using \"In List\". If you want to "
2896
  "exclude a few SKUs, choose \"Not In List\" and select the SKUs you wanted to "
2897
  "exclude from discount. (You can add multiple filters of same type)</span>"
2898
  msgstr ""
2899
 
2900
- #: v2/App/Controllers/Admin/Settings.php:490
2901
  msgid ""
2902
  "<span>Choose whether you want to include (or exclude) products on sale "
2903
  "(those having a sale price) for the discount </span>"
2904
  msgstr ""
2905
 
2906
- #: v2/App/Controllers/Admin/Settings.php:491
2907
  msgid "<span>Discount applies to custom taxonomy</span>"
2908
  msgstr ""
2909
 
2910
- #: v2/App/Controllers/Admin/Settings.php:492
2911
  msgid "Processing please wait.."
2912
  msgstr ""
2913
 
2914
- #: v2/App/Controllers/Admin/Settings.php:493
2915
  msgid "Rebuild index processed"
2916
  msgstr ""
2917
 
2918
- #: v2/App/Controllers/Admin/Settings.php:494
2919
  msgid "Please select the rules to build index"
2920
  msgstr ""
2921
 
2922
- #: v2/App/Controllers/Admin/Settings.php:495
2923
  msgid "Invalid File. Upload : <b style='color:red;'>.csv</b> File. </br>"
2924
  msgstr ""
2925
 
2926
- #: v2/App/Controllers/Admin/Settings.php:496
2927
  msgid ""
2928
  "<b>This rule is not running currently:</b> Rule reached maximum usage limit"
2929
  msgstr ""
2930
 
2931
- #: v2/App/Controllers/Admin/Settings.php:497
2932
  msgid ""
2933
  "<b>This rule is not running currently:</b> Start date and time is set in the "
2934
  "future date"
2935
  msgstr ""
2936
 
2937
- #: v2/App/Controllers/Admin/Settings.php:498
2938
  msgid "<b>This rule is not running currently:</b> Validity expired"
2939
  msgstr ""
2940
 
152
  msgid "License key for the %s is not entered. %s, you can get it from %s"
153
  msgstr ""
154
 
155
+ #: v1/helper/general-helper.php:48 v2/App/Controllers/Admin/Settings.php:308
156
  msgid "Guest"
157
  msgstr ""
158
 
273
  #: v1/includes/advanced/free_shipping_method.php:73
274
  #: v1/includes/discount-base.php:1063 v1/view/cart-rules.php:133
275
  #: v1/view/pricing-rules.php:163 v1/view/settings_promotion.php:65
276
+ #: v1/view/settings_promotion.php:100 v2/App/Controllers/Admin/Settings.php:418
277
  #: v2/App/Views/Admin/Tabs/DiscountRule.php:77
278
  msgid "Enable"
279
  msgstr ""
301
  msgstr ""
302
 
303
  #: v1/includes/discount-base.php:203 v1/view/cart-rules.php:162
304
+ #: v1/view/pricing-rules.php:192 v2/App/Controllers/Admin/Settings.php:417
305
  msgid "Active"
306
  msgstr ""
307
 
383
 
384
  #: v1/includes/discount-base.php:1024 v1/view/view-pricing-rules.php:654
385
  #: v1/view/view-pricing-rules.php:657 v1/view/view-pricing-rules.php:677
386
+ #: v2/App/Controllers/Admin/Settings.php:435
387
  msgid "Quantity"
388
  msgstr ""
389
 
412
  msgstr ""
413
 
414
  #: v1/includes/discount-base.php:1030 v1/view/view-pricing-rules.php:954
415
+ #: v2/App/Controllers/Admin/Settings.php:438
416
  msgid "Discount percentage"
417
  msgstr ""
418
 
559
  msgstr ""
560
 
561
  #: v1/includes/discount-base.php:1064 v1/view/cart-rules.php:130
562
+ #: v1/view/pricing-rules.php:160 v2/App/Controllers/Admin/Settings.php:416
563
  #: v2/App/Views/Admin/Tabs/DiscountRule.php:78
564
  msgid "Disable"
565
  msgstr ""
1430
 
1431
  #: v1/view/includes/cart-menu.php:13 v1/view/includes/sub-menu.php:13
1432
  #: v1/view/template/discount-table.php:42 v1/view/view-cart-rules.php:756
1433
+ #: v1/view/view-pricing-rules.php:708 v2/App/Controllers/Admin/Settings.php:443
1434
  #: v2/App/Views/Admin/Rules/Discounts/Bulk.php:59
1435
  #: v2/App/Views/Admin/Rules/Manage.php:192
1436
  msgid "Discount"
2599
  msgid "Select Values"
2600
  msgstr ""
2601
 
2602
+ #: v2/App/Controllers/Admin/Settings.php:230
2603
+ msgid "Searching…"
2604
+ msgstr ""
2605
+
2606
+ #: v2/App/Controllers/Admin/Settings.php:419
2607
  #: v2/App/Views/Admin/Tabs/DiscountRule.php:294
2608
  msgid " - (Running)"
2609
  msgstr ""
2610
 
2611
+ #: v2/App/Controllers/Admin/Settings.php:420
2612
  msgid "Oops!! something went wrong!"
2613
  msgstr ""
2614
 
2615
+ #: v2/App/Controllers/Admin/Settings.php:421
2616
  msgid "Rule duplicated successfully!"
2617
  msgstr ""
2618
 
2619
+ #: v2/App/Controllers/Admin/Settings.php:422
2620
  msgid "Rule deleted successfully!"
2621
  msgstr ""
2622
 
2623
+ #: v2/App/Controllers/Admin/Settings.php:423
2624
  msgid "Are you sure want to delete this rule!"
2625
  msgstr ""
2626
 
2627
+ #: v2/App/Controllers/Admin/Settings.php:424
2628
  msgid "Rule disabled successfully!"
2629
  msgstr ""
2630
 
2631
+ #: v2/App/Controllers/Admin/Settings.php:425
2632
  msgid "Rule enabled successfully!"
2633
  msgstr ""
2634
 
2635
+ #: v2/App/Controllers/Admin/Settings.php:426
2636
  msgid "Rule saved successfully!"
2637
  msgstr ""
2638
 
2639
+ #: v2/App/Controllers/Admin/Settings.php:427
2640
  msgid "Settings saved successfully!"
2641
  msgstr ""
2642
 
2643
+ #: v2/App/Controllers/Admin/Settings.php:428
2644
  msgid "Rule priority changed successfully!"
2645
  msgstr ""
2646
 
2647
+ #: v2/App/Controllers/Admin/Settings.php:429
2648
  msgid "Rule priority not changed !"
2649
  msgstr ""
2650
 
2651
+ #: v2/App/Controllers/Admin/Settings.php:430
2652
  msgid "No data for this period"
2653
  msgstr ""
2654
 
2655
+ #: v2/App/Controllers/Admin/Settings.php:431
2656
  msgid "Oops! Coupon already exists in Woocommerce"
2657
  msgstr ""
2658
 
2659
+ #: v2/App/Controllers/Admin/Settings.php:432
2660
  msgid "Copied!"
2661
  msgstr ""
2662
 
2663
+ #: v2/App/Controllers/Admin/Settings.php:433
2664
  #: v2/App/Views/Admin/Tabs/settings.php:496
2665
  msgid "Copy ShortCode"
2666
  msgstr ""
2667
 
2668
+ #: v2/App/Controllers/Admin/Settings.php:434
2669
  msgid "If you make this recursive other row(s) will be removed!"
2670
  msgstr ""
2671
 
2672
+ #: v2/App/Controllers/Admin/Settings.php:436
2673
  msgid "Minimum Quantity"
2674
  msgstr ""
2675
 
2676
+ #: v2/App/Controllers/Admin/Settings.php:437
2677
  msgid "Discount value"
2678
  msgstr ""
2679
 
2680
+ #: v2/App/Controllers/Admin/Settings.php:439
2681
  msgid "Filter (Buy)"
2682
  msgstr ""
2683
 
2684
+ #: v2/App/Controllers/Admin/Settings.php:440
2685
  #: v2/App/Views/Admin/Rules/Manage.php:146
2686
  msgid "Filter"
2687
  msgstr ""
2688
 
2689
+ #: v2/App/Controllers/Admin/Settings.php:441
2690
  msgid ""
2691
  "<p>Choose <b>what gets discount</b> (products/categories/attributes/SKU and "
2692
  "so on )</p>\n"
2693
  "<p>Note : You can also exclude products/categories.</p>"
2694
  msgstr ""
2695
 
2696
+ #: v2/App/Controllers/Admin/Settings.php:444
2697
  msgid ""
2698
  "Discount - <a href=\"https://docs.flycart.org/en/articles/3914904-bulk-"
2699
  "discounts-tiered-pricing-discounts-discount-rules-2-0?utm_source=woo-"
2702
  "\"_blank\">Read Docs</a>"
2703
  msgstr ""
2704
 
2705
+ #: v2/App/Controllers/Admin/Settings.php:445
2706
  msgid ""
2707
  "Discount - <a href=\"https://docs.flycart.org/en/articles/3809899-bundle-set-"
2708
  "discount-discount-rules-2-0?utm_source=woo-discount-rules-"
2710
  "\"font-size: 12px;\" target=\"_blank\">Read Docs</a>"
2711
  msgstr ""
2712
 
2713
+ #: v2/App/Controllers/Admin/Settings.php:446
2714
  msgid ""
2715
  "Discount - <a href=\"https://docs.flycart.org/en/articles/3810570-buy-x-get-"
2716
  "y-discount-rules-2-0?utm_source=woo-discount-rules-"
2718
  "size: 12px;\" target=\"_blank\">Read Docs</a>"
2719
  msgstr ""
2720
 
2721
+ #: v2/App/Controllers/Admin/Settings.php:447
2722
  msgid ""
2723
  "Discount - <a href=\"https://docs.flycart.org/en/articles/3810071-buy-one-"
2724
  "get-one-free-buy-x-get-x-discount-rules-2-0?utm_source=woo-discount-rules-"
2726
  "size: 12px;\" target=\"_blank\">Read Docs</a>"
2727
  msgstr ""
2728
 
2729
+ #: v2/App/Controllers/Admin/Settings.php:448
2730
  msgid ""
2731
  "<p>Select discount type and its value (percentage/price/fixed price)</p>"
2732
  msgstr ""
2733
 
2734
+ #: v2/App/Controllers/Admin/Settings.php:449
2735
  msgid ""
2736
  "<p>Select discount type and its value (percentage/price/fixed price)</p> "
2737
  "<div class=\"awdr-count-by-description\"><b>Filter set above :</b><p> This "
2746
  "p></div>"
2747
  msgstr ""
2748
 
2749
+ #: v2/App/Controllers/Admin/Settings.php:455
2750
  msgid ""
2751
  "<p>Select discount type and its value (percentage/price/fixed price)</p> "
2752
  "<div class=\"awdr-count-by-description\"><b>Individual Product :</b><p>This "
2760
  "because WooCommerce considers a variant as a product itself. </p></div>"
2761
  msgstr ""
2762
 
2763
+ #: v2/App/Controllers/Admin/Settings.php:461
2764
  msgid ""
2765
  "<p>Select discount type and its value (percentage/price/fixed price)</p><div "
2766
  "class=\"awdr-count-by-description\"><b>All variants in each product "
2773
  "</p></div>"
2774
  msgstr ""
2775
 
2776
+ #: v2/App/Controllers/Admin/Settings.php:467
2777
  msgid "Rules (optional)"
2778
  msgstr ""
2779
 
2780
+ #: v2/App/Controllers/Admin/Settings.php:469
2781
  msgid ""
2782
  "<p>Choose Buy Products. (products/categories/attributes/tags/sku) Example : "
2783
  "For Buy X get Y scenarios, choose X here.</p>"
2784
  msgstr ""
2785
 
2786
+ #: v2/App/Controllers/Admin/Settings.php:470
2787
  msgid ""
2788
  "<p>Choose on which products the discount should be applied (This can be "
2789
  "products/categories/SKU)</p>"
2790
  msgstr ""
2791
 
2792
+ #: v2/App/Controllers/Admin/Settings.php:471
2793
+ #: v2/App/Controllers/Admin/Settings.php:473
2794
  msgid "Get Discount"
2795
  msgstr ""
2796
 
2797
+ #: v2/App/Controllers/Admin/Settings.php:472
2798
  msgid ""
2799
  "<p>Enter the min/max ranges and choose free item quantity.</p><p>Note : "
2800
  "Enable recursive checkbox if the discounts should be applied in sequential "
2802
  "p>"
2803
  msgstr ""
2804
 
2805
+ #: v2/App/Controllers/Admin/Settings.php:474
2806
  msgid ""
2807
  "<p>Choose the adjustment type to which the discount should be applied. You "
2808
  "can choose from products/categories/all products.</p><p>Note : Enable "
2810
  "</p>"
2811
  msgstr ""
2812
 
2813
+ #: v2/App/Controllers/Admin/Settings.php:475
2814
  msgid ""
2815
  "<p>Discount will be applied <b>only the selected products (based on mode of "
2816
  "apply)</b></p><p>Note : Enable recursive checkbox if the discounts should be "
2817
  "applied in sequential ranges. </p>"
2818
  msgstr ""
2819
 
2820
+ #: v2/App/Controllers/Admin/Settings.php:476
2821
  msgid ""
2822
  "<p>Discount will be applied <b>only the selected categories (based on mode "
2823
  "of apply)</b></p><p>Note : Enable recursive checkbox if the discounts should "
2828
  "table>"
2829
  msgstr ""
2830
 
2831
+ #: v2/App/Controllers/Admin/Settings.php:477
2832
  msgid ""
2833
  "<p>Discount applies on the cheapest/highest priced <b>product IN CART</b>.</"
2834
  "p><p>Note : Enable recursive checkbox if the discounts should be applied in "
2838
  "tr></tr><tr><td>4</td><td>5</td><td>2</td></tr></tbody></table>"
2839
  msgstr ""
2840
 
2841
+ #: v2/App/Controllers/Admin/Settings.php:480
2842
  msgid "<p>Processing migration, please wait...</p>"
2843
  msgstr ""
2844
 
2845
+ #: v2/App/Controllers/Admin/Settings.php:481
2846
  msgid "<p>Migration completed.</p>"
2847
  msgstr ""
2848
 
2849
+ #: v2/App/Controllers/Admin/Settings.php:482
2850
  msgid "<p>Migration skipped.</p>"
2851
  msgstr ""
2852
 
2853
+ #: v2/App/Controllers/Admin/Settings.php:483
2854
  msgid "<p>Skipping migration, please wait...</p>"
2855
  msgstr ""
2856
 
2857
+ #: v2/App/Controllers/Admin/Settings.php:484
2858
  msgid ""
2859
  "<span><b>Example:</b> Product A - Small and Product A - Medium will be "
2860
  "counted as 2 quantity</span>"
2861
  msgstr ""
2862
 
2863
+ #: v2/App/Controllers/Admin/Settings.php:485
2864
  msgid "<span>Discount applies to all eligible products in the store</span>"
2865
  msgstr ""
2866
 
2867
+ #: v2/App/Controllers/Admin/Settings.php:486
2868
  msgid ""
2869
  "<span>Choose products that get the discount using \"In List\". If you want "
2870
  "to exclude a few products, choose \"Not In List\" and select the products "
2871
  "you wanted to exclude from discount. (You can add multiple filters)</span>"
2872
  msgstr ""
2873
 
2874
+ #: v2/App/Controllers/Admin/Settings.php:487
2875
  msgid ""
2876
  "<span>Choose categories that get the discount using \"In List\". If you want "
2877
  "to exclude a few categories, choose \"Not In List\" and select the "
2879
  "filters of same type)</span>"
2880
  msgstr ""
2881
 
2882
+ #: v2/App/Controllers/Admin/Settings.php:488
2883
  msgid ""
2884
  "<span> Choose attributes that get the discount using \"In List\". If you "
2885
  "want to exclude a few attributes, choose \"Not In List\" and select the "
2887
  "filters of same type)</span>"
2888
  msgstr ""
2889
 
2890
+ #: v2/App/Controllers/Admin/Settings.php:489
2891
  msgid ""
2892
  "<span>Choose tags that get the discount using \"In List\". If you want to "
2893
  "exclude a few tags, choose \"Not In List\" and select the tags you wanted to "
2894
  "exclude from discount. (You can add multiple filters of same type)</span>"
2895
  msgstr ""
2896
 
2897
+ #: v2/App/Controllers/Admin/Settings.php:490
2898
  msgid ""
2899
  "<span>Choose SKUs that get the discount using \"In List\". If you want to "
2900
  "exclude a few SKUs, choose \"Not In List\" and select the SKUs you wanted to "
2901
  "exclude from discount. (You can add multiple filters of same type)</span>"
2902
  msgstr ""
2903
 
2904
+ #: v2/App/Controllers/Admin/Settings.php:491
2905
  msgid ""
2906
  "<span>Choose whether you want to include (or exclude) products on sale "
2907
  "(those having a sale price) for the discount </span>"
2908
  msgstr ""
2909
 
2910
+ #: v2/App/Controllers/Admin/Settings.php:492
2911
  msgid "<span>Discount applies to custom taxonomy</span>"
2912
  msgstr ""
2913
 
2914
+ #: v2/App/Controllers/Admin/Settings.php:493
2915
  msgid "Processing please wait.."
2916
  msgstr ""
2917
 
2918
+ #: v2/App/Controllers/Admin/Settings.php:494
2919
  msgid "Rebuild index processed"
2920
  msgstr ""
2921
 
2922
+ #: v2/App/Controllers/Admin/Settings.php:495
2923
  msgid "Please select the rules to build index"
2924
  msgstr ""
2925
 
2926
+ #: v2/App/Controllers/Admin/Settings.php:496
2927
  msgid "Invalid File. Upload : <b style='color:red;'>.csv</b> File. </br>"
2928
  msgstr ""
2929
 
2930
+ #: v2/App/Controllers/Admin/Settings.php:497
2931
  msgid ""
2932
  "<b>This rule is not running currently:</b> Rule reached maximum usage limit"
2933
  msgstr ""
2934
 
2935
+ #: v2/App/Controllers/Admin/Settings.php:498
2936
  msgid ""
2937
  "<b>This rule is not running currently:</b> Start date and time is set in the "
2938
  "future date"
2939
  msgstr ""
2940
 
2941
+ #: v2/App/Controllers/Admin/Settings.php:499
2942
  msgid "<b>This rule is not running currently:</b> Validity expired"
2943
  msgstr ""
2944
 
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://flycart.org/
4
  Tags: woocommerce, coupons, discounts, dynamic pricing, Buy One Get One Free, pricing deals, bulk discount, discount
5
  Requires at least: 4.4.1
6
  Tested up to: 5.5
7
- Stable tag: 2.1.0
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
@@ -336,6 +336,11 @@ Discount - Enter minimum & Maximum quantity -> Adjustment Type -> Product Discou
336
 
337
  == Changelog ==
338
 
 
 
 
 
 
339
  = 2.1.0 - 13/08/20 =
340
  * Fix - Fatal error when WooCommerce is deactivated.
341
  * Fix - Displays only 10 item in sale page for attribute based rules.
4
  Tags: woocommerce, coupons, discounts, dynamic pricing, Buy One Get One Free, pricing deals, bulk discount, discount
5
  Requires at least: 4.4.1
6
  Tested up to: 5.5
7
+ Stable tag: 2.1.1
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
336
 
337
  == Changelog ==
338
 
339
+ = 2.1.1 - 17/08/20 =
340
+ * Fix - Country and state field doesn't loads when have multiple
341
+ * Fix - Warning while having BOGO rule.
342
+ * Improvement - Versioning the script files.
343
+
344
  = 2.1.0 - 13/08/20 =
345
  * Fix - Fatal error when WooCommerce is deactivated.
346
  * Fix - Displays only 10 item in sale page for attribute based rules.
v2/App/Controllers/Admin/Settings.php CHANGED
@@ -176,37 +176,37 @@ class Settings extends Base
176
  /**
177
  *Enqueue css
178
  */
179
- wp_enqueue_style(WDR_SLUG . '-datetimepickercss', WDR_PLUGIN_URL . 'Assets/Css/jquery.datetimepicker.min.css');
180
- wp_enqueue_style(WDR_SLUG . '-admin', WDR_PLUGIN_URL . 'Assets/Css/admin_style.css');
181
- wp_enqueue_style(WDR_SLUG . '-jquery-ui-css', WDR_PLUGIN_URL . 'Assets/Js/Jquery-ui/jquery-ui.min.css');
182
- wp_enqueue_style(WDR_SLUG . '-dragable-ui-css', WDR_PLUGIN_URL . 'Assets/Css/dragtable.css');
183
  /**
184
  * Enqueue js
185
  */
186
  if(apply_filters('advanced_woo_discount_rules_load_select_js', true)){
187
- wp_enqueue_script('wdr-select2-js', self::$woocommerce_helper->getWooPluginUrl() . '/assets/js/select2/select2.full.min.js', array('jquery'));
188
- wp_enqueue_script(WDR_SLUG . '-rulebuilder', WDR_PLUGIN_URL . 'Assets/Js/rulebuilder.js', array('jquery', 'wdr-select2-js', WDR_SLUG . '-datetimepickerjs'));
189
  } else {
190
- wp_enqueue_script(WDR_SLUG . '-rulebuilder', WDR_PLUGIN_URL . 'Assets/Js/rulebuilder.js', array('jquery', WDR_SLUG . '-datetimepickerjs'));
191
  }
192
  if(version_compare(getAWDRWooVersion(), '3.2.0', '<')){
193
- wp_enqueue_script('selectWoo', WDR_PLUGIN_URL . 'Assets/Js/selectWoo.full.min.js', array('jquery'));
194
  }
195
- wp_enqueue_style('wdr-select2-js', self::$woocommerce_helper->getWooPluginUrl() . '/assets/css/select2.css');
196
  wp_enqueue_script( 'woocommerce_admin' );
197
  wp_enqueue_script( 'wc-enhanced-select' );
198
  //To load woocommerce product select
199
  wp_enqueue_style( 'woocommerce_admin_styles' );
200
 
201
- wp_enqueue_script(WDR_SLUG . '-jquery-ui', WDR_PLUGIN_URL . 'Assets/Js/Jquery-ui/jquery-ui.min.js', array('jquery', 'jquery'));
202
- wp_enqueue_script(WDR_SLUG . '-datetimepickerjs', WDR_PLUGIN_URL . 'Assets/Js/jquery.datetimepicker.full.min.js', array('jquery', 'jquery'));
203
- wp_enqueue_script(WDR_SLUG . '-moment', WDR_PLUGIN_URL . 'Assets/Js/moment.min.js', array('jquery', 'jquery'));
204
- wp_register_script(WDR_SLUG . '-admin', WDR_PLUGIN_URL . 'Assets/Js/admin_script.js');
205
  wp_enqueue_script(WDR_SLUG . '-admin');
206
- wp_enqueue_script(WDR_SLUG . '-dragndraop-js', WDR_PLUGIN_URL . 'Assets/Js/jquery.dragtable.js');
207
 
208
  if ( isset( $_REQUEST['tab'] ) AND $_REQUEST['tab'] == 'statistics' ) {
209
- wp_enqueue_script( 'google-charts-loader', 'https://www.gstatic.com/charts/loader.js' );
210
 
211
  wp_enqueue_script( WDR_SLUG.'-statistics',
212
  WDR_PLUGIN_URL . 'Assets/Js/admin-statistics.js', array( 'jquery' ), WDR_VERSION );
@@ -227,6 +227,7 @@ class Settings extends Base
227
  'labels' => array(
228
  'select2_no_results' => __('no results', WDR_TEXT_DOMAIN),
229
  'placeholders' => __('Select Values', WDR_TEXT_DOMAIN),
 
230
  ),
231
  'lists' => $preloaded_lists,
232
  'admin_url' => admin_url('admin.php?page=woo_discount_rules'),
176
  /**
177
  *Enqueue css
178
  */
179
+ wp_enqueue_style(WDR_SLUG . '-datetimepickercss', WDR_PLUGIN_URL . 'Assets/Css/jquery.datetimepicker.min.css', array(), WDR_VERSION);
180
+ wp_enqueue_style(WDR_SLUG . '-admin', WDR_PLUGIN_URL . 'Assets/Css/admin_style.css', array(), WDR_VERSION);
181
+ wp_enqueue_style(WDR_SLUG . '-jquery-ui-css', WDR_PLUGIN_URL . 'Assets/Js/Jquery-ui/jquery-ui.min.css', array(), WDR_VERSION);
182
+ wp_enqueue_style(WDR_SLUG . '-dragable-ui-css', WDR_PLUGIN_URL . 'Assets/Css/dragtable.css', array(), WDR_VERSION);
183
  /**
184
  * Enqueue js
185
  */
186
  if(apply_filters('advanced_woo_discount_rules_load_select_js', true)){
187
+ wp_enqueue_script('wdr-select2-js', self::$woocommerce_helper->getWooPluginUrl() . '/assets/js/select2/select2.full.min.js', array('jquery'), WDR_VERSION);
188
+ wp_enqueue_script(WDR_SLUG . '-rulebuilder', WDR_PLUGIN_URL . 'Assets/Js/rulebuilder.js', array('jquery', 'wdr-select2-js', WDR_SLUG . '-datetimepickerjs'), WDR_VERSION);
189
  } else {
190
+ wp_enqueue_script(WDR_SLUG . '-rulebuilder', WDR_PLUGIN_URL . 'Assets/Js/rulebuilder.js', array('jquery', WDR_SLUG . '-datetimepickerjs'), WDR_VERSION);
191
  }
192
  if(version_compare(getAWDRWooVersion(), '3.2.0', '<')){
193
+ wp_enqueue_script('selectWoo', WDR_PLUGIN_URL . 'Assets/Js/selectWoo.full.min.js', array('jquery'), WDR_VERSION);
194
  }
195
+ wp_enqueue_style('wdr-select2-js', self::$woocommerce_helper->getWooPluginUrl() . '/assets/css/select2.css', array(), WDR_VERSION);
196
  wp_enqueue_script( 'woocommerce_admin' );
197
  wp_enqueue_script( 'wc-enhanced-select' );
198
  //To load woocommerce product select
199
  wp_enqueue_style( 'woocommerce_admin_styles' );
200
 
201
+ wp_enqueue_script(WDR_SLUG . '-jquery-ui', WDR_PLUGIN_URL . 'Assets/Js/Jquery-ui/jquery-ui.min.js', array('jquery'), WDR_VERSION);
202
+ wp_enqueue_script(WDR_SLUG . '-datetimepickerjs', WDR_PLUGIN_URL . 'Assets/Js/jquery.datetimepicker.full.min.js', array('jquery'), WDR_VERSION);
203
+ wp_enqueue_script(WDR_SLUG . '-moment', WDR_PLUGIN_URL . 'Assets/Js/moment.min.js', array('jquery'), WDR_VERSION);
204
+ wp_register_script(WDR_SLUG . '-admin', WDR_PLUGIN_URL . 'Assets/Js/admin_script.js', array(), WDR_VERSION);
205
  wp_enqueue_script(WDR_SLUG . '-admin');
206
+ wp_enqueue_script(WDR_SLUG . '-dragndraop-js', WDR_PLUGIN_URL . 'Assets/Js/jquery.dragtable.js', array(), WDR_VERSION);
207
 
208
  if ( isset( $_REQUEST['tab'] ) AND $_REQUEST['tab'] == 'statistics' ) {
209
+ wp_enqueue_script( 'google-charts-loader', 'https://www.gstatic.com/charts/loader.js', array(), WDR_VERSION );
210
 
211
  wp_enqueue_script( WDR_SLUG.'-statistics',
212
  WDR_PLUGIN_URL . 'Assets/Js/admin-statistics.js', array( 'jquery' ), WDR_VERSION );
227
  'labels' => array(
228
  'select2_no_results' => __('no results', WDR_TEXT_DOMAIN),
229
  'placeholders' => __('Select Values', WDR_TEXT_DOMAIN),
230
+ 'searching_text' => __('Searching…', WDR_TEXT_DOMAIN),
231
  ),
232
  'lists' => $preloaded_lists,
233
  'admin_url' => admin_url('admin.php?page=woo_discount_rules'),
v2/App/Controllers/Admin/Tabs/GeneralSettings.php CHANGED
@@ -52,6 +52,7 @@ class GeneralSettings extends Base
52
  * */
53
  protected function resetMigration(){
54
  $migration = new Migration();
 
55
  $data['migration_completed'] = 0;
56
  $data['v1_last_migrated_price_rule_id'] = 0;
57
  $data['v1_last_migrated_cart_rule_id'] = 0;
52
  * */
53
  protected function resetMigration(){
54
  $migration = new Migration();
55
+ $data['has_migration'] = null;
56
  $data['migration_completed'] = 0;
57
  $data['v1_last_migrated_price_rule_id'] = 0;
58
  $data['v1_last_migrated_cart_rule_id'] = 0;
v2/App/Controllers/ManageDiscount.php CHANGED
@@ -44,8 +44,8 @@ class ManageDiscount extends Base
44
  function loadAssets()
45
  {
46
  $ajax_update_price = self::$config->getConfig('show_strikeout_when', 'show_when_matched');
47
- wp_enqueue_style(WDR_SLUG . '-customize-table-ui-css', WDR_PLUGIN_URL . 'Assets/Css/customize-table.css');
48
- wp_enqueue_script('awdr-main', WDR_PLUGIN_URL . 'Assets/Js/site_main.js', array('jquery'));
49
  $awdr_front_end_script = array(
50
  'ajaxurl' => admin_url('admin-ajax.php'),
51
  'enable_update_price_with_qty' => $ajax_update_price,
@@ -54,7 +54,7 @@ class ManageDiscount extends Base
54
  'custom_target_variable_product' => apply_filters('advanced_woo_discount_rules_custom_target_for_variable_product_on_qty_update', ""),
55
  'js_init_trigger' => apply_filters('advanced_woo_discount_rules_update_discount_price_init_trigger', ""),
56
  );
57
- wp_enqueue_script('awdr-dynamic-price', WDR_PLUGIN_URL . 'Assets/Js/awdr-dynamic-price.js', array('jquery'));
58
  wp_localize_script('awdr-main', 'awdr_params', $awdr_front_end_script);
59
  }
60
 
44
  function loadAssets()
45
  {
46
  $ajax_update_price = self::$config->getConfig('show_strikeout_when', 'show_when_matched');
47
+ wp_enqueue_style(WDR_SLUG . '-customize-table-ui-css', WDR_PLUGIN_URL . 'Assets/Css/customize-table.css', array(), WDR_VERSION);
48
+ wp_enqueue_script('awdr-main', WDR_PLUGIN_URL . 'Assets/Js/site_main.js', array('jquery'), WDR_VERSION);
49
  $awdr_front_end_script = array(
50
  'ajaxurl' => admin_url('admin-ajax.php'),
51
  'enable_update_price_with_qty' => $ajax_update_price,
54
  'custom_target_variable_product' => apply_filters('advanced_woo_discount_rules_custom_target_for_variable_product_on_qty_update', ""),
55
  'js_init_trigger' => apply_filters('advanced_woo_discount_rules_update_discount_price_init_trigger', ""),
56
  );
57
+ wp_enqueue_script('awdr-dynamic-price', WDR_PLUGIN_URL . 'Assets/Js/awdr-dynamic-price.js', array('jquery'), WDR_VERSION);
58
  wp_localize_script('awdr-main', 'awdr_params', $awdr_front_end_script);
59
  }
60
 
v2/App/Helpers/Helper.php CHANGED
@@ -242,9 +242,9 @@ class Helper
242
  }
243
 
244
  public static function displayCompatibleCheckMessages(){
245
- if(version_compare(WDR_VERSION, '2.1.0', '>=')){
246
  if(defined('WDR_PRO_VERSION')){
247
- if(version_compare(WDR_PRO_VERSION, '2.1.0', '<')){
248
  $url = admin_url()."plugins.php";
249
  $plugin_page = '<a target="_blank" href="'.$url.'">'.__('Update now', WDR_TEXT_DOMAIN).'</a>';
250
  ?>
242
  }
243
 
244
  public static function displayCompatibleCheckMessages(){
245
+ if(version_compare(WDR_VERSION, '2.1.1', '>=')){
246
  if(defined('WDR_PRO_VERSION')){
247
+ if(version_compare(WDR_PRO_VERSION, '2.1.1', '<')){
248
  $url = admin_url()."plugins.php";
249
  $plugin_page = '<a target="_blank" href="'.$url.'">'.__('Update now', WDR_TEXT_DOMAIN).'</a>';
250
  ?>
v2/Assets/Js/admin_script.js CHANGED
@@ -514,6 +514,10 @@ jQuery(document).ready(function ($) {
514
  language: {
515
  noResults: function () {
516
  return wdr_data.labels.select2_no_results;
 
 
 
 
517
  }
518
  },
519
  ajax: {
@@ -1543,7 +1547,7 @@ jQuery(document).ready(function ($) {
1543
  }
1544
  break;
1545
  case 'shipping_country':
1546
- let shipping_country = $(element).find('.shipping_country').val();
1547
  if(!shipping_country){
1548
  condition_array.push("fails");
1549
  $(element).find('.select2-selection').css("border", "1px solid red");
@@ -1553,7 +1557,7 @@ jQuery(document).ready(function ($) {
1553
  }
1554
  break;
1555
  case 'shipping_state':
1556
- let shipping_state = $(element).find('.shipping_state').val();
1557
  if(!shipping_state){
1558
  condition_array.push("fails");
1559
  $(element).find('.select2-selection').css("border", "1px solid red");
514
  language: {
515
  noResults: function () {
516
  return wdr_data.labels.select2_no_results;
517
+ },
518
+ errorLoading: function() {
519
+ /* Workaround for https://github.com/select2/select2/issues/4355 instead of i18n_ajax_error.*/
520
+ return wdr_data.labels.searching_text;
521
  }
522
  },
523
  ajax: {
1547
  }
1548
  break;
1549
  case 'shipping_country':
1550
+ let shipping_country = $(element).find('.get_awdr_shipping_country').val();
1551
  if(!shipping_country){
1552
  condition_array.push("fails");
1553
  $(element).find('.select2-selection').css("border", "1px solid red");
1557
  }
1558
  break;
1559
  case 'shipping_state':
1560
+ let shipping_state = $(element).find('.get_awdr_shipping_state').val();
1561
  if(!shipping_state){
1562
  condition_array.push("fails");
1563
  $(element).find('.select2-selection').css("border", "1px solid red");
woo-discount-rules.php CHANGED
@@ -5,7 +5,7 @@
5
  * Description: Simple to complex discount rules for your WooCommerce store. Core package.
6
  * Author: Flycart Technologies LLP
7
  * Author URI: https://www.flycart.org
8
- * Version: 2.1.0
9
  * Slug: woo-discount-rules
10
  * Text Domain: woo-discount-rules
11
  * Domain Path: /i18n/languages/
@@ -21,7 +21,7 @@ if (!defined('ABSPATH')) {
21
  * Current version of our app
22
  */
23
  if (!defined('WDR_VERSION')) {
24
- define('WDR_VERSION', '2.1.0');
25
  }
26
 
27
  global $awdr_load_version, $awdr_switched_to_version;
5
  * Description: Simple to complex discount rules for your WooCommerce store. Core package.
6
  * Author: Flycart Technologies LLP
7
  * Author URI: https://www.flycart.org
8
+ * Version: 2.1.1
9
  * Slug: woo-discount-rules
10
  * Text Domain: woo-discount-rules
11
  * Domain Path: /i18n/languages/
21
  * Current version of our app
22
  */
23
  if (!defined('WDR_VERSION')) {
24
+ define('WDR_VERSION', '2.1.1');
25
  }
26
 
27
  global $awdr_load_version, $awdr_switched_to_version;