Discount Rules for WooCommerce - Version 2.3.7

Version Description

  • 30/04/21 =
  • Improvement - Moved advance option tab to settings.
Download this release

Release Info

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

Code changes from version 2.3.6 to 2.3.7

Files changed (18) hide show
  1. readme.txt +6 -3
  2. v2/App/Controllers/Admin/Settings.php +1 -3
  3. v2/App/Controllers/Admin/Tabs/AdvancedSection.php +2 -3
  4. v2/App/Controllers/Admin/Tabs/Help.php +1 -1
  5. v2/App/Controllers/Admin/Tabs/Recipe.php +1 -1
  6. v2/App/Controllers/Configuration.php +3 -1
  7. v2/App/Helpers/Helper.php +2 -2
  8. v2/App/Helpers/Validation.php +3 -0
  9. v2/App/Router.php +5 -0
  10. v2/App/Views/Admin/Tabs/Recipe.php +12 -7
  11. v2/App/Views/Admin/Tabs/RecipeTypes/BogoDiscountRecipe.php +6 -6
  12. v2/App/Views/Admin/Tabs/RecipeTypes/BulkDiscountRecipe.php +6 -6
  13. v2/App/Views/Admin/Tabs/RecipeTypes/BundleDiscountRecipe.php +3 -3
  14. v2/App/Views/Admin/Tabs/RecipeTypes/CartDiscountRecipe.php +6 -6
  15. v2/App/Views/Admin/Tabs/RecipeTypes/SimpleDiscountRecipe.php +6 -6
  16. v2/App/Views/Admin/Tabs/settings.php +58 -0
  17. v2/Assets/Css/admin_style.css +5 -1
  18. woo-discount-rules.php +2 -2
readme.txt CHANGED
@@ -4,11 +4,11 @@ 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.7
7
- Stable tag: 2.3.6
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
11
- Create simple to complex discount rules, dynamic pricing and discounts. A flexible and powerful WooCommerce discount plugin.
12
 
13
  == Description ==
14
 
@@ -20,7 +20,7 @@ Discounts will be visible in product page, product details page, cart, checkout
20
 
21
  Display the pricing discount table beautifully on the product page. Start selling more and retain customers by running promotions with the best dynamic pricing and discount plugin for WooCommerce.
22
 
23
- [View Demo](http://demo.flycart.org/woo-discount-rules) | [Documentation with real examples](https://docs.flycart.org/en/collections/806883-woocommerce-discount-rules) | [Ask Questions](https://www.flycart.org/support) | [PRO version](https://www.flycart.org/products/wordpress/woocommerce-discount-rules) | [Examples](https://www.flycart.org/woocommerce-discount-rules-examples)
24
 
25
  == DISCOUNT TYPES AND FEATURES ==
26
 
@@ -336,6 +336,9 @@ Note : Enable recursive checkbox if the discounts should be applied in sequentia
336
 
337
  == Changelog ==
338
 
 
 
 
339
  = 2.3.6 - 29/04/21 =
340
  * Feature - Recursive option for set discounts.
341
  * Improvement - Reset migration improvement.
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.7
7
+ Stable tag: 2.3.7
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
11
+ Create simple to complex discount rules, dynamic pricing and discounts. A flexible and powerful WooCommerce discount & WooCommerce coupon plugin.
12
 
13
  == Description ==
14
 
20
 
21
  Display the pricing discount table beautifully on the product page. Start selling more and retain customers by running promotions with the best dynamic pricing and discount plugin for WooCommerce.
22
 
23
+ [View Demo](https://demo.flycart.net/woo-discount-rules) | [Documentation with real examples](https://docs.flycart.org/en/collections/806883-woocommerce-discount-rules) | [Ask Questions](https://www.flycart.org/support) | [PRO version](https://www.flycart.org/products/wordpress/woocommerce-discount-rules) | [Examples](https://www.flycart.org/woocommerce-discount-rules-examples)
24
 
25
  == DISCOUNT TYPES AND FEATURES ==
26
 
336
 
337
  == Changelog ==
338
 
339
+ = 2.3.7 - 30/04/21 =
340
+ * Improvement - Moved advance option tab to settings.
341
+
342
  = 2.3.6 - 29/04/21 =
343
  * Feature - Recursive option for set discounts.
344
  * Improvement - Reset migration improvement.
v2/App/Controllers/Admin/Settings.php CHANGED
@@ -2,7 +2,6 @@
2
 
3
  namespace Wdr\App\Controllers\Admin;
4
 
5
- use Wdr\App\Controllers\Admin\Tabs\AdvancedSection;
6
  use Wdr\App\Controllers\Admin\Tabs\Compatible;
7
  use Wdr\App\Controllers\Admin\Tabs\DiscountRules;
8
  use Wdr\App\Controllers\Admin\Tabs\Help;
@@ -134,8 +133,7 @@ class Settings extends Base
134
  'compatible' => new Compatible(),
135
  'importexport' => new ImportExport(),
136
  'help' => new Help(),
137
- 'recipe' => new Recipe(),
138
- 'advanced_section' => new AdvancedSection(),
139
  );
140
  uasort($tabs, function ($tab1, $tab2) {
141
  $priority1 = (int)isset($tab1->priority) ? $tab1->priority : 1000;
2
 
3
  namespace Wdr\App\Controllers\Admin;
4
 
 
5
  use Wdr\App\Controllers\Admin\Tabs\Compatible;
6
  use Wdr\App\Controllers\Admin\Tabs\DiscountRules;
7
  use Wdr\App\Controllers\Admin\Tabs\Help;
133
  'compatible' => new Compatible(),
134
  'importexport' => new ImportExport(),
135
  'help' => new Help(),
136
+ 'recipe' => new Recipe()
 
137
  );
138
  uasort($tabs, function ($tab1, $tab2) {
139
  $priority1 = (int)isset($tab1->priority) ? $tab1->priority : 1000;
v2/App/Controllers/Admin/Tabs/AdvancedSection.php CHANGED
@@ -35,7 +35,6 @@ class AdvancedSection extends Base
35
  $params=array(
36
  'configuration' => $advanced_config,
37
  );
38
- $this->runAdvancedOption($advanced_config);
39
  self::$template_helper->setPath(WDR_PLUGIN_PATH . 'App/Views/Admin/Tabs/AdvancedOptions.php')->setData($params)->display();
40
  }
41
 
@@ -47,14 +46,14 @@ class AdvancedSection extends Base
47
  /**
48
  * wdr_recalculate_total_before_cart
49
  */
50
- if( $advanced_config->getConfig('wdr_disable_recalculate_total', 0)){
51
  self::$template_helper->setPath(WDR_PLUGIN_PATH . 'App/Snippets/disableRecalculateTotal.php')->render();
52
  }
53
 
54
  /**
55
  * wdr_recalculate_total_when_coupon_apply
56
  */
57
- if( $advanced_config->getConfig('wdr_recalculate_total_when_coupon_apply', 0)) {
58
  self::$template_helper->setPath(WDR_PLUGIN_PATH . 'App/Snippets/recalculateTotalBeforeApplyCoupon.php')->render();
59
  }
60
 
35
  $params=array(
36
  'configuration' => $advanced_config,
37
  );
 
38
  self::$template_helper->setPath(WDR_PLUGIN_PATH . 'App/Views/Admin/Tabs/AdvancedOptions.php')->setData($params)->display();
39
  }
40
 
46
  /**
47
  * wdr_recalculate_total_before_cart
48
  */
49
+ if($advanced_config->getConfig('disable_recalculate_total', 0)){
50
  self::$template_helper->setPath(WDR_PLUGIN_PATH . 'App/Snippets/disableRecalculateTotal.php')->render();
51
  }
52
 
53
  /**
54
  * wdr_recalculate_total_when_coupon_apply
55
  */
56
+ if( $advanced_config->getConfig('disable_recalculate_total_when_coupon_apply', 0)) {
57
  self::$template_helper->setPath(WDR_PLUGIN_PATH . 'App/Snippets/recalculateTotalBeforeApplyCoupon.php')->render();
58
  }
59
 
v2/App/Controllers/Admin/Tabs/Help.php CHANGED
@@ -14,7 +14,7 @@ class Help extends Base
14
  public function __construct()
15
  {
16
  parent::__construct();
17
- $this->title = __('Read Documentation', 'woo-discount-rules');
18
  }
19
 
20
  /**
14
  public function __construct()
15
  {
16
  parent::__construct();
17
+ $this->title = __('Documentation', 'woo-discount-rules');
18
  }
19
 
20
  /**
v2/App/Controllers/Admin/Tabs/Recipe.php CHANGED
@@ -21,7 +21,7 @@ class Recipe extends Base
21
  public function __construct()
22
  {
23
  parent::__construct();
24
- $this->title = __('Recipe', WDR_TEXT_DOMAIN);
25
  }
26
 
27
  /**
21
  public function __construct()
22
  {
23
  parent::__construct();
24
+ $this->title = __('Recipe', 'woo-discount-rules');
25
  }
26
 
27
  /**
v2/App/Controllers/Configuration.php CHANGED
@@ -66,7 +66,9 @@ class Configuration
66
  'show_subtotal_promotion' => 0,
67
  'show_cart_quantity_promotion' => 0,
68
  'show_promo_text' => '',
69
-
 
 
70
  );
71
  private static $default_advanced_section_config = array(
72
  'wdr_override_custom_price' => 0, // 0,1
66
  'show_subtotal_promotion' => 0,
67
  'show_cart_quantity_promotion' => 0,
68
  'show_promo_text' => '',
69
+ 'wdr_override_custom_price' => 0, // 0,1
70
+ 'disable_recalculate_total' => 0, // 0,1
71
+ 'disable_recalculate_total_when_coupon_apply' => 0, // 0,1
72
  );
73
  private static $default_advanced_section_config = array(
74
  'wdr_override_custom_price' => 0, // 0,1
v2/App/Helpers/Helper.php CHANGED
@@ -332,9 +332,9 @@ class Helper
332
 
333
  public static function displayCompatibleCheckMessages()
334
  {
335
- if (version_compare(WDR_VERSION, '2.3.6', '>=')) {
336
  if (defined('WDR_PRO_VERSION')) {
337
- if (version_compare(WDR_PRO_VERSION, '2.3.6', '<')) {
338
  $url = admin_url() . "plugins.php";
339
  $plugin_page = '<a target="_blank" href="' . $url . '">' . __('Update now', 'woo-discount-rules') . '</a>';
340
  ?>
332
 
333
  public static function displayCompatibleCheckMessages()
334
  {
335
+ if (version_compare(WDR_VERSION, '2.3.7', '>=')) {
336
  if (defined('WDR_PRO_VERSION')) {
337
+ if (version_compare(WDR_PRO_VERSION, '2.3.7', '<')) {
338
  $url = admin_url() . "plugins.php";
339
  $plugin_page = '<a target="_blank" href="' . $url . '">' . __('Update now', 'woo-discount-rules') . '</a>';
340
  ?>
v2/App/Helpers/Validation.php CHANGED
@@ -402,6 +402,9 @@ class Validation
402
  'show_promo_text_con',
403
  'show_applied_rules_message_on_cart',
404
  'show_cross_sell_on_cart',
 
 
 
405
  )
406
  );
407
  //validate slug may contains a-zA-Z0-9_-
402
  'show_promo_text_con',
403
  'show_applied_rules_message_on_cart',
404
  'show_cross_sell_on_cart',
405
+ 'wdr_override_custom_price',
406
+ 'disable_recalculate_total',
407
+ 'disable_recalculate_total_when_coupon_apply'
408
  )
409
  );
410
  //validate slug may contains a-zA-Z0-9_-
v2/App/Router.php CHANGED
@@ -3,6 +3,7 @@
3
  namespace Wdr\App;
4
 
5
  use Wdr\App\Controllers\Admin\Settings;
 
6
  use Wdr\App\Controllers\Admin\WDRAjax;
7
  use Wdr\App\Controllers\Admin\Tabs;
8
  use Wdr\App\Controllers\ManageDiscount;
@@ -195,5 +196,9 @@ class Router
195
 
196
  //Deprecated the event advanced_woo_discount_rules_additional_fee_value
197
  add_filter('advanced_woo_discount_rules_additional_fee_amount', array(self::$manage_discount, 'applyTaxInFee'), 10, 2);
 
 
 
 
198
  }
199
  }
3
  namespace Wdr\App;
4
 
5
  use Wdr\App\Controllers\Admin\Settings;
6
+ use Wdr\App\Controllers\Admin\Tabs\AdvancedSection;
7
  use Wdr\App\Controllers\Admin\WDRAjax;
8
  use Wdr\App\Controllers\Admin\Tabs;
9
  use Wdr\App\Controllers\ManageDiscount;
196
 
197
  //Deprecated the event advanced_woo_discount_rules_additional_fee_value
198
  add_filter('advanced_woo_discount_rules_additional_fee_amount', array(self::$manage_discount, 'applyTaxInFee'), 10, 2);
199
+
200
+ //For loading snippets
201
+ $advance_option = new AdvancedSection();
202
+ $advance_option->runAdvancedOption($manage_discount_class::$config);
203
  }
204
  }
v2/App/Views/Admin/Tabs/Recipe.php CHANGED
@@ -9,24 +9,29 @@ $template_helper = new Template();
9
  <br>
10
  <div id="wpbody-content" class="awdr-container" style="background-color: #ffffff;">
11
  <?php if($is_pro) { ?>
 
 
 
 
 
12
  <div class="awdr_recipe_container">
13
  <div class="awdr_recipe_left">
14
  <div class="awdr_recipe_main_card" data-recipe-group="awdr_product_adjustment_card_group">
15
  <div class="awdr_product_adjustment_card_container" >
16
- <h4><b> <?php _e('Simple Discount', WDR_TEXT_DOMAIN);?></b></h4>
17
- <p><?php _e('Product adjustment ', WDR_TEXT_DOMAIN);?></p>
18
  </div>
19
  </div>
20
  <div class="awdr_recipe_main_card" data-recipe-group="awdr_set_adjustment_card_group">
21
  <div class="awdr_set_adjustment_card_container">
22
- <h4><b><?php _e('Bundle(set) Discount', WDR_TEXT_DOMAIN);?></b></h4>
23
- <p><?php _e('Bundle(set) Adjustment', WDR_TEXT_DOMAIN);?></p>
24
  </div>
25
  </div>
26
  <div class="awdr_recipe_main_card" data-recipe-group="awdr_bogo_adjustment_card_group">
27
  <div class="awdr_bogo_adjustment_card_container">
28
- <h4><b><?php _e('BOGO Discount', WDR_TEXT_DOMAIN);?></b></h4>
29
- <p><?php _e('BOGO Adjustment', WDR_TEXT_DOMAIN);?></p>
30
  </div>
31
  </div>
32
  </div>
@@ -46,7 +51,7 @@ $template_helper = new Template();
46
  </div>
47
  <?php
48
  }else{ ?>
49
- <p> <?php _e("Unlock this feature by <a href='https://www.flycart.org/products/wordpress/woocommerce-discount-rules?utm_source=woo-discount-rules-v2&utm_campaign=doc&utm_medium=text-click&utm_content=unlock_pro' target='_blank'>Upgrading to Pro</a>", WDR_TEXT_DOMAIN); ?></p>
50
  <?php } ?>
51
  </div>
52
 
9
  <br>
10
  <div id="wpbody-content" class="awdr-container" style="background-color: #ffffff;">
11
  <?php if($is_pro) { ?>
12
+ <div class="awdr-header_text_recipe">
13
+ <p>
14
+ <?php _e('Use the sample recipes below to create discount rules easily. These are example rules for some of the popular discount scenarios. You can use these recipes to get started quickly.', 'woo-discount-rules'); ?>
15
+ </p>
16
+ </div>
17
  <div class="awdr_recipe_container">
18
  <div class="awdr_recipe_left">
19
  <div class="awdr_recipe_main_card" data-recipe-group="awdr_product_adjustment_card_group">
20
  <div class="awdr_product_adjustment_card_container" >
21
+ <h4><b> <?php _e('Simple Discount', 'woo-discount-rules');?></b></h4>
22
+ <p><?php _e('Product adjustment ', 'woo-discount-rules');?></p>
23
  </div>
24
  </div>
25
  <div class="awdr_recipe_main_card" data-recipe-group="awdr_set_adjustment_card_group">
26
  <div class="awdr_set_adjustment_card_container">
27
+ <h4><b><?php _e('Bundle(set) Discount', 'woo-discount-rules');?></b></h4>
28
+ <p><?php _e('Bundle(set) Adjustment', 'woo-discount-rules');?></p>
29
  </div>
30
  </div>
31
  <div class="awdr_recipe_main_card" data-recipe-group="awdr_bogo_adjustment_card_group">
32
  <div class="awdr_bogo_adjustment_card_container">
33
+ <h4><b><?php _e('BOGO Discount', 'woo-discount-rules');?></b></h4>
34
+ <p><?php _e('BOGO Adjustment', 'woo-discount-rules');?></p>
35
  </div>
36
  </div>
37
  </div>
51
  </div>
52
  <?php
53
  }else{ ?>
54
+ <p> <?php _e("Unlock this feature by <a href='https://www.flycart.org/products/wordpress/woocommerce-discount-rules?utm_source=woo-discount-rules-v2&utm_campaign=doc&utm_medium=text-click&utm_content=unlock_pro' target='_blank'>Upgrading to Pro</a>", 'woo-discount-rules'); ?></p>
55
  <?php } ?>
56
  </div>
57
 
v2/App/Views/Admin/Tabs/RecipeTypes/BogoDiscountRecipe.php CHANGED
@@ -5,14 +5,14 @@ if (!defined('ABSPATH')) {
5
  ?>
6
  <div class="awdr_bogo_adjustment_card_group" style="display: none;">
7
  <div class="awdr_simple_discount awdr_common_border_class">
8
- <b><?php _e('Buy X get X - Buy 1 get 1 free - sample', WDR_TEXT_DOMAIN);?></b>
9
- <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="buyx_gety_recipe_1"><?php _e('Create', WDR_TEXT_DOMAIN);?></button>
10
- <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', WDR_TEXT_DOMAIN);?></a>
11
 
12
  </div>
13
  <div class="awdr_simple_discount awdr_common_border_class">
14
- <b><?php _e('Buy X get Y - Buy 2 get 1 free - sample', WDR_TEXT_DOMAIN);?></b>
15
- <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="buyx_gety_recipe_2"><?php _e('Create', WDR_TEXT_DOMAIN);?></button>
16
- <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', WDR_TEXT_DOMAIN);?></a>
17
  </div>
18
  </div>
5
  ?>
6
  <div class="awdr_bogo_adjustment_card_group" style="display: none;">
7
  <div class="awdr_simple_discount awdr_common_border_class">
8
+ <b><?php _e('Buy X get X - Buy 1 get 1 free - sample', 'woo-discount-rules');?></b>
9
+ <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="buyx_gety_recipe_1"><?php _e('Create', 'woo-discount-rules');?></button>
10
+ <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', 'woo-discount-rules');?></a>
11
 
12
  </div>
13
  <div class="awdr_simple_discount awdr_common_border_class">
14
+ <b><?php _e('Buy X get Y - Buy 2 get 1 free - sample', 'woo-discount-rules');?></b>
15
+ <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="buyx_gety_recipe_2"><?php _e('Create', 'woo-discount-rules');?></button>
16
+ <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', 'woo-discount-rules');?></a>
17
  </div>
18
  </div>
v2/App/Views/Admin/Tabs/RecipeTypes/BulkDiscountRecipe.php CHANGED
@@ -5,19 +5,19 @@ if (!defined('ABSPATH')) {
5
  ?>
6
  <div class="awdr_bulk_adjustment_card_group" style="display: none;">
7
  <!--<div class="awdr_simple_discount awdr_common_border_class">
8
- <b><?php /*_e('10% Store Wide Discount bulk', WDR_TEXT_DOMAIN);*/?></b>
9
  <form>
10
  <input type="hidden" name="awdr_simple_discount" value="1">
11
- <button class="button" type="submit"><?php /*_e('Create', WDR_TEXT_DOMAIN);*/?></button>
12
  </form>
13
- <a style="display: none;" href=""><?php /*_e('Edit Rule', WDR_TEXT_DOMAIN);*/?></a>
14
  </div>
15
  <div class="awdr_simple_discount awdr_common_border_class">
16
- <b><?php /*_e('20% Store Wide Discount bulk', WDR_TEXT_DOMAIN);*/?></b>
17
  <form>
18
  <input type="hidden" name="awdr_simple_discount" value="1">
19
- <button class="button" type="submit"><?php /*_e('Create', WDR_TEXT_DOMAIN);*/?></button>
20
  </form>
21
- <a style="display: none;" href=""><?php /*_e('Edit Rule', WDR_TEXT_DOMAIN);*/?></a>
22
  </div>-->
23
  </div>
5
  ?>
6
  <div class="awdr_bulk_adjustment_card_group" style="display: none;">
7
  <!--<div class="awdr_simple_discount awdr_common_border_class">
8
+ <b><?php /*_e('10% Store Wide Discount bulk', 'woo-discount-rules');*/?></b>
9
  <form>
10
  <input type="hidden" name="awdr_simple_discount" value="1">
11
+ <button class="button" type="submit"><?php /*_e('Create', 'woo-discount-rules');*/?></button>
12
  </form>
13
+ <a style="display: none;" href=""><?php /*_e('Edit Rule', 'woo-discount-rules');*/?></a>
14
  </div>
15
  <div class="awdr_simple_discount awdr_common_border_class">
16
+ <b><?php /*_e('20% Store Wide Discount bulk', 'woo-discount-rules');*/?></b>
17
  <form>
18
  <input type="hidden" name="awdr_simple_discount" value="1">
19
+ <button class="button" type="submit"><?php /*_e('Create', 'woo-discount-rules');*/?></button>
20
  </form>
21
+ <a style="display: none;" href=""><?php /*_e('Edit Rule', 'woo-discount-rules');*/?></a>
22
  </div>-->
23
  </div>
v2/App/Views/Admin/Tabs/RecipeTypes/BundleDiscountRecipe.php CHANGED
@@ -5,9 +5,9 @@ if (!defined('ABSPATH')) {
5
  ?>
6
  <div class="awdr_set_adjustment_card_group" style="display: none;">
7
  <div class="awdr_simple_discount awdr_common_border_class">
8
- <b><?php _e('Set Discount - sample', WDR_TEXT_DOMAIN);?></b>
9
- <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="bundle_recipe_1"><?php _e('Create', WDR_TEXT_DOMAIN);?></button>
10
- <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', WDR_TEXT_DOMAIN);?></a>
11
 
12
  </div>
13
  </div>
5
  ?>
6
  <div class="awdr_set_adjustment_card_group" style="display: none;">
7
  <div class="awdr_simple_discount awdr_common_border_class">
8
+ <b><?php _e('Set Discount - sample', 'woo-discount-rules');?></b>
9
+ <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="bundle_recipe_1"><?php _e('Create', 'woo-discount-rules');?></button>
10
+ <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', 'woo-discount-rules');?></a>
11
 
12
  </div>
13
  </div>
v2/App/Views/Admin/Tabs/RecipeTypes/CartDiscountRecipe.php CHANGED
@@ -5,19 +5,19 @@ if (!defined('ABSPATH')) {
5
  ?>
6
  <div class="awdr_cart_adjustment_card_group" style="display: none;">
7
  <!--<div class="awdr_simple_discount awdr_common_border_class">
8
- <b><?php /*_e('10% Store Wide Discount Cart', WDR_TEXT_DOMAIN);*/?></b>
9
  <form>
10
  <input type="hidden" name="awdr_simple_discount" value="1">
11
- <button class="button" type="submit"><?php /*_e('Create', WDR_TEXT_DOMAIN);*/?></button>
12
  </form>
13
- <a style="display: none;" href=""><?php /*_e('Edit Rule', WDR_TEXT_DOMAIN);*/?></a>
14
  </div>
15
  <div class="awdr_simple_discount awdr_common_border_class">
16
- <b><?php /*_e('20% Store Wide Discount Cart', WDR_TEXT_DOMAIN);*/?></b>
17
  <form>
18
  <input type="hidden" name="awdr_simple_discount" value="1">
19
- <button class="button" type="submit"><?php /*_e('Create', WDR_TEXT_DOMAIN);*/?></button>
20
  </form>
21
- <a style="display: none;" href=""><?php /*_e('Edit Rule', WDR_TEXT_DOMAIN);*/?></a>
22
  </div>-->
23
  </div>
5
  ?>
6
  <div class="awdr_cart_adjustment_card_group" style="display: none;">
7
  <!--<div class="awdr_simple_discount awdr_common_border_class">
8
+ <b><?php /*_e('10% Store Wide Discount Cart', 'woo-discount-rules');*/?></b>
9
  <form>
10
  <input type="hidden" name="awdr_simple_discount" value="1">
11
+ <button class="button" type="submit"><?php /*_e('Create', 'woo-discount-rules');*/?></button>
12
  </form>
13
+ <a style="display: none;" href=""><?php /*_e('Edit Rule', 'woo-discount-rules');*/?></a>
14
  </div>
15
  <div class="awdr_simple_discount awdr_common_border_class">
16
+ <b><?php /*_e('20% Store Wide Discount Cart', 'woo-discount-rules');*/?></b>
17
  <form>
18
  <input type="hidden" name="awdr_simple_discount" value="1">
19
+ <button class="button" type="submit"><?php /*_e('Create', 'woo-discount-rules');*/?></button>
20
  </form>
21
+ <a style="display: none;" href=""><?php /*_e('Edit Rule', 'woo-discount-rules');*/?></a>
22
  </div>-->
23
  </div>
v2/App/Views/Admin/Tabs/RecipeTypes/SimpleDiscountRecipe.php CHANGED
@@ -6,15 +6,15 @@ if (!defined('ABSPATH')) {
6
 
7
  <div class="awdr_product_adjustment_card_group">
8
  <div class="awdr_simple_discount awdr_common_border_class">
9
- <b><?php _e('Coupon based user role discount - sample', WDR_TEXT_DOMAIN);?></b>
10
- <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="simple_recipe_1"><?php _e('Create', WDR_TEXT_DOMAIN);?></button>
11
- <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', WDR_TEXT_DOMAIN);?></a>
12
 
13
  </div>
14
  <div class="awdr_simple_discount awdr_common_border_class">
15
- <b><?php _e('Subtotal tiered discount - sample', WDR_TEXT_DOMAIN);?></b>
16
- <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="simple_recipe_2"><?php _e('Create', WDR_TEXT_DOMAIN);?></button>
17
- <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', WDR_TEXT_DOMAIN);?></a>
18
  </div>
19
  </div>
20
 
6
 
7
  <div class="awdr_product_adjustment_card_group">
8
  <div class="awdr_simple_discount awdr_common_border_class">
9
+ <b><?php _e('Coupon based user role discount - sample', 'woo-discount-rules');?></b>
10
+ <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="simple_recipe_1"><?php _e('Create', 'woo-discount-rules');?></button>
11
+ <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', 'woo-discount-rules');?></a>
12
 
13
  </div>
14
  <div class="awdr_simple_discount awdr_common_border_class">
15
+ <b><?php _e('Subtotal tiered discount - sample', 'woo-discount-rules');?></b>
16
+ <button class="button awdr_recipe_content" type="button" data-recipe-nonce="<?php echo $recipe_nonce;?>" data-select-recipe="simple_recipe_2"><?php _e('Create', 'woo-discount-rules');?></button>
17
+ <a style="display: none;" class="button awdr_recipe_rule_edit" href="" target="_blank" ><?php _e('View & edit Rule', 'woo-discount-rules');?></a>
18
  </div>
19
  </div>
20
 
v2/App/Views/Admin/Tabs/settings.php CHANGED
@@ -511,6 +511,64 @@
511
  <?php } ?>
512
  </tbody>
513
  </table>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
514
  <?php
515
  do_action('advanced_woo_discount_rules_after_settings_fields', $configuration);
516
  ?>
511
  <?php } ?>
512
  </tbody>
513
  </table>
514
+ <h1><?php _e('Third party plugin conflict fixes & options', 'woo-discount-rules'); ?></h1>
515
+ <p><?php _e('Use these advanced options ONLY when you use a third party plugin that interacts with product pricing & discounts and only when you DONT see the discounts applying. Otherwise these options should be left as NO.', 'woo-discount-rules'); ?></p>
516
+ <p style="color:tomato; font-weight: normal;"><?php _e('IMPORTANT: Please consult with our support team by opening a ticket at <a href="https://www.flycart.org/support" target="_blank">https://www.flycart.org/support</a> before you use these options.', 'woo-discount-rules'); ?></p>
517
+ <table class="wdr-general-setting form-table">
518
+ <tbody style="background-color: #fff;">
519
+ <tr>
520
+ <td scope="row">
521
+ <label for="" class="awdr-left-align"><?php _e('Do you have custom prices set using another plugin or custom code? (Example: A wholesale price or a country specific pricing)', 'woo-discount-rules') ?></label>
522
+ <span class="wdr_settings_desc_text awdr-clear-both"><?php _e('If you have custom prices for your products like using another plugin and if you do not see the discount NOT applied, enable this option.', 'woo-discount-rules'); ?></span>
523
+ </td>
524
+ <td>
525
+ <input type="radio" name="wdr_override_custom_price" class="settings_option_show_hide"
526
+ id="wdr_override_custom_price_1"
527
+ value="1" <?php echo($configuration->getConfig('wdr_override_custom_price', 0) ? 'checked' : '') ?>><label
528
+ for="wdr_override_custom_price_1"><?php _e('Yes', 'woo-discount-rules'); ?></label>
529
+
530
+ <input type="radio" name="wdr_override_custom_price" class="settings_option_show_hide"
531
+ id="wdr_override_custom_price_0"
532
+ value="0" <?php echo(!$configuration->getConfig('wdr_override_custom_price', 0) ? 'checked' : '') ?>><label
533
+ for="wdr_override_custom_price_0"><?php _e('No', 'woo-discount-rules'); ?></label>
534
+ </td>
535
+ </tr>
536
+ <tr>
537
+ <td scope="row">
538
+ <label for="" class="awdr-left-align"><?php _e('Disable re-calculating the cart total on cart page', 'woo-discount-rules') ?></label>
539
+ <span class="wdr_settings_desc_text awdr-clear-both"><?php _e('This will be helpful if you see the discounts not working. It could be because other plugins might be force re-calculating the totals in cart.', 'woo-discount-rules'); ?></span>
540
+ </td>
541
+ <td>
542
+ <input type="radio" name="disable_recalculate_total" class="settings_option_show_hide"
543
+ id="do_disable_recalculate_total_1"
544
+ value="1" <?php echo($configuration->getConfig('disable_recalculate_total', 0) ? 'checked' : '') ?>><label
545
+ for="do_disable_recalculate_total_1"><?php _e('Yes', 'woo-discount-rules'); ?></label>
546
+
547
+ <input type="radio" name="disable_recalculate_total" class="settings_option_show_hide"
548
+ id="do_disable_recalculate_total_0"
549
+ value="0" <?php echo(!$configuration->getConfig('disable_recalculate_total', 0) ? 'checked' : '') ?>><label
550
+ for="do_disable_recalculate_total_0"><?php _e('No', 'woo-discount-rules'); ?></label>
551
+ </td>
552
+ </tr>
553
+ <tr>
554
+ <td scope="row">
555
+ <label for="" class="awdr-left-align"><?php _e('Disable re-calculating the total when applying the coupon.', 'woo-discount-rules') ?></label>
556
+ <span class="wdr_settings_desc_text awdr-clear-both"><?php _e('This will be useful, if you see the discounts being removed after the coupon applies... or the discount does not work after applying a coupon.', 'woo-discount-rules'); ?></span>
557
+ </td>
558
+ <td>
559
+ <input type="radio" name="disable_recalculate_total_when_coupon_apply" class="settings_option_show_hide"
560
+ id="disable_recalculate_total_when_coupon_apply_1"
561
+ value="1" <?php echo($configuration->getConfig('disable_recalculate_total_when_coupon_apply', 0) ? 'checked' : '') ?>><label
562
+ for="disable_recalculate_total_when_coupon_apply_1"><?php _e('Yes', 'woo-discount-rules'); ?></label>
563
+
564
+ <input type="radio" name="disable_recalculate_total_when_coupon_apply" class="settings_option_show_hide"
565
+ id="disable_recalculate_total_when_coupon_apply_0"
566
+ value="0" <?php echo(!$configuration->getConfig('disable_recalculate_total_when_coupon_apply', 0) ? 'checked' : '') ?>><label
567
+ for="disable_recalculate_total_when_coupon_apply_0"><?php _e('No', 'woo-discount-rules'); ?></label>
568
+ </td>
569
+ </tr>
570
+ </tbody>
571
+ </table>
572
  <?php
573
  do_action('advanced_woo_discount_rules_after_settings_fields', $configuration);
574
  ?>
v2/Assets/Css/admin_style.css CHANGED
@@ -1440,7 +1440,7 @@ div.wdr {
1440
  .awdr_recipe_container{
1441
  background-color: #ffffff;
1442
  display: flex;
1443
- padding: 10px;
1444
  }
1445
  .awdr_recipe_left {
1446
  float: left;
@@ -1534,4 +1534,8 @@ div.awdr_recipe_main_card{
1534
  }
1535
  .awdr-hr-line{
1536
  padding: 10px;
 
 
 
 
1537
  }
1440
  .awdr_recipe_container{
1441
  background-color: #ffffff;
1442
  display: flex;
1443
+ padding: 0 10px;
1444
  }
1445
  .awdr_recipe_left {
1446
  float: left;
1534
  }
1535
  .awdr-hr-line{
1536
  padding: 10px;
1537
+ }
1538
+ .awdr-header_text_recipe{
1539
+ padding: 0 20px;
1540
+ font-weight: bold;
1541
  }
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
7
  * Author URI: https://www.flycart.org
8
- * Version: 2.3.6
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.3.6');
25
  }
26
 
27
  global $awdr_load_version;
5
  * Description: Simple to complex discount rules for your WooCommerce store. Core package.
6
  * Author: Flycart
7
  * Author URI: https://www.flycart.org
8
+ * Version: 2.3.7
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.3.7');
25
  }
26
 
27
  global $awdr_load_version;